Update app.py

app.py

@@ -25,11 +25,14 @@ ollama_pubkey_read = ollama_pubkey.read()
 
 
 
-def process_model(model_id, q_method, latest, oauth_token: gr.OAuthToken | None):
+def process_model(model_id, q_method, latest, maintainer, oauth_token: gr.OAuthToken | None):
 #def process_model(model_id, q_method, latest):
     if oauth_token.token is None:
         raise ValueError("You must be logged in to use GGUF-my-repo")
     model_name = model_id.split('/')[-1]
+    model_maintainer = model_id.split('/')[1]
+    ollama_model_name = model_maintainer + '_' + model_name 
+
 
     try:
         api = HfApi(token=oauth_token.token)
@@ -55,10 +58,11 @@ def process_model(model_id, q_method, latest, oauth_token: gr.OAuthToken | None)
         print(f"Current working directory: {os.getcwd()}")
         print(f"Model directory contents: {os.listdir(model_name)}")
 
-        model_file = "${model_name} + _modelfile"
+        model_file = ${model_name} + '_modelfile'
+      
         f = open("{model_file}", "w")
         print(f.write("From {model_id}")) 
-        ollama_conversion = f"ollama create -f {model_file} {OLLAMA_USERNAME}/{model_id}:{q_method}"
+        ollama_conversion = f"ollama create -f {model_file} {OLLAMA_USERNAME}/{ollama_model_name}:{q_method}"
 
         
         ollama_conversion_result = subprocess.run(ollama_conversion, shell=True, capture_output=True)
@@ -66,26 +70,30 @@ def process_model(model_id, q_method, latest, oauth_token: gr.OAuthToken | None)
         if ollama_conversion_result.returncode != 0:
             raise Exception(f"Error converting to Ollama: {ollama_conversion_result.stderr}")
         print("Model converted to Ollama successfully!")
-        
-        ollama_push =  f"ollama push {OLLAMA_USERNAME}/{model_id}:{q_method}"
+        if maintainer == True:
+            ollama_push =  f"ollama push {OLLAMA_USERNAME}/{model_name}:{q_method}"
+        else: 
+            ollama_push =  f"ollama push {OLLAMA_USERNAME}/{ollama_model_name}:{q_method}"
         ollama_push_result = subprocess.run(ollama_push, shell=True, capture_output=True)
         print(ollama_push_result)
-        if ollama_conversion_result.returncode != 0:
+        if ollama_push_result.returncode != 0:
             raise Exception(f"Error converting to Ollama: {ollama_push_result.stderr}")
         print("Model pushed to Ollama library successfully!")
         
         if latest == True:
             ollama_copy =  f"ollama cp  {OLLAMA_USERNAME}/{model_id}:{q_method} {OLLAMA_USERNAME}/{model_id}:latest"
             ollama_copy_result = subprocess.run(ollama_copy, shell=True, capture_output=True)
-            print(ollama_push_result)
-            if ollama_conversion_result.returncode != 0:
+            print(ollama_copy_result)
+            if ollama_copy_result.returncode != 0:
                 raise Exception(f"Error converting to Ollama: {ollama_push_result.stderr}")
             print("Model pushed to Ollama library successfully!")
-            
-            ollama_push_latest =  f"ollama push {OLLAMA_USERNAME}/{model_id}:latest"
+            if maintainer == True:
+                llama_push_latest =  f"ollama push {OLLAMA_USERNAME}/{model_name}:latest"
+            else:    
+                ollama_push_latest =  f"ollama push {OLLAMA_USERNAME}/{ollama_model_name}:latest"
             ollama_push_latest_result = subprocess.run(ollama_push_latest, shell=True, capture_output=True)
-            print(ollama_push_result)
-            if ollama_conversion_result.returncode != 0:
+            print(ollama_push_latest_result)
+            if ollama_push_latest_result.returncode != 0:
                 raise Exception(f"Error converting to Ollama: {ollama_push_result.stderr}")
             print("Model pushed to Ollama library successfully!")
             
@@ -125,6 +133,11 @@ with gr.Blocks(css=css) as demo:
         label="Latest",
         info="Copy Model to Ollama Library with the :latest tag"
     )
+    maintainer = gr.Checkbox(
+        value=False,
+        label="Maintainer",
+        info="This is your original repository on both Huggin Face and Ollama. (DO NOT USE)"
+    )
     iface = gr.Interface(
         fn=process_model,
         inputs=[