Update app.py

app.py

@@ -14,7 +14,7 @@ import argparse
 import gradio as gr
 from huggingface_hub import snapshot_download, HfApi
 from modelscope.hub.api import HubApi
-from modelscope.hub.constants import Licenses, ModelVisibility
+from modelscope.hub.constants import Licenses, ModelVisibility, DatasetVisibility
 import sys
 import io
 import threading
@@ -102,9 +102,6 @@ class MigrationTool:
             except Exception as login_error:
                 return False, f"✗ ModelScope Login failed: {str(login_error)}\n\n💡 Tip: Ensure you are using an 'SDK Token' from https://www.modelscope.cn (NOT modelscope.ai). The token usually starts with 'ms-'."
 
-            # Determine visibility
-            vis = ModelVisibility.PUBLIC if visibility == "public" else ModelVisibility.PRIVATE
-
             # Map license types
             license_map = {
                 "apache-2.0": Licenses.APACHE_V2,
@@ -119,36 +116,52 @@ class MigrationTool:
             }
             lic = license_map.get(license_type.lower(), Licenses.APACHE_V2)
 
+            # Check if repository exists
+            repo_exists = api.repo_exists(repo_id=repo_id, repo_type=repo_type, token=token)
+            
             # Create repository if it doesn't exist
-            try:
-                if repo_type == "model":
-                    api.create_model(
-                        model_id=repo_id,
-                        visibility=vis,
-                        license=lic,
-                        chinese_name=chinese_name,
-                        token=token,
-                    )
-                else:
-                    api.create_dataset(
-                        dataset_id=repo_id,
-                        visibility=vis,
-                        license=lic,
-                        chinese_name=chinese_name,
-                        token=token,
-                    )
-            except Exception:
-                # Repository might already exist, continue to push
-                # We update the visibility explicitly to ensure it matches user choice
+            # Important: We must create with the correct visibility BEFORE upload_folder,
+            # because upload_folder will create a public repo by default if repo doesn't exist
+            if not repo_exists:
                 try:
-                    api.set_repo_visibility(
-                        repo_id=repo_id,
-                        repo_type=repo_type,
-                        visibility=visibility,  # "public" or "private"
-                        token=token
-                    )
-                except Exception as vis_error:
-                    print(f"Warning: Failed to update visibility: {vis_error}")
+                    if repo_type == "model":
+                        # Determine visibility for models (1=private, 5=public)
+                        vis = ModelVisibility.PUBLIC if visibility == "public" else ModelVisibility.PRIVATE
+                        # Build parameters, only include license if not None
+                        create_params = {
+                            "model_id": repo_id,
+                            "visibility": vis,
+                            "token": token,
+                        }
+                        if lic is not None:
+                            create_params["license"] = lic
+                        if chinese_name:
+                            create_params["chinese_name"] = chinese_name
+                        api.create_model(**create_params)
+                    else:
+                        # Determine visibility for datasets (1=private, 5=public)
+                        vis = DatasetVisibility.PUBLIC if visibility == "public" else DatasetVisibility.PRIVATE
+                        # For datasets, need to split repo_id into namespace and name
+                        parts = repo_id.split('/')
+                        if len(parts) != 2:
+                            return False, f"✗ Invalid dataset ID format: {repo_id}. Must be 'namespace/name'"
+                        namespace, dataset_name = parts
+                        # Build parameters, only include license if not None
+                        create_params = {
+                            "dataset_name": dataset_name,
+                            "namespace": namespace,
+                            "visibility": vis,
+                        }
+                        if lic is not None:
+                            create_params["license"] = lic
+                        if chinese_name:
+                            create_params["chinese_name"] = chinese_name
+                        api.create_dataset(**create_params)
+                except Exception as create_error:
+                    error_msg = str(create_error)
+                    # Only ignore if repo already exists (race condition)
+                    if "already exists" not in error_msg.lower():
+                        return False, f"✗ Failed to create repository: {error_msg}"
 
             # Push the model/dataset
             if repo_type == "model":