From 116dfaaaad4a403f131321d5ba5395572763a369 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Sat, 11 Mar 2023 12:08:19 -0500
Subject: [PATCH] update fastapi

---
 extensions-builtin/sd-extension-system-info |  2 +-
 modules/lycoris                             |  2 +-
 requirements_versions.txt                   | 44 +++++++--------------
 scripts/xyz_grid.py                         |  1 +
 webui.py                                    | 14 +++----
 5 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info
index 5dc29a21e..abb105620 160000
--- a/extensions-builtin/sd-extension-system-info
+++ b/extensions-builtin/sd-extension-system-info
@@ -1 +1 @@
-Subproject commit 5dc29a21e96fbd9596bd792da5f0acb4ccbb76f2
+Subproject commit abb105620ea3d6695c71c313c986709e6628eacf
diff --git a/modules/lycoris b/modules/lycoris
index 098ecc123..da0033c1d 160000
--- a/modules/lycoris
+++ b/modules/lycoris
@@ -1 +1 @@
-Subproject commit 098ecc123f60b759849557e3f9cb9c1e94f29bda
+Subproject commit da0033c1d387f95b228d09a9724cfd994fcee446
diff --git a/requirements_versions.txt b/requirements_versions.txt
index 41e0ccc53..3ac9ae595 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -1,30 +1,16 @@
-blendmodes==2022
-transformers==4.25.1
-accelerate==0.12.0
-basicsr==1.4.2
-gfpgan==1.3.8
-gradio==3.16.2
-numpy==1.23.3
-Pillow==9.4.0
-realesrgan==0.3.0
-torch
-omegaconf==2.2.3
-pytorch_lightning==1.7.6
-scikit-image==0.19.2
-fonts
-font-roboto
-timm==0.6.7
-piexif==1.1.3
+accelerate==0.16.0
+diffusers==0.12.1
 einops==0.4.1
-jsonmerge==1.8.0
-clean-fid==0.1.29
-resize-right==0.0.2
-torchdiffeq==0.2.3
-kornia==0.6.7
-lark==1.1.2
-inflection==0.5.1
-GitPython==3.1.30
-torchsde==0.2.5
-safetensors==0.2.7
-httpcore<=0.15
-fastapi==0.90.1
+fastapi==0.94.0
+gfpgan==1.3.8
+GitPython==3.1.31
+gradio==3.16.2
+numexpr==2.8.4
+omegaconf==2.3.0
+pandas==1.5.3
+Pillow==9.4.0
+protobuf==3.20.3
+pytorch_lightning==1.9.4
+realesrgan==0.3.0
+safetensors==0.3.0
+transformers==4.26.1
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 64d0a0a2f..cf1787046 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -502,6 +502,7 @@ class Script(scripts.Script):
         # this could be moved to common code, but unlikely to be ever triggered anywhere else
         grid_mp = round(len(xs) * len(ys) * len(zs) * p.width * p.height / 1000000)
         assert grid_mp < opts.img_max_size_mp, f'Error: Resulting grid would be too large ({grid_mp} MPixels) (max configured size is {opts.img_max_size_mp} MPixels)'
+        Image.MAX_IMAGE_PIXELS = opts.img_max_size_mp * 1000000 * 1.1 # allow 10% overhead for margins and legend
 
         def fix_axis_seeds(axis_opt, axis_list):
             if axis_opt.label in ['Seed', 'Var. seed']:
diff --git a/webui.py b/webui.py
index ae73a74f1..3a398e843 100644
--- a/webui.py
+++ b/webui.py
@@ -18,7 +18,7 @@ from modules import paths, timer, import_hook, errors
 startup_timer = timer.Timer()
 
 import torch
-import pytorch_lightning # pytorch_lightning re-enables warnings on import so import once to disable them
+import pytorch_lightning # pytorch_lightning should be imported after torch, but it re-enables warnings on import so import once to disable them
 warnings.filterwarnings(action="ignore", category=DeprecationWarning)
 
 startup_timer.record("import torch")
@@ -187,13 +187,16 @@ def initialize():
     signal.signal(signal.SIGINT, sigint_handler)
 
 
-def setup_cors(app):
+def setup_middleware(app):
+    app.middleware_stack = None
+    app.add_middleware(GZipMiddleware, minimum_size=1000)
     if cmd_opts.cors_allow_origins and cmd_opts.cors_allow_origins_regex:
         app.add_middleware(CORSMiddleware, allow_origins=cmd_opts.cors_allow_origins.split(','), allow_origin_regex=cmd_opts.cors_allow_origins_regex, allow_methods=['*'], allow_credentials=True, allow_headers=['*'])
     elif cmd_opts.cors_allow_origins:
         app.add_middleware(CORSMiddleware, allow_origins=cmd_opts.cors_allow_origins.split(','), allow_methods=['*'], allow_credentials=True, allow_headers=['*'])
     elif cmd_opts.cors_allow_origins_regex:
         app.add_middleware(CORSMiddleware, allow_origin_regex=cmd_opts.cors_allow_origins_regex, allow_methods=['*'], allow_credentials=True, allow_headers=['*'])
+    app.build_middleware_stack()
 
 
 def create_api(app):
@@ -217,8 +220,7 @@ def api_only():
     initialize()
 
     app = FastAPI()
-    setup_cors(app)
-    app.add_middleware(GZipMiddleware, minimum_size=1000)
+    setup_middleware(app)
     api = create_api(app)
 
     modules.script_callbacks.app_started_callback(None, app)
@@ -275,9 +277,7 @@ def webui():
         # running its code. We disable this here. Suggested by RyotaK.
         app.user_middleware = [x for x in app.user_middleware if x.cls.__name__ != 'CORSMiddleware']
 
-        setup_cors(app)
-
-        app.add_middleware(GZipMiddleware, minimum_size=1000)
+        setup_middleware(app)
 
         modules.progress.setup_progress_api(app)