aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/run_tests.yaml10
-rw-r--r--.gitignore1
-rw-r--r--configs/sd_xl_inpaint.yaml98
-rw-r--r--extensions-builtin/Lora/networks.py8
-rw-r--r--extensions-builtin/Lora/scripts/lora_script.py2
-rw-r--r--extensions-builtin/Lora/ui_edit_user_metadata.py9
-rw-r--r--extensions-builtin/Lora/ui_extra_networks_lora.py5
-rw-r--r--extensions-builtin/ScuNET/scripts/scunet_model.py68
-rw-r--r--extensions-builtin/ScuNET/scunet_model_arch.py268
-rw-r--r--extensions-builtin/SwinIR/scripts/swinir_model.py156
-rw-r--r--extensions-builtin/SwinIR/swinir_model_arch.py867
-rw-r--r--extensions-builtin/SwinIR/swinir_model_arch_v2.py1017
-rw-r--r--extensions-builtin/extra-options-section/scripts/extra_options_section.py4
-rw-r--r--javascript/extraNetworks.js31
-rw-r--r--modules/api/api.py122
-rw-r--r--modules/api/models.py2
-rw-r--r--modules/codeformer/codeformer_arch.py276
-rw-r--r--modules/codeformer/vqgan_arch.py435
-rw-r--r--modules/codeformer_model.py158
-rw-r--r--modules/devices.py3
-rw-r--r--modules/esrgan_model.py199
-rw-r--r--modules/esrgan_model_arch.py465
-rw-r--r--modules/face_restoration_utils.py180
-rw-r--r--modules/gfpgan_model.py166
-rw-r--r--modules/hat_model.py43
-rw-r--r--modules/images.py13
-rw-r--r--modules/img2img.py2
-rw-r--r--modules/infotext.py (renamed from modules/generation_parameters_copypaste.py)92
-rw-r--r--modules/infotext_versions.py39
-rw-r--r--modules/initialize.py3
-rw-r--r--modules/interrogate.py4
-rw-r--r--modules/launch_utils.py7
-rw-r--r--modules/modelloader.py84
-rw-r--r--modules/paths.py1
-rw-r--r--modules/paths_internal.py1
-rw-r--r--modules/postprocessing.py4
-rw-r--r--modules/processing.py80
-rw-r--r--modules/processing_scripts/refiner.py7
-rw-r--r--modules/processing_scripts/seed.py13
-rw-r--r--modules/realesrgan_model.py158
-rw-r--r--modules/scripts.py11
-rw-r--r--modules/sd_models.py6
-rw-r--r--modules/sd_models_config.py6
-rw-r--r--modules/sd_models_xl.py9
-rw-r--r--modules/sd_samplers_timesteps.py3
-rw-r--r--modules/shared_items.py4
-rw-r--r--modules/shared_options.py23
-rw-r--r--modules/styles.py47
-rw-r--r--modules/sysinfo.py2
-rw-r--r--modules/textual_inversion/textual_inversion.py10
-rw-r--r--modules/torch_utils.py17
-rw-r--r--modules/txt2img.py2
-rw-r--r--modules/ui.py48
-rw-r--r--modules/ui_common.py4
-rw-r--r--modules/ui_extra_networks.py7
-rw-r--r--modules/ui_extra_networks_user_metadata.py4
-rw-r--r--modules/ui_gradio_extensions.py11
-rw-r--r--modules/ui_postprocessing.py2
-rw-r--r--modules/upscaler.py3
-rw-r--r--modules/upscaler_utils.py140
-rw-r--r--modules/util.py12
-rw-r--r--modules/xlmr.py5
-rw-r--r--modules/xlmr_m18.py4
-rw-r--r--requirements.txt5
-rw-r--r--requirements_versions.txt8
-rw-r--r--scripts/postprocessing_caption.py2
-rw-r--r--scripts/postprocessing_create_flipped_copies.py2
-rw-r--r--scripts/postprocessing_focal_crop.py2
-rw-r--r--scripts/processing_autosized_crop.py2
-rw-r--r--scripts/xyz_grid.py25
-rw-r--r--test/conftest.py15
-rw-r--r--test/test_face_restorers.py29
-rw-r--r--test/test_files/two-faces.jpgbin0 -> 14768 bytes
-rw-r--r--test/test_outputs/.gitkeep0
-rw-r--r--test/test_torch_utils.py19
-rw-r--r--webui.py2
76 files changed, 1348 insertions, 4244 deletions
diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
index 3dafaf8d..f42e4758 100644
--- a/.github/workflows/run_tests.yaml
+++ b/.github/workflows/run_tests.yaml
@@ -20,6 +20,12 @@ jobs:
cache-dependency-path: |
**/requirements*txt
launch.py
+ - name: Cache models
+ id: cache-models
+ uses: actions/cache@v3
+ with:
+ path: models
+ key: "2023-12-30"
- name: Install test dependencies
run: pip install wait-for-it -r requirements-test.txt
env:
@@ -33,6 +39,8 @@ jobs:
TORCH_INDEX_URL: https://download.pytorch.org/whl/cpu
WEBUI_LAUNCH_LIVE_OUTPUT: "1"
PYTHONUNBUFFERED: "1"
+ - name: Print installed packages
+ run: pip freeze
- name: Start test server
run: >
python -m coverage run
@@ -49,7 +57,7 @@ jobs:
2>&1 | tee output.txt &
- name: Run tests
run: |
- wait-for-it --service 127.0.0.1:7860 -t 600
+ wait-for-it --service 127.0.0.1:7860 -t 20
python -m pytest -vv --junitxml=test/results.xml --cov . --cov-report=xml --verify-base-url test
- name: Kill test server
if: always()
diff --git a/.gitignore b/.gitignore
index 09734267..6790e9ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ notification.mp3
/node_modules
/package-lock.json
/.coverage*
+/test/test_outputs
diff --git a/configs/sd_xl_inpaint.yaml b/configs/sd_xl_inpaint.yaml
new file mode 100644
index 00000000..3bad3721
--- /dev/null
+++ b/configs/sd_xl_inpaint.yaml
@@ -0,0 +1,98 @@
+model:
+ target: sgm.models.diffusion.DiffusionEngine
+ params:
+ scale_factor: 0.13025
+ disable_first_stage_autocast: True
+
+ denoiser_config:
+ target: sgm.modules.diffusionmodules.denoiser.DiscreteDenoiser
+ params:
+ num_idx: 1000
+
+ weighting_config:
+ target: sgm.modules.diffusionmodules.denoiser_weighting.EpsWeighting
+ scaling_config:
+ target: sgm.modules.diffusionmodules.denoiser_scaling.EpsScaling
+ discretization_config: