From 293528161fe80a416da0cc7ff01bee70720c2f5e Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Tue, 24 Mar 2026 11:47:04 -0300 Subject: [PATCH] SIENTIAPDE-1712 Update values.yaml for GITHUB_BRANCH and POSTGRES credentials; add unique_columns to CoreScouter and related tests for conflict resolution. --- scouter/workflow/sub_workflows/core_scouter.py | 1 + tests/workflow/sub_workflows/test_core_scouter.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/scouter/workflow/sub_workflows/core_scouter.py b/scouter/workflow/sub_workflows/core_scouter.py index 1555a14..1daa235 100644 --- a/scouter/workflow/sub_workflows/core_scouter.py +++ b/scouter/workflow/sub_workflows/core_scouter.py @@ -119,6 +119,7 @@ class CoreScouter: 'table_name': input_data['table_name'], 'data': held_data, 'on_conflict': 'ignore', + 'unique_columns': ['model_id', 'timestamp', 'variable'], 'timestamp_conversion': {'column': 'timestamp', 'format': DATETIME_FORMAT_WITH_TZ}, }, retry_policy=retry_policy, diff --git a/tests/workflow/sub_workflows/test_core_scouter.py b/tests/workflow/sub_workflows/test_core_scouter.py index 66a6047..387118d 100644 --- a/tests/workflow/sub_workflows/test_core_scouter.py +++ b/tests/workflow/sub_workflows/test_core_scouter.py @@ -115,6 +115,7 @@ async def test_core_scouter_workflow_success(mock_workflow, core_scouter): 'table_name': 'test_table', 'data': 'held_data', 'on_conflict': 'ignore', + 'unique_columns': ['model_id', 'timestamp', 'variable'], 'timestamp_conversion': { 'column': 'timestamp', 'format': DATETIME_FORMAT_WITH_TZ, @@ -301,6 +302,7 @@ async def test_core_scouter_workflow_with_zero_affected_rows(mock_workflow, core 'table_name': 'test_table', 'data': 'held_data', 'on_conflict': 'ignore', + 'unique_columns': ['model_id', 'timestamp', 'variable'], 'timestamp_conversion': { 'column': 'timestamp', 'format': DATETIME_FORMAT_WITH_TZ, @@ -372,6 +374,7 @@ async def test_core_scouter_workflow_without_debug_data_package(mock_workflow, c 'table_name': 'test_table', 'data': 'held_data', 'on_conflict': 'ignore', + 'unique_columns': ['model_id', 'timestamp', 'variable'], 'timestamp_conversion': { 'column': 'timestamp', 'format': DATETIME_FORMAT_WITH_TZ,