From f2b648ead272ea66908462fd8ae3336b8ca644f4 Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Thu, 8 Jan 2026 16:20:10 -0300 Subject: [PATCH] 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 | 2 +- scouter/metrics.py | 5 ++--- scouter/worker/worker.py | 10 +++++----- scouter/workflow/sub_workflows/core_scouter.py | 2 +- tests/workflow/sub_workflows/test_core_scouter.py | 6 ------ 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/scouter/activities/api.py b/scouter/activities/api.py index 1b1c282..045b415 100644 --- a/scouter/activities/api.py +++ b/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): diff --git a/scouter/metrics.py b/scouter/metrics.py index a89be12..b25fa46 100644 --- a/scouter/metrics.py +++ b/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'], -) \ No newline at end of file +) diff --git a/scouter/worker/worker.py b/scouter/worker/worker.py index d518f66..2ee4ee6 100644 --- a/scouter/worker/worker.py +++ b/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 diff --git a/scouter/workflow/sub_workflows/core_scouter.py b/scouter/workflow/sub_workflows/core_scouter.py index 13b7942..e395979 100644 --- a/scouter/workflow/sub_workflows/core_scouter.py +++ b/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), diff --git a/tests/workflow/sub_workflows/test_core_scouter.py b/tests/workflow/sub_workflows/test_core_scouter.py index 608985e..91e0fdd 100644 --- a/tests/workflow/sub_workflows/test_core_scouter.py +++ b/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,