Update app.py

app.py

@@ -16,12 +16,12 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from textwrap import dedent
 
 HF_TOKEN = os.environ.get("HF_TOKEN")
-# OLLAMA_USERNAME = os.environ.get("OLLAMA_USERNAME").lower()
+# library_username = os.environ.get("library_username").lower()
 HOME = os.environ.get("HOME")
 ollama_pubkey = open(f"{HOME}/.ollama/id_ed25519.pub", "r")
 
 
-def ollamafy_model(model_id, OLLAMA_USERNAME, ollama_q_method, latest, maintainer, oauth_token: gr.OAuthToken | None):
+def ollamafy_model(model_id, library_username, ollama_q_method, latest, maintainer, oauth_token: gr.OAuthToken | None, library_username: ollama_library_username | None):
     if oauth_token.token is None:
         raise ValueError("You must be logged in to use Ollamafy")
     # username = whoami(oauth_token.token)["name"]
@@ -76,9 +76,9 @@ def ollamafy_model(model_id, OLLAMA_USERNAME, ollama_q_method, latest, maintaine
 
         # for ollama_q_method in ollama_q_methods:
         if ollama_q_method == "FP16":
-            ollama_conversion = f"ollama create -f {model_file} {OLLAMA_USERNAME}/{ollama_model_name}:{ollama_q_method.lower()}"
+            ollama_conversion = f"ollama create -f {model_file} {library_username}/{ollama_model_name}:{ollama_q_method.lower()}"
         else:
-            ollama_conversion = f"ollama create -q {ollama_q_method} -f {model_file} {OLLAMA_USERNAME}/{ollama_model_name}:{ollama_q_method.lower()}"
+            ollama_conversion = f"ollama create -q {ollama_q_method} -f {model_file} {library_username}/{ollama_model_name}:{ollama_q_method.lower()}"
             
         ollama_conversion_result = subprocess.run(ollama_conversion, shell=True, capture_output=True)
         print(ollama_conversion_result)
@@ -88,11 +88,11 @@ def ollamafy_model(model_id, OLLAMA_USERNAME, ollama_q_method, latest, maintaine
             print("Model converted to Ollama successfully!")
         
         if maintainer:
-            ollama_push =  f"ollama push  {OLLAMA_USERNAME}/{model_name}:{q_method.lower()}"
-            ollama_rm =  f"ollama rm  {OLLAMA_USERNAME}/{model_name}:{q_method.lower()}"
+            ollama_push =  f"ollama 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  {OLLAMA_USERNAME}/{ollama_model_name}:{q_method.lower()}"
-            ollama_rm =  f"ollama rm  {OLLAMA_USERNAME}/{ollama_model_name}:{q_method.lower()}"
+            ollama_push =  f"ollama 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)
         print(ollama_push_result)
@@ -110,7 +110,7 @@ def ollamafy_model(model_id, OLLAMA_USERNAME, ollama_q_method, latest, maintaine
       
 
         if latest:
-            ollama_copy =  f"ollama cp {OLLAMA_USERNAME}/{model_id.lower()}:{q_method.lower()} {OLLAMA_USERNAME}/{model_id.lower()}:latest"
+            ollama_copy =  f"ollama cp {library_username}/{model_id.lower()}:{q_method.lower()} {library_username}/{model_id.lower()}:latest"
             ollama_copy_result = subprocess.run(ollama_copy, shell=True, capture_output=True)
             print(ollama_copy_result)
             if ollama_copy_result.returncode != 0:
@@ -118,11 +118,11 @@ def ollamafy_model(model_id, OLLAMA_USERNAME, ollama_q_method, latest, maintaine
             print("Model pushed to Ollama library successfully!")
             
             if maintainer:
-                ollama_push_latest =  f"ollama push  {OLLAMA_USERNAME}/{model_name}:latest"
-                ollama_rm_latest =  f"ollama rm  {OLLAMA_USERNAME}/{model_name}:latest"
+                ollama_push_latest =  f"ollama push  {library_username}/{model_name}:latest"
+                ollama_rm_latest =  f"ollama rm  {library_username}/{model_name}:latest"
             else:    
-                ollama_push_latest =  f"ollama push  {OLLAMA_USERNAME}/{ollama_model_name}:latest"
-                ollama_rm_latest =  f"ollama rm  {OLLAMA_USERNAME}/{ollama_model_name}:latest"
+                ollama_push_latest =  f"ollama 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)
             print(ollama_push_latest_result)
@@ -185,7 +185,7 @@ with gr.Blocks(css=css) as demo:
         label="Maintainer",
         info="Use this option is your original repository on both Hugging Face and Ollama."
     )
-    OLLAMA_USERNAME = gr.Textbox(
+    ollama_library_username = gr.Textbox(
         label="Ollama Library Username",
         info="Input your username from Ollama to push this model to their Library.",
     )
@@ -196,7 +196,7 @@ with gr.Blocks(css=css) as demo:
             login,
             account,
             model_id,
-            OLLAMA_USERNAME,
+            library_username,
             ollama_q_method,
             latest,
             maintainer
@@ -212,7 +212,7 @@ with gr.Blocks(css=css) as demo:
     
 def restart_space():
     ollama_pubkey.close(),
-    HfApi().restart_space(repo_id="unclemusclez/ollamafy", token=HF_TOKEN, ollama_username=OLLAMA_USERNAME factory_reboot=True)
+    HfApi().restart_space(repo_id="unclemusclez/ollamafy", token=HF_TOKEN, library_username=OLLAMA_USERNAME, factory_reboot=True)
 
 scheduler = BackgroundScheduler()
 scheduler.add_job(restart_space, "interval", seconds=21600)