31 Commits

Author SHA1 Message Date
z3st
3eed33f0d8 chore: increase submit limit from 2 to 5 2026-07-24 20:30:10 +08:00
z3st
a2ef82d954 fix: fix SQLite INSERT column count, fix architecture check for all arch types 2026-07-24 20:24:26 +08:00
z3st
2198aed3c2 feat: strictly filter models with valid config.json only 2026-07-24 20:03:56 +08:00
z3st
965342bafe feat: focus on Llama models only, switch back to vllm framework 2026-07-24 20:02:17 +08:00
z3st
5bb32e6bdb feat: open architecture filter, expand search keywords, let platform decide compatibility 2026-07-24 19:58:45 +08:00
z3st
75ba3bb301 chore: switch GPU to Iluvatar_bi-100 2026-07-24 19:49:42 +08:00
z3st
e28f2e3eca feat: switch to llama.cpp with GGUF support on Iluvatar, keep only GPTQ/AWQ filtered 2026-07-24 19:29:48 +08:00
z3st
e0b6c3b5a8 feat: use file-based SQLite database for persistent failure tracking 2026-07-24 19:03:13 +08:00
z3st
f438206c0e feat: submit only 2 models, add failed model tracking to avoid re-submission 2026-07-24 18:57:52 +08:00
z3st
12616c3816 restore submit version from v2.1.0 2026-07-24 18:56:18 +08:00
z3st
0a4ba2e146 feat: standalone cancel-all version - startup auto cancels all waiting/running tasks 2026-07-24 18:53:24 +08:00
z3st
2222e1545b feat: cancel-all mode - cancel all waiting/running tasks on startup 2026-07-24 18:51:51 +08:00
z3st
441b540e47 feat: filter out GPTQ/AWQ formats and Qwen3.5 arch (incompatible with Iluvatar) 2026-07-24 18:50:21 +08:00
z3st
afbda884ad feat: multi-page search, filter downloads 50-5000 for cold models 2026-07-24 00:10:32 +08:00
z3st
68c7a99e68 fix: replace gpu variable with TARGET_GPU in submit record 2026-07-24 00:02:35 +08:00
z3st
8e8fd50927 chore: switch target GPU to Iluvatar_bi-150 2026-07-23 23:51:28 +08:00
z3st
5a6862f8da fix: revert to ModelScope search (HF unreachable in container), fix ACCOUNTS reference 2026-07-23 23:32:33 +08:00
z3st
727f0f678f feat: single GPU, HuggingFace only, vllm only
- Target single GPU (ppu_zw_810e) instead of 4 GPUs
- Search only from HuggingFace API (removed ModelScope)
- Framework fixed to vllm (removed llama.cpp)
- Filter out GGUF format models
- Simplified config and functions
2026-07-23 23:19:20 +08:00
z3st
207d44b8f2 fix: add nv_framework back for API safety 2026-07-23 22:43:22 +08:00
z3st
1d33394dac fix: remove nv_framework, let platform auto-assign 2026-07-23 22:42:45 +08:00
z3st
1811a66aee fix: match platform auto-generated configParams format
- 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)
2026-07-23 22:35:50 +08:00
z3st
12bf6d637f fix: move gpu_num/cpu_num outside values block to match API spec 2026-07-23 22:10:17 +08:00
z3st
85c456afe0 fix: yaml.dump width=1000 to prevent command string wrapping 2026-07-22 22:43:35 +08:00
z3st
b3b52848c2 fix: verifyResult can be None, ensure dict return 2026-07-22 01:39:33 +08:00
z3st
d6e9f2e7a0 fix: page_size limit 50 for ModelScope API 2026-07-22 01:13:26 +08:00
z3st
821edbc8f5 debug: add logging to search function 2026-07-22 01:08:03 +08:00
z3st
5e2df178e1 feat: re-enable auto-run pipeline after connectivity test 2026-07-21 20:45:26 +08:00
z3st
761e74ff82 feat: auto-run connectivity test on startup, print results to logs 2026-07-21 20:31:23 +08:00
z3st
09ac80f1ec feat: add /test endpoint for connectivity check, disable auto-run 2026-07-21 19:53:28 +08:00
z3st
3975a3370a fix: correct ModelScope API endpoint and field names 2026-07-21 19:31:35 +08:00
z3st
7313f8da67 feat: auto-run pipeline on startup 2026-07-21 19:09:41 +08:00
2 changed files with 391 additions and 245 deletions

