add hash_oauth and add ollama@hash_oauth instance

app.py

@@ -2,6 +2,7 @@ import os
 import shutil
 import subprocess
 import signal
+import hashlib
 
 os.environ["GRADIO_ANALYTICS_ENABLED"] = "False"
 import gradio as gr
@@ -18,12 +19,45 @@ from textwrap import dedent
 HOME = os.environ.get("HOME")
 # token = os.environ.get("HF_TOKEN")
 library_username = os.environ.get("OLLAMA_USERNAME").lower()
-ollama_pubkey = open(f"{HOME}/.ollama/id_ed25519.pub", "r")
+
+ollama_start = f"systemctl ollama start"
+ollama_stop = f"systemctl ollama stop"
+
+
+def regenerate_pubkey(oauth_token: gr.OAuthToken | None):
+
+    if oauth_token.token is None:
+        raise ValueError("You must be logged in to use Ollamafy")
+    hash_oauth = hashlib.sha256(unicode_string.encode(oauth_token)).hexdigest()
+    ollama_pubkey = open(f"{HOME}/.ollama/{hash_oauth}/id_ed25519.pub", "r")
+    delete_ihome = f"rm -Rf {HOME}/{hash_oauth}"
+    ollama_istart = f"systemctl ollama@{hash_oauth} start"
+    ollama_istop = f"systemctl ollama@{hash_oauth} stop"
+        
+    result = subprocess.run(ollama_stop, shell=True, capture_output=True)
+    print(result)
+    if result.returncode != 0:
+        raise Exception(f"Error stoppping Ollama {result.stderr}")
+    print("Ollama stopped successfully!")
+
+    result = subprocess.run(delete_ihome, shell=True, capture_output=True)
+    print(result)
+    if result.returncode != 0:
+        raise Exception(f"Error removing Ollama HOME folder {result.stderr}")
+    print("Ollama HOME fodler removed successfully!")
+
+    result = subprocess.run(ollama_start, shell=True, capture_output=True)
+    print(result)
+    if result.returncode != 0:
+        raise Exception(f"Error starting Ollama {result.stderr}")
+    print("Ollama started successfully!")
 
 def ollamafy_model(login, account, model_id, ollama_library_username , ollama_q_method, latest, maintainer, oauth_token: gr.OAuthToken | None):
     ollama_library_username: library_username | None 
     if oauth_token.token is None:
         raise ValueError("You must be logged in to use Ollamafy")
+    hash_oauth = hashlib.sha256(unicode_string.encode(oauth_token)).hexdigest()
+
     # username = whoami(oauth_token.token)["name"]
     model_name = model_id.split('/')[-1]
     fp16 = f"{model_name}-fp16.gguf"
@@ -88,10 +122,10 @@ def ollamafy_model(login, account, model_id, ollama_library_username , ollama_q_
             print("Model converted to Ollama successfully!")
         
         if maintainer:
-            ollama_push =  f"ollama push  {library_username}/{model_name}:{q_method.lower()}"
+            ollama_push =  f"ollama@{hash_oauth} push  {library_username}/{model_name}:{q_method.lower()}"
             ollama_rm =  f"ollama rm  {library_username}/{model_name}:{q_method.lower()}"
         else: 
-            ollama_push =  f"ollama push  {library_username}/{ollama_model_name}:{q_method.lower()}"
+            ollama_push =  f"ollama@{hash_oauth} push  {library_username}/{ollama_model_name}:{q_method.lower()}"
             ollama_rm =  f"ollama rm  {library_username}/{ollama_model_name}:{q_method.lower()}"
             
         ollama_push_result = subprocess.run(ollama_push, shell=True, capture_output=True)
@@ -118,10 +152,10 @@ def ollamafy_model(login, account, model_id, ollama_library_username , ollama_q_
             print("Model pushed to Ollama library successfully!")
             
             if maintainer:
-                ollama_push_latest =  f"ollama push  {library_username}/{model_name}:latest"
+                ollama_push_latest =  f"ollama@{hash_oauth} push  {library_username}/{model_name}:latest"
                 ollama_rm_latest =  f"ollama rm  {library_username}/{model_name}:latest"
             else:    
-                ollama_push_latest =  f"ollama push  {library_username}/{ollama_model_name}:latest"
+                ollama_push_latest =  f"ollama@{hash_oauth} push  {library_username}/{ollama_model_name}:latest"
                 ollama_rm_latest =  f"ollama rm  {library_username}/{ollama_model_name}:latest"
                 
             ollama_push_latest_result = subprocess.run(ollama_push_latest, shell=True, capture_output=True)
@@ -154,6 +188,10 @@ with gr.Blocks(css=css) as demo:
     login = gr.LoginButton(
         min_width=250,
     )
+    generate_pubkey gr.Button (        
+        value=regenerate_pubkey(),
+        min_width=250,
+    )
     
     model_id = HuggingfaceHubSearch(
         label="Hugging Face Hub Model ID",