fix: add nv_framework back for API safety

- Remove /bin/bash -ic wrapper from sut_config.command
- Use list format for all command arguments (matches platform auto-gen)
- Add nv_framework field
- Remove unnecessary fields: docker_image, nv_docker_image, modelFormat, model, cpu_num
- Fix ref_config to match platform format (port 80, max_model_len 4096)

main.py

@@ -121,12 +121,12 @@ def init_db():
 # ModelScope 搜索
 # ============================================================
 
-def search_models(keyword: str, limit: int = 100) -> list:
+def search_models(keyword: str, limit: int = 50) -> list:
     """从 ModelScope 搜索模型"""
     url = "https://modelscope.cn/openapi/v1/models"
     params = {
         'search': keyword,
-        'page_size': limit,
+        'page_size': min(limit, 50),  # API 上限 50
         'page_number': 1,
         'sort': 'downloads',
     }
@@ -135,7 +135,11 @@ def search_models(keyword: str, limit: int = 100) -> list:
                             headers={'User-Agent': 'Mozilla/5.0'})
         data = resp.json()
         if data.get('success'):
-            return data.get('data', {}).get('models', [])
+            models = data.get('data', {}).get('models', [])
+            log(f"  搜索 [{keyword}]: status={resp.status_code} models={len(models)}")
+            return models
+        else:
+            log(f"  搜索 [{keyword}]: success=false, data={str(data)[:200]}")
     except Exception as e:
         log(f"  搜索失败 [{keyword}]: {e}")
     return []
@@ -191,7 +195,8 @@ def check_platform_verify(model_id: str) -> dict:
         resp = requests.get(url, headers=headers, params={'modelId': model_id}, timeout=10)
         data = resp.json()
         if data.get('code') == 0:
-            return data.get('data', {}).get('verifyResult', {})
+            result = data.get('data', {}).get('verifyResult', {})
+            return result if isinstance(result, dict) else {}
     except Exception:
         pass
     return {}
@@ -238,16 +243,15 @@ def check_queue_available(gpu: str, token: str) -> int:
 
 
 def build_config_params(gpu: str) -> str:
-    """构建 YAML 配置"""
+    """构建 YAML 配置 - 完全匹配平台自动生成的格式"""
     config = GPU_CONFIGS.get(gpu, {})
     framework = config.get('framework', 'vllm')
-    docker_image = config.get('docker_image', '')
 
     if framework == 'llama.cpp':
+        # hygon_k100-ai 使用 llama.cpp
         params = {
             'framework': 'llama.cpp',
-            'docker_image': docker_image,
+            'nv_framework': 'llama.cpp',
-            'nv_docker_image': docker_image,
             'api': 'completion',
             'max_tokens': 1024,
             'temperature': 0.7,
@@ -255,21 +259,21 @@ def build_config_params(gpu: str) -> str:
             'top_p': 0.9,
             'lang': 'zh',
             'max_model_len': 4096,
-            'modelFormat': 'GGUF',
             'sut_config': {
+                'gpu_num': 1,
                 'values': {
-                    'gpu_num': 1,
                     'command': [
-                        '/bin/bash', '-ic',
+                        'llama-server', '--model', '/model', '--alias', 'llm',
-                        'llama-server --model /model --alias llm --threads 20 '
+                        '--threads', '20', '--n-gpu-layers', '999', '--prio', '3',
-                        '--n-gpu-layers 999 --prio 3 --min_p 0.01 '
+                        '--min_p', '0.01', '--ctx-size', '4096',
-                        '--ctx-size 4096 --host 0.0.0.0 --port 8000 --jinja --flash-attn off'
+                        '--host', '0.0.0.0', '--port', '8000',
+                        '--jinja', '--flash-attn', 'off',
                     ]
                 }
             },
             'ref_config': {
+                'gpu_num': 1,
                 'values': {
-                    'cpu_num': 2, 'gpu_num': 1,
                     'command': [
                         'llama-server', '--model', '/model', '--alias', 'llm',
                         '--threads', '20', '--n-gpu-layers', '999',
@@ -277,13 +281,12 @@ def build_config_params(gpu: str) -> str:
                     ]
                 }
             },
-            'model': 'llm',
         }
     else:
