From 359ff0f7888100119cc31065c16d688d48e34ca9 Mon Sep 17 00:00:00 2001
From: TSC <112517630+LucianoCirino@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:09:51 -0500
Subject: [PATCH 1/2] Use sys.executable for Pip Calls

This PR addresses an issue where the code could potentially use a global version of pip not associated with the running Python interpreter, leading to errors such as "module pip not found".
---
 tsc_utils.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tsc_utils.py b/tsc_utils.py
index e9e422a..94baacd 100644
--- a/tsc_utils.py
+++ b/tsc_utils.py
@@ -472,10 +472,11 @@ def global_preview_method():
 #-----------------------------------------------------------------------------------------------------------------------
 # Auto install Efficiency Nodes Python package dependencies
 import subprocess
-# Note: Auto installer install packages inside the requirements.txt.
-#       It first trys ComfyUI's python_embedded folder if python.exe exists inside ...\ComfyUI_windows_portable\python_embeded.
-#       If no python.exe is found, it attempts a general global pip install of packages.
-#       On an error, an user is directed to attempt manually installing the packages themselves.
+# Note: This auto-installer installs packages listed in the requirements.txt.
+#       It first checks if python.exe exists inside the ...\ComfyUI_windows_portable\python_embeded directory.
+#       If python.exe is found in that location, it will use this embedded Python version for the installation.
+#       Otherwise, it uses the Python interpreter that's currently executing the script (via sys.executable) to attempt a general pip install of the packages.
+#       If any errors occur during installation, the user is directed to manually install the required packages.
 
 def install_packages(my_dir):
     # Compute path to the target site-packages
@@ -496,12 +497,15 @@ def install_packages(my_dir):
             if pkg not in installed_packages:
                 printout = f"Installing required package '{pkg}'..."
                 print(f"{message('Efficiency Nodes:')} {printout}", end='', flush=True)
+
                 if use_embedded:  # Targeted installation
-                    subprocess.check_call(['pip', 'install', pkg, '--target=' + target_dir, '--no-warn-script-location',
-                                           '--disable-pip-version-check'], stdout=subprocess.DEVNULL,
-                                          stderr=subprocess.PIPE)
+                    subprocess.check_call([embedded_python_exe, '-m', 'pip', 'install', pkg, '--target=' + target_dir,
+                                           '--no-warn-script-location', '--disable-pip-version-check'],
+                                          stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
                 else:  # Untargeted installation
-                    subprocess.check_call(['pip', 'install', pkg], stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
+                    subprocess.check_call([sys.executable, "-m", "pip", 'install', pkg],
+                                          stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
+
                 print(f"\r{message('Efficiency Nodes:')} {printout}{success('Installed!')}", flush=True)
 
     except Exception as e:  # This catches all exceptions derived from the base Exception class
@@ -513,7 +517,8 @@ def packages(python_exe=None, versions=False):
             return [(r.decode().split('==')[0] if not versions else r.decode()) for r in
                     subprocess.check_output([python_exe, '-m', 'pip', 'freeze']).split()]
         else:
-            return [(r.split('==')[0] if not versions else r) for r in subprocess.getoutput('pip freeze').splitlines()]
+            return [(r.split('==')[0] if not versions else r) for r in
+                    subprocess.getoutput([sys.executable, "-m", "pip", "freeze"]).splitlines()]
     except subprocess.CalledProcessError as e:
         raise e  # re-raise the error to handle it outside
 

From 1479ea36a4a1e459318b5a42444aefcacc9112f6 Mon Sep 17 00:00:00 2001
From: TSC <112517630+LucianoCirino@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:35:08 -0500
Subject: [PATCH 2/2] updated when to use embedded

---
 tsc_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsc_utils.py b/tsc_utils.py
index 94baacd..ef80f7a 100644
--- a/tsc_utils.py
+++ b/tsc_utils.py
@@ -484,7 +484,7 @@ def install_packages(my_dir):
     embedded_python_exe = os.path.abspath(os.path.join(my_dir, '..', '..', '..', 'python_embeded', 'python.exe'))
 
     # If embedded_python_exe exists, target the installations. Otherwise, go untargeted.
-    use_embedded = os.path.exists(embedded_python_exe)
+    use_embedded = os.path.exists(embedded_python_exe) and embedded_python_exe == sys.executable
 
     # Load packages from requirements.txt
     with open(os.path.join(my_dir, 'requirements.txt'), 'r') as f: