diff --git a/orchestrator/activities/activities.py b/orchestrator/activities/activities.py index 02437c2..23c0ace 100644 --- a/orchestrator/activities/activities.py +++ b/orchestrator/activities/activities.py @@ -10,7 +10,7 @@ with workflow.unsafe.imports_passed_through(): from orchestrator.activities.formatters import Formatters from typing import Any from logging import Logger - from sientia_do.notifications.handlers import NotificationHandler + from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler class Activities( # Couchbase, diff --git a/orchestrator/activities/couchbase.py b/orchestrator/activities/couchbase.py index 4e22777..7a6e1cd 100644 --- a/orchestrator/activities/couchbase.py +++ b/orchestrator/activities/couchbase.py @@ -9,7 +9,7 @@ with workflow.unsafe.imports_passed_through(): from couchbase.auth import PasswordAuthenticator from couchbase.cluster import Cluster from couchbase.options import ClusterOptions - 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 diff --git a/orchestrator/activities/formatters.py b/orchestrator/activities/formatters.py index ca1e1f1..3d758e1 100644 --- a/orchestrator/activities/formatters.py +++ b/orchestrator/activities/formatters.py @@ -7,7 +7,7 @@ with workflow.unsafe.imports_passed_through(): from typing import Any from logging import Logger from datetime import datetime - 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.notifications.models import NotificationLevel from orchestrator.utils.orchestrator_functions import ( diff --git a/orchestrator/activities/mongo_db.py b/orchestrator/activities/mongo_db.py index 2c38012..9fa5db8 100644 --- a/orchestrator/activities/mongo_db.py +++ b/orchestrator/activities/mongo_db.py @@ -7,7 +7,7 @@ with workflow.unsafe.imports_passed_through(): import traceback from logging import Logger from pymongo import MongoClient - 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 orchestrator.utils.patterns import DEFAULT_DATE_FORMAT diff --git a/orchestrator/activities/slot_manager.py b/orchestrator/activities/slot_manager.py index cf2e49f..5f34b1e 100644 --- a/orchestrator/activities/slot_manager.py +++ b/orchestrator/activities/slot_manager.py @@ -5,7 +5,7 @@ with workflow.unsafe.imports_passed_through(): import json from logging import Logger from sientia_do.temporal.activities.redis_base import Redis - from sientia_do.notifications.handlers import NotificationHandler + from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler class SlotManager(Redis): diff --git a/orchestrator/activities/temporal_manager.py b/orchestrator/activities/temporal_manager.py index 7b4b929..8eddeb0 100644 --- a/orchestrator/activities/temporal_manager.py +++ b/orchestrator/activities/temporal_manager.py @@ -6,7 +6,7 @@ from temporalio.common import SearchAttributeKey, SearchAttributePair, TypedSear with workflow.unsafe.imports_passed_through(): from typing import Any from logging import Logger - 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 google.protobuf.json_format import MessageToDict import base64 diff --git a/orchestrator/worker/worker.py b/orchestrator/worker/worker.py index a0f58bd..908de5a 100644 --- a/orchestrator/worker/worker.py +++ b/orchestrator/worker/worker.py @@ -14,7 +14,7 @@ with workflow.unsafe.imports_passed_through(): build_redis_config, build_mongodb_config ) - 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 @@ -26,8 +26,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'], logger=logger, project_name=os.getenv('PROJECT_NAME', 'orchestrator'), ) diff --git a/values.yaml b/values.yaml index 7eecab2..c9e54cd 100644 --- a/values.yaml +++ b/values.yaml @@ -132,7 +132,7 @@ env: - name: GITHUB_REPO_URL value: "git@github.com:Aignosi/sientia-dataops-orchestrator_temporal.git" - name: GITHUB_BRANCH - value: "SIENTIAPDE-1150-ajustar-orquestrador-para-manter-uma-store-de-detalhes-dos-schedules" + value: "SIENTIAPDE-1163-alterar-dinamica-de-notificacoes-para-usar-o-mongodb-ao-inves-do-kafka" - name: PYTHON_APP value: "orchestrator.worker.worker"