From 6b258468d01142dbbc82b59eb331a10709b17026 Mon Sep 17 00:00:00 2001
From: Saifeddine ALOUI <aloui.seifeddine@gmail.com>
Date: Fri, 1 Mar 2024 01:34:47 +0100
Subject: [PATCH] fixed builds

---
 .../server/endpoints/lollms_personalities_infos.py   |  2 ++
 lollms/utilities.py                                  | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lollms/server/endpoints/lollms_personalities_infos.py b/lollms/server/endpoints/lollms_personalities_infos.py
index 09b2e1d..7eceabe 100644
--- a/lollms/server/endpoints/lollms_personalities_infos.py
+++ b/lollms/server/endpoints/lollms_personalities_infos.py
@@ -471,6 +471,8 @@ def select_personality(data:PersonalitySelectionInfos):
     if id<len(lollmsElfServer.mounted_personalities):
         lollmsElfServer.config["active_personality_id"]=id
         lollmsElfServer.personality:AIPersonality = lollmsElfServer.mounted_personalities[lollmsElfServer.config["active_personality_id"]]
+        if lollmsElfServer.personality is None:
+            return {"status": False, "error":"Something is wrong with the personality"}
         if lollmsElfServer.personality.processor:
             lollmsElfServer.personality.processor.selected()
         ASCIIColors.success("ok")
diff --git a/lollms/utilities.py b/lollms/utilities.py
index 6c02814..20abc2d 100644
--- a/lollms/utilities.py
+++ b/lollms/utilities.py
@@ -441,12 +441,12 @@ def reinstall_pytorch_with_cuda():
         ASCIIColors.error(ex)
     try:
         ASCIIColors.info("Installing pytorch 2.1.1")
-        result = subprocess.run(["pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir", "--index-url", "https://download.pytorch.org/whl/cu121"])
+        result = subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir", "--index-url", "https://download.pytorch.org/whl/cu121"])
     except Exception as ex:
         ASCIIColors.error(ex)
     if result.returncode != 0:
         ASCIIColors.warning("Couldn't find Cuda build tools on your PC. Reverting to CPU.")
-        result = subprocess.run(["pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
+        result = subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
         if result.returncode != 0:
             ASCIIColors.error("Couldn't install pytorch !!")
         else:
@@ -454,10 +454,10 @@ def reinstall_pytorch_with_cuda():
 
 
 def reinstall_pytorch_with_rocm():
-    result = subprocess.run(["pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir", "--index-url", "https://download.pytorch.org/whl/rocm5.6"])
+    result = subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir", "--index-url", "https://download.pytorch.org/whl/rocm5.6"])
     if result.returncode != 0:
         ASCIIColors.warning("Couldn't find Cuda build tools on your PC. Reverting to CPU.")
-        result = subprocess.run(["pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
+        result = subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
         if result.returncode != 0:
             ASCIIColors.error("Couldn't install pytorch !!")
         else:
@@ -466,10 +466,10 @@ def reinstall_pytorch_with_rocm():
             
 
 def reinstall_pytorch_with_cpu():
-    result = subprocess.run(["pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
+    result = subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
     if result.returncode != 0:
         ASCIIColors.warning("Couldn't find Cuda build tools on your PC. Reverting to CPU.")
-        result = subprocess.run(["pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
+        result = subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "torch", "torchvision", "torchaudio", "--no-cache-dir"])
         if result.returncode != 0:
             ASCIIColors.error("Couldn't install pytorch !!")
         else: