refact

ModelSurge · Aug 11, 2023 · 43f58c8 · 43f58c8
1 parent 0e27b73
commit 43f58c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/lib_comfyui/comfyui/pre_main.py b/lib_comfyui/comfyui/pre_main.py
@@ -28,16 +28,24 @@ def main():
 
 @ipc.restrict_to_process('comfyui')
 def fix_path():
-    path = list(sys.path)
+    path = sys.path.copy()
+
+    # make path entries unique
     sys.path.clear()
     seen = set()
     sys.path.extend(
         p
         for p in path
         if not (p in seen or seen.add(p))
     )
+
     # put comfyui install dir first
-    sys.path[:0] = [sys.path.pop(sys.path.index(os.getcwd()))]
+    cwd = os.getcwd()
+    try:
+        sys.path.remove(cwd)
+    except ValueError:
+        pass
+    sys.path.insert(0, cwd)
 
 
 @ipc.restrict_to_process('comfyui')

diff --git a/lib_comfyui/comfyui/get_sys_path.py → lib_comfyui/comfyui/print_sys_path.py b/lib_comfyui/comfyui/get_sys_path.py → lib_comfyui/comfyui/print_sys_path.py
diff --git a/lib_comfyui/comfyui_process.py b/lib_comfyui/comfyui_process.py
@@ -7,7 +7,7 @@
 
 from lib_comfyui import ipc, torch_utils, argv_conversion, global_state
 from lib_comfyui.webui import settings
-from lib_comfyui.comfyui import pre_main, get_sys_path
+from lib_comfyui.comfyui import pre_main, print_sys_path
 
 
 comfyui_process = None
@@ -72,7 +72,7 @@ def get_base_sys_path(executable, comfyui_install_location):
     env = os.environ.copy()
     del env['PYTHONPATH']
     return subprocess.run(
-        args=[executable, inspect.getfile(get_sys_path)],
+        args=[executable, inspect.getfile(print_sys_path)],
         executable=executable,
         cwd=str(comfyui_install_location),
         env=env,