选股系统小改:只读接口 /review/latest 与周报两个头两行(台账 060)
配合数据基座判收读数包与量价研判链判收。两处都是加法、向下兼容。 一、只读接口 GET /review/latest。新 review_latest.py 只做文件读取:取最新一份 复盘_YYYY-MM-DD_next_close.md、前二十行、三个标记行计数(公司质地=、五日头、二十日头);api.py 末尾加路由、没有周报回 404;config.py 加 REVIEW_DIR(默认 data/review)。数据基座判收命令读它拿周报的质地分组与两个头计数,判评析第三条与量价第四条。纯文件读取、不连库。 二、周报三套对照加两行。plan_review.py 加 timing_head_eval,compare_table 在择时决策系统那一行之后插两行——五日头(判分种类 pv_h5、期限 5)与二十日头(pv_h20、期限 20),查询与择时自评同款、只把种类与期限换成参数。没有判分记录写「本期无判分记录(判分种类 pv_h20 尚未产生)」,读不到写「读不到」,两种分开。今天二十日头还没产生判分,头几周那一行就是「本期无判分记录」,属正常读数不是缺陷。 生效方式分两种:周报两行拉代码即生效(周报是 run.py plan-review 子进程、读挂载目录里的代码,不用重启);只读接口要重启接口容器,先经审批、避开七点到七点半与八点半到九点零五、重启后预热计划接口。 离线单测:新 test_review_latest.py(临时目录三份文件)与 test_plan_review_heads.py(注入假读数、给缺席驱动装最小桩、pandas 用真的),本地各 ALL OK;README 接口表加一行。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
681e1ff06e
commit
bb286c5e2e
|
|
@ -193,6 +193,7 @@ docker compose exec akg-factor-bridge python run.py freeze --date 2026-07-24
|
||||||
| `POST /plan/refresh?date=` | 重生成当日计划文件 |
|
| `POST /plan/refresh?date=` | 重生成当日计划文件 |
|
||||||
| `GET /plan/verdict?codes=300750,SH600438&date=` | 逐票『计划判决』(2026-08-18 PMS 对接加):decision(main/observe/reject/absent)+ 与命令行 `plan_reconcile` 逐字同口径的 verdict_text + score/rank/tier/赛道/图谱证据。单票数据异常或代码形态认不出只报该票 error,不崩整批 |
|
| `GET /plan/verdict?codes=300750,SH600438&date=` | 逐票『计划判决』(2026-08-18 PMS 对接加):decision(main/observe/reject/absent)+ 与命令行 `plan_reconcile` 逐字同口径的 verdict_text + score/rank/tier/赛道/图谱证据。单票数据异常或代码形态认不出只报该票 error,不崩整批 |
|
||||||
| `GET\|POST /api/v1/xxl/daily-build?key=&steps=&date=` | XXL-JOB 平台触发盘前链(build→plan→push-pool,白名单步骤、单实例互斥、回调结案);`.env` 不配 `XXL_TRIGGER_KEY` 则整组禁用 |
|
| `GET\|POST /api/v1/xxl/daily-build?key=&steps=&date=` | XXL-JOB 平台触发盘前链(build→plan→push-pool,白名单步骤、单实例互斥、回调结案);`.env` 不配 `XXL_TRIGGER_KEY` 则整组禁用 |
|
||||||
|
| `GET /review/latest` | 最新一份复盘周报的只读读数(2026-09-16 加,配合数据基座判收读数包):文件名、日期、大小、前二十行、三个标记行计数(`公司质地=`、`五日头`、`二十日头`)。没有周报回 404。纯文件读取,不连库 |
|
||||||
|
|
||||||
逐票对账的命令行形态(同一段判决代码):
|
逐票对账的命令行形态(同一段判决代码):
|
||||||
`docker compose exec -T akg-factor-bridge python plan_reconcile.py 300750 [--date 2026-08-04]`
|
`docker compose exec -T akg-factor-bridge python plan_reconcile.py 300750 [--date 2026-08-04]`
|
||||||
|
|
|
||||||
11
api.py
11
api.py
|
|
@ -30,6 +30,7 @@ import logic_state_daily
|
||||||
import plan
|
import plan
|
||||||
import plan_reconcile
|
import plan_reconcile
|
||||||
import regime
|
import regime
|
||||||
|
import review_latest
|
||||||
from xxl import router as xxl_router
|
from xxl import router as xxl_router
|
||||||
|
|
||||||
_access = logging.getLogger("plan.access")
|
_access = logging.getLogger("plan.access")
|
||||||
|
|
@ -352,3 +353,13 @@ def logic_state_lookup(codes: str | None = None, code: str | None = None,
|
||||||
except Exception as e: # noqa: BLE001
|
except Exception as e: # noqa: BLE001
|
||||||
_access.warning("logic_state company_review failed date=%s err=%r", d, e)
|
_access.warning("logic_state company_review failed date=%s err=%r", d, e)
|
||||||
return {"date": d, "count": len(out) + len(bad), "states": out + bad}
|
return {"date": d, "count": len(out) + len(bad), "states": out + bad}
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/review/latest")
|
||||||
|
def review_latest_endpoint():
|
||||||
|
"""最新一份复盘周报的只读读数(2026-09-16 小改,配合数据基座判收读数包):文件名、日期、大小、
|
||||||
|
前二十行、三个标记行计数(公司质地=、五日头、二十日头)。没有周报回 404。纯文件读取,不连库。"""
|
||||||
|
p = review_latest.payload()
|
||||||
|
if p is None:
|
||||||
|
raise HTTPException(status_code=404, detail="还没有生成过复盘周报")
|
||||||
|
return p
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,10 @@ def _opt(k: str, fallback: str) -> str:
|
||||||
return os.environ.get(k) or fallback
|
return os.environ.get(k) or fallback
|
||||||
|
|
||||||
|
|
||||||
|
# 复盘周报目录(2026-09-16 小改):run.py plan-review 把周报写这里,review_latest 从这里取最新一份。
|
||||||
|
REVIEW_DIR = os.environ.get("REVIEW_DIR", "data/review")
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
class Conn:
|
class Conn:
|
||||||
host: str
|
host: str
|
||||||
|
|
|
||||||
|
|
@ -210,6 +210,28 @@ def timing_self_eval(since: str, until: str | None) -> str:
|
||||||
f"命中率 {hits / n * 100:.0f}%({since} 至 {until or '今日'})")
|
f"命中率 {hits / n * 100:.0f}%({since} 至 {until or '今日'})")
|
||||||
|
|
||||||
|
|
||||||
|
def timing_head_eval(since: str, until: str | None, *, ref_type: str, horizon: int) -> str:
|
||||||
|
"""量价研判链某个头的方向命中率(2026-09-16 小改,配合数据基座量价判收第四条):
|
||||||
|
五日头判分种类 pv_h5 期限 5、二十日头 pv_h20 期限 20。查询与 timing_self_eval 同款,
|
||||||
|
只把 ref_type 与 horizon 换成参数。没有判分记录写"本期无判分记录",读不到写"读不到",两种分开。"""
|
||||||
|
lo = int(since.replace("-", ""))
|
||||||
|
hi = int((until or dt.date.today().isoformat()).replace("-", ""))
|
||||||
|
try:
|
||||||
|
df = db.read_mysql(
|
||||||
|
"pms", "SELECT COUNT(*) AS n, SUM(dir_hit) AS hits FROM decision_outcome "
|
||||||
|
"WHERE ref_type = %s AND horizon = %s AND dir_hit IS NOT NULL "
|
||||||
|
"AND base_date >= %s AND base_date <= %s", (ref_type, horizon, lo, hi))
|
||||||
|
n = int(df.iloc[0]["n"] or 0) if not df.empty else 0
|
||||||
|
hits = int(df.iloc[0]["hits"] or 0) if not df.empty else 0
|
||||||
|
except Exception as e: # noqa: BLE001
|
||||||
|
print(f" (量价 {ref_type} 判分表读取失败: {e!r})")
|
||||||
|
return "读不到"
|
||||||
|
if n == 0:
|
||||||
|
return f"本期无判分记录(判分种类 {ref_type} 尚未产生)"
|
||||||
|
return (f"看 {horizon} 个交易日后涨跌方向判断对不对,{n} 条里对了 {hits} 条,"
|
||||||
|
f"命中率 {hits / n * 100:.0f}%({since} 至 {until or '今日'})")
|
||||||
|
|
||||||
|
|
||||||
def decision_ledger_entries(path: str = DECISION_LEDGER_PATH) -> list[dict]:
|
def decision_ledger_entries(path: str = DECISION_LEDGER_PATH) -> list[dict]:
|
||||||
"""解析 docs/复盘决定台账.md 的条目标题行 "## 0NN · 日期 · 标题" -> [{no, date, title}]。
|
"""解析 docs/复盘决定台账.md 的条目标题行 "## 0NN · 日期 · 标题" -> [{no, date, title}]。
|
||||||
文件不存在或没有条目返回空列表,周报对表节据此写"台账文件缺失"。"""
|
文件不存在或没有条目返回空列表,周报对表节据此写"台账文件缺失"。"""
|
||||||
|
|
@ -571,8 +593,9 @@ def _list_reading(lists_tbl: pd.DataFrame, name: str) -> str:
|
||||||
|
|
||||||
|
|
||||||
def compare_table(lists_tbl: pd.DataFrame, since: str, until: str | None) -> pd.DataFrame:
|
def compare_table(lists_tbl: pd.DataFrame, since: str, until: str | None) -> pd.DataFrame:
|
||||||
"""第七节"三套对照":三行——选股系统候选单按日等权读数;择时决策系统自评口径与本期方向命中率;
|
"""第七节"三套对照":选股系统候选单按日等权读数;择时决策系统自评口径与本期方向命中率;
|
||||||
PMS 账本四份名单读数。三套口径不同,只并列不合并。"""
|
量价研判链两个头(五日头、二十日头)各自的方向命中率;PMS 账本四份名单读数。
|
||||||
|
三套口径不同,只并列不合并。两个头随量价研判链上线,二十日头头几周可能还没判分记录。"""
|
||||||
rows = [
|
rows = [
|
||||||
{"系统": "选股系统", "口径": "候选单按计划日等权,相对全池等权超额与跑赢比例(第一节主口径)",
|
{"系统": "选股系统", "口径": "候选单按计划日等权,相对全池等权超额与跑赢比例(第一节主口径)",
|
||||||
"读数": _list_reading(lists_tbl, "候选单")},
|
"读数": _list_reading(lists_tbl, "候选单")},
|
||||||
|
|
@ -581,6 +604,13 @@ def compare_table(lists_tbl: pd.DataFrame, since: str, until: str | None) -> pd.
|
||||||
"方向判断对不对,统计判对的比例。只看股票自己的涨跌,没有减去大盘涨跌,"
|
"方向判断对不对,统计判对的比例。只看股票自己的涨跌,没有减去大盘涨跌,"
|
||||||
"与上一行候选单的超额口径不同,两个数字不能直接比大小。",
|
"与上一行候选单的超额口径不同,两个数字不能直接比大小。",
|
||||||
"读数": timing_self_eval(since, until)},
|
"读数": timing_self_eval(since, until)},
|
||||||
|
{"系统": "择时决策系统·五日头",
|
||||||
|
"口径": "量价研判链的五日头(判分种类 pv_h5、期限 5 个交易日)自己打的分的方向命中率,口径同上一行。",
|
||||||
|
"读数": timing_head_eval(since, until, ref_type="pv_h5", horizon=5)},
|
||||||
|
{"系统": "择时决策系统·二十日头",
|
||||||
|
"口径": "量价研判链的二十日头(判分种类 pv_h20、期限 20 个交易日)的方向命中率。"
|
||||||
|
"头几周二十日头可能还没产生判分,那时读数是「本期无判分记录」,属正常。",
|
||||||
|
"读数": timing_head_eval(since, until, ref_type="pv_h20", horizon=20)},
|
||||||
{"系统": "PMS 账本",
|
{"系统": "PMS 账本",
|
||||||
"口径": "这一行是 PMS 当天的新开仓审批记录,拆成三份名单:系统自动放行的、"
|
"口径": "这一行是 PMS 当天的新开仓审批记录,拆成三份名单:系统自动放行的、"
|
||||||
"人工同意的、人工否决的。否决的也照样算收益,用来看当初拒得对不对。"
|
"人工同意的、人工否决的。否决的也照样算收益,用来看当初拒得对不对。"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,76 @@
|
||||||
|
"""复盘周报只读读数(2026-09-16 选股系统小改,配合数据基座判收读数包)。
|
||||||
|
|
||||||
|
数据基座的判收命令要读周报里三处标记行的计数:公司质地分组("公司质地=")、量价两个头
|
||||||
|
("五日头""二十日头")。这里只做纯文件读取——取最新一份周报、前二十行、三个标记行计数——
|
||||||
|
不连任何库,api.py 的 GET /review/latest 直接调 payload。周报文件由 run.py plan-review 子进程
|
||||||
|
生成在 REVIEW_DIR(默认 data/review),文件名形如 复盘_2026-09-18_next_close.md。
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from config import REVIEW_DIR
|
||||||
|
|
||||||
|
DEFAULT_MARKERS = ("公司质地=", "五日头", "二十日头")
|
||||||
|
_NAME_RE = re.compile(r"^复盘_(\d{4}-\d{2}-\d{2})_(?P<start>[a-z_]+)\.md$")
|
||||||
|
|
||||||
|
|
||||||
|
def latest_report(dir_: str = REVIEW_DIR, *, start: str = "next_close") -> Optional[dict]:
|
||||||
|
"""最新一份周报:只认 复盘_YYYY-MM-DD_{start}.md,按日期倒序取第一。目录不存在或无匹配返回 None。"""
|
||||||
|
try:
|
||||||
|
names = os.listdir(dir_)
|
||||||
|
except OSError:
|
||||||
|
return None
|
||||||
|
found = []
|
||||||
|
for name in names:
|
||||||
|
m = _NAME_RE.match(name)
|
||||||
|
if m and m.group("start") == start:
|
||||||
|
found.append((m.group(1), name))
|
||||||
|
if not found:
|
||||||
|
return None
|
||||||
|
date, name = sorted(found, reverse=True)[0]
|
||||||
|
return {"file": name, "date": date, "path": os.path.join(dir_, name)}
|
||||||
|
|
||||||
|
|
||||||
|
def head_lines(path: str, n: int = 20) -> list[str]:
|
||||||
|
"""前 n 行(去掉行尾换行)。读不到返回空列表。"""
|
||||||
|
try:
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
out = []
|
||||||
|
for line in f:
|
||||||
|
out.append(line.rstrip("\n"))
|
||||||
|
if len(out) >= n:
|
||||||
|
break
|
||||||
|
return out
|
||||||
|
except OSError:
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def marker_counts(path: str, markers: tuple = DEFAULT_MARKERS) -> dict[str, int]:
|
||||||
|
"""每个标记在正文里出现的行数(含该标记的行计一次)。读不到全给零。"""
|
||||||
|
counts = {m: 0 for m in markers}
|
||||||
|
try:
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
for line in f:
|
||||||
|
for m in markers:
|
||||||
|
if m in line:
|
||||||
|
counts[m] += 1
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
return counts
|
||||||
|
|
||||||
|
|
||||||
|
def payload(dir_: str = REVIEW_DIR, *, start: str = "next_close", markers: tuple = DEFAULT_MARKERS) -> Optional[dict]:
|
||||||
|
"""/review/latest 的返回体:文件名、日期、大小、前二十行、三个标记行计数。没有周报返回 None。"""
|
||||||
|
rep = latest_report(dir_, start=start)
|
||||||
|
if not rep:
|
||||||
|
return None
|
||||||
|
path = rep["path"]
|
||||||
|
try:
|
||||||
|
size = os.path.getsize(path)
|
||||||
|
except OSError:
|
||||||
|
size = None
|
||||||
|
return {"file": rep["file"], "date": rep["date"], "size": size,
|
||||||
|
"head": head_lines(path, 20), "marker_counts": marker_counts(path, markers)}
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
"""plan_review 三套对照插入两个头两行的单测(注入假读数,需要 pandas,容器里跑)。
|
||||||
|
|
||||||
|
跑法:docker exec akg_factor_bridge python3 test_plan_review_heads.py
|
||||||
|
"""
|
||||||
|
import sys
|
||||||
|
import types
|
||||||
|
|
||||||
|
# 与 test_market_context.py 同一约定:只给缺席的驱动装最小桩(pandas 要真的,compare_table 返回 DataFrame)。
|
||||||
|
for _n in ("psycopg", "pymysql", "dotenv"):
|
||||||
|
if _n not in sys.modules:
|
||||||
|
try:
|
||||||
|
__import__(_n)
|
||||||
|
except ImportError:
|
||||||
|
sys.modules[_n] = types.ModuleType(_n)
|
||||||
|
|
||||||
|
import pandas as pd # noqa: E402
|
||||||
|
|
||||||
|
import plan_review # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
calls = []
|
||||||
|
plan_review._list_reading = lambda tbl, name: f"{name}读数" # noqa: SLF001
|
||||||
|
plan_review.timing_self_eval = lambda since, until: "择时自评读数"
|
||||||
|
|
||||||
|
def fake_head(since, until, *, ref_type, horizon):
|
||||||
|
calls.append((ref_type, horizon))
|
||||||
|
return f"{ref_type} 命中率 55%"
|
||||||
|
plan_review.timing_head_eval = fake_head
|
||||||
|
|
||||||
|
tbl = pd.DataFrame([{"名单": "候选单"}])
|
||||||
|
out = plan_review.compare_table(tbl, "2026-09-01", "2026-09-11")
|
||||||
|
systems = list(out["系统"])
|
||||||
|
assert systems == ["选股系统", "择时决策系统", "择时决策系统·五日头", "择时决策系统·二十日头", "PMS 账本"], systems
|
||||||
|
assert ("pv_h5", 5) in calls and ("pv_h20", 20) in calls, calls
|
||||||
|
reading = dict(zip(out["系统"], out["读数"]))
|
||||||
|
assert reading["择时决策系统·五日头"] == "pv_h5 命中率 55%", reading
|
||||||
|
assert reading["择时决策系统·二十日头"] == "pv_h20 命中率 55%", reading
|
||||||
|
print("ALL OK — 三套对照多出五日头、二十日头两行,顺序正确,判分种类 pv_h5/pv_h20 与期限 5/20 正确")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
"""review_latest 只读读数单测(临时目录,不连库、不连接口)。
|
||||||
|
|
||||||
|
跑法:python3 test_review_latest.py 或 docker exec akg_factor_bridge python3 test_review_latest.py
|
||||||
|
"""
|
||||||
|
import os
|
||||||
|
import tempfile
|
||||||
|
|
||||||
|
import review_latest as R
|
||||||
|
|
||||||
|
|
||||||
|
def _write(d, name, text):
|
||||||
|
with open(os.path.join(d, name), "w", encoding="utf-8") as f:
|
||||||
|
f.write(text)
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
_write(d, "复盘_2026-09-11_next_close.md",
|
||||||
|
"标题\n公司质地=好 3 只\n五日头 命中率 60%\n二十日头 本期无判分记录\n")
|
||||||
|
_write(d, "复盘_2026-09-18_next_close.md",
|
||||||
|
"# 最新周报\n公司质地=好 4 只\n五日头 命中率 62%\n二十日头 本期无判分记录\n正文\n")
|
||||||
|
_write(d, "复盘_2026-09-18_signal_close.md", "别的 start 不该被选\n")
|
||||||
|
|
||||||
|
rep = R.latest_report(d)
|
||||||
|
assert rep["date"] == "2026-09-18", rep
|
||||||
|
assert rep["file"] == "复盘_2026-09-18_next_close.md", "取最新一份 next_close"
|
||||||
|
|
||||||
|
pl = R.payload(d)
|
||||||
|
assert pl["date"] == "2026-09-18"
|
||||||
|
assert pl["size"] > 0
|
||||||
|
assert pl["head"][0] == "# 最新周报", "前二十行含首行"
|
||||||
|
assert len(pl["head"]) <= 20
|
||||||
|
mc = pl["marker_counts"]
|
||||||
|
assert mc["公司质地="] == 1, mc
|
||||||
|
assert mc["五日头"] == 1 and mc["二十日头"] == 1, mc
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as empty:
|
||||||
|
assert R.latest_report(empty) is None, "无周报返回 None"
|
||||||
|
assert R.payload(empty) is None
|
||||||
|
assert R.latest_report("/no/such/dir/xxx") is None, "目录不存在不炸"
|
||||||
|
print("ALL OK — 取最新一份 next_close / 前二十行 / 三个标记行计数 / 无周报返回 None / 目录不存在不炸")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
Loading…
Reference in New Issue