diff --git a/laborious/activities/activities.py b/laborious/activities/activities.py index 2156009..3e47efe 100644 --- a/laborious/activities/activities.py +++ b/laborious/activities/activities.py @@ -2,7 +2,7 @@ from temporalio import activity, 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 laborious.activities.mlflow import MLFlow from laborious.activities.gates import Gates diff --git a/laborious/activities/gates.py b/laborious/activities/gates.py index 10d3f64..2a54052 100644 --- a/laborious/activities/gates.py +++ b/laborious/activities/gates.py @@ -3,7 +3,7 @@ from temporalio import activity, workflow with workflow.unsafe.imports_passed_through(): import traceback - 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/laborious/activities/mlflow.py b/laborious/activities/mlflow.py index 4b8c129..bc0113e 100644 --- a/laborious/activities/mlflow.py +++ b/laborious/activities/mlflow.py @@ -5,7 +5,7 @@ from temporalio import activity, workflow with workflow.unsafe.imports_passed_through(): from sientia_do.temporal.activities.base import BaseActivity - 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 laborious.utils.repository.model_repository import MLFlowRepository from typing import Any diff --git a/laborious/activities/opc.py b/laborious/activities/opc.py index 6b62e22..85a9ebe 100644 --- a/laborious/activities/opc.py +++ b/laborious/activities/opc.py @@ -2,7 +2,7 @@ from temporalio import activity, workflow with workflow.unsafe.imports_passed_through(): - 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/laborious/utils/connectors_config.py b/laborious/utils/connectors_config.py index 49cce2b..5158f05 100644 --- a/laborious/utils/connectors_config.py +++ b/laborious/utils/connectors_config.py @@ -44,3 +44,15 @@ def build_opc_config(): 'reconnection_interval': int(getenv('OPC_RECONNECTION_INTERVAL', '120')) } } + + +def build_mongodb_config(): + username = getenv('MONGODB_USERNAME', 'sientia') + password = getenv('MONGODB_PASSWORD', 'sientia') + uri = getenv('MONGODB_URL', 'localhost:27017') + + connection_string = f'mongodb://{username}:{password}@{uri}' + return { + 'connection_string': connection_string, + 'database_name': getenv('MONGODB_DATABASE_NAME', 'sientia') + } diff --git a/laborious/utils/repository/opc_repository.py b/laborious/utils/repository/opc_repository.py index f0a768e..4a436e6 100644 --- a/laborious/utils/repository/opc_repository.py +++ b/laborious/utils/repository/opc_repository.py @@ -6,7 +6,7 @@ from asyncua.sync import Client from asyncua.crypto.security_policies import SecurityPolicyBasic256 from asyncua.ua import DataValue, Variant, VariantType, DateTime from regex import F -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.utils.logger import Logger diff --git a/laborious/worker/worker.py b/laborious/worker/worker.py index d2879e3..005bb18 100644 --- a/laborious/worker/worker.py +++ b/laborious/worker/worker.py @@ -14,9 +14,10 @@ with workflow.unsafe.imports_passed_through(): from laborious.utils.connectors_config import ( build_postgres_config, build_mlflow_config, - build_opc_config + build_opc_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 @@ -28,10 +29,12 @@ 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', 'laborious'), + project_name=os.getenv('PROJECT_NAME', 'laborious') ) logger.info('Starting Activities...') diff --git a/values.yaml b/values.yaml index 61c5ea7..06be537 100644 --- a/values.yaml +++ b/values.yaml @@ -123,7 +123,7 @@ env: - name: GITHUB_REPO_URL value: "git@github.com:Aignosi/sientia-dataops-laborious_temporal.git" - name: GITHUB_BRANCH - value: "SIENTIAPDE-1148-separar-scouter-laborious-e-orchestrator-por-namespaces" + value: "SIENTIAPDE-1154-otimizar-conexao-com-banco-de-dados-e-paralelismo" - name: PYTHON_APP value: "laborious.worker.worker"