+        # vllm (P800, Ascend, MetaX)
         params = {
             'framework': 'vllm',
-            'docker_image': docker_image,
+            'nv_framework': 'vllm',
-            'nv_docker_image': docker_image,
             'api': 'completion',
             'max_tokens': 1024,
             'temperature': 0.7,
@@ -291,21 +294,9 @@ def build_config_params(gpu: str) -> str:
             'top_p': 0.9,
             'lang': 'zh',
             'max_model_len': 2048,
-            'modelFormat': 'HuggingFace',
             'sut_config': {
+                'gpu_num': 1,
                 'values': {
-                    'gpu_num': 1,
-                    'command': [
-                        '/bin/bash', '-ic',
-                        'vllm serve /model --port 8000 --served-model-name llm '
-                        '--max-model-len 2048 --dtype auto --gpu-memory-utilization 0.95 '
-                        '-tp 1 --enforce-eager --trust-remote-code'
-                    ]
-                }
-            },
-            'ref_config': {
-                'values': {
-                    'cpu_num': 2, 'gpu_num': 1,
                     'command': [
                         'vllm', 'serve', '/model', '--port', '8000',
                         '--served-model-name', 'llm', '--max-model-len', '2048',
@@ -314,9 +305,18 @@ def build_config_params(gpu: str) -> str:
                     ]
                 }
             },
-            'model': 'llm',
+            'ref_config': {
+                'gpu_num': 1,
+                'values': {
+                    'command': [
+                        'vllm', 'serve', '/model', '--port', '80',
+                        '--served-model-name', 'llm', '--max-model-len', '4096',
+                        '--enforce-eager', '--trust-remote-code', '-tp', '1',
+                    ]
+                }
+            },
         }
-    return yaml.dump(params, default_flow_style=False, allow_unicode=True)
+    return yaml.dump(params, default_flow_style=False, allow_unicode=True, width=1000)
 
 
 def submit_model(model_url: str, gpu: str, token: str) -> tuple:
@@ -483,6 +483,8 @@ class AgentHandler(BaseHTTPRequestHandler):
                 'last_run': state['last_run'],
                 'last_result': state['last_result'],
             })
