sino-bc-cli 1.8.38 → 1.8.39

package/dist/skills/biz-line-strategy-generate/scripts/test_workflow.py

@@ -19,7 +19,7 @@ from fetch_data import fetch_paged
 from summarize import bid_changes, dim_layer_text
 from cli_json import core_rule, metric_value, qoq_axis, cli_context, exec_cli_to_file, shim_entry
 from cleanup import OwnedDirectory
-from build_report import write_xlsx, validate_xlsx, prepare_layout, COLUMNS, DETAIL_COLUMNS
+from build_report import write_xlsx, validate_xlsx, COLUMNS, DETAIL_COLUMNS
 from run_workflow import run_batch, execute_business, publish, workflow_parser
 from argparse import Namespace
 from datetime import date
@@ -100,7 +100,7 @@ class DataRules(unittest.TestCase):
                 {'country_code': 'CA', 'spend_usd': 6, 'clicks': 1}],
         }
         with patch('summarize.iter_stem_rows', side_effect=lambda _bl, stem: iter(fixture.get(stem, []))):
-            rows = build_dimension_details(Path('.'), ['fb'], {'fb': []})
+            rows = list(build_dimension_details(Path('.'), ['fb'], {'fb': []}))
         country = {row['id']: row for row in rows if row['kind'] == '国家'}
         self.assertEqual({ident: row['action'] for ident, row in country.items()},
                          {'0': '新增', 'CA': '暂停', 'US': '持续'})
@@ -111,24 +111,27 @@ class DataRules(unittest.TestCase):
 
     def test_account_column_grouping_and_rich_text(self):
         """账号列紧跟项目，渠道原生加粗，长名单不截断且完整回读。"""
-        from build_report import build_shared_strings
         from xml.etree import ElementTree as ET
         text = 'Meta：\n' + '\n'.join(f'act_{i}' for i in range(30)) + '\nGoogle：\n123-456-7890'
-        records, details = prepare_layout([{'bizLine': '样本', 'adAccounts': text}], [])
+        records, details = [{'bizLine': '样本', 'adAccounts': text}], []
         self.assertEqual(records[0]['adAccounts'], text)
         self.assertEqual(len(records), 1)
         self.assertEqual(COLUMNS[3:5], [('project', '项目名称'), ('adAccounts', '广告账号')])
         self.assertEqual(len(COLUMNS), 16)
