Update app.py

app.py

@@ -33,10 +33,10 @@ QUANT_PARAMS = {
 def list_files_in_folder(folder_path):
     # List all files and directories in the specified folder
     all_items = os.listdir(folder_path)
-    
+
     # Filter out only files
     files = [item for item in all_items if os.path.isfile(os.path.join(folder_path, item))]
-    
+
     return files
 
 def clear_hf_cache_space():
@@ -48,8 +48,8 @@ def clear_hf_cache_space():
     scan.delete_revisions(*to_delete).execute()
     print("Cache has been cleared")
 
-def upload_to_hub(path, upload_repo, hf_path, oauth_token):
-    card = ModelCard.load(hf_path, token=oauth_token.token)
+def upload_to_hub(path, upload_repo, hf_path, token):
+    card = ModelCard.load(hf_path, token=token)
     card.data.tags = ["mlx"] if card.data.tags is None else card.data.tags + ["mlx", "mlx-my-repo"]
     card.data.base_model = hf_path
     card.text = dedent(
@@ -85,7 +85,7 @@ def upload_to_hub(path, upload_repo, hf_path, oauth_token):
 
     logging.set_verbosity_info()
 
-    api = HfApi(token=oauth_token.token)
+    api = HfApi(token=token)
     api.create_repo(repo_id=upload_repo, exist_ok=True)
 
     files = list_files_in_folder(path)
@@ -98,35 +98,49 @@ def upload_to_hub(path, upload_repo, hf_path, oauth_token):
             path_in_repo=file,
             repo_id=upload_repo,
         )
-        
-    print(f"Upload successful, go to https://huggingface.co/{upload_repo} for details.")    
+
+    print(f"Upload successful, go to https://huggingface.co/{upload_repo} for details.")
 
 def process_model(model_id, q_method, oauth_token: gr.OAuthToken | None):
     if oauth_token.token is None:
-        raise ValueError("You must be logged in to use MLX-my-repo")
-    
-    model_name = model_id.split('/')[-1]
-    username = whoami(oauth_token.token)["name"]
+        return ("You must be logged in to use MLX-my-repo", "error.png")
+
+    print(f"Token {token}")
+
+    # Verify the token
+    username = None
+    try:
+        user_info = whoami(token=token)
+        username = user_info["name"]
+        print(f"✅ Logged in as {username}")
+    except Exception as e:
+        return (f"❌ Authentication failed: {e}", "error.png")
+
     try:
+        model_name = model_id.split('/')[-1]
+        repo_name = None
+        q_bits = None
+
         if q_method == "FP16":
-            upload_repo = f"{username}/{model_name}-mlx-fp16"
-            with tempfile.TemporaryDirectory(dir="converted") as tmpdir:
-                # The target directory must not exist
-                mlx_path = os.path.join(tmpdir, "mlx")
-                convert(model_id, mlx_path=mlx_path, quantize=False, dtype="float16")
-                print("Conversion done")
-                upload_to_hub(path=mlx_path, upload_repo=upload_repo, hf_path=model_id, oauth_token=oauth_token)
-                print("Upload done")
+            q_bits = "float16"
+            repo_name = f"{model_name}-fp16"
         else:
             q_bits = QUANT_PARAMS[q_method]
-            upload_repo = f"{username}/{model_name}-mlx-{q_bits}Bit"
-            with tempfile.TemporaryDirectory(dir="converted") as tmpdir:
-                # The target directory must not exist
-                mlx_path = os.path.join(tmpdir, "mlx")
+            repo_name = f"{model_name}-{q_bits}bit"
+
+        upload_repo = f"{username}/${repo_name}"
+
+        with tempfile.TemporaryDirectory(dir=f"converted/${repo_name}") as tmpdir:
+            # The target directory must not exist
+            mlx_path = os.path.join(tmpdir, "mlx")
+            if q_method == "FP16":
+                convert(model_id, mlx_path=mlx_path, quantize=False, dtype="float16")
+            else:
                 convert(model_id, mlx_path=mlx_path, quantize=True, q_bits=q_bits)
-                print("Conversion done")
-                upload_to_hub(path=mlx_path, upload_repo=upload_repo, hf_path=model_id, oauth_token=oauth_token)
-                print("Upload done")
+            print("Conversion done")
+            upload_to_hub(path=mlx_path, upload_repo=upload_repo, hf_path=model_id, token=token)
+            print("Upload done")
+
         return (
             f'Find your repo <a href="https://hf.co/{upload_repo}" target="_blank" style="text-decoration:underline">here</a>',
             "llama.png",
@@ -141,7 +155,7 @@ css="""/* Custom CSS to allow scrolling */
 .gradio-container {overflow-y: auto;}
 """
 # Create Gradio interface
-with gr.Blocks(css=css) as demo: 
+with gr.Blocks(css=css) as demo:
     gr.Markdown("You must be logged in to use MLX-my-repo.")
     gr.LoginButton(min_width=250)
 
@@ -159,7 +173,7 @@ with gr.Blocks(css=css) as demo:
         filterable=False,
         visible=True
     )
-    
+
     iface = gr.Interface(
         fn=process_model,
         inputs=[