7a985dddd5
## 1. PG-only 重构
- 删 app/core/db/connection.py + schema.py (MySQL 路径)
- 新 app/core/db/{orm,models,pg_bootstrap}.py — SQLAlchemy 2.x ORM 一键建表
- 16 张业务表全在 market_data schema,原生 TIMESTAMPTZ / JSONB / Float / TEXT
- requirements.txt 删 PyMySQL 路径,加 psycopg2
## 2. 同步任务扩展(3 个新 task)
- **tick_trade** (mairui hsrl/zbjy):当天逐笔交易,21:00 发布
- **moneyflow** (mairui hsstock/history/transaction):个股资金流,21:30 发布
- **longhubang** (akshare):龙虎榜聚合层 + 席位层(2 张新表)
- 长虎榜放宽 akshare 政策:仅"无替代源 + 烟测通过"场景允许
- data_eastmoney 私有 API 不需要(akshare 烟测通过)
- 3-timer 设计:
- 15:30 market-sync.service (8 base tasks via runall_once)
- 21:05 market-sync-tick.service (tick_trade)
- 21:35 market-sync-moneyflow.service (moneyflow)
- 22:00 market-sync-lhb.service (longhubang,新加)
- bin/systemd/ 新增 tick / moneyflow / lhb 各 1 对 service+timer
- bin/market_sync_*_run.sh wrapper 脚本(不做法定节假日过滤,fail-open)
## 3. stock_code 统一为带 SH/SZ/BJ 前缀
- 历史 bug:stocks.code 用 SH600519,但 kline/moneyflow/tick_trade/kline_5min
/stock_sector_map/industry 6 张表用纯 6 位 600519,跨表 JOIN 全部 0 行
- 新增 to_hermes() 工具:6位 / 9位(mairui `000001.SZ` 格式)→ 统一 SH000001
- 5 个 task 改写:用 to_hermes(code6) 写入 stock_code
- 一次性迁移 6 张表存量 154M 行(CASE WHEN 探测 + 去重 + 加前缀)
- ORM: stock_sector_map.stock_code / industry.code String(6)→String(10)
## 4. Bug 修复
- **share table stock_code 格式**:之前写 6 位不带前缀,与 stocks 不一致
→ 修 task_share_snapshot + 一次性 UPDATE 63,417 行加前缀
- **share_snapshot warning 状态错填 last_error**:
→ 加 mark_sync_warning() 走专用路径,不写 last_failure_at / last_error
- **schedule config lastRun 不同步**:
→ 加 update_job_status_for_dataset(),SyncTask.run() 完成后自动镜像
→ cli/runall 触发的 task 也能更新 schedule config
## 5. mairui UTF-8 编码修复
- 历史 bug:mairui.py:_fetch 用 latin-1 兜底解码,把所有 UTF-8 中文名
double-encoded 写入 stocks.name(如 `歌华有线` 变成 `æ\xad\x8cå\x8d\x8e...`)
- 加 _decode_response():UTF-8 → GBK → latin-1 兜底
- 一次性修复 stocks.name 5,213 行:
- 4,370 行 (encode('latin-1').decode('utf-8') 反向解码)
- 616 行 (含 fullwidth A,宽松 printable 检查)
- 820 行 (mid-character 截断,重新从 mairui 拉)
## 6. 测试
- tests/test_smoke.py: TASKS 10→11, SYNC_DEFINITIONS 10→11
- tests/test_schema_models.py: 16→18 张表,新增 longhubang_daily/seat
- pytest 11/11 passed
## 验证
- 6 张表 0 残留无前缀行
- stocks JOIN kline_stock / kline_5min / moneyflow / tick_trade / stock_sector_map:88-100% 命中
- 5,213 stocks.name 全部正确 UTF-8 中文
- pytest 11/11 passed
86 lines
3.0 KiB
Python
86 lines
3.0 KiB
Python
"""一次性跑完所有 sync task(按依赖顺序)。
|
||
|
||
按 sort_order 触发:stock_basic → kline_daily → kline_index → kline_5min
|
||
→ industry_sector → sector_features
|
||
→ share_snapshot → market_regime
|
||
|
||
每个 task 跑完写日志 + 把 result 落到 logs/runall_summary.json。
|
||
|
||
注:以下 task **不**在 runall 链中 —— 各自有独立的 systemd timer:
|
||
- tick_trade : mairui 21:00 发布 → market-sync-tick.timer (21:05)
|
||
- moneyflow : mairui 21:30 发布 → market-sync-moneyflow.timer (21:35)
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
import json
|
||
import sys
|
||
import time
|
||
from pathlib import Path
|
||
|
||
_PROJECT_ROOT = Path(__file__).resolve().parent.parent
|
||
if str(_PROJECT_ROOT) not in sys.path:
|
||
sys.path.insert(0, str(_PROJECT_ROOT))
|
||
|
||
from app.core.utils.logging import setup_logging, get_logger
|
||
setup_logging()
|
||
logger = get_logger("runall")
|
||
|
||
from app.core.datasource.registry import build_default_registry
|
||
from app.core.sync.registry import seed_sync_registry
|
||
build_default_registry()
|
||
seed_sync_registry()
|
||
|
||
from app.tasks import get_task
|
||
|
||
# 顺序执行,按 sort_order 走(便于排查 + 避免外部 API 限流)
|
||
# 注:tick_trade / moneyflow 由独立 timer 跑(21:05 / 21:35)
|
||
TASKS = [
|
||
"stock_basic",
|
||
"kline_index",
|
||
"kline_daily",
|
||
"kline_5min",
|
||
"industry_sector",
|
||
"sector_features",
|
||
"share_snapshot",
|
||
"market_regime",
|
||
]
|
||
|
||
# 不跳任何 task — 全量跑
|
||
SKIP: set[str] = set()
|
||
|
||
results = {}
|
||
t_all = time.time()
|
||
for tid in TASKS:
|
||
if tid in SKIP:
|
||
results[tid] = {"status": "skipped", "message": "已 ok"}
|
||
logger.info(f"[runall] {tid} 跳过(已 ok)")
|
||
continue
|
||
logger.info(f"[runall] >>> 开始 {tid}")
|
||
t0 = time.time()
|
||
try:
|
||
task = get_task(tid)
|
||
# 大表 task 限小批量股票,避免跑爆;其他 task 跑全量
|
||
kwargs = {"max_workers": 5}
|
||
if tid in {"kline_daily", "kline_5min", "moneyflow", "share_snapshot"}:
|
||
# 这些 task 支持 MARKET_DATA_STOCK_LIMIT 环境变量,但通过 cli 跑可 --codes 限
|
||
# 测全量费时,先跑全量
|
||
pass
|
||
r = task.run(trigger_source="runall", **kwargs)
|
||
elapsed = round(time.time() - t0, 1)
|
||
r["elapsed_sec"] = elapsed
|
||
results[tid] = r
|
||
logger.info(f"[runall] <<< {tid} 完成 status={r.get('status')} elapsed={elapsed}s msg={r.get('message')}")
|
||
except Exception as e:
|
||
elapsed = round(time.time() - t0, 1)
|
||
logger.exception(f"[runall] !!! {tid} 异常: {e}")
|
||
results[tid] = {"status": "error", "message": str(e), "elapsed_sec": elapsed}
|
||
|
||
# 每个 task 之间 sleep 5s 让健康监控跑
|
||
time.sleep(5)
|
||
|
||
elapsed_total = round(time.time() - t_all, 1)
|
||
summary = {"total_elapsed_sec": elapsed_total, "tasks": results}
|
||
out = _PROJECT_ROOT / "logs" / "runall_summary.json"
|
||
out.write_text(json.dumps(summary, ensure_ascii=False, indent=2))
|
||
logger.info(f"[runall] 全部完成 total={elapsed_total}s summary={out}")
|
||
print(json.dumps(summary, ensure_ascii=False, indent=2)) |