Fixed reading paths from paths.json

Author: MoonRide303

fooocus_version.py

@@ -1,2 +1,2 @@
-version = '2.0.78 MRE'
+version = '2.0.78.1 MRE'
 full_version = 'Fooocus ' + version

modules/path.py

@@ -4,7 +4,7 @@
 from os.path import exists
 from modules.model_loader import load_file_from_url
 
-def load_paths():
+def load_paths(paths_filename):
     paths_dict = {
         'modelfile_path': '../models/checkpoints/',
         'lorafile_path': '../models/loras/',
@@ -13,13 +13,15 @@ def load_paths():
         'controlnet_path': '../models/controlnet/',
         'vae_approx_path': '../models/vae_approx/',
         'fooocus_expansion_path': '../models/prompt_expansion/fooocus_expansion/',
+        'upscale_models_path': '../models/upscale_models/',
+        'inpaint_models_path': '../models/inpaint/',
         'styles_path': '../sdxl_styles/',
         'wildcards_path': '../wildcards/',
         'temp_outputs_path': '../outputs/'
     }
 
-    if exists('paths.json'):
-        with open('paths.json', encoding='utf-8') as paths_file:
+    if exists(paths_filename):
+        with open(paths_filename, encoding='utf-8') as paths_file:
             try:
                 paths_obj = json.load(paths_file)
                 if 'path_checkpoints' in paths_obj:
@@ -36,6 +38,10 @@ def load_paths():
                     paths_dict['vae_approx_path'] = paths_obj['path_vae_approx']
                 if 'path_fooocus_expansion' in paths_obj:
                     paths_dict['fooocus_expansion_path'] = paths_obj['path_fooocus_expansion']
+                if 'path_upscale_models' in paths_obj:
+                    paths_dict['upscale_models_path'] = paths_obj['path_upscale_models']
+                if 'path_inpaint_models' in paths_obj:
+                    paths_dict['inpaint_models_path'] = paths_obj['path_inpaint_models']
                 if 'path_styles' in paths_obj:
                     paths_dict['styles_path'] = paths_obj['path_styles']
                 if 'path_wildcards' in paths_obj:
@@ -71,13 +77,13 @@ def load_paths():
 def get_config_or_set_default(key, default):
     global config_dict
     v = config_dict.get(key, None)
-    if isinstance(v, str) and os.path.exists(v) and os.path.isdir(v):
-        return v
-    else:
-        dp = os.path.abspath(os.path.join(os.path.dirname(__file__), default))
+    if not isinstance(v, str):
+        v = default
+    dp = v if os.path.isabs(v) else os.path.abspath(os.path.join(os.path.dirname(__file__), v))
+    if not os.path.exists(dp) or not os.path.isdir(dp):
         os.makedirs(dp, exist_ok=True)
         config_dict[key] = dp
-        return dp
+    return dp
 
 
 modelfile_path = get_config_or_set_default('modelfile_path', '../models/checkpoints/')

paths-example.json

@@ -6,6 +6,8 @@
     "path_controlnet": "../models/controlnet/",
     "path_vae_approx": "../models/vae_approx/",
     "path_fooocus_expansion": "../models/prompt_expansion/fooocus_expansion/",
+    "path_upscale_models": "../models/upscale_models/",
+    "path_inpaint_models": "../models/inpaint/",
     "path_styles": "../sdxl_styles/",
     "path_wildcards": "../wildcards/",
     "path_outputs": "../outputs/"

update_log_mre.md

@@ -1,3 +1,7 @@
+### 2.0.78.1 MRE
+
+* Fixed reading paths from paths.json (broken in 2.0.73 MRE).
+
 ### 2.0.76 MRE
 
 * Added information about total execution time.