Commit Graph

392 Commits (eca7bfd9bcec8f7d8a4e36b992b6247dcf63c7c3)

Author SHA1 Message Date
Abdullah Alfaraj 70f6b6a612 add support to prompt shortcut in txt2img mode 2023-02-03 13:52:56 +03:00
Abdullah Alfaraj bd8bb1d6d7 fix bug: submit new sd url will not do anything 2023-02-02 19:03:06 +03:00
Abdullah Alfaraj 874f804446 replace python server dependency for txt2img and img2img mode 2023-02-02 09:29:11 +03:00
Abdullah Alfaraj 34d8928898 all communication between plugin ui and proxy server is done through rest api 2023-02-01 12:34:53 +03:00
Abdullah Alfaraj 3c4a87fc01 store the output images in the generation_session 2023-01-31 18:02:19 +03:00
Abdullah Alfaraj 4cfc13fcc7 remove old exportPng dead code 2023-01-31 16:03:05 +03:00
Abdullah Alfaraj c1dd2d58f3 use base64 for img2img modes instead of path 2023-01-31 14:04:45 +03:00
Abdullah Alfaraj 8d4c85c047 txt2img uses base64 instead of paths 2023-01-31 11:14:17 +03:00
Abdullah Alfaraj 6bc58b4e78 add base64 image data to layer functions 2023-01-31 10:26:53 +03:00
Abdullah Alfaraj 28f884de64 fix prettier formatting 2023-01-31 07:34:57 +03:00
Abdullah Alfaraj 4c04a8ae6e remove sim from formatting 2023-01-31 07:09:06 +03:00
Abdullah Alfaraj c557556e9c apply formatting to the code base 2023-01-30 02:00:05 +03:00
Daniele b77def6c64 Bug fix - inpainting conditioning mask not displayed in img2img 2023-01-28 13:15:33 +00:00
Abdullah Alfaraj 6a78d013f5 fix the bug switching between tabs will throw photoshop error message. 2023-01-27 10:08:34 +03:00
Abdullah Alfaraj 122706de6c fix namespace bug: autoFillInInpaintMaskWeight 2023-01-26 23:38:39 +03:00
Abdullah Alfaraj 84eb7dd2ff add the history button 2023-01-26 20:31:39 +03:00
Abdullah Alfaraj 5419b33527 add functional set init image btn to the output images in the viewer tab 2023-01-26 08:34:38 +03:00
Abdullah Alfaraj 13d4cc1114
Merge pull request #65 from AbdullahAlfaraj/merge_64
Merge_64
2023-01-26 06:11:56 +03:00
Abdullah Alfaraj 36ee3bb9f7 hide the inpaint mask weight in txt2img and img2img 2023-01-26 02:08:18 +03:00
Abdullah Alfaraj c653bdefa0 all images imported will be place at top of document 2023-01-25 23:09:07 +03:00
Daniele c4ed78f470 Merge branch 'separate-outpaint' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into separate-outpaint 2023-01-25 17:50:38 +00:00
Daniele 788e1d17ec Image viewer on hover button 2023-01-25 17:50:07 +00:00
Abdullah Alfaraj f46b56bfeb
Merge pull request #63 from Kyxsune/separate-outpaint
Hi res Fixed, Fixed
2023-01-25 20:20:02 +03:00
Abdullah Alfaraj d6c2b89dae add preset menu settings 2023-01-25 20:14:54 +03:00
kyxsune a21c945be3 Hi res Fixed, Fixed 2023-01-25 11:31:55 -05:00
Abdullah Alfaraj b60faa38d8 add support to the horde 2023-01-25 07:30:12 +03:00
Abdullah Alfaraj 56ffe683e4 add images from history to canvas 2023-01-25 03:39:06 +03:00
Abdullah Alfaraj 773d26789b hide mask expansion in img2img mode 2023-01-25 02:19:25 +03:00
Daniele 02ee4dd2ec Conditional display of Mask Expansion, hidden from txt2img 2023-01-24 20:09:15 +00:00
Abdullah Alfaraj 065d5ea5a5 modify alt click and shift click in the viewer tab 2023-01-24 20:16:31 +03:00
Abdullah Alfaraj f66cfe8339 make sure the active layer is selected before creating the mask related layers 2023-01-24 19:30:32 +03:00
Abdullah Alfaraj e231e963ab fix bug: don't delete selection area on end of session 2023-01-24 18:00:16 +03:00
Abdullah Alfaraj 41ac8c56f2 add ui settings manager class for preset 2023-01-24 17:00:55 +03:00
Abdullah Alfaraj cd9e8fbfdb bug fix: resize correctly on silent import 2023-01-24 05:42:17 +03:00
Abdullah Alfaraj f2f54f857d discard all will delete active selection 2023-01-24 01:40:57 +03:00
Abdullah Alfaraj 2c5d8c67f8 fix bug: selection area will not bring the active session ui 2023-01-24 01:40:29 +03:00
Abdullah Alfaraj 2c61affbc0 update inpaint mask weight when refreshing the ui 2023-01-23 22:37:44 +03:00
Abdullah Alfaraj 18a01fd9b3 wait for the image to load on canvas by 200ms 2023-01-23 10:02:05 +03:00
Abdullah Alfaraj 41901bd0ad select the last generated image 2023-01-23 07:31:44 +03:00
Abdullah Alfaraj e77a2439e3 create a temp mask layer when transitioning from inpaint session to another inpaint session 2023-01-23 04:33:28 +03:00
Abdullah Alfaraj 11dad32a62 refactor easyModeGenerate 2023-01-23 02:37:53 +03:00
Abdullah Alfaraj 0437cce5ed fix bug: wait for the session to start 2023-01-23 01:31:55 +03:00
Abdullah Alfaraj 6507ef2ef3 fix snapAndFill bug 2023-01-23 00:00:35 +03:00
Abdullah Alfaraj 52e9a2d254 create a session folder and place the generated images in it 2023-01-22 22:29:44 +03:00
Abdullah Alfaraj deaad4ea6d remove trailing "/" or "\" from url 2023-01-22 18:22:30 +03:00
Abdullah Alfaraj 575e9c5016 bug fix: ui will update when clicking mask content radio buttons 2023-01-22 03:42:11 +03:00
Abdullah Alfaraj 80d95ce20c one click loading image from search 2023-01-22 03:18:12 +03:00
Abdullah Alfaraj 362da64ca8 silent import works with a delay 2023-01-21 23:56:01 +03:00
Abdullah Alfaraj 8a1845644d silent import 2023-01-21 22:38:57 +03:00
Abdullah Alfaraj 43a252ce07 refresh the mask if it already exist 2023-01-21 17:45:03 +03:00
Abdullah Alfaraj b874704e61 add support to switching between init images in the same session and editing the mask 2023-01-21 16:42:59 +03:00
Abdullah Alfaraj 1f89df42e6 add ViewerManager class 2023-01-20 16:10:17 +03:00
Abdullah Alfaraj a44e6b40fe add a set init image button to the viewer tab 2023-01-20 15:47:50 +03:00
Abdullah Alfaraj c0353286ec reselecting the session selection area is irrelevant if we have changed the mode 2023-01-20 15:42:08 +03:00
Abdullah Alfaraj c4258d2958 added restore faces option 2023-01-20 12:13:02 +03:00
Abdullah Alfaraj f09f1baae4 use the thumbnails as preview for the search images 2023-01-20 01:06:43 +03:00
Abdullah Alfaraj 7e20454c3f add a basic image search engine to the history tab 2023-01-20 00:43:38 +03:00
Abdullah Alfaraj 5037bf2df1 rename custom mode to accept selected 2023-01-19 20:01:16 +03:00
Abdullah Alfaraj b72c30a90a add the functionality for the selection mode buttons 2023-01-19 17:37:21 +03:00
Abdullah Alfaraj 99220ef774 add test for horde support 2023-01-19 16:28:31 +03:00
Abdullah Alfaraj be620059e3 method to change the generate btn names 2023-01-18 19:41:13 +03:00
Abdullah Alfaraj e8c51b50df moving the selection will change generate button ui/ indicate end of session 2023-01-18 15:54:19 +03:00
Abdullah Alfaraj 8a6bb515e0 add acceptAll, discardALL and acceptSelected functionality to manage the generated images 2023-01-18 15:05:09 +03:00
Abdullah Alfaraj 7e167cf478 add UI class to handle all ui related logic 2023-01-18 13:40:03 +03:00
Abdullah Alfaraj ce0b5ae00d all session management will be done by GenerationSession class 2023-01-18 13:05:07 +03:00
Abdullah Alfaraj 0da79e7eec sync the inpainting mask weight slider with the value in auto1111 2023-01-18 00:43:58 +03:00
Abdullah Alfaraj d1997074d2 set inpainting mask weight in auto1111 on release of the slider 2023-01-18 00:26:31 +03:00
Abdullah Alfaraj a493dad00b adding a mask expansion slider 2023-01-17 19:44:04 +03:00
Abdullah Alfaraj 59706fc9fd refactoring outpaint 2023-01-17 19:24:11 +03:00
Abdullah Alfaraj 8dce0f0f2e add a clipping mask to MaskGroup in outpaint mode 2023-01-17 16:58:54 +03:00
Abdullah Alfaraj bec3498a70 add an interface class to access sd config info 2023-01-17 13:26:11 +03:00
Abdullah Alfaraj 0fe2dbebc1 display the current model when we first run the plugin 2023-01-17 11:13:50 +03:00
Abdullah Alfaraj 1d7c731249
Merge pull request #57 from megachomba/feat/inpainting_mask_strength
added inpainting mask strength support.
@megachomba this is an awesome feature thank you for adding support to it.
2023-01-17 07:19:44 +03:00
Abdullah Alfaraj 86328a7c90 catch errors while updating the ui 2023-01-16 14:05:04 +03:00
Guillaume GUARD 1a42226d0d added inpainting mask strengh support 2023-01-16 11:57:43 +01:00
Guillaume GUARD 25e1f298ad Revert "added inpainting mask strengh support"
This reverts commit 0be5fd3b5d.
2023-01-16 11:45:40 +01:00
Guillaume GUARD 0be5fd3b5d added inpainting mask strengh support 2023-01-15 18:36:11 +01:00
Abdullah Alfaraj c8e5eb1435 add a refresh prompt menu button 2023-01-15 10:29:48 +03:00
Abdullah Alfaraj 4c5c173ce3 add a prompt shortcut menu and load prompt key and value from it 2023-01-15 10:16:55 +03:00
Abdullah Alfaraj c25dbce782 load the prompt shortcut form the textarea instead of the proxy server 2023-01-15 08:47:51 +03:00
Abdullah Alfaraj fb193acff4
Merge pull request #55 from Kyxsune/separate-outpaint
Quick add to Prompt Shortcut
2023-01-15 08:43:03 +03:00
Abdullah Alfaraj 9c9ae888d0 catching errors when switching tabs 2023-01-15 08:13:36 +03:00
Abdullah Alfaraj 595fd5ab3a only delete inpaint mask layer if it exist 2023-01-15 07:22:40 +03:00
Abdullah Alfaraj 87e9eaec19 Merge branch 'pr/Kyxsune/53' into merge_hi_res_new 2023-01-15 04:54:32 +03:00
kyxsune ab9ddf086e Added Easy addition to prompt_shortcus 2023-01-14 14:37:22 -05:00
kyxsune fbfcecec5e Changed Behaviour to sync with other aspects 2023-01-14 12:48:43 -05:00
kyxsune cca62a4176 Added all the info 2023-01-14 02:02:54 -05:00
Abdullah Alfaraj 0baf047176 only show hi res fix checkbox in txt2img mode 2023-01-14 07:50:29 +03:00
Abdullah Alfaraj 60754b0971 only show mask blur slider in inpaint or outpaint mode 2023-01-14 07:19:46 +03:00
Abdullah Alfaraj cfebfa4697 only show inpaint padding slider when inpaint full res is checked and in inpainting or outpainting mode 2023-01-14 07:08:13 +03:00
Abdullah Alfaraj 2924b6045a hi res sliders will only show in the txt2img mode 2023-01-14 06:49:54 +03:00
Abdullah Alfaraj 7f1c123639 hide hi res sliders when hi res fix is unchecked 2023-01-14 06:24:29 +03:00
Abdullah Alfaraj 6f45435017 place the width and height sliders on the same level 2023-01-14 04:09:02 +03:00
Abdullah Alfaraj 7e7802e79c choose type of layers: smart or rasterize 2023-01-14 03:44:08 +03:00
Abdullah Alfaraj 6cb0e7d9fc add support to blurry mask and a sharp mask 2023-01-13 22:36:15 +03:00
Abdullah Alfaraj beb4070661 store the active selection when working inside the prompt textarea, so it doesn't interfere with navigation 2023-01-13 11:30:09 +03:00
Abdullah Alfaraj 9fb7c14454 adding a reset button 2023-01-13 08:58:17 +03:00
Abdullah Alfaraj 1e67d45ccb fill the width and height sliders when selection area is moved 2023-01-13 05:52:10 +03:00
Abdullah Alfaraj e4dbcd0fbf check if the selection area has moved 2023-01-13 05:11:03 +03:00
Abdullah Alfaraj 10389f33ac visualize the auto1111 and proxy server status 2023-01-12 22:08:14 +03:00
Abdullah Alfaraj 11f0bc8f30 reselect the selection area after each generation 2023-01-12 09:42:12 +03:00
Abdullah Alfaraj 349bfe114a use width and height from rectangular selection area 2023-01-12 08:40:08 +03:00
Abdullah Alfaraj 8a5d9ee0e5 make layerToSelection work with multiple of layers 2023-01-12 05:30:26 +03:00
Abdullah Alfaraj 751e22de0a [bug fix]: async layer deletion 2023-01-12 01:29:31 +03:00
Abdullah Alfaraj 6c6ac31dd7 color code the generate buttons 2023-01-11 08:53:27 +03:00
Abdullah Alfaraj 3e9e2e0544 remove addNotificationListener 2023-01-11 07:21:11 +03:00
Abdullah Alfaraj 33ee4dfd02 reset html init image and mask after deletion 2023-01-11 05:56:02 +03:00
Abdullah Alfaraj 53a43dfd7e create new inpaint mask layers on the start of new session 2023-01-11 05:17:12 +03:00
Abdullah Alfaraj 50723ec76d selecting inpaint will create new layer for you to paint mask on 2023-01-11 05:01:20 +03:00
Abdullah Alfaraj 2c4e832c16 get final image width and height from the selection area 2023-01-11 00:39:39 +03:00
Abdullah Alfaraj 7cb49b75ec wait for acceptAll to finish 2023-01-10 09:43:47 +03:00
Abdullah Alfaraj 56b1c44dc2 commented code: add support showing tips when mouse hover on top of element 2023-01-10 08:07:44 +03:00
Abdullah Alfaraj ab275668bc error handling during inpainting 2023-01-10 05:16:10 +03:00
Abdullah Alfaraj 58871b3253 prompt for selection before any type of generation 2023-01-10 02:03:40 +03:00
Abdullah Alfaraj 0837083f17 remove init inpaint mask button 2023-01-10 01:39:39 +03:00
Abdullah Alfaraj 234b120743 add easy mode for img2img 2023-01-10 00:40:48 +03:00
Abdullah Alfaraj a5acf8773f start new session if the user generate in different mode 2023-01-09 23:10:21 +03:00
Abdullah Alfaraj 8334809819 return empty json when data are invalid 2023-01-09 20:45:29 +03:00
Abdullah Alfaraj 60ed3177fe remove dead code/comments 2023-01-09 20:24:53 +03:00
Abdullah Alfaraj 012ea991b6 interrupt will discard all images and end session on first attempt 2023-01-09 20:19:15 +03:00
Abdullah Alfaraj 1cc870f5f5 unlink html before changing visibility of layer 2023-01-09 19:29:31 +03:00
Abdullah Alfaraj 1b2e1ae553 the state of Viewer Image will determine whether a layer get unlinked or deleted 2023-01-09 08:42:33 +03:00
Abdullah Alfaraj 5e2b089349 accept all the generate layers from the current session 2023-01-09 07:21:35 +03:00
Abdullah Alfaraj d592991d21 remove init outpaint mask button 2023-01-09 00:41:47 +03:00
Abdullah Alfaraj 10cbb581a5 only create InitImage and InitMaskImage if their associate layers exist 2023-01-09 00:37:12 +03:00
Abdullah Alfaraj ee895db154 you can select the images you want to keep in the viewer tab and discard the rest 2023-01-08 19:09:40 +03:00
Abdullah Alfaraj f49070f5f2 generate can act like generate() or generateMore() 2023-01-08 03:18:45 +03:00
Abdullah Alfaraj 5cbdb1fffe add html toggle for classes and for session related buttons 2023-01-07 23:00:56 +03:00
Abdullah Alfaraj d4a2c69704 add easyMode to txt2img and outpaint 2023-01-07 18:20:31 +03:00
Abdullah Alfaraj d96cd73906 add outpaint radio button mode selector 2023-01-07 16:36:44 +03:00
Abdullah Alfaraj 929b83ef8e refactor init images, and masks 2023-01-07 03:39:13 +03:00
Abdullah Alfaraj 2bc96295a6 create a ViewerImage class 2023-01-06 23:05:49 +03:00
Abdullah Alfaraj e7cd69303f add a batch number field in the viewer container 2023-01-06 17:20:32 +03:00
Abdullah Alfaraj 8c097405a1 add progress bar to the viewer tab 2023-01-06 16:50:26 +03:00
Abdullah Alfaraj 322251e1ae use cleanLayer instead of cleanSnapAndFill 2023-01-06 00:35:10 +03:00
Abdullah Alfaraj c84c9d0200 add init image and mask for inpainting and outpainting to the viewer tab 2023-01-05 21:54:32 +03:00
Abdullah Alfaraj d283730db8 link the mask related layers to viewer 2023-01-05 19:50:45 +03:00
Abdullah Alfaraj 32a02afeba add visibility func that control how to turn the layer on and off 2023-01-05 17:17:00 +03:00
Abdullah Alfaraj 3e0a4ebb0f [fix] missing await 2023-01-05 15:16:55 +03:00
Abdullah Alfaraj 97f44b090e refactor code to viewerImageClickHandler 2023-01-05 15:12:27 +03:00
Abdullah Alfaraj 8aff447bb0 add Image viewer tab with generate more button 2023-01-05 03:20:32 +03:00
Abdullah Alfaraj 0437de5ed1 separate getting the data from the ui from the generate request 2023-01-04 21:23:35 +03:00
Abdullah Alfaraj 32015ae0ec [Feature]: toggle between last generated images 2023-01-04 15:17:35 +03:00
Abdullah Alfaraj 65d137d32e load last generated images in the new viewer tab 2023-01-04 13:04:58 +03:00
Abdullah Alfaraj 47bf0d325d use psapi.setInitImageMask 2023-01-03 11:51:37 +03:00
Abdullah Alfaraj 87b5cf567c use the psapi.setInitImage 2023-01-03 10:30:33 +03:00
Abdullah Alfaraj 53b5078997 newExportPng method that doesn't relay on the buggy Quick Export as png feature 2023-01-03 09:40:47 +03:00
Abdullah Alfaraj 8c71798693 add Auto Fill Model from metadata 2023-01-02 09:28:15 +03:00
Abdullah Alfaraj f21d05ae17 Added Auto Fill in sampler support 2023-01-02 08:22:33 +03:00
Abdullah Alfaraj 84dc71ca2d auto fill in HiResFixs related values 2023-01-01 18:21:45 +03:00
Abdullah Alfaraj 38869f32be extract negative prompt from metadata_json or prompt's string 2023-01-01 15:26:49 +03:00
Abdullah Alfaraj 23f141c7ef refactor prompt 2023-01-01 14:51:34 +03:00
Abdullah Alfaraj 0fdd0bd844 auto fill in from metadata 2023-01-01 14:29:18 +03:00
Abdullah Alfaraj 971ac23948 remove link current document button 2023-01-01 10:37:40 +03:00
kyxsune f733e4de71 Hi res fix added. Sloppy 2022-12-31 17:29:12 -05:00
Abdullah Alfaraj 8632d0f4e5 click an image from the history tab to reuse its seed 2022-12-31 19:31:24 +03:00
Abdullah Alfaraj c2d0505670 history tab will load previously generated images, with their metadata 2022-12-31 19:09:18 +03:00
Abdullah Alfaraj 4c5c80c848 load generated images from project directory 2022-12-31 15:55:05 +03:00
Abdullah Alfaraj bb885006ae send uniqueDocumentId in the payload 2022-12-31 11:22:06 +03:00
Abdullah Alfaraj c94d81e725 only generate a new unique id if the document doesn't have one. 2022-12-31 10:26:25 +03:00
Abdullah Alfaraj 3369944d01 read and write unique document id to metadata 2022-12-31 09:52:51 +03:00
Abdullah Alfaraj cfe2c46766 generate new uuid from plugin 2022-12-31 09:10:00 +03:00
Abdullah Alfaraj cc159abca9 send prompt_shortcut in the request to the proxy server 2022-12-30 20:14:32 +03:00
Abdullah Alfaraj f760e4c891 improve the style of prompt library tab 2022-12-30 18:02:16 +03:00
Abdullah Alfaraj 1cb8562c4d add an example for prompt_shortcut by default 2022-12-30 17:39:35 +03:00
Abdullah Alfaraj ad66680e9a save and load prompt shortcut from proxy server 2022-12-30 16:38:28 +03:00
Abdullah Alfaraj 462155056f change the sd_url from the plugin ui 2022-12-29 13:58:44 +03:00
Abdullah Alfaraj a40510fcc4 unselect active layers when using prompt section so keystrokes don't affect the layers. 2022-12-28 22:18:13 +03:00
Abdullah Alfaraj 2ee10f069e unselect the active layers while the prompts textarea are active 2022-12-28 20:37:25 +03:00
Abdullah Alfaraj 68c08dc113 added multiple tabs 2022-12-28 14:03:05 +03:00
Abdullah Alfaraj 907899bc64 padding slider show value from 0 to 256 2022-12-27 17:25:39 +03:00
Abdullah Alfaraj bfa8973409 [typo fix] 2022-12-27 17:06:22 +03:00
Abdullah Alfaraj dfc939c813 [bug fix] clean button now work on inpaint 2022-12-27 16:33:39 +03:00
Abdullah Alfaraj db4617e117 add inpaint at full resolution padding 2022-12-27 16:31:24 +03:00
Abdullah Alfaraj 66f941470d added prompt for marquee dialog box for inpaint and img2img mode 2022-12-27 11:35:40 +03:00
Abdullah Alfaraj fc3f423b2f don't execute Init outpaint mask if no selection present 2022-12-27 09:27:35 +03:00
Abdullah Alfaraj 72abcc9472 displaying the version plugin to the plugin ui 2022-12-26 20:29:20 +03:00
Abdullah Alfaraj 5bb4999b2b [Bug]: fix interrupt button freezing 2022-12-26 16:00:01 +03:00
Abdullah Alfaraj 509f3e1ff1 try and catch errors in requestInterrupt 2022-12-26 14:14:54 +03:00
Abdullah Alfaraj 61c32ea58b add last seed button 2022-12-26 09:06:15 +03:00
Abdullah Alfaraj f2a6ba0460 [UX]: fix the misalignment problem in the img ui 2022-12-25 01:26:00 +03:00
Abdullah Alfaraj 16b8011760 [UX]: disable refresh button after clicking for 3s 2022-12-25 00:37:09 +03:00
Abdullah Alfaraj 6b6a2a7f8c refresh button will refresh the samplers too. 2022-12-25 00:21:50 +03:00
Abdullah Alfaraj 05688bb986 request update progressBar every 0.5s 2022-12-24 23:46:10 +03:00
Abdullah Alfaraj 714eebb917 [Bug] fix trying to delete undefined layers 2022-12-24 11:23:46 +03:00
Abdullah Alfaraj 1b4011a82e [Feature]: added snap and fill button 2022-12-24 03:08:01 +03:00
Abdullah Alfaraj c0a91c87b0 delete the mask related layers before generating 2022-12-23 12:12:23 +03:00
Abdullah Alfaraj 6e55a9982e [Feature]: delete mask related layer 2022-12-23 09:05:15 +03:00
Abdullah Alfaraj 580caebe25 bug fix: quick export will use unique names 2022-12-22 15:05:09 +03:00
Abdullah Alfaraj 1c2c6d114c Revert "bug fix: use a session_id in quick export"
This reverts commit b829a8e0a8.
2022-12-22 08:15:42 +03:00
Abdullah Alfaraj b829a8e0a8 bug fix: use a session_id in quick export 2022-12-22 08:02:53 +03:00
Abdullah Alfaraj 8b35fad077 first commit, initialize the project add files 2022-12-20 23:08:48 +03:00