Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
afbda884ad | ||
|
|
68c7a99e68 | ||
|
|
8e8fd50927 | ||
|
|
5a6862f8da |
86
main.py
86
main.py
@@ -31,7 +31,7 @@ PORT = 8080
|
|||||||
STRATEGY_ID = os.getenv("STRATEGY_ID", "")
|
STRATEGY_ID = os.getenv("STRATEGY_ID", "")
|
||||||
|
|
||||||
# 目标GPU
|
# 目标GPU
|
||||||
TARGET_GPU = "ppu_zw_810e"
|
TARGET_GPU = "Iluvatar_bi-150"
|
||||||
|
|
||||||
# 账号Token
|
# 账号Token
|
||||||
TARGET_TOKEN = "f45f1aae2c094426be237c88b1085015"
|
TARGET_TOKEN = "f45f1aae2c094426be237c88b1085015"
|
||||||
@@ -98,29 +98,49 @@ def init_db():
|
|||||||
# ModelScope 搜索
|
# ModelScope 搜索
|
||||||
# ============================================================
|
# ============================================================
|
||||||
|
|
||||||
def search_models(keyword: str, limit: int = 50) -> list:
|
MODELSCOPE_API = "https://modelscope.cn/api/v1"
|
||||||
"""从 HuggingFace 搜索模型"""
|
DOWNLOAD_MIN = 50
|
||||||
url = "https://huggingface.co/api/models"
|
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 = {
|
params = {
|
||||||
'search': keyword,
|
'search': keyword,
|
||||||
'limit': limit,
|
'page_size': 50,
|
||||||
|
'page_number': page,
|
||||||
'sort': 'downloads',
|
'sort': 'downloads',
|
||||||
'direction': -1,
|
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
resp = requests.get(url, params=params, timeout=20)
|
resp = requests.get(url, params=params, timeout=20,
|
||||||
|
headers={'User-Agent': 'Mozilla/5.0'})
|
||||||
data = resp.json()
|
data = resp.json()
|
||||||
log(f" [{keyword}]: {len(data)} 个结果")
|
if data.get('success'):
|
||||||
return [{'id': m.get('id'), 'downloads': m.get('downloads', 0)} for m in data]
|
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:
|
except Exception as e:
|
||||||
log(f" [{keyword}]: 失败 {e}")
|
log(f" [{keyword}] page={page}: {e}")
|
||||||
return []
|
break
|
||||||
|
time.sleep(0.3)
|
||||||
|
log(f" [{keyword}]: {len(models)} 个 (50<={DOWNLOAD_MAX})")
|
||||||
|
return models
|
||||||
|
|
||||||
|
|
||||||
def check_architecture(model_id: str) -> tuple:
|
def check_architecture(model_id: str) -> tuple:
|
||||||
"""检查模型架构"""
|
"""检查模型架构"""
|
||||||
try:
|
try:
|
||||||
cfg_url = f"https://huggingface.co/{model_id}/raw/main/config.json"
|
cfg_url = f"{MODELSCOPE_API}/models/{model_id}/repo?Revision=master&FilePath=config.json"
|
||||||
resp = requests.get(cfg_url, timeout=10)
|
resp = requests.get(cfg_url, timeout=10)
|
||||||
if resp.status_code == 200:
|
if resp.status_code == 200:
|
||||||
cfg = resp.json()
|
cfg = resp.json()
|
||||||
@@ -145,7 +165,13 @@ def check_architecture(model_id: str) -> tuple:
|
|||||||
|
|
||||||
|
|
||||||
def normalize_model_url(model_url: str) -> str:
|
def normalize_model_url(model_url: str) -> str:
|
||||||
"""标准化 URL 格式 - 直接返回 HuggingFace URL"""
|
"""标准化 URL 格式"""
|
||||||
|
if '/models/' in model_url:
|
||||||
|
return model_url
|
||||||
|
if 'modelscope.cn/' in model_url:
|
||||||
|
parts = model_url.split('modelscope.cn/')
|
||||||
|
if len(parts) == 2:
|
||||||
|
return f"https://www.modelscope.cn/models/{parts[1]}"
|
||||||
return model_url
|
return model_url
|
||||||
|
|
||||||
|
|
||||||
@@ -285,24 +311,22 @@ def run_pipeline(submit_limit: int = 30):
|
|||||||
log(f"提交限制: {submit_limit} 个")
|
log(f"提交限制: {submit_limit} 个")
|
||||||
|
|
||||||
# 1. 搜索
|
# 1. 搜索
|
||||||
log("\n--- 阶段1: 搜索 HuggingFace ---")
|
log("\n--- 阶段1: 搜索 ModelScope ---")
|
||||||
seen = set()
|
seen = set()
|
||||||
all_models = []
|
all_models = []
|
||||||
for kw in SEARCH_KEYWORDS:
|
for kw in SEARCH_KEYWORDS:
|
||||||
models = search_models(kw, limit=100)
|
models = search_models(kw)
|
||||||
for m in models:
|
for m in models:
|
||||||
mid = m.get('id', '')
|
mid = m.get('id', '')
|
||||||
if mid and mid not in seen:
|
if mid and mid not in seen:
|
||||||
seen.add(mid)
|
seen.add(mid)
|
||||||
downloads = m.get('downloads', 0)
|
|
||||||
if downloads >= 50:
|
|
||||||
all_models.append({
|
all_models.append({
|
||||||
'model_id': mid,
|
'model_id': mid,
|
||||||
'url': f"https://huggingface.co/{mid}",
|
'url': f"https://modelscope.cn/{mid}",
|
||||||
'downloads': downloads,
|
'downloads': m.get('downloads', 0),
|
||||||
})
|
})
|
||||||
time.sleep(0.3)
|
time.sleep(0.3)
|
||||||
log(f"搜索完成: {len(seen)} 个唯一模型, {len(all_models)} 个下载量>=50")
|
log(f"搜索完成: {len(seen)} 个唯一模型, {len(all_models)} 个下载量{DOWNLOAD_MIN}-{DOWNLOAD_MAX}")
|
||||||
|
|
||||||
# 2. 格式筛选(只保留HuggingFace格式,排除GGUF)
|
# 2. 格式筛选(只保留HuggingFace格式,排除GGUF)
|
||||||
log("\n--- 阶段2: 格式筛选 ---")
|
log("\n--- 阶段2: 格式筛选 ---")
|
||||||
@@ -371,7 +395,7 @@ def run_pipeline(submit_limit: int = 30):
|
|||||||
log(f" ✅ {m['model_id']}")
|
log(f" ✅ {m['model_id']}")
|
||||||
db_conn.execute(
|
db_conn.execute(
|
||||||
'INSERT OR REPLACE INTO submitted VALUES (?,?,?,?)',
|
'INSERT OR REPLACE INTO submitted VALUES (?,?,?,?)',
|
||||||
(m['model_id'], gpu, str(task_id), datetime.now().isoformat())
|
(m['model_id'], TARGET_GPU, str(task_id), datetime.now().isoformat())
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
log(f" ❌ {m['model_id']}: {msg}")
|
log(f" ❌ {m['model_id']}: {msg}")
|
||||||
@@ -492,10 +516,9 @@ class AgentHandler(BaseHTTPRequestHandler):
|
|||||||
|
|
||||||
# 3. ModelHub 查询 API
|
# 3. ModelHub 查询 API
|
||||||
try:
|
try:
|
||||||
token = list(ACCOUNTS.values())[0]
|
|
||||||
resp = requests.get(
|
resp = requests.get(
|
||||||
'https://modelhub.org.cn/api/adapt/task/page',
|
'https://modelhub.org.cn/api/adapt/task/page',
|
||||||
headers={'Xc-Token': token, 'Accept': 'application/json'},
|
headers={'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json'},
|
||||||
params={'current': 1, 'pageSize': 1, 'onlyMine': 'true'},
|
params={'current': 1, 'pageSize': 1, 'onlyMine': 'true'},
|
||||||
timeout=10,
|
timeout=10,
|
||||||
)
|
)
|
||||||
@@ -510,17 +533,16 @@ class AgentHandler(BaseHTTPRequestHandler):
|
|||||||
|
|
||||||
# 4. ModelHub 提交 API (dry test)
|
# 4. ModelHub 提交 API (dry test)
|
||||||
try:
|
try:
|
||||||
token = list(ACCOUNTS.values())[0]
|
|
||||||
resp = requests.post(
|
resp = requests.post(
|
||||||
'https://modelhub.org.cn/api/adapt/task/add',
|
'https://modelhub.org.cn/api/adapt/task/add',
|
||||||
headers={'Xc-Token': token, 'Accept': 'application/json', 'Content-Type': 'application/json'},
|
headers={'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json', 'Content-Type': 'application/json'},
|
||||||
json={
|
json={
|
||||||
'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
|
'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
|
||||||
'taskType': 'text-generation',
|
'taskType': 'text-generation',
|
||||||
'targetGpu': 'Kunlunxin_p-800',
|
'targetGpu': TARGET_GPU,
|
||||||
'framework': 'vllm',
|
'framework': 'vllm',
|
||||||
'strategyId': STRATEGY_ID,
|
'strategyId': STRATEGY_ID,
|
||||||
'configParams': 'framework: vllm\n',
|
'configParams': build_config_params(),
|
||||||
},
|
},
|
||||||
timeout=10,
|
timeout=10,
|
||||||
)
|
)
|
||||||
@@ -614,10 +636,9 @@ def main():
|
|||||||
|
|
||||||
# 3. ModelHub 查询
|
# 3. ModelHub 查询
|
||||||
try:
|
try:
|
||||||
token = list(ACCOUNTS.values())[0]
|
|
||||||
resp = requests.get(
|
resp = requests.get(
|
||||||
'https://modelhub.org.cn/api/adapt/task/page',
|
'https://modelhub.org.cn/api/adapt/task/page',
|
||||||
headers={'Xc-Token': token, 'Accept': 'application/json'},
|
headers={'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json'},
|
||||||
params={'current': 1, 'pageSize': 1, 'onlyMine': 'true'},
|
params={'current': 1, 'pageSize': 1, 'onlyMine': 'true'},
|
||||||
timeout=10
|
timeout=10
|
||||||
)
|
)
|
||||||
@@ -631,15 +652,14 @@ def main():
|
|||||||
|
|
||||||
# 4. ModelHub 提交
|
# 4. ModelHub 提交
|
||||||
try:
|
try:
|
||||||
token = list(ACCOUNTS.values())[0]
|
|
||||||
resp = requests.post(
|
resp = requests.post(
|
||||||
'https://modelhub.org.cn/api/adapt/task/add',
|
'https://modelhub.org.cn/api/adapt/task/add',
|
||||||
headers={'Xc-Token': token, 'Accept': 'application/json', 'Content-Type': 'application/json'},
|
headers={'Xc-Token': TARGET_TOKEN, 'Accept': 'application/json', 'Content-Type': 'application/json'},
|
||||||
json={
|
json={
|
||||||
'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
|
'modelAddress': 'https://www.modelscope.cn/models/Qwen/Qwen3-8B',
|
||||||
'taskType': 'text-generation', 'targetGpu': 'Kunlunxin_p-800',
|
'taskType': 'text-generation', 'targetGpu': TARGET_GPU,
|
||||||
'framework': 'vllm', 'strategyId': STRATEGY_ID,
|
'framework': 'vllm', 'strategyId': STRATEGY_ID,
|
||||||
'configParams': 'framework: vllm\n',
|
'configParams': build_config_params(),
|
||||||
}, timeout=10
|
}, timeout=10
|
||||||
)
|
)
|
||||||
data = resp.json()
|
data = resp.json()
|
||||||
|
|||||||
Reference in New Issue
Block a user