From 95defccbf671c39fc937bd78df63f4e02b0a0e98 Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Wed, 16 Jul 2025 08:59:21 -0300 Subject: [PATCH] SIENTIAPDE-1163 Refactor notification handler imports across multiple files to use CoreNotificationHandler instead of NotificationHandler for consistency and clarity. --- scouter/activities/activities.py | 2 +- scouter/activities/faker.py | 2 +- scouter/activities/mongodb.py | 2 +- scouter/activities/redis.py | 2 +- scouter/worker/worker.py | 6 ++++-- tests/activities/test_faker.py | 2 +- tests/activities/test_redis.py | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scouter/activities/activities.py b/scouter/activities/activities.py index 59990b4..775f958 100644 --- a/scouter/activities/activities.py +++ b/scouter/activities/activities.py @@ -2,7 +2,7 @@ from temporalio import workflow with workflow.unsafe.imports_passed_through(): from sientia_do.temporal.activities.postgres import Postgres - from sientia_do.notifications.handlers import NotificationHandler + from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler from sientia_do.temporal.utils.logger import Logger from scouter.activities.redis import Redis from scouter.activities.gates import Gates diff --git a/scouter/activities/faker.py b/scouter/activities/faker.py index 49311ea..f8e5253 100644 --- a/scouter/activities/faker.py +++ b/scouter/activities/faker.py @@ -5,7 +5,7 @@ import json from kafka import KafkaProducer from temporalio import activity -from sientia_do.notifications.handlers import NotificationHandler +from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler from sientia_do.temporal.activities.base import BaseActivity from sientia_do.temporal.utils.logger import Logger diff --git a/scouter/activities/mongodb.py b/scouter/activities/mongodb.py index 2191d55..3189235 100644 --- a/scouter/activities/mongodb.py +++ b/scouter/activities/mongodb.py @@ -6,7 +6,7 @@ with workflow.unsafe.imports_passed_through(): from datetime import datetime from pymongo import MongoClient from pandas import DataFrame - from sientia_do.notifications.handlers import NotificationHandler + from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler from sientia_do.notifications.models import NotificationLevel from sientia_do.temporal.activities.base import BaseActivity from sientia_do.temporal.utils.logger import Logger diff --git a/scouter/activities/redis.py b/scouter/activities/redis.py index 9c1f3c6..9bad871 100644 --- a/scouter/activities/redis.py +++ b/scouter/activities/redis.py @@ -3,7 +3,7 @@ from temporalio import workflow, activity with workflow.unsafe.imports_passed_through(): from logging import Logger - from sientia_do.notifications.handlers import NotificationHandler + from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler from sientia_do.notifications.models import NotificationLevel from sientia_do.temporal.activities.redis_base import Redis as RedisBase from sientia_do.temporal.utils.logger import Logger diff --git a/scouter/worker/worker.py b/scouter/worker/worker.py index 87e3672..239ecd8 100644 --- a/scouter/worker/worker.py +++ b/scouter/worker/worker.py @@ -4,7 +4,7 @@ from temporalio.worker import Worker with workflow.unsafe.imports_passed_through(): import sys import os - from sientia_do.notifications.handlers import NotificationHandler + from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler from sientia_do.temporal.utils.logger import get_logger from scouter.activities.activities import Activities from scouter.workflow.scouter import Scouter @@ -28,8 +28,10 @@ async def main(): logger.info('Starting Notification Handler...') + mongo_config = build_mongodb_config() notification_handler = NotificationHandler( - servers=os.getenv('KAFKA_BOOTSTRAP_SERVERS', 'http://localhost:9092'), + connection_string=mongo_config['connection_string'], + database=mongo_config['database_name'], logger=logger, project_name=os.getenv('PROJECT_NAME', 'scouter') ) diff --git a/tests/activities/test_faker.py b/tests/activities/test_faker.py index 40f4893..0e3a61c 100644 --- a/tests/activities/test_faker.py +++ b/tests/activities/test_faker.py @@ -1,6 +1,6 @@ from unittest.mock import MagicMock, patch, call import pytest -from sientia_do.notifications.handlers import NotificationHandler +from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler from scouter.activities.faker import Faker diff --git a/tests/activities/test_redis.py b/tests/activities/test_redis.py index e158794..eff8d40 100644 --- a/tests/activities/test_redis.py +++ b/tests/activities/test_redis.py @@ -3,7 +3,7 @@ from datetime import datetime import pytest import numpy as np from pandas import DataFrame -from sientia_do.notifications.handlers import NotificationHandler +from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler from sientia_do.notifications.models import NotificationLevel from scouter.activities.redis import Redis