SIENTIAPDE-1478

Refactor metrics and imports across multiple files

- Removed unused import of CORE_LABELS in metrics.py.
- Updated import statements in api.py for consistency.
- Cleaned up import order in worker.py for better readability.
- Added missing newline at the end of metrics.py.
- Adjusted formatting in core_scouter.py to ensure proper syntax.
- Removed redundant 'on_conflict' and 'unique_columns' keys from test cases in test_core_scouter.py for clarity.

scouter/activities/api.py

@@ -9,8 +9,8 @@ with workflow.unsafe.imports_passed_through():
     from sientia_do.observability.logger import Logger
     from sientia_do.observability.metrics_controller import MetricsController
     from sientia_do.observability.sientia_monitoring import SientiaMonitoring
-    from sientia_do.temporal.constants import DATETIME_FORMAT_WITH_TZ
     from sientia_do.repository.pi_web_api_client import PIWebAPIClient
+    from sientia_do.temporal.constants import DATETIME_FORMAT_WITH_TZ
 
 
 class API(SientiaMonitoring):

scouter/metrics.py

@@ -1,5 +1,4 @@
-from prometheus_client import Counter, Gauge, Histogram
-from sientia_do.observability.metrics import CORE_LABELS as SIENTIA_CORE_LABELS
+from prometheus_client import Counter, Gauge
 
 # Application health and status metrics
 APP_UP = Gauge(
@@ -23,4 +22,4 @@ TAG_CHANGES_MONITOR = Gauge(
     'scouter_tag_changes_monitor',
     'Current value change of each tag',
     [*CORE_LABELS, 'tag_name'],
-)
+)

scouter/worker/worker.py

@@ -9,17 +9,17 @@ with workflow.unsafe.imports_passed_through():
     import sys
 
     from prometheus_client import start_http_server
-    from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler
-    from sientia_do.observability.logger import get_logger
-
-    from scouter import metrics
-    from scouter.activities.activities import Activities
     from sientia_do.connectors_config import (
         build_api_config,
         build_mongodb_config,
         build_postgres_config,
         build_redis_config,
     )
+    from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler
+    from sientia_do.observability.logger import get_logger
+
+    from scouter import metrics
+    from scouter.activities.activities import Activities
     from scouter.workflow.pi_web_api_scouter import PIWebAPIScouter
     from scouter.workflow.scouter import Scouter
     from scouter.workflow.sub_workflows.core_scouter import CoreScouter

scouter/workflow/sub_workflows/core_scouter.py

@@ -109,7 +109,7 @@ class CoreScouter:
                 'schema': input_data['schema'],
                 'table_name': input_data['table_name'],
                 'data': held_data,
-                'timestamp_conversion': {'column': 'timestamp', 'format': DATETIME_FORMAT_WITH_TZ}
+                'timestamp_conversion': {'column': 'timestamp', 'format': DATETIME_FORMAT_WITH_TZ},
             },
             retry_policy=retry_policy,
             start_to_close_timeout=timedelta(seconds=60),

tests/workflow/sub_workflows/test_core_scouter.py

@@ -118,8 +118,6 @@ async def test_core_scouter_workflow_success(mock_workflow, core_scouter):
                         'column': 'timestamp',
                         'format': DATETIME_FORMAT_WITH_TZ,
                     },
-                    'on_conflict': 'ignore',
-                    'unique_columns': ['model_id', 'timestamp', 'variable'],
                 },
                 retry_policy=ANY,
                 start_to_close_timeout=ANY,
@@ -305,8 +303,6 @@ async def test_core_scouter_workflow_with_zero_affected_rows(mock_workflow, core
                 'column': 'timestamp',
                 'format': DATETIME_FORMAT_WITH_TZ,
             },
-            'on_conflict': 'ignore',
-            'unique_columns': ['model_id', 'timestamp', 'variable'],
         },
         retry_policy=ANY,
         start_to_close_timeout=ANY,
@@ -377,8 +373,6 @@ async def test_core_scouter_workflow_without_debug_data_package(mock_workflow, c
                         'column': 'timestamp',
                         'format': DATETIME_FORMAT_WITH_TZ,
                     },
-                    'on_conflict': 'ignore',
-                    'unique_columns': ['model_id', 'timestamp', 'variable'],
                 },
                 retry_policy=ANY,
                 start_to_close_timeout=ANY,