Update app.py

app.py

@@ -75,65 +75,65 @@ def process_model(model_id, q_method, use_imatrix, imatrix_q_method, private_rep
             ollama_modelfile.close()
             print(quantized_gguf_path)
     
-            for ollama_q_method in ollama_q_methods:
-                if ollama_q_method == "FP16":
-                    ollama_conversion = f"ollama create  -q {ollama_q_method} -f {model_file} {OLLAMA_USERNAME}/{ollama_model_name}:{ollama_q_method.lower()}"
-                else:
-                    ollama_conversion = f"ollama create -f {model_file} {OLLAMA_USERNAME}/{ollama_model_name}:{ollama_q_method.lower()}"
-                ollama_conversion_result = subprocess.run(ollama_conversion, shell=True, capture_output=True)
-                print(ollama_conversion_result)
-                if ollama_conversion_result.returncode != 0:
-                    raise Exception(f"Error converting to Ollama: {ollama_conversion_result.stderr}")
-                print("Model converted to Ollama successfully!")
+            # 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()}"
+            else:
+                ollama_conversion = f"ollama create -q {ollama_q_method} -f {model_file} {OLLAMA_USERNAME}/{ollama_model_name}:{ollama_q_method.lower()}"
+            ollama_conversion_result = subprocess.run(ollama_conversion, shell=True, capture_output=True)
+            print(ollama_conversion_result)
+            if ollama_conversion_result.returncode != 0:
+                raise Exception(f"Error converting to Ollama: {ollama_conversion_result.stderr}")
+            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()}"
+            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_result = subprocess.run(ollama_push, shell=True, capture_output=True)
+            print(ollama_push_result)
+            if ollama_push_result.returncode != 0:
+                raise Exception(f"Error pushing to Ollama: {ollama_push_result.stderr}")
+            print("Model pushed to Ollama library successfully!")
+            
+            ollama_rm_result = subprocess.run(ollama_rm, shell=True, capture_output=True)
+            print(ollama_rm_result)
+            if ollama_rm_result.returncode != 0:
+                raise Exception(f"Error removing to Ollama: {ollama_rm_result.stderr}")
+            print("Model pushed to Ollama library successfully!")
+       
+    
+            if latest:
+                ollama_copy =  f"ollama cp  {OLLAMA_USERNAME}/{model_id.lower()}:{q_method.lower()} {OLLAMA_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:
+                    raise Exception(f"Error converting to Ollama: {ollama_push_result.stderr}")
+                print("Model pushed to Ollama library 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()}"
-                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()}"
+                if maintainer == True:
+                    ollama_push_latest =  f"ollama push  {OLLAMA_USERNAME}/{model_name}:latest"
+                    ollama_rm_latest =  f"ollama rm  {OLLAMA_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_result = subprocess.run(ollama_push, shell=True, capture_output=True)
-                print(ollama_push_result)
-                if ollama_push_result.returncode != 0:
+                ollama_push_latest_result = subprocess.run(ollama_push_latest, shell=True, capture_output=True)
+                print(ollama_push_latest_result)
+                if ollama_push_latest_result.returncode != 0:
                     raise Exception(f"Error pushing to Ollama: {ollama_push_result.stderr}")
                 print("Model pushed to Ollama library successfully!")
-                
-                ollama_rm_result = subprocess.run(ollama_rm, shell=True, capture_output=True)
-                print(ollama_rm_result)
-                if ollama_rm_result.returncode != 0:
-                    raise Exception(f"Error removing to Ollama: {ollama_rm_result.stderr}")
+
+                ollama_rm_latest_result = subprocess.run(ollama_rm_latest, shell=True, capture_output=True)
+                print(ollama_rm_latest_result)
+                if ollama_rm_latest_result.returncode != 0:
+                    raise Exception(f"Error pushing to Ollama: {ollama_rm_latest.stderr}")
                 print("Model pushed to Ollama library successfully!")
-           
         
-                if latest:
-                    ollama_copy =  f"ollama cp  {OLLAMA_USERNAME}/{model_id.lower()}:{q_method.lower()} {OLLAMA_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:
-                        raise Exception(f"Error converting to Ollama: {ollama_push_result.stderr}")
-                    print("Model pushed to Ollama library successfully!")
-                    
-                    if maintainer == True:
-                        ollama_push_latest =  f"ollama push  {OLLAMA_USERNAME}/{model_name}:latest"
-                        ollama_rm_latest =  f"ollama rm  {OLLAMA_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_result = subprocess.run(ollama_push_latest, shell=True, capture_output=True)
-                    print(ollama_push_latest_result)
-                    if ollama_push_latest_result.returncode != 0:
-                        raise Exception(f"Error pushing to Ollama: {ollama_push_result.stderr}")
-                    print("Model pushed to Ollama library successfully!")
-
-                    ollama_rm_latest_result = subprocess.run(ollama_rm_latest, shell=True, capture_output=True)
-                    print(ollama_rm_latest_result)
-                    if ollama_rm_latest_result.returncode != 0:
-                        raise Exception(f"Error pushing to Ollama: {ollama_rm_latest.stderr}")
-                    print("Model pushed to Ollama library successfully!")
-            
-       
+   
     except Exception as e:
         return (f"Error: {e}", "error.png")
     finally: