Update app.py

app.py

@@ -80,8 +80,17 @@ class MigrationTool:
             Tuple of (success, message)
         """
         try:
-            # Create HubApi instance
+            # Clean and validate token
+            token = token.strip()
+            if not token:
+                return False, "✗ ModelScope token is empty"
+
+            # Create HubApi instance and login explicitly
             api = HubApi()
+            try:
+                api.login(token)
+            except Exception as login_error:
+                return False, f"✗ ModelScope Login failed: {str(login_error)}\n\n💡 Tip: Ensure you are using an 'SDK Token' (starts with 'ms-') from https://www.modelscope.cn/my/myaccesstoken, NOT a 'Git Token'."
 
             # Determine visibility
             vis = ModelVisibility.PUBLIC if visibility == "public" else ModelVisibility.PRIVATE
@@ -90,8 +99,13 @@ class MigrationTool:
             license_map = {
                 "apache-2.0": Licenses.APACHE_V2,
                 "mit": Licenses.MIT,
+                "gpl-2.0": Licenses.GPL_V2,
                 "gpl-3.0": Licenses.GPL_V3,
-                "other": Licenses.OTHER,
+                "lgpl-2.1": Licenses.LGPL_V2_1,
+                "lgpl-3.0": Licenses.LGPL_V3,
+                "afl-3.0": Licenses.AFL_V3,
+                "ecl-2.0": Licenses.ECL_V2,
+                "other": None,
             }
             lic = license_map.get(license_type.lower(), Licenses.APACHE_V2)
 
@@ -105,23 +119,32 @@ class MigrationTool:
                         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 as create_error:
                 # Repository might already exist, continue to push
                 pass
 
             # Push the model/dataset
             if repo_type == "model":
-                api.push_model(
-                    model_id=repo_id,
-                    model_dir=local_path,
+                api.upload_folder(
+                    repo_id=repo_id,
+                    folder_path=local_path,
                     token=token,
                 )
             else:
-                # For datasets, use similar approach
-                api.push_model(
-                    model_id=repo_id,
-                    model_dir=local_path,
+                # For datasets, use upload_folder with repo_type='dataset'
+                api.upload_folder(
+                    repo_id=repo_id,
+                    folder_path=local_path,
                     token=token,
+                    repo_type="dataset"
                 )
 
             return True, f"✓ Successfully uploaded {repo_type} to ModelScope"
@@ -155,13 +178,21 @@ class MigrationTool:
         """
         output = []
 
-        # Validate inputs
+        # Validate and clean inputs
+        hf_token = hf_token.strip() if hf_token else ""
+        ms_token = ms_token.strip() if ms_token else ""
+        hf_repo_id = hf_repo_id.strip() if hf_repo_id else ""
+        ms_repo_id = ms_repo_id.strip() if ms_repo_id else ""
+
         if not hf_token or not ms_token:
             return "✗ Error: Both HuggingFace and ModelScope tokens are required"
 
         if not hf_repo_id or not ms_repo_id:
             return "✗ Error: Both source and destination repository IDs are required"
 
+        if "/" not in ms_repo_id:
+            return "✗ Error: Destination ModelScope Repo ID must be in 'username/repo-name' format"
+
         # Download from HuggingFace
         output.append(f"⬇️  Downloading {repo_type} from HuggingFace: {hf_repo_id}...")
         success, msg, local_path = self.download_from_hf(hf_repo_id, repo_type, hf_token)
@@ -227,8 +258,8 @@ def create_interface():
                 ms_token = gr.Textbox(
                     label="ModelScope Token",
                     type="password",
-                    placeholder="Enter your ModelScope token",
-                    info="Your ModelScope SDK token"
+                    placeholder="ms-...",
+                    info="Your ModelScope SDK token (must start with 'ms-')"
                 )
 
             with gr.Column():
@@ -264,7 +295,17 @@ def create_interface():
         with gr.Row():
             with gr.Column():
                 license_type = gr.Dropdown(
-                    choices=["apache-2.0", "mit", "gpl-3.0", "other"],
+                    choices=[
+                        "apache-2.0", 
+                        "mit", 
+                        "gpl-2.0", 
+                        "gpl-3.0", 
+                        "lgpl-2.1", 
+                        "lgpl-3.0", 
+                        "afl-3.0", 
+                        "ecl-2.0",
+                        "other"
+                    ],
                     label="License",
                     value="apache-2.0",
                     info="License for the repository"