ollama_pid

result = subprocess.run(ollama_pid, shell=True, capture_output=True)
print(result)
if result.returncode != 0:
raise Exception(f"Error retrieving Ollama PID {result.stderr}")
print(f"Ollama PID Retrived: {ollama_pid}")

app.py

@@ -32,10 +32,17 @@ def regenerate_pubkey(pubkey, oauth_token: gr.OAuthToken | None):
     generate_ollama_pid_file = f"echo $! > ollama.pid"
     ollama_pubkey = f"cat {HOME}/{hash_oauth}/.ollama/id_ed25519.pub"  
     ollama_start = f"HOME={HOME}/{hash_oauth} ollama serve & {generate_ollama_pid_file} & sleep 5"    
-    ollama_stop = f"kill -9 'cat {HOME}/{hash_oauth}/ollama.pid'"
+    ollama_pid = f"cat {HOME}/{hash_oauth}/ollama.pid"
+    ollama_stop = f"kill -9 {ollama_pid}"
     delete_home = f"rm -Rf {HOME}/{hash_oauth}/.ollama"
     
     try:
+        result = subprocess.run(ollama_pid, shell=True, capture_output=True)
+        print(result)
+        if result.returncode != 0:
+            raise Exception(f"Error retrieving Ollama PID {result.stderr}")
+        print(f"Ollama PID Retrived: {ollama_pid}")
+
         result = subprocess.run(ollama_stop, shell=True, capture_output=True)
         print(result)
         if result.returncode != 0:
@@ -46,7 +53,7 @@ def regenerate_pubkey(pubkey, oauth_token: gr.OAuthToken | None):
         print(result)
         if result.returncode != 0:
             raise Exception(f"Error removing Ollama HOME folder {result.stderr}")
-        print("Ollama HOME fodler removed successfully!")
+        print("Ollama HOME folder removed successfully!")
     
         result = subprocess.run(ollama_start, shell=True, capture_output=True)
         print(result)
@@ -83,7 +90,8 @@ def ollamafy_model(login, model_id, ollama_library_username , ollama_q_method, l
     # username = whoami(oauth_token.token)["name"]
     model_name = model_id.split('/')[-1]
     fp16 = f"{model_name}-fp16.gguf"
-    ollama_stop = f"kill -9 'cat {HOME}/{hash_oauth}/ollama.pid'"
+    ollama_pid = f"cat {HOME}/{hash_oauth}/ollama.pid"
+    ollama_stop = f"kill -9 {ollama_pid}"
     delete_home = f"rm -Rf {HOME}/{hash_oauth}/.ollama"
     download_gguf = f"wget download_gguf_link"
 
@@ -212,6 +220,12 @@ def ollamafy_model(login, model_id, ollama_library_username , ollama_q_method, l
         shutil.rmtree(model_name, ignore_errors=True)
         print("Folder cleaned up successfully!")
         
+        result = subprocess.run(ollama_pid, shell=True, capture_output=True)
+        print(result)
+        if result.returncode != 0:
+            raise Exception(f"Error retrieving Ollama PID {result.stderr}")
+        print(f"Ollama PID Retrived: {ollama_pid}")
+        
         result = subprocess.run(ollama_stop, shell=True, capture_output=True)
         print(result)
         if result.returncode != 0: