Commit Graph

257 Commits

Author SHA1 Message Date
AUTOMATIC 96d6ca4199 manual fixes for ruff 2023-05-10 08:25:25 +03:00
AUTOMATIC 762265eab5 autofixes from ruff 2023-05-10 07:52:45 +03:00
Aarni Koskela 3ba6c3c83c Fix up string formatting/concatenation to f-strings where feasible 2023-05-09 22:25:39 +03:00
AUTOMATIC 90e4659822 bump gradio to 3.28.1 2023-04-29 20:28:30 +03:00
AUTOMATIC1111 fc6eeda69c
Merge pull request #9130 from Vespinian/fix-api-alwayson_scripts-less-then-requiered-args
[Fix] Prevent alwayson_scripts args param resizing script_arg list when they are inserted in it
2023-04-29 12:55:19 +03:00
AUTOMATIC 101a18fc84 bump gradio to 3.27 2023-04-29 09:17:35 +03:00
Vespinian 70a0a11783 Changed behavior that puts the args from alwayson_script request in the script_args, so don't accidently resize the arg list if we get less arg then or default list has 2023-03-28 23:52:51 -04:00
AUTOMATIC1111 c7daba71de
Merge pull request #8669 from Vespinian/fix-api-running-unwanted_scripts
Fix for API running unwanted alwayson scripts
2023-03-27 08:11:34 +03:00
Vespinian 23f6dfce4c Reworked this PR, now we have 2 default arg list (one for each tab) that will be initialized on the first api request and then reused afterwards. The init_script_args copies the corresponding default list and applies the modifications asked by the api request. 2023-03-25 14:16:35 -04:00
Vespinian f371579571 Revert "Made copies of global scriptrunners, now we clear the copied scriptrunner of alwayson_scripts and only add back the ones that that were requested"
This reverts commit dfa258de5f.
2023-03-25 14:11:46 -04:00
Vespinian db602b100e Revert "Comment fix"
This reverts commit f04bd037a5.
2023-03-25 14:11:38 -04:00
AUTOMATIC1111 a03536f213
Merge pull request #8662 from vladmandic/api-handler
api error handler
2023-03-25 12:47:32 +03:00
Φφ 4cbbb881ee Unload checkpoints on Request
…to free VRAM.

New Action buttons in the settings to manually free and reload checkpoints, essentially
juggling models between RAM and VRAM.
2023-03-21 09:28:50 +03:00
Vespinian f04bd037a5 Comment fix 2023-03-15 22:27:54 -04:00
Vespinian dfa258de5f Made copies of global scriptrunners, now we clear the copied scriptrunner of alwayson_scripts and only add back the ones that that were requested 2023-03-15 22:17:32 -04:00
Vladimir Mandic 5387576c59
api error handler 2023-03-15 15:11:04 -04:00
Vespinian 49bbdbe447 small diff whitespace cleanup 2023-03-11 14:34:56 -05:00
Vespinian 5546e71a10 Fixed whitespace 2023-03-11 12:35:20 -05:00
Vespinian 46f9fe3cd6 Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui 2023-03-11 12:33:35 -05:00
Vespinian 2174f58dae Changed alwayson_script_name and alwayson_script_args api params to 1 alwayson_scripts param dict 2023-03-11 12:21:33 -05:00
AUTOMATIC1111 8ec0442dcd
Merge pull request #8322 from yeataro/master
add: /sdapi/v1/scripts in API
2023-03-11 13:43:34 +03:00
AUTOMATIC 3531a50080 rename fields for API for saving/sending images
save images to correct directories
2023-03-11 13:22:59 +03:00
Yea Chen f85a192f99
Update modules/api/api.py
Suggested change by @akx

Co-authored-by: Aarni Koskela <akx@iki.fi>
2023-03-07 04:04:35 +08:00
Vladimir Mandic b012d70f15
update using original defaults 2023-03-04 17:51:37 -05:00
Yea chen c48bbccf12 add: /sdapi/v1/scripts in API
API for get scripts list
2023-03-04 11:46:07 +08:00
Vladimir Mandic f8e219bad9
allow api requests to specify do not send images in response 2023-03-03 09:00:52 -05:00
Vladimir Mandic 23d4fb5bf2
allow saving of images via api 2023-03-03 08:29:10 -05:00
Vespinian c6c2a59333 comment clarification 2023-02-27 23:45:59 -05:00
Vespinian a39c4cf766 small refactor of api.py 2023-02-27 23:27:33 -05:00
Vespinian 3b6de96467 Added alwayson_script_name and alwayson_script_args to api
Added 2 additional possible entries in the api request: alwayson_script_name, a string list, and, alwayson_script_args, a list of list containing the args of each script. This allows us to send args to always on script and keep backwards compatibility with old script_name and script_arg api params
2023-02-27 21:51:20 -05:00
minux302 33947a3c66 fix arg for hypernetwork train api 2023-02-10 17:58:35 +09:00
AUTOMATIC 6f31d2210c support detecting midas model
fix broken api for checkpoint list
2023-01-27 11:54:19 +03:00
AUTOMATIC d2ac95fa7b remove the need to place configs near models 2023-01-27 11:28:12 +03:00
AUTOMATIC 602a1864b0 also return the removed field to sdapi/v1/upscalers because someone might have relied on it existing 2023-01-24 10:09:30 +03:00
AUTOMATIC 42a70d7477 repair sdapi/v1/upscalers returning bogus results 2023-01-24 10:05:45 +03:00
Vladimir Mandic 45e270dfc8
add image decod exception handling 2023-01-23 17:11:22 -05:00
Vladimir Mandic 6e1b296baf
api-image-format 2023-01-23 10:10:59 -05:00
AUTOMATIC b5230197a6 rework extras tab to use script system 2023-01-23 09:24:43 +03:00
AUTOMATIC 6d805b669e make CLIP interrogator download original text files if the directory does not exist
remove random artist built-in extension (to re-added as a normal extension on demand)
remove artists.csv (but what does it mean????????????????????)
make interrogate buttons show Loading... when you click them
2023-01-21 09:14:27 +03:00
AUTOMATIC 40ff6db532 extra networks UI
rework of hypernets: rather than via settings, hypernets are added directly to prompt as <hypernet:name:weight>
2023-01-21 08:36:07 +03:00
AUTOMATIC a95f135308 change hash to sha256 2023-01-14 09:56:59 +03:00
Vladimir Mandic 39ea251945
add textinfo to progress response 2023-01-11 10:23:51 -05:00
Vladimir Mandic 2275f130bf
relax reponse type check enforcement 2023-01-09 21:23:58 -05:00
AUTOMATIC1111 b1d976dca2
Merge pull request #6466 from vladmandic/api-get-memory
Implement API get-memory
2023-01-10 02:02:19 +03:00
Vladimir Mandic 95727312ca
remove bytes -> gb conversion 2023-01-09 16:54:12 -05:00
AUTOMATIC 137ce534b2 remove some code duplication
remove calls to locals()
add a test for img2img with script
2023-01-08 16:14:38 +03:00
noodleanon 6d0cc1e239
Corrected is_img2img param 2023-01-08 11:03:48 +00:00
noodleanon d38ede71d5
Added script support in txt2img endpoint 2023-01-07 14:21:31 +00:00
noodleanon 50e2536279
Merge branch 'AUTOMATIC1111:master' into img2img-api-scripts 2023-01-07 14:18:09 +00:00
Vladimir Mandic 47534577ed
api-get-memory 2023-01-07 07:51:35 -05:00
AUTOMATIC1111 983167e621
Merge pull request #6448 from aednzxy/patch-2
increase upscale api validation limit
2023-01-07 12:34:42 +03:00
Dean Hopkins 82c1f10b14 increase upscale api validation limit 2023-01-06 22:10:03 +00:00
noodleanon b5253f0dab
allow img2img api to run scripts 2023-01-05 21:21:48 +00:00
Suffocate 1288a3bb7d Use the read_info_from_image function directly 2023-01-04 20:36:30 +00:00
Vladimir Mandic 11b8160a08
fix typo 2023-01-04 06:36:57 -05:00
AUTOMATIC 3bd737767b disable broken API logging 2023-01-04 14:20:32 +03:00
AUTOMATIC1111 a8ad8666cd
Merge pull request #6261 from vladmandic/api-logging
add api logging
2023-01-04 14:04:11 +03:00
AUTOMATIC 4ec6470a1a fix checkpoint list API 2023-01-04 13:26:23 +03:00
Vladimir Mandic cec209981e
log only sdapi 2023-01-03 10:58:52 -05:00
Vladimir Mandic aaa4c2aacb
add api logging 2023-01-03 09:45:16 -05:00
Philpax c65909ad16 feat(api): return more data for embeddings 2023-01-02 12:21:48 +11:00
Philpax b5819d9bf1 feat(api): add /sdapi/v1/embeddings 2023-01-02 10:18:11 +11:00
AUTOMATIC fef98723b2 set sd_model for API later, inside the lock, to prevent multiple requests with different models ending up with incorrect results #5877 #6012 2022-12-31 12:44:26 +03:00
Philpax 5be9387b23 fix(api): only begin/end state in lock 2022-12-25 21:45:44 +11:00
Vladimir Mandic 5f1dfbbc95 implement train api 2022-12-24 18:02:22 -05:00
Philpax 6247f21a63 fix(api): don't save extras output to disk 2022-12-24 22:04:53 +11:00
AUTOMATIC1111 adab48cb1b
Merge pull request #5637 from aednzxy/patch-1
API endpoint to refresh checkpoints
2022-12-24 12:19:43 +03:00
Jim Hays c0355caefe Fix various typos 2022-12-14 21:01:32 -05:00
Dean Hopkins 960293d6b2
API endpoint to refresh checkpoints
API endpoint to refresh checkpoints
2022-12-11 19:16:44 +00:00
ywx9 9539c2045a Bug fix 2022-12-09 23:03:06 +09:00
AUTOMATIC b2f17dd367 prevent include_init_images from being passed to StableDiffusionProcessingImg2Img in API #4989 2022-12-03 09:15:24 +03:00
AUTOMATIC1111 554787231a
Merge pull request #5117 from aliencaocao/fix_api_sampler_name
Fix api ignoring sampler_name settings
2022-11-27 16:51:47 +03:00
AUTOMATIC1111 b24aed0b69
Merge pull request #4960 from Hugo-Matias/master
fix null negative_prompt on get requests
2022-11-27 16:36:29 +03:00
Billy Cao 06ada734c7 Prevent warning on sampler_index if sampler_name is being used 2022-11-27 21:19:47 +08:00
Billy Cao 3cf93de24f Fix sampler_name for API requests are being ignored 2022-11-27 21:12:37 +08:00
Sena fcd75bd874
Fix other apis 2022-11-24 13:10:40 +08:00
Sena 75b67eebf2
Fix bare base64 not accept 2022-11-23 17:43:58 +08:00
Rogerooo c27a973c82 fix null negative_prompt on get requests
Small typo that causes a bug when returning negative prompts from the get request.
2022-11-22 14:02:59 +00:00
AUTOMATIC c81d440d87 moved deepdanbooru to pure pytorch implementation 2022-11-20 16:39:20 +03:00
AUTOMATIC1111 41e242b220
Merge pull request #4733 from MaikoTan/api-authorization
feat: add http basic authentication for api
2022-11-19 15:20:03 +03:00
AUTOMATIC 5a6387e189 make it possible to change models etc by editing options using API 2022-11-19 15:15:24 +03:00
Maiko Tan 336c341a7c
Merge branch 'master' into api-authorization 2022-11-19 20:13:07 +08:00
AUTOMATIC1111 84a6f211d4
Merge pull request #4358 from bamarillo/master
[API][Feature] Add Skip endpoint
2022-11-19 14:50:02 +03:00
AUTOMATIC cdc8020d13 change StableDiffusionProcessing to internally use sampler name instead of sampler index 2022-11-19 12:01:51 +03:00
Maiko Sinkyaet Tan 8f2ff861d3
feat: add http basic authentication for api 2022-11-15 16:12:34 +08:00
snowmeow2 67c8e11be7 Adding DeepDanbooru to the interrogation API 2022-11-07 02:32:06 +08:00
AUTOMATIC1111 07d1bd4267
Merge branch 'master' into roy.add_simple_interrogate_api 2022-11-06 11:27:54 +03:00
Bruno Seoane 7f63980e47 Remove unnecesary return 2022-11-05 19:09:13 -03:00
Bruno Seoane 3c72055c22 Add skip endpoint 2022-11-05 19:05:15 -03:00
Bruno Seoane 0ebf66b575 Fix set config endpoint 2022-11-05 19:00:47 -03:00
Bruno Seoane 99b05addb1 Fix options endpoint not showing the full list of options 2022-11-05 18:46:47 -03:00
AUTOMATIC1111 2e604233fd
Merge pull request #4329 from Blucknote/patch-1
Python 3.8 typing compatibility
2022-11-05 17:23:22 +03:00
evshiron b6cfaaa20b Merge branch 'master' into fix/encode-pnginfo 2022-11-05 22:12:20 +08:00
Evgeniy a170e3d222
Python 3.8 typing compatibility
Solves problems with

