Commit Graph

429 Commits (8d73846cbf2abb9f686e77e4a58ba36706ddad19)

Author SHA1 Message Date
Abdullah Alfaraj 62fe41d2ce move btnImageSearch click event to image_search_tab 2023-03-19 04:49:40 +03:00
Abdullah Alfaraj 2a7817a29e move btnLoadHistory click event to history_tab.js 2023-03-15 06:35:18 +03:00
Abdullah Alfaraj 69e47e8cf2 refactor getHistoryMetadata 2023-03-15 06:14:04 +03:00
Abdullah Alfaraj ae156e0a9b update the progress bar using sudo timer when loading ControlNet models 2023-03-14 02:59:55 +03:00
Abdullah Alfaraj 97987f614d increment version to v1.2.2 2023-03-13 23:30:41 +03:00
Abdullah Alfaraj 769dba6677 use the right config_obj 2023-03-13 23:17:48 +03:00
Abdullah Alfaraj 0ae02a7808 comment old log 2023-03-13 23:17:25 +03:00
Abdullah Alfaraj 99b68d2030 fix bug: use the right config_obj 2023-03-13 16:50:56 +03:00
Abdullah Alfaraj c6fe3d2e0e refresh controlnet tab when refreshing the ui 2023-03-13 01:03:53 +03:00
Abdullah Alfaraj cc433cdb7e use background-image property for preview image instead of img.src 2023-03-12 16:54:58 +03:00
Abdullah Alfaraj 0b35d3dd23 remove dead commented code 2023-03-11 22:37:38 +03:00
Abdullah Alfaraj 1852068339 add preset sub menu to the settings tab 2023-03-11 18:10:02 +03:00
Abdullah Alfaraj deaecb7b41 Merge branch 'presets' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into refactor-controlnet-js 2023-03-10 22:56:39 +03:00
Abdullah Alfaraj 2166463f75 setters and getters for the ControlNet Unit interface 2023-03-10 22:56:15 +03:00
Abdullah Alfaraj 9dc217eb12 increment version to v1.2.1 2023-03-10 14:44:02 +03:00
Abdullah Alfaraj 54f38aae8a refactor code 2023-03-10 14:25:41 +03:00
Abdullah Alfaraj 07c06602a4 remove deprecated code autoFillInSettings 2023-03-09 11:07:20 +03:00
Abdullah Alfaraj eb60e649ea update the controlnet preprocessor list from config 2023-03-07 23:26:24 +03:00
Abdullah Alfaraj 75e191549a Merge branch 'master' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into silent_mode_resolve 2023-03-07 18:44:55 +03:00
Abdullah Alfaraj cdd820269e enable progress bar and the interrupt button for ControlNet mode 2023-03-07 18:24:08 +03:00
Daniele 53c306bac9 Multi ControlNet Support 2023-03-06 20:55:43 +00:00
Daniele 927afebd6f Merge branch 'master' of https://github.com/adunato/Auto-Photoshop-StableDiffusion-Plugin 2023-03-06 14:12:54 +00:00
Abdullah Alfaraj f522cbb61e make the silent mode optional 2023-03-06 15:03:28 +03:00
Abdullah Alfaraj 519e36a648 increment version to v1.2.0 2023-03-05 10:58:12 +03:00
Abdullah Alfaraj 8fd78a91b1 convert the batch size from string to integer 2023-03-02 06:11:48 +03:00
Daniele ea9c09a60e refactoring tagging of index,js 2023-03-01 14:27:56 +00:00
Abdullah Alfaraj 0f626db963 selecting the prompt text area should interfere with the active layers or the selection area 2023-03-01 12:39:22 +03:00
Abdullah Alfaraj 43ebd1abba remove duplicate code 2023-03-01 04:48:10 +03:00
Abdullah Alfaraj dec89befac use a sudo timer for controlnet mode count from 0 to 100 2023-02-28 08:35:00 +03:00
Abdullah Alfaraj d8d3f9fc73 reverse the order of the history images 2023-02-28 05:03:06 +03:00
Abdullah Alfaraj 3dd3b2f8db disable the generate button for 5 seconds after clicking 2023-02-28 05:02:16 +03:00
Abdullah Alfaraj 4717516327 don't show generate more button unless the session is active 2023-02-28 01:17:07 +03:00
Abdullah Alfaraj c90ee87bd2 an option to load the original prompt 2023-02-27 10:23:20 +03:00
Abdullah Alfaraj 6d775578a1 always store the original prompt 2023-02-27 09:41:42 +03:00
Abdullah Alfaraj b0358c8240 Merge branch 'master' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into control_net_3 2023-02-27 06:57:21 +03:00
Abdullah Alfaraj a23d042a4f comment old code 2023-02-27 06:55:32 +03:00
Abdullah Alfaraj c75ee5b5c5 fix duplicate background layer issue 2023-02-27 05:15:23 +03:00
Abdullah Alfaraj f0f46d8fbd only request a new generation when the previous generation is finished 2023-02-27 04:44:34 +03:00
Abdullah Alfaraj af8c46b192 fix the update prompt message, get data from online file 2023-02-27 00:05:06 +03:00
Abdullah Alfaraj e2def41107 only get the controlnet settings when controlnet is enabled 2023-02-26 21:33:56 +03:00
Abdullah Alfaraj 1194807d39 only send control_net settings if control_net is enabled 2023-02-26 02:18:37 +03:00
Abdullah Alfaraj 6c74919240 Merge branch 'master' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into control_net_2 2023-02-25 07:38:39 +03:00
Abdullah Alfaraj 3c643b379f cover the background layer edge cases 2023-02-25 04:19:18 +03:00
Abdullah Alfaraj 194a196a87 bug fix: the interrupt button won't delete mask related layers 2023-02-24 22:26:39 +03:00
Abdullah Alfaraj 991b5b4c98 clean mask related layers when after canceling the generation 2023-02-24 08:28:50 +03:00
Abdullah Alfaraj 19b48c8488 refactor duplicateLayer() 2023-02-24 04:19:55 +03:00
Abdullah Alfaraj 1f33c62951 make the progress image update optional 2023-02-24 02:29:41 +03:00
Abdullah Alfaraj 5bbe77142c save the "settings tab" settings 2023-02-24 01:13:26 +03:00
Abdullah Alfaraj f6738936bd refactor settings tab, move all functionality to settings.js 2023-02-23 23:02:32 +03:00
Abdullah Alfaraj 8abbfc769c load horde settings on plugin start 2023-02-23 21:03:57 +03:00
Abdullah Alfaraj 62f251f958 refactor global variable 2023-02-23 19:20:57 +03:00
Abdullah Alfaraj e89a99af27 fix bug: hi res won't work with 512x512 images 2023-02-23 04:00:32 +03:00
Abdullah Alfaraj f6a7b0dbd8 Merge branch 'notification' into master 2023-02-23 01:49:04 +03:00
Abdullah Alfaraj 8e790670e4 check for auto1111 status before each generation and notify the user if needed 2023-02-23 01:38:29 +03:00
Abdullah Alfaraj ebbe23ee98 catching error in the buttons unfocus method 2023-02-22 22:57:46 +03:00
Abdullah Alfaraj 6d8b013ace Merge branch 'master' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into master 2023-02-22 19:58:15 +03:00
Abdullah Alfaraj db9ea11789 replace mouse leave event with mouse click 2023-02-22 19:57:25 +03:00
Abdullah Alfaraj 19011b7b13 add prompt library sub tab 2023-02-22 18:53:38 +03:00
Abdullah Alfaraj cba77e73e1 bug fix: clicking set init image of a thumbnail will select the correct layers 2023-02-22 16:35:47 +03:00
Daniele edcbe5d4ed give the user a visual cue when they click a button/ different from on hover 2023-02-22 13:10:38 +00:00
Abdullah Alfaraj 52975d3fbd use the thumbnail class for the viewer init image 2023-02-22 04:16:26 +03:00
Abdullah Alfaraj 3a1abd47f2 update the viewer tab when adding a new init image 2023-02-22 03:41:33 +03:00
Abdullah Alfaraj c75689ca28 load the history image at the location it was generated at 2023-02-22 00:57:18 +03:00
Abdullah Alfaraj bcbd42eda8 add controlNet request for img2img modes 2023-02-21 23:23:34 +03:00
Abdullah Alfaraj 656664d393 convert the output of ControlNet api to a standard response the plugin can work with 2023-02-21 21:33:12 +03:00
Abdullah Alfaraj 047fc5c032 map plugin settings to the control net settings 2023-02-21 17:06:19 +03:00
Abdullah Alfaraj 0e14caeb4d functional set control image button 2023-02-21 03:29:35 +03:00
Abdullah Alfaraj 60a669de84 notification for an inactive selection area 2023-02-21 01:53:51 +03:00
Abdullah Alfaraj 718c5d02df Merge branch 'master' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into notification 2023-02-20 23:51:31 +03:00
Abdullah Alfaraj d09558d37a check if the background layer exist before every generation 2023-02-20 23:50:55 +03:00
Abdullah Alfaraj 4996b72a59 display the res difference with width and height label 2023-02-20 20:29:56 +03:00
Abdullah Alfaraj 12562abf9f create a sub tab menu that link viewer, history, and image search tabs 2023-02-20 14:52:28 +03:00
Abdullah Alfaraj a8823cfe27 formatting 2023-02-20 11:10:12 +03:00
Abdullah Alfaraj 07a1bbf45d
Merge pull request #106 from AbdullahAlfaraj/heal-brush
Heal-brush
2023-02-19 13:34:50 +03:00
Abdullah Alfaraj 7b2d168c0a reset the viewer manager on session end 2023-02-19 13:33:37 +03:00
Abdullah Alfaraj 597de25e7f comment debugger 2023-02-19 10:22:23 +03:00
Abdullah Alfaraj ed03260e66 use the thumbnail slider to scale the thumbnails in the viewer tab 2023-02-19 09:47:46 +03:00
Abdullah Alfaraj 593477538b make the opacity of mask temp layer as 60, while internally use value of 100 opacity 2023-02-19 09:28:40 +03:00
Abdullah Alfaraj 980d85c067 replace the img in viewer manager with a thumbnail container 2023-02-19 09:06:24 +03:00
Abdullah Alfaraj 7346e87c48 move timer function to general 2023-02-19 08:43:41 +03:00
Daniele fb7d85a621 Thumbnail class and history image buttons 2023-02-18 21:59:09 +00:00
Abdullah Alfaraj 8d0c25ca51 allow for loading async preset loaders 2023-02-18 09:49:01 +03:00
Abdullah Alfaraj 5c3073b99d increment to version 1.1.10 2023-02-17 10:25:47 +03:00
Abdullah Alfaraj bdee357acc display the progress image in the viewer tab if batch_size > 1 2023-02-17 10:15:27 +03:00
Abdullah Alfaraj 6cd05bc5f7 add dummy.js module 2023-02-17 10:11:22 +03:00
Abdullah Alfaraj f2b8d1e6be refactor the viewer thumbnail click handler 2023-02-16 14:17:42 +03:00
Abdullah Alfaraj 584075da7a turn off the visibility for newly imported generated images 2023-02-16 14:11:28 +03:00
Abdullah Alfaraj a1174d7731 replace isLayerValid with doesLayerExist 2023-02-16 14:09:45 +03:00
Abdullah Alfaraj 9b33c6c23a add history suspension 2023-02-16 06:40:16 +03:00
Daniele 5d778599e1 Refactor tagging 2023-02-15 16:48:11 +00:00
Abdullah Alfaraj 7957f3e333 Merge branch 'silent_export' into master 2023-02-15 14:50:21 +03:00
Abdullah Alfaraj 1aec59a1e3 use the silent method to export the mask and init image 2023-02-15 11:35:20 +03:00
Abdullah Alfaraj 030bad9dee remove deprecated code, export_png.js, sdapi.js 2023-02-15 07:36:10 +03:00
Abdullah Alfaraj 93582b2b2a increment version to v1.1.9 2023-02-14 13:14:23 +03:00
Abdullah Alfaraj 4bb41abb8e add mode label the "generate more" button inner text 2023-02-14 12:56:59 +03:00
Abdullah Alfaraj af3ebe9b2e use the backend type to select the appropriate generation routine 2023-02-14 11:35:03 +03:00
Abdullah Alfaraj 23b7cdfc7f select the right mode when clicking the viewer tab 2023-02-14 11:26:32 +03:00
Abdullah Alfaraj 4c4a7cdec3 Merge branch 'master' of https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin into horde_native 2023-02-14 05:52:20 +03:00
Abdullah Alfaraj 2664c2b1b5 clicking on sd tab will select the normal mode 2023-02-14 04:09:21 +03:00
Abdullah Alfaraj 9bbdd23414 use current active layer when importing a layer via place event command 2023-02-13 10:52:44 +03:00
Abdullah Alfaraj dcff4b5882 load the progress image if it exist 2023-02-13 10:46:36 +03:00
Abdullah Alfaraj 9e9875bad7 reset progressBar after the generation has ended 2023-02-13 10:38:03 +03:00
Abdullah Alfaraj b59f114850 only use progressRecursive for the auto1111 backend 2023-02-13 10:32:03 +03:00
Abdullah Alfaraj 8bcda44cc4 check which backend to use for img2img mode 2023-02-13 10:29:17 +03:00
Abdullah Alfaraj f5e33fdde6 delete the last progress image after teh generation process has completed 2023-02-13 10:23:43 +03:00
Abdullah Alfaraj b970b0d22e check is the which backend is been used 2023-02-13 02:58:59 +03:00
Daniele 4977e0c8a5 Extras - bug fixing 2023-02-12 12:43:54 +00:00
Abdullah Alfaraj b7674c9178 get the backend server type 2023-02-12 13:31:26 +03:00
Daniele 8fb3db6521 Extras tab 2023-02-11 21:46:52 +00:00
Abdullah Alfaraj 39f404a830 apply the mask expansion from the getSettings() 2023-02-11 10:11:00 +03:00
Abdullah Alfaraj 7700c2ddd4 typo: missing await 2023-02-11 00:34:37 +03:00
Abdullah Alfaraj 1df0dbc128 rename util_layer to layer_util 2023-02-10 19:47:44 +03:00
Abdullah Alfaraj 5e382ccf50 rename doc_id to doc_uuid to indicate that it's not the same as photoshop doc id 2023-02-10 16:00:37 +03:00
Abdullah Alfaraj 0690b5ced5 remove dead code 2023-02-10 15:58:59 +03:00
Abdullah Alfaraj 861bc2f45a added interrupt horde request 2023-02-09 21:48:07 +03:00
Abdullah Alfaraj 8e779babd5 remove dead code 2023-02-09 18:45:41 +03:00
Abdullah Alfaraj 2446e4a16f fix last seed button 2023-02-09 14:44:55 +03:00
Abdullah Alfaraj dd106bee00 do the prompt_shortcut substitution in getSettings() 2023-02-09 02:52:33 +03:00
Abdullah Alfaraj 914a6409aa added hordeGenerator class to images in txt2img mode 2023-02-09 02:49:37 +03:00
Abdullah Alfaraj 0cb51762c5 add generateHorde() 2023-02-08 15:48:52 +03:00
Abdullah Alfaraj 52b5596031 use g_generation_session.selectionInfo instead of g_selection 2023-02-08 15:48:27 +03:00
Abdullah Alfaraj e12e8d7742 store the horde generated images into the output folder 2023-02-08 13:21:18 +03:00
Abdullah Alfaraj 31cc01e775 map the plugin settings to the horde settings 2023-02-08 02:13:11 +03:00
Abdullah Alfaraj fef5a0d696 setup the horde native rest api 2023-02-07 18:48:35 +03:00
Abdullah Alfaraj 6991619446 fix the prompt shortcut not loading correctly 2023-02-07 14:20:39 +03:00
Abdullah Alfaraj 50c343df46 increment plugin version to v1.1.7 2023-02-06 16:32:51 +03:00
Abdullah Alfaraj 3b708d5ec0 add update button to prompt the user update links 2023-02-06 15:39:59 +03:00
Abdullah Alfaraj 808406ed7b load metadata from history tab 2023-02-05 17:23:02 +03:00
Abdullah Alfaraj 4aeba9004a store the auto metadata data in both txt2img and img2img modes 2023-02-05 11:36:28 +03:00
Abdullah Alfaraj b4cf722462 fix progress bar not updating 2023-02-05 10:31:25 +03:00
Abdullah Alfaraj 8943492ace auto update extension v1.1.6 .ccx 2023-02-05 00:10:15 +03:00
Abdullah Alfaraj a5e6195264
increment version to v1.1.5
auto-update extension
2023-02-04 23:11:29 +03:00
Abdullah Alfaraj 874aa43bae prompt shortcut will load from prompt_shortcut.json if it's not empty 2023-02-04 22:47:27 +03:00
Abdullah Alfaraj c3b69d971d expose the plugin doc/project path 2023-02-04 21:21:56 +03:00
Abdullah Alfaraj 1eeb449cbc add options to select the extension type 2023-02-04 17:25:23 +03:00
Abdullah Alfaraj 02ef6fa695 add an extension type option 2023-02-04 16:29:01 +03:00
Abdullah Alfaraj aef8756bdf
increment version to v1.1.3 2023-02-04 13:02:46 +03:00
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