fix: preserve data granularity and recover tasks safely
This commit is contained in:
+6
-3
@@ -13,7 +13,7 @@ from studio.database import Database
|
||||
from studio.domain import PROVINCES
|
||||
from studio.imports import import_file, export_sheet
|
||||
from studio.jobs import JobManager
|
||||
from studio.network import ProxyRouter, Transport, ProxyUnavailable, RemoteUnavailable
|
||||
from studio.network import ProxyRouter, Transport, ProxyUnavailable, RemoteUnavailable, RateLimited
|
||||
from studio.settings import SettingsStore
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
@@ -60,6 +60,7 @@ def create_app(data_dir=None):
|
||||
|
||||
@app.exception_handler(ProxyUnavailable)
|
||||
@app.exception_handler(RemoteUnavailable)
|
||||
@app.exception_handler(RateLimited)
|
||||
async def remote_error(request, exc):
|
||||
return JSONResponse({"detail": str(exc)}, status_code=503)
|
||||
|
||||
@@ -188,10 +189,12 @@ def create_app(data_dir=None):
|
||||
if total > 100 * 1024 * 1024:
|
||||
raise ValueError("一次最多上传 100 MB,请拆分文件")
|
||||
stream.write(chunk)
|
||||
records, scores = import_file(temporary, year)
|
||||
result = import_file(temporary, year)
|
||||
records, scores = result
|
||||
db.upsert_catalog(records)
|
||||
db.upsert_scores(scores)
|
||||
return {"records": len(records), "scores": len(scores), "message": "导入完成,相同记录按年份更新"}
|
||||
db.index_schools(result.schools)
|
||||
return {"records": len(records), "scores": len(scores), "indexed_schools": len(result.schools), "message": "导入完成,相同记录按年份更新;无详情的 YAM 种子只作为院校索引"}
|
||||
except (UnicodeError, json.JSONDecodeError, KeyError) as exc:
|
||||
raise ValueError(f"文件编码或结构无法识别({type(exc).__name__})") from None
|
||||
finally:
|
||||
|
||||
Reference in New Issue
Block a user