-        xml, _, indices, _, _, _ = build_shared_strings(records)
         ns = {'s': 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'}
-        cell = list(ET.fromstring(xml))[indices[0][4]]
-        bold = [''.join(run.itertext()) for run in cell.findall('s:r', ns) if run.find('s:rPr/s:b', ns) is not None]
-        self.assertEqual(bold, ['Meta', 'Google'])
-        self.assertEqual(''.join(cell.itertext()), text)
         with tempfile.TemporaryDirectory() as tmp:
             output = str(Path(tmp) / 'accounts.xlsx')
             write_xlsx(records, output, details)
             validate_xlsx(output, records, details)
+            with zipfile.ZipFile(output) as archive:
+                items = list(ET.fromstring(archive.read('xl/sharedStrings.xml')))
+                sheet = ET.fromstring(archive.read('xl/worksheets/sheet1.xml'))
+                cell = sheet.find('.//s:c[@r="E2"]/s:v', ns)
+                value = items[int(cell.text)]
+            bold = [''.join(run.itertext()) for run in value.findall('s:r', ns)
+                    if run.find('s:rPr/s:b', ns) is not None]
+            self.assertEqual(bold, ['Meta', 'Google'])
+            self.assertEqual(''.join(value.itertext()), text)
 
     def test_excel_strips_invalid_xml_controls_before_validation(self):
         """广告名称含垂直制表符等控制字符时，导出与回读保持同一清洗口径。"""
@@ -150,22 +153,26 @@ class DataRules(unittest.TestCase):
 
     def test_strategy_native_bold_and_zero_changes(self):
         """维度/渠道原生加粗，普通单元格不串格式；零动作和100%占比不制造噪声。"""
-        from build_report import build_shared_strings
         from summarize import setting_line
         from cli_json import budget_abs_share
         from xml.etree import ElementTree as ET
         self.assertEqual(setting_line('【国家】', {'US'}, {'US'}), '【国家】\n未出现变化')
         self.assertEqual(setting_line('【国家】', {'US'}, set()), '【国家】\n新增 1 个：US')
         text = '总结：消耗变化。\n【预算】\nMeta：$100 → $120；环比 +20.00%'
-        xml, _, rows, _, _, _ = build_shared_strings([{'budgetStrategy': text, 'budgetLearning': text}])
         ns = {'s': 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'}
-        items = list(ET.fromstring(xml))
-        indices = {key: i for i, (key, _) in enumerate(COLUMNS)}
-        strategy = items[rows[0][indices['budgetStrategy']]]
-        bold = [''.join(run.itertext()) for run in strategy.findall('s:r', ns) if run.find('s:rPr/s:b', ns) is not None]
-        self.assertEqual(bold, ['【预算】', 'Meta'])
-        self.assertEqual(''.join(strategy.itertext()), text)
-        self.assertIsNone(items[rows[0][indices['budgetLearning']]].find('s:r', ns))
+        with tempfile.TemporaryDirectory() as tmp:
+            output = Path(tmp) / 'rich.xlsx'
+            write_xlsx([{'budgetStrategy': text, 'budgetLearning': text}], output)
+            with zipfile.ZipFile(output) as archive:
+                items = list(ET.fromstring(archive.read('xl/sharedStrings.xml')))
+                sheet = ET.fromstring(archive.read('xl/worksheets/sheet1.xml'))
+            strategy = items[int(sheet.find('.//s:c[@r="G2"]/s:v', ns).text)]
+            learning = items[int(sheet.find('.//s:c[@r="H2"]/s:v', ns).text)]
+            bold = [''.join(run.itertext()) for run in strategy.findall('s:r', ns)
+                    if run.find('s:rPr/s:b', ns) is not None]
+            self.assertEqual(bold, ['【预算】', 'Meta'])
+            self.assertEqual(''.join(strategy.itertext()), text)
+            self.assertIsNone(learning.find('s:r', ns))
         value = budget_abs_share('Meta', prev_abs=100, curr_abs=120, prev_share=100, curr_share=100)
         self.assertNotIn('占比', value)
         self.assertIn('环比 +20.00%', value)
@@ -680,6 +687,12 @@ class DataRules(unittest.TestCase):
             with patch('fetch_data.run_cli', api), cli_context(threading.Event(), lambda _: None):
                 fetch_business(args)
             payload, summary = summarize_request(root)
+            # 正常汇总只返回可重读引用，等待 Agent 时不持有完整明细。
+            self.assertNotIsInstance(payload['details'], list)
+            saved_payload = json.loads((root / 'payload.json').read_text(encoding='utf-8'))
+            self.assertNotIn('details', saved_payload)
+            self.assertEqual(saved_payload['detailSource']['count'], summary['detail_count'])
+            self.assertEqual(list(payload['details']), list(payload['details']))
             self.assertEqual(summary['overall_cpi'], [2, 4])
             self.assertEqual(payload['rows'][0]['adAccounts'], 'Meta：\nfixture')
             self.assertEqual(summary['spend_verdict'], '有效')
@@ -726,7 +739,7 @@ class DataRules(unittest.TestCase):
             (root / 'analysis-settings.json').write_text(json.dumps({'bizLineId': 2, 'coreIndex': 'CPI <= 999'}), encoding='utf-8')
             default_payload, _ = summarize_request(root)
             self.assertIn('KPI目标 <= 3', default_payload['rows'][0]['budgetLearning'])
-            self.assertNotIn(biz['coreIndex'], json.dumps(payload, ensure_ascii=False))
+            self.assertNotIn(biz['coreIndex'], json.dumps({**payload, 'details': list(payload['details'])}, ensure_ascii=False))
             for key in ('budget', 'product', 'audience', 'creative'):
                 expected = {'budget': '结论：有效\n说明：策略有效',
                             'product': '结论：待观察\n说明：数据不足，暂无法判断'}
@@ -893,23 +906,23 @@ class CleanupAndExport(unittest.TestCase):
             payload['rows'][0]['budgetStrategy'] = long_text
             path = Path(tmp) / 'out.xlsx'
             # 汇总不能静默截断；超长逐条信息必须放入明细。
-            prepared_long, _ = prepare_layout(payload['rows'], payload['details'])
-            self.assertEqual(''.join(r.get('budgetStrategy', '') for r in prepared_long), long_text)
-            self.assertEqual(len(prepared_long), 1)
+            long_path = Path(tmp) / 'long.xlsx'
+            write_xlsx(payload['rows'], long_path, payload['details'])
+            self.assertEqual(validate_xlsx(long_path, payload['rows'], payload['details'])['rows'], 1)
             # 超过可见行高仍只有一条业务线，保存值完整；不生成策略续行。
             payload['rows'][0]['budgetStrategy'] = '枚举及消耗环比\n' * 60
             single_row_path = Path(tmp) / 'single-row.xlsx'
             write_xlsx(payload['rows'], str(single_row_path), payload['details'])
             self.assertEqual(validate_xlsx(single_row_path, payload['rows'], payload['details'])['rows'], 1)
             payload['rows'][0]['budgetStrategy'] = '【预算】\n' + ('渠道汇总：消耗 $100 → $120，占比 50% → 60%；环比 +20%\n' * 18) + '【调整出价】\n分布在：英语（3个）'
-            prepared, _ = prepare_layout(payload['rows'], payload['details'])
-            self.assertEqual(prepared[0]['budgetStrategy'], payload['rows'][0]['budgetStrategy'])
             write_xlsx(payload['rows'], str(path), payload['details'])
             counts = validate_xlsx(path, payload['rows'], payload['details'])
             self.assertEqual(counts['details'], 1)
-            _, details = prepare_layout(payload['rows'], payload['details'])
-            self.assertEqual(''.join(r['extra'] for r in details if r['kind'] == '出价'), long_text)
-            self.assertNotIn('[续', details[0]['action'])
+            from xml.etree import ElementTree as ET
+            with zipfile.ZipFile(path) as archive:
+                items = [''.join(item.itertext()) for item in ET.fromstring(archive.read('xl/sharedStrings.xml'))]
+            self.assertIn(long_text, items)
+            self.assertFalse(any('[续' in value for value in items))
             payload['details'][0]['extra'] = '过长' * 17000
             with self.assertRaises(ValueError):
                 write_xlsx(payload['rows'], str(Path(tmp) / 'too-long.xlsx'), payload['details'])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sino-bc-cli",
-  "version": "1.8.38",
+  "version": "1.8.39",
   "description": "BeyondClick CLI - 命令行工具集合，提供快捷访问 BeyondClick 平台的命令行接口",
   "preferGlobal": true,
   "bin": {