+        elif path == '/test':
+            self._json(self._run_connectivity_test())
         elif path == '/status':
             self._json({
                 'running': state['running'],
@@ -534,6 +536,85 @@ class AgentHandler(BaseHTTPRequestHandler):
         else:
             self._json({'error': 'not found'}, 404)
 
+    def _run_connectivity_test(self) -> dict:
+        """测试各 API 连通性"""
+        results = {}
+
+        # 1. ModelScope 搜索 API
+        try:
+            resp = requests.get(
+                'https://modelscope.cn/openapi/v1/models',
+                params={'search': 'qwen', 'page_size': 2, 'sort': 'downloads'},
+                timeout=10,
+                headers={'User-Agent': 'Mozilla/5.0'}
+            )
+            results['modelscope_search'] = {
+                'status': resp.status_code,
+                'ok': resp.status_code == 200,
+                'body_preview': resp.text[:200] if resp.status_code == 200 else resp.text[:100],
+            }
+        except Exception as e:
+            results['modelscope_search'] = {'ok': False, 'error': str(e)}
+
+        # 2. ModelScope config.json API
+        try:
+            resp = requests.get(
+                'https://modelscope.cn/api/v1/models/Qwen/Qwen3-8B/repo?Revision=master&FilePath=config.json',
+                timeout=10,
+            )
+            results['modelscope_config'] = {
+                'status': resp.status_code,
+                'ok': resp.status_code == 200,
+                'body_preview': resp.text[:200] if resp.status_code == 200 else resp.text[:100],
+            }
+        except Exception as e:
+            results['modelscope_config'] = {'ok': False, 'error': str(e)}
+
+        # 3. ModelHub 查询 API
+        try:
+            token = list(ACCOUNTS.values())[0]
+            resp = requests.get(
+                'https://modelhub.org.cn/api/adapt/task/page',
+                headers={'Xc-Token': token, 'Accept': 'application/json'},
+                params={'current': 1, 'pageSize': 1, 'onlyMine': 'true'},
+                timeout=10,
+            )
+            data = resp.json()
+            results['modelhub_query'] = {
+                'ok': data.get('code') == 0,
+                'code': data.get('code'),
+                'total': data.get('data', {}).get('total'),
+            }
+        except Exception as e:
+            results['modelhub_query'] = {'ok': False, 'error': str(e)}
+
+        # 4. ModelHub 提交 API (dry test)
+        try:
+            token = list(ACCOUNTS.values())[0]
+            resp = requests.post(
+                'https://modelhub.org.cn/api/adapt/task/add',
+                headers={'Xc-Token': token, 'Accept': 'application/json', 'Content-Type': 'application/json'},
+                json={
+                    'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
+                    'taskType': 'text-generation',
+                    'targetGpu': 'Kunlunxin_p-800',
+                    'framework': 'vllm',
+                    'strategyId': STRATEGY_ID,
+                    'configParams': 'framework: vllm\n',
+                },
+                timeout=10,
+            )
+            data = resp.json()
+            results['modelhub_submit'] = {
+                'ok': data.get('code') == 0,
+                'code': data.get('code'),
+                'message': data.get('message', '')[:100],
+            }
+        except Exception as e:
+            results['modelhub_submit'] = {'ok': False, 'error': str(e)}
+
+        return results
+
     def _json(self, body: dict, status: int = 200):
         payload = json.dumps(body, ensure_ascii=False).encode()
         self.send_response(status)
@@ -572,10 +653,86 @@ def main():
     log(f"STRATEGY_ID: {STRATEGY_ID}")
     log(f"GPU: {', '.join(GPU_CONFIGS.keys())}")
 
-    # 启动后自动执行一次提交流程
+    # 启动后自动运行连通性测试
-    def _auto_run():
+    def _startup_test():
-        time.sleep(3)  # 等 HTTP 服务就绪
+        time.sleep(2)
-        log("自动触发提交流程...")
+        log("=" * 50)
+        log("连通性测试开始")
+        log("=" * 50)
+
+        # 1. ModelScope 搜索
+        try:
+            resp = requests.get(
+                'https://modelscope.cn/openapi/v1/models',
+                params={'search': 'qwen', 'page_size': 2, 'sort': 'downloads'},
+                timeout=10, headers={'User-Agent': 'Mozilla/5.0'}
+            )
+            if resp.status_code == 200:
+                data = resp.json()
+                models = data.get('data', {}).get('models', [])
+                log(f"[ModelScope搜索] ✅ status={resp.status_code} models={len(models)}")
+                for m in models[:2]:
+                    log(f"  {m.get('id')} downloads={m.get('downloads')}")
+            else:
+                log(f"[ModelScope搜索] ❌ status={resp.status_code} body={resp.text[:100]}")
+        except Exception as e:
+            log(f"[ModelScope搜索] ❌ error={e}")
+
+        # 2. ModelScope config.json
+        try:
+            resp = requests.get(
+                'https://modelscope.cn/api/v1/models/Qwen/Qwen3-8B/repo?Revision=master&FilePath=config.json',
+                timeout=10
+            )
+            if resp.status_code == 200:
+                cfg = resp.json()
+                log(f"[ModelScope配置] ✅ arch={cfg.get('architectures')} type={cfg.get('model_type')}")
+            else:
+                log(f"[ModelScope配置] ❌ status={resp.status_code}")
+        except Exception as e:
+            log(f"[ModelScope配置] ❌ error={e}")
+
+        # 3. ModelHub 查询
+        try:
+            token = list(ACCOUNTS.values())[0]
+            resp = requests.get(
+                'https://modelhub.org.cn/api/adapt/task/page',
+                headers={'Xc-Token': token, 'Accept': 'application/json'},
+                params={'current': 1, 'pageSize': 1, 'onlyMine': 'true'},
+                timeout=10
+            )
+            data = resp.json()
+            if data.get('code') == 0:
+                log(f"[ModelHub查询] ✅ total={data['data'].get('total')}")
+            else:
+                log(f"[ModelHub查询] ❌ code={data.get('code')} msg={data.get('message','')[:80]}")
+        except Exception as e:
+            log(f"[ModelHub查询] ❌ error={e}")
+
+        # 4. ModelHub 提交
+        try:
+            token = list(ACCOUNTS.values())[0]
+            resp = requests.post(
+                'https://modelhub.org.cn/api/adapt/task/add',
+                headers={'Xc-Token': token, 'Accept': 'application/json', 'Content-Type': 'application/json'},
+                json={
+                    'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
+                    'taskType': 'text-generation', 'targetGpu': 'Kunlunxin_p-800',
+                    'framework': 'vllm', 'strategyId': STRATEGY_ID,
+                    'configParams': 'framework: vllm\n',
+                }, timeout=10
+            )
+            data = resp.json()
+            log(f"[ModelHub提交] code={data.get('code')} msg={data.get('message','')[:80]}")
+        except Exception as e:
+            log(f"[ModelHub提交] ❌ error={e}")
+
+        log("=" * 50)
+        log("连通性测试完成")
+        log("=" * 50)
+
+        # 开始正式提交流程
+        log("\n自动触发提交流程...")
         try:
             state['running'] = True
             state['last_run'] = datetime.now().isoformat()
@@ -587,7 +744,7 @@ def main():
         finally:
             state['running'] = False
 
-    threading.Thread(target=_auto_run, daemon=True).start()
+    threading.Thread(target=_startup_test, daemon=True).start()
 
     while not shutdown_requested:
         server.handle_request()