search

vladmandic / automatic

SD.Next: Advanced Implementation of Stable Diffusion and other Diffusion-based generative image models
https://github.com/vladmandic/automatic
GNU Affero General Public License v3.0
5.31k stars 379 forks source link

[Issue]: sdnext update makes sdnext-modernui loose its branch, causing an error on next update #3152

Closed Tillerz closed 1 month ago

Tillerz commented 1 month ago

Issue Description

sdnext update on startup makes sdnext-modernui module loose its git branch, causing an error on next update as it doesn't know what branch to pull from anymore.

Version Platform Description

WSL2/Win11

Relevant log output

14:50:07-894641 ERROR    Error running git: . / pull --rebase --force
14:50:07-895797 ERROR    Local changes detected: check log for details: /home/tillerz/dev/sdnext.log
14:50:07-896637 DEBUG    Git output: Updating 2aadaa3..956dba3

                         error: Your local changes to the following files would be overwritten by merge:
                                 extensions-builtin/sdnext-modernui
                         Please commit your changes or stash them before you merge.
                         Aborting

sdnext.log output

2024-05-18 14:50:07,216 | sd | INFO | launch | Starting SD.Next
2024-05-18 14:50:07,218 | sd | INFO | installer | Logger: file="/home/tillerz/dev/sdnext.log" level=DEBUG size=64 mode=create
2024-05-18 14:50:07,218 | sd | INFO | installer | Python 3.10.12 on Linux
2024-05-18 14:50:07,234 | sd | INFO | installer | Version: app=sd.next updated=2024-05-17 hash=2aadaa3 branch=dev url=https://github.com/vladmandic/automatic.git/tree/dev
2024-05-18 14:50:07,499 | sd | INFO | installer | Updating main repository
2024-05-18 14:50:07,894 | sd | ERROR | installer | Error running git: . / pull --rebase --force
2024-05-18 14:50:07,895 | sd | ERROR | installer | Local changes detected: check log for details: /home/tillerz/dev/sdnext.log
2024-05-18 14:50:07,896 | sd | DEBUG | installer | Git output: Updating 2aadaa3..956dba3

error: Your local changes to the following files would be overwritten by merge:
        extensions-builtin/sdnext-modernui
