feat: strictly filter models with valid config.json only

main.py

@@ -47,7 +47,7 @@ SUPPORTED_SPECIAL_ARCHS = ['Eagle3Speculator', 'LlamaForCausalLMEagle3']
 MODELHUB_API = "https://modelhub.org.cn/api"
 
 # 搜索关键词
-SEARCH_KEYWORDS = ['qwen', 'Qwen2', 'Qwen3', 'Qwen3.5', 'Llama-3', 'Llama-3.1', 'Mistral', 'DeepSeek']
+SEARCH_KEYWORDS = ['Llama-3', 'Llama-3.1', 'Llama-3.2', 'Meta-Llama', 'Llama-4']
 
 # ============================================================
 # 全局状态
@@ -254,26 +254,25 @@ def check_queue_available() -> int:
 
 
 def build_config_params() -> str:
-    """构建 YAML 配置 - llama.cpp (支持 GGUF)"""
+    """构建 YAML 配置 - vllm"""
     params = {
-        'framework': 'llama.cpp',
+        'framework': 'vllm',
-        'nv_framework': 'llama.cpp',
+        'nv_framework': 'vllm',
         'api': 'completion',
         'max_tokens': 1024,
         'temperature': 0.7,
         'repetition_penalty': 1.2,
         'top_p': 0.9,
         'lang': 'zh',
-        'max_model_len': 4096,
+        'max_model_len': 2048,
         'sut_config': {
             'gpu_num': 1,
             'values': {
                 'command': [
-                    'llama-server', '--model', '/model', '--alias', 'llm',
+                    'vllm', 'serve', '/model', '--port', '8000',
-                    '--threads', '20', '--n-gpu-layers', '999', '--prio', '3',
+                    '--served-model-name', 'llm', '--max-model-len', '2048',
-                    '--min_p', '0.01', '--ctx-size', '4096',
+                    '--dtype', 'auto', '--gpu-memory-utilization', '0.95',
-                    '--host', '0.0.0.0', '--port', '8000',
+                    '-tp', '1', '--enforce-eager', '--trust-remote-code',
-                    '--jinja', '--flash-attn', 'off',
                 ]
             }
         },
@@ -281,9 +280,9 @@ def build_config_params() -> str:
             'gpu_num': 1,
             'values': {
                 'command': [
-                    'llama-server', '--model', '/model', '--alias', 'llm',
+                    'vllm', 'serve', '/model', '--port', '80',
-                    '--threads', '20', '--n-gpu-layers', '999',
+                    '--served-model-name', 'llm', '--max-model-len', '4096',
-                    '--ctx-size', '4096', '--host', '0.0.0.0', '--port', '8000',
+                    '--enforce-eager', '--trust-remote-code', '-tp', '1',
                 ]
             }
         },
@@ -303,7 +302,7 @@ def submit_model(model_url: str) -> tuple:
         'modelAddress': normalize_model_url(model_url),
         'taskType': 'text-generation',
         'targetGpu': TARGET_GPU,
-        'framework': 'llama.cpp',
+        'framework': 'vllm',
         'strategyId': STRATEGY_ID,
         'configParams': build_config_params(),
     }
@@ -366,14 +365,22 @@ def run_pipeline(submit_limit: int = 2):
             hf_models.append(m)
     log(f"格式筛选: {len(hf_models)} 通过, {format_skipped} 跳过 (GPTQ/AWQ)")
 
-    # 3. 架构筛选（参考检查，不做严格过滤，让平台决定兼容性）
+    # 3. 架构筛选（只保留有标准config.json的模型，排除无效格式）
     log("\n--- 阶段3: 架构检查 ---")
+    arch_passed = []
+    arch_rejected = 0
     for m in hf_models:
         ok, reason = check_architecture(m['model_id'])
         if not ok:
-            log(f"  ! {m['model_id']}: {reason} (仍保留)")
+            arch_rejected += 1
+            log(f"  x {m['model_id']}: {reason}")
+        elif reason == 'GGUF':
+            arch_rejected += 1
+            log(f"  x {m['model_id']}: GGUF(无config)")
+        else:
+            arch_passed.append(m)
         time.sleep(0.1)
-    log(f"架构检查: {len(hf_models)} 个模型进入下一阶段")
+    log(f"架构检查: {len(arch_passed)} 通过, {arch_rejected} 拒绝")
 
     # 4. 筛选并提交（只针对目标GPU）
     log(f"\n--- 阶段4: 筛选并提交 [{TARGET_GPU}] ---")
@@ -387,7 +394,7 @@ def run_pipeline(submit_limit: int = 2):
 
     # 筛选
     to_submit = []
-    for m in hf_models:
+    for m in arch_passed:
         model_id = m['model_id']
 
         # 检查全平台验证状态
@@ -567,7 +574,7 @@ class AgentHandler(BaseHTTPRequestHandler):
                     'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
                     'taskType': 'text-generation',
                     'targetGpu': TARGET_GPU,
-                    'framework': 'llama.cpp',
+                    'framework': 'vllm',
                     'strategyId': STRATEGY_ID,
                     'configParams': build_config_params(),
                 },
@@ -685,7 +692,7 @@ def main():
                 json={
                     'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
                     'taskType': 'text-generation', 'targetGpu': TARGET_GPU,
-                    'framework': 'llama.cpp', 'strategyId': STRATEGY_ID,
+                    'framework': 'vllm', 'strategyId': STRATEGY_ID,
                     'configParams': build_config_params(),
                 }, timeout=10
             )