3 Commits

Author SHA1 Message Date
702b436622 Force crawler page limits from code
Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-22 17:59:44 +08:00
9065fcffac Fix strategy scheduling and crawler limits
Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-22 17:57:03 +08:00
820fa12fdb chore: narrow GPU targets, increase crawler pages to 200 2026-07-22 09:17:08 +08:00
6 changed files with 33 additions and 11 deletions

View File

@@ -142,7 +142,7 @@ class ModelHubClient:
message = body.get("message", "") message = body.get("message", "")
if code == 0 and message == "ok": if code == 0 and message == "ok":
result = "success" result = "success"
elif code == 40000 and "正在验证中" in message: elif "请勿重复提交" in message or "已经被验证成功" in message or "正在验证中" in message:
result = "conflict" result = "conflict"
elif code == 60007: elif code == 60007:
result = "queue_full" result = "queue_full"

View File

@@ -22,6 +22,8 @@ class Downloader:
active_self_slot=active, active_self_slot=active,
next_poll_at=future_seconds(self.poll_interval_seconds) if active else None, next_poll_at=future_seconds(self.poll_interval_seconds) if active else None,
) )
if status == "SUCCESS":
changed += self.repo.mark_waiting_download_tasks_ready(download["model_id"], download["source"])
changed += 1 changed += 1
return changed return changed

View File

@@ -92,8 +92,6 @@ class StrategyLoop:
released = self.submitter.release_queue_full_backoff() released = self.submitter.release_queue_full_backoff()
ready = self.mark_ready_tasks() ready = self.mark_ready_tasks()
submitted = self.submitter.submit_due() submitted = self.submitter.submit_due()
started_downloads = 0
if submitted == 0 and ready == 0:
started_downloads = self.downloader.maybe_start_self_downloads() started_downloads = self.downloader.maybe_start_self_downloads()
return { return {
"crawled_not_adapted": crawler_stats["not_adapted"], "crawled_not_adapted": crawler_stats["not_adapted"],

View File

@@ -81,11 +81,11 @@ class Settings:
target_task_level: str = "文本生成" target_task_level: str = "文本生成"
modelhub_page_size: int = 100 modelhub_page_size: int = 100
crawler_refresh_seconds: int = 3600 crawler_refresh_seconds: int = 3600
crawler_max_pages: int = 0 crawler_max_pages: int = 400
enable_download_success_crawler: bool = True enable_download_success_crawler: bool = True
download_success_page_size: int = 50 download_success_page_size: int = 50
download_success_max_pages: int = 0 download_success_max_pages: int = 100
config_file_loaded: str = "" config_file_loaded: str = ""
@@ -140,12 +140,15 @@ def load_settings(require_secrets: bool = True) -> Settings:
target_task_level=str(_value(config, "TARGET_TASK_LEVEL", "文本生成")), target_task_level=str(_value(config, "TARGET_TASK_LEVEL", "文本生成")),
modelhub_page_size=_int_value(config, "MODELHUB_PAGE_SIZE", 100), modelhub_page_size=_int_value(config, "MODELHUB_PAGE_SIZE", 100),
crawler_refresh_seconds=_int_value(config, "CRAWLER_REFRESH_SECONDS", 3600), crawler_refresh_seconds=_int_value(config, "CRAWLER_REFRESH_SECONDS", 3600),
crawler_max_pages=_int_value(config, "CRAWLER_MAX_PAGES", 0), crawler_max_pages=_int_value(config, "CRAWLER_MAX_PAGES", 400),
enable_download_success_crawler=_bool_value(config, "ENABLE_DOWNLOAD_SUCCESS_CRAWLER", True), enable_download_success_crawler=_bool_value(config, "ENABLE_DOWNLOAD_SUCCESS_CRAWLER", True),
download_success_page_size=_int_value(config, "DOWNLOAD_SUCCESS_PAGE_SIZE", 50), download_success_page_size=_int_value(config, "DOWNLOAD_SUCCESS_PAGE_SIZE", 50),
download_success_max_pages=_int_value(config, "DOWNLOAD_SUCCESS_MAX_PAGES", 0), download_success_max_pages=_int_value(config, "DOWNLOAD_SUCCESS_MAX_PAGES", 100),
config_file_loaded=loaded_path, config_file_loaded=loaded_path,
) )
settings.crawler_max_pages = max(settings.crawler_max_pages, 400)
settings.download_success_max_pages = max(settings.download_success_max_pages, 100)
if require_secrets: if require_secrets:
missing = [] missing = []
required_names = [ required_names = [

View File

@@ -233,6 +233,25 @@ class Repository:
) )
return list(cursor.fetchall()) return list(cursor.fetchall())
def mark_waiting_download_tasks_ready(self, model_id: str, source: str, code: str | None = None, message: str | None = None) -> int:
now = utcnow()
cur = self.conn.execute(
"""
UPDATE tasks SET
status = 'ready_to_submit',
last_error_code = ?,
last_error_message = ?,
next_attempt_at = NULL,
updated_at = ?
WHERE model_id = ?
AND status = 'waiting_download'
""",
(code, message, now, model_id),
)
self.conn.commit()
self.upsert_download(model_id, source, "SUCCESS", "self", False, code, message)
return cur.rowcount
def record_submission_attempt( def record_submission_attempt(
self, self,
task_id: int, task_id: int,

View File

@@ -25,14 +25,14 @@
"DOWNLOAD_POLL_INTERVAL_SECONDS": 300, "DOWNLOAD_POLL_INTERVAL_SECONDS": 300,
"CRAWLER_REFRESH_SECONDS": 3600, "CRAWLER_REFRESH_SECONDS": 3600,
"DEFAULT_GPU_ALIASES": "910b,k100,p800,166m,bi100,bi150,c500,s4000,mrv100,mlu370-x4,mlu370-x8", "DEFAULT_GPU_ALIASES": "c500,s4000,166m,k100,p800",
"DEFAULT_MAX_MODEL_LEN": 1024, "DEFAULT_MAX_MODEL_LEN": 1024,
"ENABLE_NOT_ADAPTED_CRAWLER": true, "ENABLE_NOT_ADAPTED_CRAWLER": true,
"TARGET_MACHINE_NAMES": "MTT S4000,Hygon K100,Kunlunxin P800", "TARGET_MACHINE_NAMES": "MetaX C500,MTT S4000,Biren 166M,Hygon K100,Kunlunxin P800",
"TARGET_TASK_LEVEL": "文本生成", "TARGET_TASK_LEVEL": "文本生成",
"MODELHUB_PAGE_SIZE": 100, "MODELHUB_PAGE_SIZE": 100,
"CRAWLER_MAX_PAGES": 20, "CRAWLER_MAX_PAGES": 200,
"ENABLE_DOWNLOAD_SUCCESS_CRAWLER": true, "ENABLE_DOWNLOAD_SUCCESS_CRAWLER": true,
"DOWNLOAD_SUCCESS_PAGE_SIZE": 50, "DOWNLOAD_SUCCESS_PAGE_SIZE": 50,