同步:完善质量分析工作台并更新主题字体
同步已上线的智能分析执行协议、来源查询、图表报告与管理页面配套代码。 补齐数据库迁移、运行依赖和回归测试,保留原有指标计算口径。 统一午夜黑及其他主题的控件细节、中文和业务数字字体。 排除本地业务数据、凭据、预览、发布与验收产物。 验证:生产构建通过,320项前端回归通过;本轮仅同步Git,不再次部署。
This commit is contained in:
@@ -0,0 +1,192 @@
|
||||
import copy
|
||||
import sys
|
||||
import threading
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from unittest.mock import patch
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'scripts'))
|
||||
from nao_agent_task import (TaskUnavailable, _explicit_history_refresh_intent,
|
||||
normalize_task, plan_task)
|
||||
from test_nao_agent_task import task_value
|
||||
|
||||
|
||||
def history_plan(**changes):
|
||||
value = task_value(kind='report', freshQuery=False, historyMode='all', dimensions=[],
|
||||
stages=[], fields=[], comparisonRequired=False, trendRequired=False,
|
||||
verifySource=False, fullDetails=False, filterUpdates={})
|
||||
value.update(changes)
|
||||
return value
|
||||
|
||||
|
||||
class HistoryReportTaskTest(unittest.TestCase):
|
||||
def test_refresh_intent_respects_negation_without_weakening_positive_refresh(self):
|
||||
for question in ('整理历史报告,不重新查询', '不要重新查数据,只整理已完成结果',
|
||||
'无需重查,汇总历史报告', '不需要重新核验数据',
|
||||
'不用最新数据,整理历史', '不需要重新查最新数据,只整理历史'):
|
||||
with self.subTest(question=question):
|
||||
self.assertFalse(_explicit_history_refresh_intent(question))
|
||||
for question in ('不要复用历史,重新查询当前数据', '重新跑数据后更新报告',
|
||||
'最新数据需要重新核验', '必须重查当前数据'):
|
||||
with self.subTest(question=question):
|
||||
self.assertTrue(_explicit_history_refresh_intent(question))
|
||||
task = normalize_task(history_plan(), '整理已完成历史结果,不重新查询',
|
||||
{'_protocol': {'version': 1}})
|
||||
self.assertEqual(task['historyMode'], 'all')
|
||||
with self.assertRaises(TaskUnavailable):
|
||||
normalize_task(history_plan(), '不要复用历史,重新查询数据',
|
||||
{'_protocol': {'version': 1}})
|
||||
|
||||
def test_history_report_does_not_inherit_local_filters_or_period(self):
|
||||
context = {
|
||||
'_protocol': {'version': 1},
|
||||
'filters': {'department': '新能源汽车磁钢',
|
||||
'extraFilters': {'customerCode': ['800001']}},
|
||||
'period': {'year': 2026, 'monthStart': 1, 'monthEnd': 9},
|
||||
'comparisonPeriod': {'year': 2025, 'monthStart': 1, 'monthEnd': 9},
|
||||
}
|
||||
task = normalize_task(history_plan(), '重新生成以上报告,正文突出重点', context)
|
||||
self.assertEqual(task['kind'], 'report')
|
||||
self.assertEqual(task['historyMode'], 'all')
|
||||
self.assertFalse(task['freshQuery'])
|
||||
self.assertEqual(task['filters'], {})
|
||||
self.assertIsNone(task['period'])
|
||||
self.assertIsNone(task['comparisonPeriod'])
|
||||
self.assertEqual(task['dimensions'], [])
|
||||
self.assertEqual(task['stages'], [])
|
||||
self.assertEqual(task['fields'], [])
|
||||
self.assertEqual(task['dimensionStages'], {})
|
||||
self.assertNotIn('queryPlan', task)
|
||||
self.assertFalse(task['comparisonRequired'])
|
||||
self.assertFalse(task['trendRequired'])
|
||||
self.assertFalse(task['verifySource'])
|
||||
self.assertFalse(task['fullDetails'])
|
||||
self.assertEqual(task['visualPreference'], 'none')
|
||||
|
||||
def test_new_filter_period_and_refresh_intent_cannot_be_silently_dropped(self):
|
||||
invalid = [
|
||||
(history_plan(filterUpdates={'department': '消费电子'}), '整理历史报告'),
|
||||
(history_plan(period={'year': 2026, 'month': 9}), '整理历史报告'),
|
||||
(history_plan(comparisonPeriod={'year': 2025, 'month': 9}), '整理历史报告'),
|
||||
(history_plan(), '重新查询数据并更新报告'),
|
||||
(history_plan(freshQuery=True), '整理历史报告'),
|
||||
(history_plan(fields=['rate']), '整理历史报告'),
|
||||
(history_plan(historyMode='none'), '整理历史报告'),
|
||||
]
|
||||
for value, question in invalid:
|
||||
with self.subTest(value=value, question=question):
|
||||
with self.assertRaises(TaskUnavailable):
|
||||
normalize_task(value, question, {'_protocol': {'version': 1},
|
||||
'filters': {'columnFilters': [{'field': 'code'}]}})
|
||||
|
||||
column_rule = {'field': 'orderNo', 'stages': ['black'],
|
||||
'operator': 'in', 'values': ['WO-1']}
|
||||
context = {'_protocol': {'version': 1},
|
||||
'_businessCatalog': {'sourceFields': [{
|
||||
'key': 'orderNo', 'label': '委托单号', 'type': 'source_value',
|
||||
'stages': ['black'], 'columns': {'black': '委托单号'},
|
||||
'operators': ['in'],
|
||||
}]}}
|
||||
with self.assertRaises(TaskUnavailable) as error:
|
||||
normalize_task(history_plan(columnFilters=[column_rule]), '整理历史报告', context)
|
||||
self.assertEqual(error.exception.field, 'freshQuery')
|
||||
|
||||
def test_existing_record_and_source_receipts_can_be_preserved_without_new_reads(self):
|
||||
review = {'aligned': True, 'requiresEvidence': True, 'requiresSourceVerification': False,
|
||||
'requiresAllSourceRows': False, 'requiresTrend': False, 'requiresComparison': False}
|
||||
with patch('nao_agent_task._model_json', side_effect=[history_plan(), review]):
|
||||
planned = plan_task(base_url='https://offline.invalid/v1', api_key='synthetic', model='m',
|
||||
question='把已完成的全部逐行记录和原件核验结果整合成历史报告,不重新打开原件',
|
||||
context={'_protocol': {'version': 1}}, cancel_event=threading.Event())
|
||||
self.assertEqual(planned['kind'], 'report')
|
||||
self.assertFalse(planned['fullDetails'])
|
||||
self.assertFalse(planned['verifySource'])
|
||||
|
||||
def test_history_report_does_not_override_an_independent_review_requiring_new_rows(self):
|
||||
review = {'aligned': True, 'requiresEvidence': True, 'requiresSourceVerification': False,
|
||||
'requiresAllSourceRows': True, 'requiresTrend': False, 'requiresComparison': False}
|
||||
with patch('nao_agent_task._model_json', side_effect=[history_plan(), review] * 3):
|
||||
with self.assertRaises(TaskUnavailable):
|
||||
plan_task(base_url='https://offline.invalid/v1', api_key='synthetic', model='m',
|
||||
question='把该规格本月每条原始记录及全部字段列入报告',
|
||||
context={'_protocol': {'version': 1}}, cancel_event=threading.Event())
|
||||
|
||||
def test_legacy_non_protocol_report_is_not_changed(self):
|
||||
value = history_plan()
|
||||
task = normalize_task(value, '整理历史报告', {})
|
||||
self.assertEqual(task['kind'], 'report')
|
||||
self.assertEqual(task['historyMode'], 'all')
|
||||
|
||||
def test_protocol_planner_prompt_exposes_bounded_history_report_contract(self):
|
||||
replies = [history_plan(), {
|
||||
'aligned': True, 'requiresEvidence': True,
|
||||
'requiresSourceVerification': False, 'requiresAllSourceRows': False,
|
||||
'requiresTrend': False, 'requiresComparison': False,
|
||||
}]
|
||||
calls = []
|
||||
def fake_model(**kwargs):
|
||||
calls.append(kwargs)
|
||||
return replies.pop(0)
|
||||
with patch('nao_agent_task._model_json', side_effect=fake_model):
|
||||
planned = plan_task(base_url='https://offline.invalid/v1', api_key='synthetic', model='m',
|
||||
question='整理当前会话已经完成的分析结果',
|
||||
context={'_protocol': {'version': 1}},
|
||||
cancel_event=threading.Event())
|
||||
self.assertEqual(planned['kind'], 'report')
|
||||
self.assertEqual(len(calls), 2)
|
||||
self.assertIn('仅在用户要求汇总/重排已完成历史时用kind=report', calls[0]['system'])
|
||||
self.assertIn('historyMode=last或all、freshQuery=false', calls[0]['system'])
|
||||
self.assertIn('previousVerifiedTurns为空或缺失不表示会话没有已分析来源', calls[0]['system'])
|
||||
self.assertIn('用户说不重新查询、不要重查、无需重新查时是复用历史', calls[0]['system'])
|
||||
self.assertEqual(calls[0]['payload']['previousVerifiedTurns'], [])
|
||||
self.assertIn('不能据此判断历史数据不存在', calls[1]['system'])
|
||||
self.assertEqual(calls[1]['payload']['previousVerifiedTurns'], [])
|
||||
capabilities = calls[0]['payload']['platformCapabilities']
|
||||
self.assertIn('confirmed_history_report', capabilities['enabled'])
|
||||
self.assertNotIn('report', capabilities['unsupported'])
|
||||
|
||||
def test_report_review_does_not_rebind_prior_customer_product_or_column_scope(self):
|
||||
column_rule = {'field': 'orderNo', 'stages': ['black'],
|
||||
'operator': 'in', 'values': ['WO-1']}
|
||||
previous = {
|
||||
'kind': 'analysis', 'goal': '客户800001规格SPEC-A的正式质量分析',
|
||||
'question': '查询客户800001规格SPEC-A', 'period': {'year': 2026, 'month': 9},
|
||||
'dimensions': ['product'], 'fields': ['rate'], 'stages': ['black'],
|
||||
'filters': {'extraFilters': {'customerCode': ['800001']}, 'product': 'SPEC-A',
|
||||
'columnFilters': [column_rule]},
|
||||
}
|
||||
context = {
|
||||
'_protocol': {'version': 1}, '_agentTask': previous,
|
||||
'filters': copy.deepcopy(previous['filters']), 'period': previous['period'],
|
||||
'_businessCatalog': {
|
||||
'extraFields': [{'key': 'customerCode', 'label': '客户代码'}],
|
||||
'sourceFields': [{'key': 'orderNo', 'label': '委托单号', 'type': 'source_value',
|
||||
'stages': ['black'], 'columns': {'black': '委托单号'},
|
||||
'operators': ['in']}],
|
||||
'productMatch': {'status': 'unique', 'query': 'SPEC-A',
|
||||
'candidates': [{'name': 'SPEC-A'}]},
|
||||
},
|
||||
}
|
||||
replies = [history_plan(), {
|
||||
'aligned': True, 'requiresEvidence': True,
|
||||
'requiresSourceVerification': False, 'requiresAllSourceRows': False,
|
||||
'requiresTrend': False, 'requiresComparison': False,
|
||||
'customerCodes': ['800001'], 'productScope': 'single',
|
||||
}]
|
||||
calls = []
|
||||
def fake_model(**kwargs):
|
||||
calls.append(kwargs)
|
||||
return replies.pop(0)
|
||||
with patch('nao_agent_task._model_json', side_effect=fake_model):
|
||||
planned = plan_task(base_url='https://offline.invalid/v1', api_key='synthetic', model='m',
|
||||
question='整理当前会话已完成的历史报告,沿用各轮范围',
|
||||
context=context, previous=previous, cancel_event=threading.Event())
|
||||
self.assertEqual(planned['kind'], 'report')
|
||||
self.assertEqual(planned['filters'], {})
|
||||
self.assertIsNone(planned['period'])
|
||||
self.assertEqual(len(calls), 2)
|
||||
self.assertFalse(calls[1]['payload']['columnFilterReviewRequired'])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user