View File

@@ -4,6 +4,8 @@ ENV PYTHONUNBUFFERED=1
WORKDIR /app
RUN mkdir -p /app/data
COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt

634
main.py
View File

@@ -30,33 +30,11 @@ HOST = "0.0.0.0"
PORT = 8080
STRATEGY_ID = os.getenv("STRATEGY_ID", "")
# 四个账号的 Token
ACCOUNTS = {
'MetaX_c-500': 'f8e60d1dac7f4472967e7ca40145747b',
'Kunlunxin_p-800': 'f45f1aae2c094426be237c88b1085015',
'Ascend_910-b4': 'f3c05879e7c34bbba92f399f12884183',
'hygon_k100-ai': 'b88507029b884ad3b4bad8ba09e6546e',
}
# 目标GPU
TARGET_GPU = "Iluvatar_bi-100"
# GPU 引擎配置
GPU_CONFIGS = {
'MetaX_c-500': {
'framework': 'vllm',
'docker_image': 'modelhubxc-4pd.tencentcloudcr.com/enginex/enginex-metax/vllm:0.9.1',
},
'Kunlunxin_p-800': {
'framework': 'vllm',
'docker_image': 'modelhubxc-4pd.tencentcloudcr.com/enginex/sunjichen/xc-llm-kunlun:latest',
},
'Ascend_910-b4': {
'framework': 'vllm',
'docker_image': 'git.modelhub.org.cn:9443/enginex-ascend/vllm-ascend:v0.11.0rc0',
},
'hygon_k100-ai': {
'framework': 'llama.cpp',
'docker_image': 'modelhubxc-4pd.tencentcloudcr.com/enginex/enginex-hygon/hygon-llama.cpp:b7516',
},
}
# 账号Token
TARGET_TOKEN = "f45f1aae2c094426be237c88b1085015"
# 架构白名单
SUPPORTED_ARCH_KEYWORDS = ['Qwen', 'Qwen2', 'Qwen3']
@@ -66,11 +44,10 @@ SUPPORTED_MODEL_TYPES = [
]
SUPPORTED_SPECIAL_ARCHS = ['Eagle3Speculator', 'LlamaForCausalLMEagle3']
MODELSCOPE_API = "https://modelscope.cn/api/v1"
MODELHUB_API = "https://modelhub.org.cn/api"
# 搜索关键词
SEARCH_KEYWORDS = ['qwen', 'Qwen2', 'Qwen3', 'Qwen3.5', 'Qwen1.5', 'Qwen-']
SEARCH_KEYWORDS = ['Llama-3', 'Llama-3.1', 'Llama-3.2', 'Meta-Llama', 'Llama-4']
# ============================================================
# 全局状态
@@ -104,43 +81,83 @@ db_conn = None
def init_db():
global db_conn
db_conn = sqlite3.connect(':memory:', check_same_thread=False)
db_conn.execute('''CREATE TABLE IF NOT EXISTS queue (
model_id TEXT, gpu TEXT, url TEXT, downloads INTEGER,
params TEXT, category TEXT, score REAL,
os.makedirs('/app/data', exist_ok=True)
db_conn = sqlite3.connect('/app/data/submit_history.db', check_same_thread=False)
db_conn.execute('''CREATE TABLE IF NOT EXISTS submitted (
model_id TEXT, gpu TEXT, task_id TEXT, status TEXT,
submitted_at TEXT, checked_at TEXT,
PRIMARY KEY(model_id, gpu)
)''')
db_conn.execute('''CREATE TABLE IF NOT EXISTS submitted (
model_id TEXT, gpu TEXT, task_id TEXT, submitted_at TEXT,
db_conn.execute('''CREATE TABLE IF NOT EXISTS failed (
model_id TEXT, gpu TEXT, reason TEXT, failed_at TEXT,
PRIMARY KEY(model_id, gpu)
)''')
db_conn.commit()
def is_model_failed(model_id: str) -> bool:
"""检查模型是否已知失败"""
if db_conn:
row = db_conn.execute(
'SELECT 1 FROM failed WHERE model_id=? AND gpu=?',
(model_id, TARGET_GPU)
).fetchone()
return row is not None
return False
def record_failed(model_id: str, reason: str):
"""记录失败的模型"""
if db_conn:
db_conn.execute(
'INSERT OR REPLACE INTO failed VALUES (?,?,?,?)',
(model_id, TARGET_GPU, reason, datetime.now().isoformat())
)
db_conn.commit()
# ============================================================
# ModelScope 搜索
# ============================================================
def search_models(keyword: str, limit: int = 100) -> list:
"""从 ModelScope 搜索模型"""
url = f"{MODELSCOPE_API}/models"
params = {
'Query': keyword,
'PageSize': limit,
'SortBy': 'GITHUB_SCORE',
}
try:
resp = requests.get(url, params=params, timeout=15)
data = resp.json()
models = data.get('Data', {}).get('Models', [])
return models
except Exception as e:
log(f" 搜索失败 [{keyword}]: {e}")
return []
MODELSCOPE_API = "https://modelscope.cn/api/v1"
DOWNLOAD_MIN = 50
DOWNLOAD_MAX = 5000
SEARCH_PAGES = 5 # 每个关键词搜5页50*5=250个结果
def search_models(keyword: str) -> list:
"""从 ModelScope 搜索模型多页筛选下载量50-5000的冷门模型"""
url = "https://modelscope.cn/openapi/v1/models"
models = []
for page in range(1, SEARCH_PAGES + 1):
params = {
'search': keyword,
'page_size': 50,
'page_number': page,
'sort': 'downloads',
}
try:
resp = requests.get(url, params=params, timeout=20,
headers={'User-Agent': 'Mozilla/5.0'})
data = resp.json()
if data.get('success'):
page_models = data.get('data', {}).get('models', [])
for m in page_models:
dl = m.get('downloads', 0)
if DOWNLOAD_MIN <= dl <= DOWNLOAD_MAX:
models.append({'id': m.get('id'), 'downloads': dl})
if len(page_models) < 50:
break # 最后一页,不继续
else:
break
except Exception as e:
log(f" [{keyword}] page={page}: {e}")
break
time.sleep(0.3)
log(f" [{keyword}]: {len(models)} 个 (50<={DOWNLOAD_MAX})")
return models
def check_architecture(model_id: str) -> tuple:
"""检查模型架构"""
"""检查模型是否有有效的 config.json不限架构类型"""
try:
cfg_url = f"{MODELSCOPE_API}/models/{model_id}/repo?Revision=master&FilePath=config.json"
resp = requests.get(cfg_url, timeout=10)
@@ -148,20 +165,13 @@ def check_architecture(model_id: str) -> tuple:
cfg = resp.json()
archs = cfg.get('architectures', [])
mtype = cfg.get('model_type', '')
arch_str = str(archs)
for special in SUPPORTED_SPECIAL_ARCHS:
if special in arch_str:
return True, special
for kw in SUPPORTED_ARCH_KEYWORDS:
if kw in arch_str:
return True, kw
if mtype in SUPPORTED_MODEL_TYPES:
return True, mtype
return False, f"arch={archs} type={mtype}"
if archs or mtype:
return True, f"arch={archs} type={mtype}"
return False, "empty config"
mid_upper = model_id.upper()
if 'QWEN3' in mid_upper or 'QWEN2' in mid_upper:
return True, "GGUF"
return False, "no config, not Qwen"
if 'LLAMA' in mid_upper:
return True, "Llama(GGUF)"
return False, "no config"
except Exception as e:
return True, f"check error: {e}"
@@ -183,26 +193,27 @@ def normalize_model_url(model_url: str) -> str:
def check_platform_verify(model_id: str) -> dict:
"""查询全平台验证状态"""
headers = {'Xc-Token': list(ACCOUNTS.values())[0], 'Accept': 'application/json'}
headers = {'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json'}
url = f"{MODELHUB_API}/computility/models/search-by-model-id"
try:
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 {}
def check_my_submitted(model_id: str, gpu: str, token: str) -> bool:
def check_my_submitted(model_id: str) -> bool:
"""检查自己是否已提交"""
headers = {'Xc-Token': token, 'Accept': 'application/json'}
headers = {'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json'}
url = f"{MODELHUB_API}/adapt/task/page"
try:
resp = requests.get(url, headers=headers, params={
'current': 1, 'pageSize': 100, 'onlyMine': 'true',
'gpuType': gpu, 'modelId': model_id,
'gpuType': TARGET_GPU, 'modelId': model_id,
}, timeout=10)
data = resp.json()
if data.get('code') == 0:
@@ -217,14 +228,14 @@ def check_my_submitted(model_id: str, gpu: str, token: str) -> bool:
return False
def check_queue_available(gpu: str, token: str) -> int:
def check_queue_available() -> int:
"""查询队列可用位置"""
headers = {'Xc-Token': token, 'Accept': 'application/json'}
headers = {'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json'}
url = f"{MODELHUB_API}/adapt/task/page"
try:
resp = requests.get(url, headers=headers, params={
'current': 1, 'pageSize': 1, 'onlyMine': 'true',
'gpuType': gpu, 'status': 'waiting',
'gpuType': TARGET_GPU, 'status': 'waiting',
}, timeout=10)
data = resp.json()
if data.get('code') == 0:
@@ -235,104 +246,58 @@ def check_queue_available(gpu: str, token: str) -> int:
return -1
def build_config_params(gpu: str) -> str:
"""构建 YAML 配置"""
config = GPU_CONFIGS.get(gpu, {})
framework = config.get('framework', 'vllm')
docker_image = config.get('docker_image', '')
if framework == 'llama.cpp':
params = {
'framework': 'llama.cpp',
'docker_image': docker_image,
'nv_docker_image': docker_image,
'api': 'completion',
'max_tokens': 1024,
'temperature': 0.7,
'repetition_penalty': 1.2,
'top_p': 0.9,
'lang': 'zh',
'max_model_len': 4096,
'modelFormat': 'GGUF',
'sut_config': {
'values': {
'gpu_num': 1,
'command': [
'/bin/bash', '-ic',
'llama-server --model /model --alias llm --threads 20 '
'--n-gpu-layers 999 --prio 3 --min_p 0.01 '
'--ctx-size 4096 --host 0.0.0.0 --port 8000 --jinja --flash-attn off'
]
}
},
'ref_config': {
'values': {
'cpu_num': 2, 'gpu_num': 1,
'command': [
'llama-server', '--model', '/model', '--alias', 'llm',
'--threads', '20', '--n-gpu-layers', '999',
'--ctx-size', '4096', '--host', '0.0.0.0', '--port', '8000',
]
}
},
'model': 'llm',
}
else:
params = {
'framework': 'vllm',
'docker_image': docker_image,
'nv_docker_image': docker_image,
'api': 'completion',
'max_tokens': 1024,
'temperature': 0.7,
'repetition_penalty': 1.2,
'top_p': 0.9,
'lang': 'zh',
'max_model_len': 2048,
'modelFormat': 'HuggingFace',
'sut_config': {
'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',
'--dtype', 'auto', '--gpu-memory-utilization', '0.95',
'-tp', '1', '--enforce-eager', '--trust-remote-code',
]
}
},
'model': 'llm',
}
return yaml.dump(params, default_flow_style=False, allow_unicode=True)
def build_config_params() -> str:
"""构建 YAML 配置 - vllm"""
params = {
'framework': 'vllm',
'nv_framework': 'vllm',
'api': 'completion',
'max_tokens': 1024,
'temperature': 0.7,
'repetition_penalty': 1.2,
'top_p': 0.9,
'lang': 'zh',
'max_model_len': 2048,
'sut_config': {
'gpu_num': 1,
'values': {
'command': [
'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': {
'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, width=1000)
def submit_model(model_url: str, gpu: str, token: str) -> tuple:
def submit_model(model_url: str) -> tuple:
"""提交单个模型"""
headers = {
'Xc-Token': token,
'Xc-Token': TARGET_TOKEN,
'Accept': 'application/json',
'Content-Type': 'application/json',
}
url = f"{MODELHUB_API}/adapt/task/add"
config = GPU_CONFIGS.get(gpu, {})
payload = {
'modelAddress': normalize_model_url(model_url),
'taskType': 'text-generation',
'targetGpu': gpu,
'framework': config.get('framework', 'vllm'),
'targetGpu': TARGET_GPU,
'framework': 'vllm',
'strategyId': STRATEGY_ID,
'configParams': build_config_params(gpu),
'configParams': build_config_params(),
}
try:
resp = requests.post(url, headers=headers, json=payload, timeout=30)
@@ -349,117 +314,127 @@ def submit_model(model_url: str, gpu: str, token: str) -> tuple:
# 主流程
# ============================================================
def run_pipeline(gpus: list = None, submit_limit: int = 30):
"""完整流程:搜索→筛选→提交"""
if gpus is None:
gpus = list(GPU_CONFIGS.keys())
def run_pipeline(submit_limit: int = 5):
"""完整流程:搜索→筛选→提交只针对目标GPU"""
init_db()
log("=" * 50)
log("开始执行流程")
log(f"目标GPU: {', '.join(gpus)}")
log(f"提交限制: 每GPU {submit_limit}")
log(f"目标GPU: {TARGET_GPU}")
log(f"提交限制: {submit_limit}")
# 1. 搜索
log("\n--- 阶段1: 搜索 ModelScope ---")
seen = set()
all_models = []
for kw in SEARCH_KEYWORDS:
models = search_models(kw, limit=100)
models = search_models(kw)
for m in models:
mid = m.get('ModelId', m.get('Name', ''))
mid = m.get('id', '')
if mid and mid not in seen:
seen.add(mid)
downloads = m.get('Downloads', 0)
if downloads >= 50:
all_models.append({
'model_id': mid,
'url': f"https://modelscope.cn/{mid}",
'downloads': downloads,
'params': m.get('Parameters', ''),
'category': 'quantized' if 'GGUF' in mid.upper() else 'standard',
})
all_models.append({
'model_id': mid,
'url': f"https://modelscope.cn/{mid}",
'downloads': m.get('downloads', 0),
})
time.sleep(0.3)
log(f"搜索完成: {len(seen)} 个唯一模型, {len(all_models)} 个下载量>=50")
log(f"搜索完成: {len(seen)} 个唯一模型, {len(all_models)} 个下载量{DOWNLOAD_MIN}-{DOWNLOAD_MAX}")
# 2. 架构筛选
log("\n--- 阶段2: 架构筛选 ---")
# 2. 格式筛选(排除 GPTQ/AWQ保留 GGUF 和 HuggingFace
log("\n--- 阶段2: 格式筛选 ---")
hf_models = []
format_skipped = 0
SKIP_FORMATS = ['GPTQ', 'AWQ']
for m in all_models:
mid_upper = m['model_id'].upper()
skip = False
for fmt in SKIP_FORMATS:
if fmt in mid_upper:
format_skipped += 1
log(f" x {m['model_id']}: {fmt}格式,跳过")
skip = True
break
if not skip:
hf_models.append(m)
log(f"格式筛选: {len(hf_models)} 通过, {format_skipped} 跳过 (GPTQ/AWQ)")
# 3. 架构筛选只保留有标准config.json的模型排除无效格式
log("\n--- 阶段3: 架构检查 ---")
arch_passed = []
arch_rejected = 0
for m in all_models:
for m in hf_models:
ok, reason = check_architecture(m['model_id'])
if ok:
arch_passed.append(m)
else:
if not ok:
arch_rejected += 1
log(f" {m['model_id']}: {reason}")
time.sleep(0.15)
log(f"架构筛选: {len(arch_passed)} 通过, {arch_rejected} 拒绝")
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(arch_passed)} 通过, {arch_rejected} 拒绝")
# 3. 按 GPU 筛选并提交
log("\n--- 阶段3: 筛选并提交 ---")
total_submitted = 0
for gpu in gpus:
token = ACCOUNTS.get(gpu)
if not token:
# 4. 筛选并提交只针对目标GPU
log(f"\n--- 阶段4: 筛选并提交 [{TARGET_GPU}] ---")
# 检查队列
available = check_queue_available()
if available <= 0:
log(f" 队列满,跳过")
return 0
log(f" 队列可用: {available}")
# 筛选
to_submit = []
for m in arch_passed:
model_id = m['model_id']
# 检查全平台验证状态
verify = check_platform_verify(model_id)
if TARGET_GPU in verify:
continue # 已有记录,跳过
# 检查自己是否已提交
if check_my_submitted(model_id):
continue
log(f"\n[{gpu}]")
# 检查队列
available = check_queue_available(gpu, token)
if available <= 0:
log(f" 队列满,跳过")
# 检查是否已知失败(避免重复提交)
if is_model_failed(model_id):
continue
log(f" 队列可用: {available}")
# 筛选
to_submit = []
for m in arch_passed:
model_id = m['model_id']
to_submit.append(m)
if len(to_submit) >= min(submit_limit, available):
break
time.sleep(0.2)
# hygon 只接受 GGUF
if gpu == 'hygon_k100-ai' and 'GGUF' not in model_id.upper():
continue
log(f" 待提交: {len(to_submit)}")
# 检查全平台验证状态
verify = check_platform_verify(model_id)
if gpu in verify:
continue # 已有记录,跳过
# 提交
submitted = 0
for m in to_submit:
ok, task_id, msg = submit_model(m['url'])
if ok:
submitted += 1
log(f"{m['model_id']}")
db_conn.execute(
'INSERT OR REPLACE INTO submitted VALUES (?,?,?,?,?,?)',
(m['model_id'], TARGET_GPU, str(task_id), 'submitted',
datetime.now().isoformat(), None)
)
else:
log(f"{m['model_id']}: {msg}")
# 永久失败类型记录到 failed 表
if any(kw in str(msg) for kw in ['保护期', '白名单', '唯一性']):
record_failed(m['model_id'], msg)
time.sleep(0.5)
# 检查自己是否已提交
if check_my_submitted(model_id, gpu, token):
continue
to_submit.append(m)
if len(to_submit) >= min(submit_limit, available):
break
time.sleep(0.2)
log(f" 待提交: {len(to_submit)}")
# 提交
submitted = 0
for m in to_submit:
ok, task_id, msg = submit_model(m['url'], gpu, token)
if ok:
submitted += 1
log(f"{m['model_id']}")
db_conn.execute(
'INSERT OR REPLACE INTO submitted VALUES (?,?,?,?)',
(m['model_id'], gpu, str(task_id), datetime.now().isoformat())
)
else:
log(f"{m['model_id']}: {msg}")
time.sleep(0.5)
log(f" 提交完成: {submitted}/{len(to_submit)}")
total_submitted += submitted
log(f" 提交完成: {submitted}/{len(to_submit)}")
db_conn.commit()
log(f"\n{'=' * 50}")
log(f"流程完成,共提交 {total_submitted} 个模型")
return total_submitted
log(f"流程完成,共提交 {submitted} 个模型")
return submitted
# ============================================================
@@ -481,6 +456,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'],
@@ -510,17 +487,16 @@ class AgentHandler(BaseHTTPRequestHandler):
if content_len > 0:
body = json.loads(self.rfile.read(content_len))
gpus = body.get('gpus', list(GPU_CONFIGS.keys()))
limit = body.get('limit', 30)
limit = body.get('limit', 5)
self._json({'status': 'started', 'gpus': gpus, 'limit': limit})
self._json({'status': 'started', 'gpu': TARGET_GPU, 'limit': limit})
# 后台运行
def _run():
try:
state['running'] = True
state['last_run'] = datetime.now().isoformat()
count = run_pipeline(gpus=gpus, submit_limit=limit)
count = run_pipeline(submit_limit=limit)
state['last_result'] = {'submitted': count, 'success': True}
except Exception as e:
log(f"流程异常: {traceback.format_exc()}")
@@ -532,6 +508,83 @@ 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:
resp = requests.get(
'https://modelhub.org.cn/api/adapt/task/page',
headers={'Xc-Token': TARGET_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:
resp = requests.post(
'https://modelhub.org.cn/api/adapt/task/add',
headers={'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json', 'Content-Type': 'application/json'},
json={
'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
'taskType': 'text-generation',
'targetGpu': TARGET_GPU,
'framework': 'vllm',
'strategyId': STRATEGY_ID,
'configParams': build_config_params(),
},
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)
@@ -568,7 +621,98 @@ def main():
log(f"智能体启动 | {HOST}:{PORT}")
log(f"STRATEGY_ID: {STRATEGY_ID}")
log(f"GPU: {', '.join(GPU_CONFIGS.keys())}")
log(f"目标GPU: {TARGET_GPU}")
# 启动后自动运行连通性测试
def _startup_test():
time.sleep(2)
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:
resp = requests.get(
'https://modelhub.org.cn/api/adapt/task/page',
headers={'Xc-Token': TARGET_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:
resp = requests.post(
'https://modelhub.org.cn/api/adapt/task/add',
headers={'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json', 'Content-Type': 'application/json'},
json={
'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
'taskType': 'text-generation', 'targetGpu': TARGET_GPU,
'framework': 'vllm', 'strategyId': STRATEGY_ID,
'configParams': build_config_params(),
}, 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()
count = run_pipeline(submit_limit=5)
state['last_result'] = {'submitted': count, 'success': True}
except Exception as e:
log(f"流程异常: {traceback.format_exc()}")
state['last_result'] = {'error': str(e), 'success': False}
finally:
state['running'] = False
threading.Thread(target=_startup_test, daemon=True).start()
while not shutdown_requested:
server.handle_request()