@1aboveio/skills 1.0.22 → 1.0.23

package/skills/risk-compliance/portfolio-payment-analysis/scripts/build_report.py

@@ -6,6 +6,7 @@ Portfolio fields remain calculation/reconciliation evidence; this report never r
 Edit presentation.json for narrative review, then rerender with render.py.
 """
 import argparse
+import csv
 from csv_export import safe_writer
 import json
 from datetime import date
@@ -45,49 +46,6 @@ def table(headers, rows, **extra):
     return {'type':'table','headers':headers,'rows':rows,**extra}
 
 
-def top_reasons(merchant):
-    return sorted(merchant.get('decline_reasons',[]),key=lambda r:(-r['count'],r['code'],r['message']))[:5]
-
-
-def weekly_blocks(facts, merchants, selected):
-    series={entry.get('id'):entry for entry in facts.get('merchant_weeks',[])}
-    blocks=[]
-    if not series:
-        return blocks+[para('尚未生成子商户周数据，请先运行最新计算脚本。','callout')]
-    grid=next(iter(series.values()))['weeks']
-    def label(week):
-        return week['start']+' 至 '+week['end']+('（不完整周）' if week['partial_week'] else '（完整周）')
-    rows=[]
-    for merchant in merchants:
-        weeks=series.get(merchant.get('id'),{}).get('weeks',[])
-        cells=[]
-        for week in weeks:
-            metrics=week['metrics']
-            if not metrics.get('layer_observed',{}).get('auth',False):
-                cells.append('')
-            else:
-                successful_usd=amount(metrics,'approved_amount')
-                cells.append(number(metrics['approvals'])+' / '+number(metrics['attempts'])+' · '+percent(metrics['auth_rate'])+(' · 授权成功 USD '+successful_usd if successful_usd else ''))
-        rows.append([name(merchant),merchant.get('id') or '未归属',*cells])
-    blocks.append(para('周汇总格里的美元是授权成功金额，不是销售金额。结算层未观察到时，销售金额留空，授权成功金额仍可出现。','note'))
-    blocks.append(table(['子商户','商户 ID',*[label(w) for w in grid]],rows,wrap_headers=True))
-    chosen={m.get('id') for m in selected}
-    for merchant in merchants:
-        weeks=series.get(merchant.get('id'),{}).get('weeks',[])
-        metric_labels=['授权尝试','授权成功笔数','授权成功率','授权成功金额 USD','较上周（百分点）','尝试笔数周环比','销售金额 USD','销售金额周环比','退款笔数','退款金额 USD','争议快照记录']
-        weekly_columns=[]
-        for week in weeks:
-            metric=week['metrics'];comparison=week['comparison'];observed=metric.get('layer_observed',{}).get('auth',False)
-            pp=comparison.get('auth_rate_pp')
-            weekly_columns.append([number(metric['attempts']) if observed else '',number(metric['approvals']) if observed else '',percent(metric['auth_rate']),amount(metric,'approved_amount'),('' if pp is None else f'{pp:+.2f}'),percent(comparison.get('attempts_pct')),amount(metric,'sales'),percent(comparison.get('sales_usd_pct')),number(metric['refund_count']) if metric['layer_observed']['settlement'] else '',amount(metric,'refunds',True),number(metric['dispute_snapshots']) if metric['layer_observed']['dispute'] else ''])
-        weekly_rows=[[metric_label,*[column[i] for column in weekly_columns]] for i,metric_label in enumerate(metric_labels)]
-        blocks.append(table(['指标',*[label(w) for w in weeks]],weekly_rows,wrap_headers=True,collapsed=merchant.get('id') not in chosen,caption=name(merchant)+' · '+str(merchant.get('id') or '未归属')+' · 每周明细'))
-        if merchant.get('id') in chosen:
-            # Visible tables need a merchant heading; collapsed ones have a summary caption.
-            blocks.insert(len(blocks)-1,para(name(merchant)+' · '+str(merchant.get('id') or '未归属')+' · 每周明细','heading'))
-    return blocks
-
-
 def write_weekly_csv(facts, output):
     with (output/'merchant-weekly.csv').open('w',encoding='utf-8',newline='') as handle:
         writer=safe_writer(handle,numeric_columns={11,13,15})
@@ -134,10 +92,6 @@ def segment_charts(merchant, periods):
     return blocks
 
 
-def merchant_detail_blocks(merchant, periods):
-    return segment_charts(merchant,periods)
-
-
 def risk_charts(history):
     if not history:
         return []
@@ -174,16 +128,17 @@ def write_risk_csv(facts, output):
     with (output/'merchant-risk-history.csv').open('w',encoding='utf-8-sig',newline='') as handle:
         writer=safe_writer(handle,numeric_columns={7,10,11})
         writer.writerow(['merchant_id','merchant_name','metric','frequency','start','end','series','value','date_basis','status','numerator','denominator','denominator_start','denominator_end','formula','reason'])
+        import report_model, sys
         for merchant in facts.get('merchant_risk_history',[]):
-            for metric in ('disputes','fraud','vamp'):
-                history=merchant[metric]
-                for frequency in ('monthly','weekly'):
-                    for point in history.get(frequency,[]):
-                        for series,value in point['values'].items():
-                            writer.writerow([merchant.get('id'),merchant.get('name'),metric,frequency,point['start'],point['end'],series,value,history.get('basis',''),history.get('status',''),'','','','','',''])
-                        for series,value in point.get('rates',{}).items():
-                            detail=point.get('rate_details',{}).get(series,{})
-                            writer.writerow([merchant.get('id'),merchant.get('name'),metric+'_rate',frequency,point['start'],point['end'],series,value,detail.get('date_basis',''),detail.get('status',''),detail.get('numerator'),detail.get('denominator'),detail.get('denominator_start'),detail.get('denominator_end'),detail.get('formula'),detail.get('reason')])
+            for chart in report_model.risk_charts(facts,merchant,sys.modules[__name__]):
+                metric='vamp' if 'VAMP' in chart['title'] else 'fraud' if '欺诈报告' in chart['title'] else 'disputes'
+                frequency='weekly' if '周度' in chart['title'] else 'monthly'
+                for point in chart['points']:
+                    for series,value in point['counts'].items():
+                        writer.writerow([merchant.get('id'),merchant.get('name'),metric,frequency,point['start'],point['end'],series,value,chart.get('date_basis',''),'extract_observation','','','','','',''])
+                    for series,value in point['rates'].items():
+                        detail=point['details'].get(series,{})
+                        writer.writerow([merchant.get('id'),merchant.get('name'),metric+'_rate',frequency,point['start'],point['end'],series,value,detail.get('date_basis',chart.get('date_basis','')),detail.get('status',''),detail.get('numerator'),detail.get('denominator'),detail.get('denominator_start'),detail.get('denominator_end'),detail.get('formula'),detail.get('reason')])
 
 
 def write_segment_csv(facts, output):
@@ -203,7 +158,8 @@ def write_detail_csv(facts, output):
     with (output/'merchant-detail-comparison.csv').open('w',encoding='utf-8',newline='') as handle:
         writer=safe_writer(handle,numeric_columns={13,14})
         writer.writerow(['merchant_id','merchant_name','dimension','population','group_key','group_label','period','start','end','count','approvals','auth_rate','share','attempt_amount_usd','approved_amount_usd'])
-        for merchant in facts.get('merchant_detail_comparison',{}).get('merchants',[]):
+        comparison=facts.get('interactive_report') or facts.get('merchant_detail_comparison',{})
+        for merchant in comparison.get('merchants',[]):
             for dimension in merchant['dimensions']:
                 for group in dimension['groups']:
                     for period in group['periods']:
@@ -223,6 +179,12 @@ def without_merchants(facts, excluded):
     out['merchant_breakdowns']=[m for m in facts.get('merchant_breakdowns',[]) if keep(m)]
     detail=facts.get('merchant_detail_comparison') or {}
     out['merchant_detail_comparison']={**detail,'merchants':[m for m in detail.get('merchants',[]) if keep(m)]}
+    interactive=facts.get('interactive_report')
+    if interactive:
+        out['interactive_report']={**interactive,'merchants':[m for m in interactive.get('merchants',[]) if keep(m)],'risk_sales':[r for r in interactive.get('risk_sales',[]) if r.get('id') not in excluded]}
+        opened=interactive.get('opened_disputes')
+        if opened is not None and 'merchant_month_counts' in opened:
+            out['interactive_report']['opened_disputes']={**opened,'merchant_month_counts':[r for r in opened['merchant_month_counts'] if r['merchant_id'] not in excluded]}
     return out
 
 
@@ -235,14 +197,16 @@ def filter_existing_csv(path, excluded):
         return
     header,body=rows[0],rows[1:]
     id_at=next((i for i,cell in enumerate(header) if cell in ('merchant_id','id')),None)
-    kept=[row for row in body if (row[id_at] if id_at is not None and id_at<len(row) else None) not in excluded and not any(cell in excluded for cell in row)]
+    if id_at is None:
+        raise ValueError('Business CSV is missing a merchant ID column: '+path.name)
+    kept=[row for row in body if (row[id_at] if id_at<len(row) else None) not in excluded]
     with path.open('w',newline='',encoding='utf-8') as handle:
         csv.writer(handle).writerows([header,*kept])
 
 
 def build(facts, detail_merchants=None, excluded_ids=None):
     excluded=set(excluded_ids or [])
-    known={m.get('id') for m in facts.get('merchants',[])}
+    known={m.get('id') for m in facts.get('merchants',[])} | {m.get('id') for m in facts.get('interactive_report',{}).get('merchants',[])}
     unknown=excluded-known
     if unknown:
         raise ValueError('Unknown excluded merchant IDs: '+', '.join(sorted(unknown)))
@@ -283,84 +247,11 @@ def build(facts, detail_merchants=None, excluded_ids=None):
         'summary_title':'子商户核查重点','summary':findings,'sections':[],
         'links':[{'label':'商户风险历史 CSV','file':'merchant-risk-history.csv'},{'label':'本周与上周同期细分 CSV','file':'merchant-detail-comparison.csv'},{'label':'子商户每周指标 CSV','file':'merchant-weekly.csv'},{'label':'子商户指标 CSV','file':'merchant-metrics.csv'},{'label':'商户归属 CSV','file':'merchant-mapping.csv'},{'label':'归属与核验记录 JSON','file':'coverage-and-reconciliation.json'},{'label':'Markdown 报告','file':'overview.zh.md'}],
         'footer':'来源：Worldpay 授权、结算、争议及 DART-340 欺诈文件。'}
-    sections=model['sections']
-    comparison=[]
-    for m in merchants:
-        status='本期有授权记录' if m['attempts'] else '本期无授权记录'
-        if 0<m['attempts']<30:status='样本少于 30 笔'
-        observed=m.get('layer_observed',{}).get('auth',False)
-        comparison.append([name(m),m.get('id') or '未归属',number(m['attempts']) if observed else '',number(m['approvals']) if observed else '',percent(m['auth_rate']),amount(m,'sales'),number(m['refund_count']),amount(m,'refunds',True),number(m['dispute_snapshots']),status])
-    sections.append({'title':'1. 子商户对比','nav':'子商户对比','blocks':[
-        table(['子商户','商户 ID','授权尝试','授权成功','授权成功率','销售金额 USD','退款笔数','退款金额 USD','争议快照记录','样本说明'],comparison,filter=True),
-    ]})
-    sections.append({'title':'2. 子商户逐周对比','nav':'逐周对比','blocks':weekly_blocks(facts,merchants,selected)})
-    detail_groups=[]
-    comparison_data=facts.get('merchant_detail_comparison',{})
-    periods=comparison_data.get('periods',[])
-    comparisons={item.get('id'):item for item in comparison_data.get('merchants',[])}
-    histories={item.get('id'):item for item in facts.get('merchant_risk_history',[])}
-    expanded={m.get('id') for m in selected}
-    for m in merchants:
-        comparison=comparisons.get(m.get('id'))
-        blocks=merchant_detail_blocks(comparison,periods) if comparison else []
-        blocks.extend(risk_charts(histories.get(m.get('id'))))
-        detail_groups.append({'type':'group','caption':name(m)+' · '+str(m.get('id') or '未归属'),'collapsed':m.get('id') not in expanded,'blocks':blocks})
-    sections.append({'title':'3. 重点子商户详情','nav':'商户详情','blocks':detail_groups})
-    action_rows=[]
-    for m in selected:
-        reasons=top_reasons(m)
-        if reasons:
-            reason=reasons[0]
-            evidence=f"{reason['message']}：{number(reason['count'])} 笔；授权成功率 {percent(m['auth_rate'])}"
-            action='核对该响应在该商户下的处理商含义，再按发卡行国家和认证状态细分检查。'
-        else:
-            evidence=f"授权成功 {number(m['approvals'])} / {number(m['attempts'])}；缺少可展开的拒绝响应"
-            action='核对该商户的响应字段与来源覆盖，避免根据缺失原因直接调整策略。'
-        action_rows.append([name(m),m.get('id') or '未归属',evidence,action,'不将观察差异视为已确认原因，不估算可挽回金额。'])
-    for m in followups:
-        action_rows.append([name(m),m.get('id') or '未归属',f"未观察到本期授权；退款 {number(m['refund_count'])} 笔，争议快照记录 {number(m['dispute_snapshots'])} 条",'核对原始销售所属商户、退款处理及争议责任。','无本期授权不代表停业；争议记录不等于新增案件。'])
-    if not action_rows:
-        action_rows=[['未归属或缺少观察','','缺少支持逐商户判断的记录','先补齐商户身份及来源覆盖。','暂不形成商户表现结论。']]
-    sections.append({'title':'4. 逐商户核查清单','nav':'核查清单','blocks':[table(['子商户','商户 ID','观察依据','下一步核查','解释边界'],action_rows)]})
-    coverage=[table(['子商户','商户 ID','授权记录','结算记录','争议记录'],[[name(m),m.get('id') or '未归属',*['✓' if m.get('layer_observed',{}).get(layer,False) else '' for layer in ('auth','settlement','dispute')]] for m in merchants])]
-    audit=facts.get('quality',{}).get('risk_history',{})
-    if audit:
-        attribution=audit.get('fraud_attribution',{})
-        files=audit.get('files',[])
-        invalid=[item.get('date',item['file']) for item in files if item.get('status')=='invalid']
-        future=[item.get('date',item['file']) for item in files if item.get('status')=='future_not_parsed']
-        unmatched=attribution.get('unmatched')
-        amounts=audit.get('unmatched_amounts_by_currency') or {}
-        rows=[
-            ['欺诈记录归属',str(attribution.get('attributed',0))+' / '+str(audit.get('distinct_exact_rows',0))],
-            ['无效欺诈文件日期','、'.join(invalid) or '无'],
-            ['数据截至',meta['main_end']]
-        ]
-        if future:
-            rows.append(['晚于截止日、未解析的欺诈文件','、'.join(future)])
-        if unmatched:
-            amount_text='、'.join(currency+' '+money(value) for currency,value in amounts.items())
-            rows.append(['未归属欺诈记录',str(unmatched)+' 条'+(('，金额 '+amount_text) if amount_text else '')+'，未计入商户笔数'])
-        coverage.append(table(['数据范围','观察值'],rows))
-        notes=[]
-        if any(item.get('error')=='missing_header' for item in files):
-            notes.append('缺少表头的欺诈文件未解析，因此没有进入笔数。')
-        if future:
-            notes.append('晚于截止日的欺诈文件未解析。')
-        if unmatched:
-            notes.append('未能归属的欺诈记录不计入商户笔数。')
-        definitions_note=''.join(notes)
-    else:
-        definitions_note=''
-    definitions=[
-        para('空白为不可用或未观察到的数据，不作为 0；0 仅表示提供的记录中观察到的零值。'),
-        para('授权、销售与退款按各自事件日期统计。授权成功金额与结算销售金额不同，退款金额以绝对值展示。周汇总格里的美元是授权成功金额，不是销售金额。销售金额 0.00 是结算层观察到的零值；没有结算层记录时销售金额留空。'),
-        para('争议趋势按同一阶段最早观察到的争议日期统计案件，状态更新不重复计数；并非新增案件。欺诈按 340FRD 文件生成日作为报告日，完全重复记录取最早报告日。'),
-        para('比率按卡组织月度时间口径作提取数据估算，并非正式监控结果。Visa 使用当月分母，Mastercard 拒付与 EFM 使用上月分母；EFM 分子是 4837/4863 欺诈拒付，不是 340FRD 的全部 Mastercard 报告。周图仅展示笔数；预争议比率为描述性指标，不纳入 VAMP。'),
-        para('340FRD 报告日已按文件生成日确认。'+definitions_note+'VAMP 仍需核验 TC15/TC05 处理日、事件身份、适用范围及排除标记。')
-    ]
-    coverage.append({'type':'group','caption':'数据口径','collapsed':True,'blocks':definitions})
-    sections.append({'title':'5. 商户归属与覆盖','nav':'归属与覆盖','blocks':coverage})
+    import report_model, sys
+    model=report_model.build_model(facts,model,sys.modules[__name__])
+    if detail_merchants:
+        tabs=model['sections'][1]['blocks'][0]['tabs']
+        tabs.sort(key=lambda tab:(tab.get('id') not in set(detail_merchants),list(detail_merchants).index(tab.get('id')) if tab.get('id') in detail_merchants else 0))
     return model
 
 

package/skills/risk-compliance/portfolio-payment-analysis/scripts/echarts_report.py

@@ -0,0 +1,43 @@
+"""Self-contained ECharts renderer; calculations remain in presentation.json."""
+import json
+from pathlib import Path
+import render_custom as incumbent
+base=incumbent.base
+ROOT=Path(__file__).parent
+
+def payload(value):return json.dumps(value,ensure_ascii=False).replace('<','\\u003c').replace('>','\\u003e').replace('&','\\u0026')
+
+def chart_html(b,identifier,spark=False):
+ title=b.get('title','每日授权笔数')
+ data={**b,'type':'sparkline'} if spark else b
+ hp=('<div class="ec-spark"' if spark else '<div class="ec-block"')+' data-echarts-block="true">'
+ if not spark:
+  hp+='<h3>'+base.esc(title)+'</h3>'
+  note=b.get('dual_note') or b.get('description') or ''
+  if b['type']=='weekly_transaction_trend':note='柱状：授权尝试金额 USD（左轴）；折线：授权尝试笔数（右轴）。最近八周内展示有数据的周。'
+  if note:hp+='<p class="note">'+base.esc(note)+'</p>'
+  if b['type']=='comparison_chart' and not b.get('approval_rate_only') and len(b['metrics'])>1:
+   hp+='<label class="ec-control">选择指标 <select data-ec-metric>'+''.join('<option value="'+base.esc(m['key'])+'"'+(' selected' if m['key']==b['default_metric'] else '')+'>'+base.esc(m['label'])+'</option>' for m in b['metrics'])+'</select></label>'
+ hp+='<div class="ec-scroll"><div class="ec-host" role="img" aria-label="'+base.esc(title)+'"></div></div><script type="application/json" data-ec-data>'+payload(data)+'</script></div>'
+ return hp
+
+def spark(cell):
+ hp=chart_html(cell,'spark',True);points=cell['points'];desc='；'.join(p['date']+' '+(f"{p['attempts']:,} 笔" if p['attempts'] is not None else '未观察到数据') for p in points)
+ return hp+'<small class="ec-spark-dates">'+points[0]['date'][5:]+' — '+points[-1]['date'][5:]+'</small>',desc
+
+def output(b,identifier,level=3):
+ if b['type'] in ('risk_dual_axis','weekly_transaction_trend','comparison_chart'):
+  return chart_html(b,identifier),'### '+base.mdtext(b['title'])+'\n\n'+base.mdtext(b.get('dual_note') or b.get('description') or '')
+ return incumbent.render_block(b,identifier,level,output,spark)
+
+CSS=(ROOT/'assets/charts.css').read_text(encoding='utf-8')
+
+JS=(ROOT/'assets/charts.js').read_text(encoding='utf-8')
+
+TAB_JS=(ROOT/'assets/tabs.js').read_text(encoding='utf-8')
+
+def render(model,output_dir):
+ base.render(model,output_dir,block_renderer=output,extra_css=incumbent.CSS+CSS,script=TAB_JS,comparison_js='')
+ path=Path(output_dir)/'overview.zh.html';page=path.read_text();bundle=(ROOT/'vendor/echarts.min.js').read_text().replace('</script','<\\/script')
+ notice=(ROOT/'vendor/NOTICE').read_text();license_text=(ROOT/'vendor/LICENSE').read_text();assert '-->' not in notice+license_text
+ page=page.replace('</body>','<!-- Apache ECharts 6.1.0 third-party notices\n'+notice+'\n'+license_text+'\n--><script>'+bundle+'</script><script>'+JS+'</script></body>');path.write_text(page)

package/skills/risk-compliance/portfolio-payment-analysis/scripts/interactive_report.py

@@ -0,0 +1,3 @@
+"""Compatibility imports for saved integrations; implementation has explicit stages."""
+from report_data import calculate
+from report_model import build_model

package/skills/risk-compliance/portfolio-payment-analysis/scripts/issuer_data.py

@@ -0,0 +1,52 @@
+"""Merchant-scoped issuing-bank drilldown aggregates; no raw rows are exported."""
+from collections import Counter
+from payment_amounts import attempt_amount_usd
+
+def attach(blocks,dimensions,auth,periods,calc,rates=None):
+ country=next((d for d in dimensions if d['key']=='bin_country'),None)
+ chart=next((b for b in blocks if b.get('title')==(country or {}).get('label')),None)
+ if not country or not chart:return []
+ groups={g['label']:g for g in country['groups']};audit=[]
+ current=next(p for p in periods if p['key']=='current')
+ for category in chart['categories']:
+  group=groups.get(category['label'])
+  if group is None and category.get('is_unknown'):group=next((g for g in country['groups'] if g['key']=='["unknown"]'),None)
+  if group is None:continue
+  import json
+  key=json.loads(group['key'])
+  if key[0]=='other':continue
+  rows=[r for r in auth if (r.get('Issuing bank country','').strip()==key[1] if key[0]=='value' else not r.get('Issuing bank country','').strip())]
+  ranking_rows=[r for r in rows if current['start']<=calc.day(r['Timestamp'])<=current['end']]
+  ranking=Counter(r.get('Issuing bank','').strip() or '未知发卡行' for r in ranking_rows)
+  banks=sorted((name for name,n in ranking.items() if n>0),key=lambda name:(-ranking[name],name))[:5];children=[]
+  for bank in banks:
+   values={}
+   for p in periods:
+    country_rows=[r for r in rows if p['start']<=calc.day(r['Timestamp'])<=p['end']]
+    all_rows=[r for r in auth if p['start']<=calc.day(r['Timestamp'])<=p['end']]
+    rr=[r for r in country_rows if (r.get('Issuing bank','').strip() or '未知发卡行')==bank]
+    n=len(rr);ap=sum(r.get('Response type','').lower()=='approval' for r in rr)
+    def amount(selected):
+     return attempt_amount_usd(selected,rates or {},calc.day)
+    values[p['key']]={'count':n if country_rows else None,'approvals':ap if country_rows else None,'auth_rate':ap/n if n else None,'share':n/len(all_rows) if country_rows and all_rows else None,'attempt_amount':amount(rr) if country_rows else None,'approved_amount':amount([r for r in rr if r.get('Response type','').lower()=='approval']) if country_rows else None}
+   children.append({'label':bank,'values':values,'ranking_count':ranking[bank]})
+  category['children']=children
+  audit.append({'country':category['label'],'banks':children,'country_count':len(ranking_rows),'ranking_period':{'start':current['start'],'end':current['end']},'top5_count':sum(ranking[b] for b in banks)})
+ chart['issuer_drilldown']=True
+ chart['description']='点击国家展开或折叠 Top 5 发卡行。按本周（'+current['start']+' 至 '+current['end']+'）授权尝试笔数降序排名（包括授权拒绝，不是按成功笔数）；上周比较同一组发卡行。授权成功率显示成功笔数/尝试笔数；尝试为 0 时留空。银行比例以该商户当周全部授权尝试为分母；Top 5 不代表该国全部银行。'
+ return audit
+
+
+def calculate(dimensions,auth,periods,calc,rates=None):
+ """Return issuer groups using source grouping keys, without a chart builder."""
+ country=next((d for d in dimensions if d['key']=='bin_country'),None)
+ if not country:return None
+ import json
+ categories=[]
+ for group in country['groups']:
+  key=json.loads(group['key'])
+  label='其他（合并）' if key==['other'] else '未知（缺失）' if key==['unknown'] else group['label']
+  categories.append({'label':label,'is_unknown':key==['unknown']})
+ block={'title':country['label'],'categories':categories}
+ attach([block],dimensions,auth,periods,calc,rates)
+ return block

package/skills/risk-compliance/portfolio-payment-analysis/scripts/payment_amounts.py

@@ -0,0 +1,20 @@
+"""Shared daily-USD amount calculation for authorization aggregates."""
+from decimal import Decimal, InvalidOperation
+
+def attempt_amount_usd(rows, rates, day):
+    """Return a complete decimal sum or None; never a partial converted total."""
+    total = Decimal(0)
+    for row in rows:
+        try:
+            amount = Decimal(row.get('Transaction amount', ''))
+            currency = (row.get('Transaction amount currency') or '').strip().upper()
+            rate = Decimal(1) if currency == 'USD' else rates.get((day(row['Timestamp']), currency))
+            if not amount.is_finite() or amount < 0 or rate is None:
+                return None
+            rate = Decimal(str(rate))
+            if not rate.is_finite() or rate <= 0:
+                return None
+            total += amount * rate
+        except (InvalidOperation, TypeError, KeyError, ValueError):
+            return None
+    return str(total)

package/skills/risk-compliance/portfolio-payment-analysis/scripts/render.py

@@ -1,160 +1,9 @@
 #!/usr/bin/env python3
-"""Render a reviewed report model to portable HTML and Markdown, without dependencies.
-
-Usage: python3 render.py --model presentation.json --output REPORT_DIRECTORY
-The model owns narrative; editing it and rerendering keeps both formats in sync.
-"""
-import argparse
-import html
-import json
+"""Render reviewed merchant presentation with embedded offline ECharts."""
+import argparse,json
 from pathlib import Path
-from comparison_charts import chart as comparison_chart, CSS as COMPARISON_CSS, JS as COMPARISON_JS
-
-CSS = """
-:root{--ink:#142c36;--muted:#536770;--paper:#f4f6f4;--line:#d8e2df;--accent:#087b71;--amber:#9c5215}
-*{box-sizing:border-box}html{scroll-behavior:smooth}body{margin:0;background:var(--paper);color:var(--ink);font:16px/1.7 -apple-system,BlinkMacSystemFont,'Segoe UI','PingFang SC','Microsoft YaHei',sans-serif}a{color:var(--accent);text-underline-offset:4px}a:focus-visible,input:focus-visible,button:focus-visible,summary:focus-visible{outline:3px solid #c16613;outline-offset:4px}.mast{background:#142c36;color:#fff;padding:42px max(24px,calc((100vw - 1180px)/2)) 36px}.eyebrow{font-size:12px;letter-spacing:.16em;text-transform:uppercase;color:#9bdbcf}.mast h1{font-size:clamp(28px,4vw,44px);letter-spacing:-.035em;line-height:1.25;margin:14px 0}.mast p{color:#d1e0e0;max-width:850px}.periods{display:flex;flex-wrap:wrap;gap:8px 24px;font-size:13px}.toolbar{position:sticky;top:0;z-index:2;background:#fffef9;border-bottom:1px solid var(--line);padding:12px max(24px,calc((100vw - 1180px)/2));display:flex;gap:20px;align-items:center;flex-wrap:wrap}.toolbar a{font-size:14px;text-decoration:none;min-height:30px;display:inline-flex;align-items:center}.toolbar button{margin-left:auto;background:none;border:1px solid var(--line);padding:8px 14px;border-radius:4px;color:var(--ink);cursor:pointer}main{max-width:1228px;padding:28px 24px 64px;margin:auto}.kpis{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:1px;background:var(--line);border:1px solid var(--line);margin-bottom:28px}.kpi{background:#fff;padding:22px}.kpi-label{font-size:14px;color:var(--muted)}.kpi-value{font-variant-numeric:tabular-nums;font-size:clamp(25px,3vw,36px);font-weight:650;letter-spacing:-.04em;line-height:1.6}.kpi small{font-size:12px;color:var(--muted)}.summary{background:#e9f2ed;border-left:4px solid var(--accent);padding:24px 28px;margin-bottom:32px}.summary h2{margin:0 0 12px;font-size:21px}.summary ol{padding-left:22px;margin:0}.summary li+li{margin-top:10px}.section{scroll-margin-top:100px;background:white;border:1px solid var(--line);margin:24px 0;padding:28px 32px}.section h2{font-size:25px;letter-spacing:-.025em;margin:0 0 16px}.section h3{font-size:19px;margin:28px 0 12px}p{margin:10px 0 18px}.note{font-size:13px;color:var(--muted)}.callout{border-left:3px solid #b97028;background:#fff8ec;padding:14px 18px;font-size:14px}.table-wrap{overflow-x:auto;border:1px solid var(--line);margin:16px 0}table{width:100%;border-collapse:collapse;font-size:14px;font-variant-numeric:tabular-nums}th{background:#eff4f2;text-align:left;color:#35545d;font-weight:600;white-space:nowrap}th,td{padding:12px 14px;border-bottom:1px solid #e8eeeb;vertical-align:top}tbody tr:last-child td{border-bottom:0}tbody tr:hover{background:#f4f8f6}td:not(:first-child){white-space:nowrap}.filter{display:flex;align-items:center;gap:12px;margin:16px 0;font-size:14px}.filter input{width:min(320px,100%);padding:10px 12px;border:1px solid #9eb5af;border-radius:4px;font:inherit}.bars{margin:24px 0}.bar-row{display:grid;grid-template-columns:minmax(100px,180px) 1fr 100px;gap:14px;align-items:center;margin:12px 0;font-size:13px}.bar-label{overflow-wrap:anywhere}.track{background:#eff4f2;height:24px}.fill{background:var(--accent);height:100%;min-width:1px}.bar-value{text-align:right;font-variant-numeric:tabular-nums}.chart{width:100%;height:auto;display:block}.chart text{font-family:inherit;fill:#536770;font-size:12px}.chart text.title{font-size:14px}.chart line.grid{stroke:#e2eae6}.chart path.series{stroke:#087b71;stroke-width:3;fill:none}.chart circle{fill:#087b71;stroke:white;stroke-width:2}.footer{font-size:12px;color:var(--muted);padding-top:18px;border-top:1px solid var(--line)}details{margin:16px 0}summary{cursor:pointer;font-weight:600;padding:10px 0}.empty{color:var(--muted);padding:18px;background:#f4f6f4}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}
-table.wrap-headers{table-layout:fixed;min-width:900px}table.wrap-headers th,table.wrap-headers td{white-space:normal;overflow-wrap:anywhere}table.wrap-headers th:first-child{width:17%}
-@media(max-width:700px){main{padding:18px 12px 36px}.mast{padding:28px 20px}.kpis{grid-template-columns:repeat(2,minmax(0,1fr))}.kpi{padding:16px}.section{padding:22px 16px}.section h2{font-size:22px}.toolbar{position:static;padding:10px 16px;gap:10px 16px}.toolbar button{margin-left:0}.summary{padding:20px}.bar-row{grid-template-columns:110px 1fr 66px;gap:8px;font-size:12px}.periods{display:block}.periods span{display:block}}
-@media print{body{background:white;font-size:11px}.mast{background:white;color:#142c36;padding:0}.mast p,.eyebrow{color:#536770}.toolbar,.filter{display:none}main{padding:10px 0;max-width:none}.section{break-inside:avoid;padding:16px}.kpis{grid-template-columns:repeat(4,1fr)}.kpi-value{font-size:23px}a{color:inherit}details>*{display:block!important}.table-wrap{overflow:visible}th,td{padding:7px}.summary{background:#f2f5f2}}
-@media(prefers-reduced-motion:reduce){html{scroll-behavior:auto}}
-"""
-JS = """
-document.querySelectorAll('input[data-table]').forEach(input=>input.addEventListener('input',()=>{
- const table=document.getElementById(input.dataset.table), query=input.value.toLowerCase();
- let visible=0;
- table.querySelectorAll('tbody tr').forEach(row=>{row.hidden=!row.textContent.toLowerCase().includes(query);if(!row.hidden)visible++});
- document.getElementById(input.dataset.table+'-status').textContent='显示 '+visible+' 行';
-}));
-document.getElementById('print-report').addEventListener('click',()=>window.print());
-"""
-
-def esc(value):
-    return html.escape(str(value), quote=True)
-
-
-def mdtext(value):
-    text=html.escape(str(value),quote=False).replace('\n',' ')
-    for char in ('\\','*','_','[',']','`','#','|'):
-        text=text.replace(char,'\\'+char)
-    return text
-
-
-def mdcell(value):
-    return mdtext(value)
-
-
-def table(block, identifier):
-    headers, rows = block['headers'], block['rows']
-    body = '<div class="table-wrap"><table id="'+identifier+'"'+(' class="wrap-headers"' if block.get('wrap_headers') else '')+'><thead><tr>'
-    body += ''.join('<th scope="col">'+esc(v)+'</th>' for v in headers)+'</tr></thead><tbody>'
-    body += ''.join('<tr>'+''.join('<td>'+esc(v)+'</td>' for v in row)+'</tr>' for row in rows)
-    body += '</tbody></table></div>'
-    if block.get('filter'):
-        body = f'<label class="filter">筛选商户<input data-table="{identifier}" type="search" placeholder="商户名称或 ID" aria-controls="{identifier}"></label><span class="sr-only" id="{identifier}-status" aria-live="polite"></span>'+body
-    md = '| '+' | '.join(map(mdcell, headers))+' |\n| '+' | '.join(['---']*len(headers))+' |\n'
-    md += '\n'.join('| '+' | '.join(map(mdcell, row))+' |' for row in rows)
-    return body, md
-
-
-def bars(block):
-    rows = block['rows']
-    maximum = max((r['value'] for r in rows), default=0) or 1
-    out = '<div class="bars" role="img" aria-label="'+esc(block.get('title','数量分布'))+'">'
-    for r in rows:
-        out += '<div class="bar-row"><span class="bar-label">'+esc(r['label'])+'</span><div class="track"><div class="fill" style="width:'+str(max(0,r['value']/maximum*100))+'%"></div></div><span class="bar-value">'+esc(r.get('display',r['value']))+'</span></div>'
-    return out+'</div>', '\n'.join('- '+mdtext(r['label'])+'：'+mdtext(r.get('display',r['value'])) for r in rows)
-
-
-def line_chart(block):
-    rows=block['rows']; w=1000; h=250; left=52; right=30; top=32; bottom=45
-    maximum=block.get('max',100)
-    plotw=w-left-right; ploth=h-top-bottom
-    out=f'<svg class="chart" viewBox="0 0 {w} {h}" role="img" aria-label="{esc(block.get("title","趋势"))}"><title>{esc(block.get("title","趋势"))}</title>'
-    for n in range(5):
-        value=maximum*n/4; y=top+ploth*(1-n/4)
-        out+=f'<line class="grid" x1="{left}" y1="{y}" x2="{w-right}" y2="{y}"/><text x="{left-8}" y="{y+4}" text-anchor="end">{value:g}</text>'
-    points=[]
-    for i,r in enumerate(rows):
-        x=left+plotw*i/max(1,len(rows)-1)
-        if r['value'] is None:
-            if points: out+='<path class="series" d="'+' '.join(points)+'"/>';points=[]
-        else:
-            y=top+ploth*(1-r['value']/maximum)
-            points.append(('M' if not points else 'L')+f'{x},{y}')
-            out+=f'<circle cx="{x}" cy="{y}" r="4"><title>{esc(r["label"])}: {r["value"]:.2f}</title></circle>'
-        if len(rows)<=8 or i%max(1,len(rows)//8)==0 or i==len(rows)-1:
-            out+=f'<text x="{x}" y="{h-15}" text-anchor="middle">{esc(r["label"])}</text>'
-    if points: out+='<path class="series" d="'+' '.join(points)+'"/>'
-    out+='</svg>'
-    return out, '\n'.join('- '+mdtext(r['label'])+'：'+('N/A' if r['value'] is None else f'{r["value"]:.2f}') for r in rows)
-
-
-def block_output(block, identifier, level=3):
-    kind=block['type'];text=block.get('text','')
-    if kind=='paragraph': hp='<p>'+esc(text)+'</p>';mp=mdtext(text)
-    elif kind=='note': hp='<p class="note">'+esc(text)+'</p>';mp=mdtext(text)
-    elif kind=='callout': hp='<p class="callout">'+esc(text)+'</p>';mp='> '+mdtext(text)
-    elif kind=='heading': hp=f'<h{level}>'+esc(text)+f'</h{level}>';mp='#'*level+' '+mdtext(text)
-    elif kind=='table': hp,mp=table(block,identifier)
-    elif kind=='bars': hp,mp=bars(block)
-    elif kind=='line': hp,mp=line_chart(block)
-    elif kind=='list':
-        hp='<ol>'+''.join('<li>'+esc(x)+'</li>' for x in block['items'])+'</ol>'
-        mp='\n'.join(f'{n+1}. {mdtext(x)}' for n,x in enumerate(block['items']))
-    elif kind in ('comparison_chart','time_series_chart'): hp,mp=comparison_chart(block,identifier)
-    elif kind=='group':
-        children=[block_output(child,identifier+'-'+str(i),min(level+1,6)) for i,child in enumerate(block['blocks'])]
-        hp=''.join(pair[0] for pair in children);mp='\n\n'.join(pair[1] for pair in children)
-        if not block.get('collapsed'):
-            hp=f'<h{level}>'+esc(block['caption'])+f'</h{level}>'+hp
-            mp='#'*level+' '+mdtext(block['caption'])+'\n\n'+mp
-    else: raise ValueError('Unknown block type: '+kind)
-    if block.get('collapsed'):
-        hp='<details><summary>'+esc(block.get('caption','查看明细'))+'</summary>'+hp+'</details>'
-        mp='#'*level+' '+mdtext(block.get('caption','查看明细'))+'\n\n'+mp
-    return hp,mp
-
-
-def render(model, output):
-    output=Path(output);output.mkdir(parents=True,exist_ok=True)
-    parts=[]; md=['# '+mdtext(model['title']),mdtext(model.get('subtitle',''))]
-    periods=model.get('periods',[])
-    md.extend(map(mdtext,periods))
-    if model.get('summary'):
-        parts.append('<section class="summary"><h2>'+esc(model.get('summary_title','本期要点'))+'</h2><ol>'+''.join('<li>'+esc(x)+'</li>' for x in model['summary'])+'</ol></section>')
-        md+=['## '+mdtext(model.get('summary_title','本期要点'))]+[f'{i+1}. {mdtext(x)}' for i,x in enumerate(model['summary'])]
-    if model.get('kpis'):
-        parts.append('<div class="kpis">'+''.join('<div class="kpi"><div class="kpi-label">'+esc(k['label'])+'</div><div class="kpi-value">'+esc(k['value'])+'</div><small>'+esc(k.get('note',''))+'</small></div>' for k in model['kpis'])+'</div>')
-        md+=['## 核心指标',table({'headers':['指标','数值','说明'],'rows':[[k['label'],k['value'],k.get('note','')] for k in model['kpis']]},'kpis')[1]]
-    nav=[]
-    for i,section in enumerate(model['sections']):
-        sid='section-'+str(i+1)
-        nav.append(f'<a href="#{sid}">{esc(section.get("nav",section["title"]))}</a>')
-        parts.append(f'<section class="section" id="{sid}"><h2>{esc(section["title"])}</h2>')
-        md+=['## '+mdtext(section['title'])]
-        for j,b in enumerate(section['blocks']):
-            hp,mp=block_output(b,sid+'-table-'+str(j))
-            parts.append(hp);md.append(mp)
-        parts.append('</section>')
-    footer=model.get('footer','')
-    links=model.get('links',[])
-    # Links are local artifacts only; reject script URLs and escaping parent paths.
-    for link in links:
-        target=Path(link['file'])
-        if target.is_absolute() or len(target.parts)!=1 or ':' in link['file'] or target.name in {'.','..'}:
-            raise ValueError('Report links must name a sibling file')
-    footer_html=esc(footer)
-    if links:
-        footer_html+='<p>'+ ' · '.join('<a href="'+esc(l['file'])+'">'+esc(l['label'])+'</a>' for l in links)+'</p>'
-        md.append(' · '.join('['+l['label']+']('+l['file']+')' for l in links))
-    page='<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>'+esc(model['title'])+'</title><style>'+CSS+COMPARISON_CSS+'</style></head><body><header class="mast"><div class="eyebrow">Submerchant / Payment Review</div><h1>'+esc(model['title'])+'</h1><p>'+esc(model.get('subtitle',''))+'</p><div class="periods">'+''.join('<span>'+esc(x)+'</span>' for x in periods)+'</div></header><nav class="toolbar" aria-label="报告导航">'+''.join(nav)+'<button type="button" id="print-report">打印 / 保存 PDF</button></nav><main>'+''.join(parts)+'<footer class="footer">'+footer_html+'</footer></main><script>'+JS+COMPARISON_JS+'</script></body></html>'
-    (output/'overview.zh.html').write_text(page,encoding='utf-8')
-    (output/'overview.zh.md').write_text('\n\n'.join(md+[mdtext(footer)])+'\n',encoding='utf-8')
-
-
+from echarts_report import render
 if __name__=='__main__':
-    parser=argparse.ArgumentParser(description=__doc__)
-    parser.add_argument('--model',required=True,type=Path)
-    parser.add_argument('--output',required=True,type=Path)
-    args=parser.parse_args()
-    render(json.loads(args.model.read_text(encoding='utf-8')),args.output)
+ parser=argparse.ArgumentParser(description=__doc__)
+ parser.add_argument('--model',type=Path,required=True);parser.add_argument('--output',type=Path,required=True)
+ args=parser.parse_args();render(json.loads(args.model.read_text(encoding='utf-8')),args.output)