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

@@ -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,

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,

values.yaml

@@ -163,7 +163,7 @@ env:
   - name: GITHUB_REPO_URL
     value: "git@github.com:Aignosi/sientia-dataops-scouter_temporal.git"
   - name: GITHUB_BRANCH
-    value: "fix/SIENTIAPDE-1478"
+    value: "fix/SIENTIAPDE-1712"
   - name: PYTHON_APP
     value: "scouter.worker.worker"
 
@@ -173,9 +173,9 @@ env:
   - name: POSTGRES_PORT
     value: "5432"
   - name: POSTGRES_USER
-    value: "sientia"
+    value: "posgres"
   - name: POSTGRES_PASSWORD
-    value: "sientia"
+    value: "nFqc81y6kwmr2zuAIx43DhiOosFCVPpeEfTtTWZflkNjB2j1KtEeIANkhFR9mAX3"
   - name: POSTGRES_DBNAME
     value: "sientia"
   - name: POSTGRES_MIN_CONNECTIONS