Update app.py

app.py

@@ -14,6 +14,11 @@ import gradio as gr
 from huggingface_hub import snapshot_download, HfApi
 from modelscope.hub.api import HubApi
 from modelscope.hub.constants import Licenses, ModelVisibility
+import sys
+import io
+import threading
+import queue
+import time
 
 
 class MigrationTool:
@@ -90,7 +95,7 @@ class MigrationTool:
             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'."
+                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
@@ -169,63 +174,139 @@ class MigrationTool:
         repo_type: str,
         visibility: str,
         license_type: str,
-        chinese_name: Optional[str] = None
+        chinese_name: Optional[str] = None,
+        progress=gr.Progress(track_tqdm=True)
     ) -> str:
-        """Perform the complete migration process.
-
-        Returns:
-            Status message with migration progress
-        """
-        output = []
-
-        # 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)
-        output.append(msg)
-        if not success:
-            self.cleanup()
-            return "\n".join(output)
-
-        # Upload to ModelScope
-        output.append(f"\n⬆️  Uploading {repo_type} to ModelScope: {ms_repo_id}...")
-        success, msg = self.upload_to_ms(
-            local_path,
-            ms_repo_id,
-            ms_token,
-            repo_type,
-            visibility,
-            license_type,
-            chinese_name
-        )
-        output.append(msg)
+        """Perform the complete migration process with real-time console log capture."""
+        
+        log_queue = queue.Queue()
+        output_lines = []
+        
+        # Helper to capture console output and send it to the queue
+        class StreamToQueue(io.StringIO):
+            def __init__(self, original_stream, q):
+                super().__init__()
+                self.original_stream = original_stream
+                self.q = q
+            def write(self, s):
+                if s:
+                    # Write to original stream (console) and our queue (Gradio)
+                    self.original_stream.write(s)
+                    self.original_stream.flush()
+                    self.q.put(s)
+            def flush(self):
+                self.original_stream.flush()
+
+        def update_output():
+            """Gather all pending messages from the queue and return the full status."""
+            new_data = False
+            while not log_queue.empty():
+                try:
+                    msg = log_queue.get_nowait()
+                    # Clean up common console control characters for better display
+                    msg = msg.replace('\r', '\n').strip()
+                    if msg:
+                        for line in msg.split('\n'):
+                            clean_line = line.strip()
+                            if clean_line:
+                                output_lines.append(clean_line)
+                                new_data = True
+                except queue.Empty:
+                    break
+            return "\n".join(output_lines), new_data
+
+        # Thread-safe migration execution storage
+        results = {"success": False, "message": "", "finished": False}
+
+        def run_migration():
+            try:
+                # Clean inputs
+                nonlocal hf_token, ms_token, hf_repo_id, ms_repo_id
+                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 or not hf_repo_id or not ms_repo_id:
+                    results["message"] = "✗ Error: All tokens and repository IDs are required"
+                    results["finished"] = True
+                    return
+
+                if "/" not in ms_repo_id:
+                    results["message"] = "✗ Error: ModelScope Repo ID must include your namespace (e.g., 'username/repo-name')"
+                    results["finished"] = True
+                    return
+
+                # 1. Download
+                progress(0.1, desc="Downloading from HuggingFace...")
+                print(f"⬇️  Starting download from HuggingFace: {hf_repo_id}...")
+                success, msg, local_path = self.download_from_hf(hf_repo_id, repo_type, hf_token)
+                print(msg)
+                if not success:
+                    results["message"] = msg
+                    results["finished"] = True
+                    return
+
+                # 2. Upload
+                progress(0.4, desc="Uploading to ModelScope...")
+                print(f"\n⬆️  Starting upload to ModelScope: {ms_repo_id}...")
+                success, msg = self.upload_to_ms(
+                    local_path, 
+                    ms_repo_id, 
+                    ms_token, 
+                    repo_type, 
+                    visibility, 
+                    license_type, 
+                    chinese_name
+                )
+                print(msg)
+                results["success"] = success
+                results["message"] = msg
 
-        # Cleanup
-        output.append("\n🧹 Cleaning up temporary files...")
-        self.cleanup()
-        output.append("✓ Cleanup complete")
+            except Exception as e:
+                results["message"] = f"✗ Unexpected error: {str(e)}"
+            finally:
+                print("\n🧹 Cleaning up temporary files...")
+                self.cleanup()
+                print("✓ Cleanup complete")
+                results["finished"] = True
+
+        # Redirect stdout and stderr to our queue
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = StreamToQueue(sys.stdout, log_queue)
+        sys.stderr = StreamToQueue(sys.stderr, log_queue)
 
-        if success:
-            output.append(f"\n✅ Migration completed successfully!")
-            output.append(f"Your {repo_type} is now available at: https://www.modelscope.cn/models/{ms_repo_id}")
-        else:
-            output.append(f"\n❌ Migration failed")
+        try:
+            # Start the migration in a background thread
+            thread = threading.Thread(target=run_migration)
+            thread.start()
+
+            # Continuously yield updates until the migration thread completes
+            while not results["finished"]:
+                current_status, updated = update_output()
+                if updated:
+                    yield current_status
+                time.sleep(0.1)
+
+            # Final capture of any remaining logs
+            final_status, _ = update_output()
+            
+            # Append final results
+            if results["success"]:
+                progress(1.0, desc="Completed")
+                final_status += f"\n\n✅ Migration completed successfully!"
+                final_status += f"\nYour {repo_type} is available at: https://www.modelscope.cn/models/{ms_repo_id}"
+            else:
+                progress(1.0, desc="Failed")
+                final_status += f"\n\n❌ Migration failed: {results['message']}"
+            
+            yield final_status
 
-        return "\n".join(output)
+        finally:
+            # CRITICAL: Restore original streams so we don't break the whole app
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
 
 
 def create_interface():
@@ -241,7 +322,8 @@ def create_interface():
 
         ## 📋 Instructions:
         1. Get your **HuggingFace token** from: https://huggingface.co/settings/tokens
-        2. Get your **ModelScope token** from: https://www.modelscope.cn/my/myaccesstoken
+        2. Get your **ModelScope SDK token** from: https://www.modelscope.cn/my/myaccesstoken
+           * **Note**: Use tokens from **modelscope.cn** (Chinese site). The international site (modelscope.ai) is not currently supported by the SDK.
         3. Fill in the repository details below
         4. Click "Start Migration"
         """)
@@ -258,8 +340,8 @@ def create_interface():
                 ms_token = gr.Textbox(
                     label="ModelScope Token",
                     type="password",
-                    placeholder="ms-...",
-                    info="Your ModelScope SDK token (must start with 'ms-')"
+                    placeholder="Enter your ModelScope SDK token",
+                    info="Use your SDK token from modelscope.cn (usually starts with 'ms-')"
                 )
 
             with gr.Column():