```Traceback (most recent call last):
  File "webui.py", line 201, in <module>
    webui()
  File "webui.py", line 178, in webui
    create_api(app)
  File "webui.py", line 117, in create_api
    from modules.api.api import Api
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\api.py", line 9, in <module>
    from modules.api.models import *
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 194, in <module>
    class SamplerItem(BaseModel):
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 196, in SamplerItem
    aliases: list[str] = Field(title="Aliases")
TypeError: 'type' object is not subscriptable```

and

```Traceback (most recent call last):
  File "webui.py", line 201, in <module>
    webui()
  File "webui.py", line 178, in webui
    create_api(app)
  File "webui.py", line 117, in create_api
    from modules.api.api import Api
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\api.py", line 9, in <module>
    from modules.api.models import *
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 194, in <module>
    class SamplerItem(BaseModel):
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 197, in SamplerItem
    options: dict[str, str] = Field(title="Options")
TypeError: 'type' object is not subscriptable```
2022-11-05 17:06:56 +03:00
Billy Cao ebce0c57c7 Use typing.Optional instead of | to add support for Python 3.9 and below. 2022-11-05 11:38:24 +08:00
evshiron 73e1cd6f53 Merge branch 'master' into fix/encode-pnginfo 2022-11-05 01:43:02 +08:00
AUTOMATIC 116bcf730a disable setting options via API until it is fixed by the author 2022-11-04 16:49:05 +03:00
AUTOMATIC1111 e9c767d8db
Merge branch 'master' into 7flash/fix-api-compatibility 2022-11-04 11:00:32 +03:00
AUTOMATIC1111 371c4b990e
Merge pull request #4218 from bamarillo/utils-endpoints
[API][Feature] Utils endpoints
2022-11-04 10:46:51 +03:00
digburn 8eb64dab3e
fix: correct default val of upscale_first to False 2022-11-04 00:35:18 +00:00
Gur b2c48091db fixed api compatibility with python 3.8 2022-11-04 06:55:03 +08:00
Bruno Seoane 743fffa3d6 Remove unused endpoint 2022-11-03 00:52:01 -03:00
Bruno Seoane 7a2e36b583 Add config and lists endpoints 2022-11-03 00:51:22 -03:00
digburn 2ac25ea64f fix: Add required parameter to API extras route 2022-11-02 21:52:23 +00:00
evshiron e21fcd72fc add back png info in image api 2022-11-02 22:37:45 +08:00
AUTOMATIC 4a8cf01f6f remove duplicate code from #3970 2022-11-02 12:12:32 +03:00
evshiron 51e0a83969 Merge branch 'master' into fix/progress-api 2022-11-02 12:31:33 +08:00
AUTOMATIC 198a1ffcfc fix API returning extra stuff in base64 encoded iamges for #3972 2022-11-01 19:14:10 +03:00
Roy Shilkrot 3f3d14afd5 nix unused thing 2022-10-31 11:51:21 -04:00
Roy Shilkrot df6a7ebfe8 revert things to master 2022-10-31 11:50:33 -04:00
Roy Shilkrot 509fd1459b Merge remote-tracking branch 'upstream/master' into roy.add_simple_interrogate_api 2022-10-31 11:45:52 -04:00
evshiron adaa699e38 prototype interrupt api 2022-10-31 10:31:06 +08:00
evshiron 1a4ff2de6a fix current image in progress api when parallel processing enabled 2022-10-30 17:02:47 +08:00
AUTOMATIC 149784202c rework #3722 to not introduce duplicate code 2022-10-30 09:10:22 +03:00
evshiron 9f4f894d74 allow skip current image in progress api 2022-10-30 06:03:32 +08:00
evshiron 9f104b53c4 preview current image when opts.show_progress_every_n_steps is enabled 2022-10-30 05:19:17 +08:00
evshiron 88f46a5bec update progress response model 2022-10-30 05:04:29 +08:00
evshiron e9c6c2a51f add description for state field 2022-10-30 04:02:56 +08:00
evshiron f62db4d5c7 fix progress response model 2022-10-30 03:56:44 +08:00
evshiron 7f5212fb5f Merge branch 'master' into feat/progress-api 2022-10-30 03:49:00 +08:00
evshiron 6b719c49b1 Merge branch 'master' into feat/progress-api 2022-10-30 03:45:29 +08:00
Bruno Seoane 83a1f44ae2 Fix space 2022-10-29 16:10:00 -03:00
Bruno Seoane 4609b83cd4 Add PNG Info endpoint 2022-10-29 16:09:19 -03:00
Roy Shilkrot bdc9083798 Add a barebones interrogate API 2022-10-27 15:20:15 -04:00
evshiron fddb4883f4 prototype progress api 2022-10-26 22:39:08 +08:00
Bruno Seoane b2e0d8ba78 Remove folder endpoint 2022-10-26 09:54:26 -03:00
Bruno Seoane 8320963dcb Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui 2022-10-26 09:50:26 -03:00
Stephen b46c64c6e5 clean 2022-10-26 09:46:17 +03:00
Stephen db9ab1a46b [Bugfix][API] - Fix API response for colab users 2022-10-26 09:46:17 +03:00
Bruno Seoane 2267498a8c Merge remote-tracking branch 'upstream/master' 2022-10-24 08:37:37 -03:00
Bruno Seoane 595dca85af Reverse run_extras change
Update serialization on the batch images endpoint
2022-10-24 08:32:18 -03:00
AUTOMATIC 2c05e06ea7 rename api/processing to api/models for #3511 2022-10-24 14:11:14 +03:00
Bruno Seoane 90f02c7522 Remove unused field and class 2022-10-23 16:05:54 -03:00
Bruno Seoane 1e625624ba Add folder processing endpoint
Also minor refactor
2022-10-23 16:01:16 -03:00
Bruno Seoane 866b36d705 Move processing's models into models.py
It didn't make sense to have two differente files for the same and
"models" is a more descriptive name.
2022-10-23 15:35:49 -03:00
Bruno Seoane e0ca4dfbc1 Update endpoints to use gradio's own utils functions 2022-10-23 15:13:37 -03:00
Bruno Seoane e3f0e34cd6 Merge branch 'master' of https://github.com/bamarillo/stable-diffusion-webui 2022-10-23 13:14:54 -03:00
Bruno Seoane 4ff852ffb5 Add batch processing "extras" endpoint 2022-10-23 13:07:59 -03:00
Stephen 5dc0739ecd working mask 2022-10-23 09:26:56 +03:00
Stephen 9e1a8b7734 non-implemented mask with any type 2022-10-23 09:26:56 +03:00
Stephen a7c213d0f5 [API][Feature] - Add img2img API endpoint 2022-10-23 09:26:56 +03:00
Bruno Seoane 28e26c2bef Add "extra" single image operation
- Separate extra modes into 3 endpoints so the user ddoesn't ahve to
handle so many unused parameters.
 - Add response model for codumentation
2022-10-22 23:17:27 -03:00
Bruno Seoane b02926df13 Moved moodels to their own file and extracted base64 conversion to its own function 2022-10-22 20:24:04 -03:00
Bruno Seoane 1b4d04737a Remove unused imports 2022-10-22 20:13:16 -03:00
arcticfaded 0f0d6ab8e0 call sampler by name 2022-10-19 05:19:01 +00:00
arcticfaded e7f4808505 provide sampler by name 2022-10-18 19:04:56 +00:00
arcticfaded 8d5d863a9d gradio and FastAPI 2022-10-18 06:51:53 +00:00
Ryan Voots 247aeb3aaa Put API under /sdapi/ so that routing is simpler in the future. This means that one could allow access to /sdapi/ but not the webui. 2022-10-18 08:44:50 +03:00
Ryan Voots c3851a853d Re-use webui fastapi application rather than requiring one or the other, not both. 2022-10-18 08:44:50 +03:00
arcticfaded f29b16bad1 prevent API from saving 2022-10-17 20:36:14 +00:00