Add literal contains filters across source queries and analysis context
This commit is contained in:
@@ -25,7 +25,7 @@ from test_nao_quality_tools import FakeApi, RELEASE
|
||||
def source_field(key, label, black, bright, stages=('black', 'bright')):
|
||||
return {'key': key, 'label': label, 'columns': {'black': black, 'bright': bright},
|
||||
'stages': list(stages), 'type': 'source_value',
|
||||
'operators': ['in', 'not_in', 'is_empty', 'not_empty']}
|
||||
'operators': ['in', 'not_in', 'contains', 'is_empty', 'not_empty']}
|
||||
|
||||
|
||||
SOURCE_FIELDS = [
|
||||
@@ -349,6 +349,15 @@ class SourceColumnProtocolTests(unittest.TestCase):
|
||||
with self.assertRaisesRegex(TaskUnavailable, '不超过256字符'):
|
||||
protocol_task(columnFilters=[{**rule, 'values': ['X' * 257]}])
|
||||
|
||||
def test_contains_keywords_are_preserved_as_literal_or_values(self):
|
||||
rule = {'field': 'batchNumber', 'stages': ['black'], 'operator': 'contains',
|
||||
'values': [' 001', 'A|B', 'abC']}
|
||||
task = protocol_task(columnFilters=[rule])
|
||||
self.assertEqual(task['filters']['columnFilters'], [rule])
|
||||
for invalid in ([], [''], [' '], ['x' * 257], [1], ['one'] * 51):
|
||||
with self.subTest(invalid=invalid), self.assertRaises(TaskUnavailable):
|
||||
protocol_task(columnFilters=[{**rule, 'values': invalid}])
|
||||
|
||||
def test_protocol_presentation_enums_default_consistently_when_omitted_or_null(self):
|
||||
base = task_value(kind='metrics', dimensions=[], stages=['black'], fields=['rate'],
|
||||
period={'year': 2026, 'month': 3}, comparisonRequired=False,
|
||||
@@ -396,6 +405,10 @@ class SourceColumnProtocolTests(unittest.TestCase):
|
||||
self.assertIn('periodCoverage(available/complete,可省略或null', prompt)
|
||||
self.assertIn('freshQuery(bool)', prompt)
|
||||
self.assertIn('needsClarification(bool)', prompt)
|
||||
self.assertIn('in/not_in/contains/is_empty/not_empty', prompt)
|
||||
self.assertIn('contains关键字是子串而非完整候选值', prompt)
|
||||
self.assertEqual(model_call.call_args_list[0].kwargs['payload']['businessCatalog']['sourceColumnOperators'],
|
||||
['in', 'not_in', 'contains', 'is_empty', 'not_empty'])
|
||||
|
||||
def test_three_arbitrary_source_keys_keep_literal_values_and_stage_scopes(self):
|
||||
task = protocol_task()
|
||||
@@ -429,7 +442,7 @@ class SourceColumnProtocolTests(unittest.TestCase):
|
||||
def test_unauthorized_unknown_and_missing_stage_columns_fail_closed(self):
|
||||
for bad in ([{**RULES[0], 'field': 'notInDirectory'}],
|
||||
[{**RULES[0], 'field': 'blackOnlyCode', 'stages': ['bright']}],
|
||||
[{**RULES[0], 'operator': 'contains'}]):
|
||||
[{**RULES[0], 'operator': 'starts_with'}]):
|
||||
with self.subTest(bad=bad), self.assertRaises(TaskUnavailable):
|
||||
normalize_task(task_value(kind='metrics', dimensions=[], stages=['black'], fields=['rate'],
|
||||
period={'year': 2026}, columnFilters=bad), '筛选原表字段',
|
||||
@@ -529,6 +542,20 @@ class SourceColumnProtocolTests(unittest.TestCase):
|
||||
self.assertEqual(customer_lookup['filters']['columnFilters'], [
|
||||
{'field': 'dispatchOrder', 'stages': ['bright'], 'operator': 'not_empty'}])
|
||||
|
||||
def test_contains_keyword_skips_exact_candidate_value_validation(self):
|
||||
from nao_agent_task import _resolve_source_column_values
|
||||
rule = {'field': 'batchNumber', 'stages': ['black'], 'operator': 'contains',
|
||||
'values': ['001']}
|
||||
task = protocol_task(columnFilters=[rule])
|
||||
calls = []
|
||||
def resolver(**contract):
|
||||
calls.append(contract)
|
||||
raise AssertionError('contains is a substring, not a complete candidate value')
|
||||
result = _resolve_source_column_values(task, release_id=RELEASE, resolver=resolver)
|
||||
self.assertEqual(result, {'status': 'exact'})
|
||||
self.assertEqual(calls, [])
|
||||
self.assertEqual(task['filters']['columnFilters'], [rule])
|
||||
|
||||
def test_missing_literal_offers_same_scope_alternatives_without_substitution(self):
|
||||
from nao_agent_task import _resolve_source_column_values
|
||||
task = protocol_task(columnFilters=[RULES[0]])
|
||||
|
||||
Reference in New Issue
Block a user