diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index b186ad208..7dbd50846 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit b186ad208823b0f6d2449a3816d5fc06268ed38a +Subproject commit 7dbd508461af2b533d931ee3f03118b13b9f05d5 diff --git a/requirements_versions.txt b/requirements_versions.txt index 069832893..331d0fe86 100644 --- a/requirements_versions.txt +++ b/requirements_versions.txt @@ -1,16 +1,30 @@ -accelerate==0.16.0 -diffusers==0.12.1 -einops==0.4.1 -fastapi==0.90.1 +blendmodes==2022 +transformers==4.25.1 +accelerate==0.12.0 +basicsr==1.4.2 gfpgan==1.3.8 -GitPython==3.1.31 gradio==3.16.2 -numexpr==2.8.4 -omegaconf==2.3.0 -pandas==1.5.3 +numpy==1.23.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 +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 +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.27 +torchsde==0.2.5 +safetensors==0.2.7 +httpcore<=0.15 +fastapi==0.90.1 diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index 21d482380..f068598df 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -433,7 +433,7 @@ class Script(scripts.Script): if opt.label == 'Nothing': return [0] - valslist = [x.strip() for x in chain.from_iterable(csv.reader(StringIO(vals))) if x] + valslist = [x.strip() for x in chain.from_iterable(csv.reader(StringIO(vals)))] if opt.type == int: valslist_ext = [] @@ -499,12 +499,6 @@ class Script(scripts.Script): z_opt = self.current_axis_options[z_type] zs = process_axis(z_opt, z_values) - # this could be moved to common code, but unlikely to be ever triggered anywhere else - Image.MAX_IMAGE_PIXELS = opts.img_max_size_mp * 1000000 * 1.1 # allow 10% overhead for margins and legend - grid_mp = round(len(xs) * len(ys) * len(zs) * p.width * p.height / 1000000) - if grid_mp > opts.img_max_size_mp: - return Processed(p, [], p.seed, info=f'Error: Resulting grid would be too large ({grid_mp} MPixels) (max configured size is {opts.img_max_size_mp} MPixels)') - def fix_axis_seeds(axis_opt, axis_list): if axis_opt.label in ['Seed', 'Var. seed']: return [int(random.randrange(4294967294)) if val is None or val == '' or val == -1 else val for val in axis_list]