sxbh_admin/cma-management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dupont): None guard for raw formatting in /reports/dupont insight detail
ci/woodpecker/push/main Pipeline failed
Details

Browse Source 
Non-ending stock windows (e.g. ?period=2026-Q2 / 2026-05 / custom) return raw total_assets/equity as None when the window has no subject_balances level-1 rows; identity guard reports status 'unavailable' (not 'identity_broken') and execution continues into the insight detail f-string, where .2f on None raised TypeError -> HTTP 500. Add explicit fmt() ('-' for None) for the four raw columns in detail.

Task: fullstack-20261004-1544 (P1; proposer wecom-fullstack; ASK-20261004-07 follow-up). No DDL. Single file.
This commit is contained in:
Hermes CI Fix
2026-10-04 18:03:34 +08:00
parent 38a6de9325
commit 40d2ffe0f7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/api/reports.py
+6 -2
View File
@@ -2414,11 +2414,15 @@ def get_dupont_analysis(
roe_exact = f_ann.get("roe") roe_exact = f_ann.get("roe")
roe_change = None if (roe_exact is None or prev_roe is None) else round(roe_exact - prev_roe, 4) roe_change = None if (roe_exact is None or prev_roe is None) else round(roe_exact - prev_roe, 4)
def _fmt(v):
# 存量/流量缺失时 raw 值为 None（如博海存量仅到区间外）⇒ 显式「-」，不得 None 格式化
return "-" if v is None else f"{v:.2f}"
detail = (f"{label}口径（流量累计 {win['period_start']}~{win['period_end']}，" detail = (f"{label}口径（流量累计 {win['period_start']}~{win['period_end']}，"
f"存量{'平均' if cur['basis'] == 'average' else '期末回落'}" f"存量{'平均' if cur['basis'] == 'average' else '期末回落'}"
f"{'，年化 ×12/' + str(win['months']) if annualize else '，非年化'}）：" f"{'，年化 ×12/' + str(win['months']) if annualize else '，非年化'}）："
f"净利润 {cur['raw']['net_profit']:.2f}万 / 营业收入 {cur['raw']['revenue']:.2f}万 / " f"净利润 {_fmt(cur['raw']['net_profit'])}万 / 营业收入 {_fmt(cur['raw']['revenue'])}万 / "
f"平均总资产 {cur['raw']['total_assets']:.2f}万 / 平均净资产 {cur['raw']['equity']:.2f}万；" f"平均总资产 {_fmt(cur['raw']['total_assets'])}万 / 平均净资产 {_fmt(cur['raw']['equity'])}万；"
f"ROE = {factors['net_profit_margin']['value']}% × {factors['asset_turnover']['value']} × " f"ROE = {factors['net_profit_margin']['value']}% × {factors['asset_turnover']['value']} × "
f"{factors['equity_multiplier']['value']} = {None if roe_exact is None else round(roe_exact, 2)}%" f"{factors['equity_multiplier']['value']} = {None if roe_exact is None else round(roe_exact, 2)}%"
f"（恒等式 {'通过' if identity.get('status') == 'pass' else identity.get('status')}，" f"（恒等式 {'通过' if identity.get('status') == 'pass' else identity.get('status')}，"