Please commit your changes or stash them before you merge.
Aborting
2024-05-18 14:50:07,903 | sd | INFO | installer | Upgraded to version: 2aadaa3 Fri May 17 18:57:29 2024 +0300
2024-05-18 14:50:07,907 | sd | INFO | launch | Platform: arch=x86_64 cpu=x86_64 system=Linux release=5.15.146.1-microsoft-standard-WSL2 python=3.10.12
2024-05-18 14:50:07,908 | sd | DEBUG | installer | Setting environment tuning
2024-05-18 14:50:07,909 | sd | DEBUG | installer | HF cache folder: /home/tillerz/.cache/huggingface/hub
2024-05-18 14:50:07,910 | sd | DEBUG | installer | Torch allocator: "garbage_collection_threshold:0.80,max_split_size_mb:512"
2024-05-18 14:50:07,911 | sd | DEBUG | installer | Torch overrides: cuda=False rocm=False ipex=False diml=False openvino=False
2024-05-18 14:50:07,912 | sd | DEBUG | installer | Torch allowed: cuda=True rocm=True ipex=True diml=True openvino=True
2024-05-18 14:50:07,913 | sd | INFO | installer | nVidia CUDA toolkit detected: nvidia-smi present
2024-05-18 14:50:07,930 | sd | INFO | launch | Startup: standard
2024-05-18 14:50:07,931 | sd | INFO | installer | Verifying requirements
2024-05-18 14:50:07,943 | sd | INFO | installer | Verifying packages
2024-05-18 14:50:07,944 | sd | INFO | installer | Verifying submodules
2024-05-18 14:50:08,284 | sd | DEBUG | installer | Submodule: extensions-builtin/sd-extension-chainner / main
2024-05-18 14:50:08,905 | sd | DEBUG | installer | Submodule: extensions-builtin/sd-extension-system-info / main
2024-05-18 14:50:09,270 | sd | DEBUG | installer | Submodule: extensions-builtin/sd-webui-agent-scheduler / main
2024-05-18 14:50:09,682 | sd | DEBUG | installer | Submodule: extensions-builtin/sdnext-modernui / main
2024-05-18 14:50:10,056 | sd | DEBUG | installer | Submodule: extensions-builtin/stable-diffusion-webui-rembg / master
2024-05-18 14:50:10,416 | sd | DEBUG | installer | Submodule: modules/k-diffusion / master
2024-05-18 14:50:10,772 | sd | DEBUG | installer | Submodule: wiki / master
2024-05-18 14:50:11,130 | sd | DEBUG | paths | Register paths
2024-05-18 14:50:11,174 | sd | DEBUG | installer | Installed packages: 222
2024-05-18 14:50:11,175 | sd | DEBUG | installer | Extensions all: ['sd-extension-system-info', 'sd-webui-agent-scheduler', 'sd-extension-chainner', 'sdnext-modernui', 'stable-diffusion-webui-rembg', 'Lora']
2024-05-18 14:50:11,187 | sd | DEBUG | installer | Submodule: extensions-builtin/sd-extension-system-info / main
2024-05-18 14:50:11,539 | sd | DEBUG | installer | Running extension installer: /home/tillerz/dev/extensions-builtin/sd-extension-system-info/install.py
2024-05-18 14:50:11,716 | sd | DEBUG | installer | Submodule: extensions-builtin/sd-webui-agent-scheduler / main
2024-05-18 14:50:12,081 | sd | DEBUG | installer | Running extension installer: /home/tillerz/dev/extensions-builtin/sd-webui-agent-scheduler/install.py
2024-05-18 14:50:12,201 | sd | DEBUG | installer | Submodule: extensions-builtin/sd-extension-chainner / main
2024-05-18 14:50:12,581 | sd | DEBUG | installer | Submodule: extensions-builtin/sdnext-modernui / main
2024-05-18 14:50:12,978 | sd | DEBUG | installer | Submodule: extensions-builtin/stable-diffusion-webui-rembg / master
2024-05-18 14:50:13,335 | sd | DEBUG | installer | Running extension installer: /home/tillerz/dev/extensions-builtin/stable-diffusion-webui-rembg/install.py
2024-05-18 14:50:13,810 | sd | DEBUG | installer | Extensions all: ['stable-diffusion-webui-text2prompt', 'adetailer']
2024-05-18 14:50:13,821 | sd | DEBUG | installer | Submodule: extensions/stable-diffusion-webui-text2prompt / main
2024-05-18 14:50:14,191 | sd | DEBUG | installer | Submodule: extensions/adetailer / main
2024-05-18 14:50:14,515 | sd | DEBUG | installer | Running extension installer: /home/tillerz/dev/extensions/adetailer/install.py
2024-05-18 14:50:14,639 | sd | INFO | installer | Extensions enabled: ['sd-extension-system-info', 'sd-webui-agent-scheduler', 'sd-extension-chainner', 'sdnext-modernui', 'stable-diffusion-webui-rembg', 'Lora', 'stable-diffusion-webui-text2prompt', 'adetailer']
2024-05-18 14:50:14,640 | sd | INFO | installer | Verifying requirements
2024-05-18 14:50:14,646 | sd | INFO | installer | Updating Wiki
2024-05-18 14:50:14,653 | sd | DEBUG | installer | Submodule: /home/tillerz/dev/wiki / master
2024-05-18 14:50:15,011 | sd | WARNING | launch | Setup complete with errors: 1

Backend

Diffusers

Branch

Dev

Model

SD 1.5

Acknowledgements

vladmandic commented 1 month ago

as msg says log may contain more info - can you upload it here as well?

Tillerz commented 1 month ago

added

vladmandic commented 1 month ago

i've made some updates, hope that helps - if not, update here with new info and i'll reopen.