minor fixes

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log for SD.Next
 
-## Update for 2024-02-21
+## Update for 2024-02-22
 
 - **Improvements**:
   - **IP Adapter** major refactor  
@@ -104,6 +104,7 @@
   - fix taesd with bfloat16
   - fix model merge manual merge settings, thanks @AI-Casanova  
   - fix gradio instant update issues for textboxes in quicksettings  
+  - fix rembg missing dependency  
   - bind controlnet extension to last known working commit, thanks @Aptronymist  
   - prompts-from-file fix resizable prompt area  
 

extensions-builtin/Lora/networks.py

@@ -442,7 +442,7 @@ def list_available_networks():
     if os.path.exists(shared.cmd_opts.lora_dir):
         directories.append(shared.cmd_opts.lora_dir)
     else:
-        shared.log.warning('LoRA directory not found: path="{shared.cmd_opts.lora_dir}"')
+        shared.log.warning(f'LoRA directory not found: path="{shared.cmd_opts.lora_dir}"')
     if os.path.exists(shared.cmd_opts.lyco_dir) and shared.cmd_opts.lyco_dir != shared.cmd_opts.lora_dir:
         directories.append(shared.cmd_opts.lyco_dir)
 

modules/images.py

@@ -343,7 +343,7 @@ class FilenameGenerator:
         else:
             debug(f'Filename generator init: {seed} {prompt}')
         self.p = p
-        if seed is not None and seed > 0:
+        if seed is not None and int(seed) > 0:
             self.seed = seed
         elif hasattr(p, 'all_seeds'):
             self.seed = p.all_seeds[0]

modules/modeldata.py

@@ -90,6 +90,8 @@ class Shared(sys.modules[__name__].__class__):
                 model_type = 'sd' # sd is compatible with sd
             elif "Kandinsky" in self.sd_model.__class__.__name__:
                 model_type = 'kandinsky'
+            elif "Cascade" in self.sd_model.__class__.__name__:
+                model_type = 'sc'
             else:
                 model_type = self.sd_model.__class__.__name__
         except Exception:

modules/styles.py

@@ -78,14 +78,20 @@ class StyleDatabase:
             self.load_csv(legacy_file)
             opts.styles_dir = os.path.join(paths.models_path, "styles")
             self.path = opts.styles_dir
-            os.makedirs(opts.styles_dir, exist_ok=True)
-            self.save_styles(opts.styles_dir, verbose=True)
-            log.debug(f'Migrated styles: file={legacy_file} folder={opts.styles_dir}')
-            self.reload()
+            try:
+                os.makedirs(opts.styles_dir, exist_ok=True)
+                self.save_styles(opts.styles_dir, verbose=True)
+                log.debug(f'Migrated styles: file={legacy_file} folder={opts.styles_dir}')
+                self.reload()
+            except Exception as e:
+                log.error(f'styles failed to migrate: file={legacy_file} error={e}')
         if not os.path.isdir(opts.styles_dir):
             opts.styles_dir = os.path.join(paths.models_path, "styles")
             self.path = opts.styles_dir
-            os.makedirs(opts.styles_dir, exist_ok=True)
+            try:
+                os.makedirs(opts.styles_dir, exist_ok=True)
+            except Exception:
+                pass
 
     def load_style(self, fn, prefix=None):
         with open(fn, 'r', encoding='utf-8') as f: