SIENTIAPDE-1141
refactor: remove commented-out code and improve timeout settings in orchestrator.py and test_activities.py
This commit is contained in:
@@ -14,27 +14,6 @@ class Orchestrator:
|
||||
|
||||
input_data['workflow_name'] = 'orchestrator'
|
||||
|
||||
await workflow.execute_local_activity_method(
|
||||
Activities.prepare_activity,
|
||||
{
|
||||
'workflow_name': input_data['workflow_name'],
|
||||
'schedule_name': input_data['schedule_name'],
|
||||
'model_name': '-',
|
||||
'model_id': '-'
|
||||
},
|
||||
retry_policy=retry_policy,
|
||||
start_to_close_timeout=timedelta(seconds=600)
|
||||
)
|
||||
|
||||
# pipeline_config_handler = workflow.execute_local_activity_method(
|
||||
# Activities.load_query_from_couchbase,
|
||||
# {
|
||||
# 'query': input_data['pipelines_query']
|
||||
# },
|
||||
# retry_policy=retry_policy,
|
||||
# start_to_close_timeout=timedelta(seconds=60)
|
||||
# )
|
||||
|
||||
pipeline_config_handler = workflow.execute_local_activity_method(
|
||||
Activities.aggregate_documents_in_mongodb,
|
||||
{
|
||||
@@ -44,15 +23,6 @@ class Orchestrator:
|
||||
start_to_close_timeout=timedelta(seconds=60)
|
||||
)
|
||||
|
||||
# opc_servers_handler = workflow.execute_local_activity_method(
|
||||
# Activities.load_query_from_couchbase,
|
||||
# {
|
||||
# 'query': input_data['opc_servers_query']
|
||||
# },
|
||||
# retry_policy=retry_policy,
|
||||
# start_to_close_timeout=timedelta(seconds=60)
|
||||
# )
|
||||
|
||||
opc_servers_handler = workflow.execute_local_activity_method(
|
||||
Activities.find_documents_in_mongodb,
|
||||
{
|
||||
@@ -65,7 +35,7 @@ class Orchestrator:
|
||||
orchestrated_schedules_handler = workflow.execute_local_activity_method(
|
||||
Activities.load_schedule,
|
||||
retry_policy=retry_policy,
|
||||
start_to_close_timeout=timedelta(seconds=60)
|
||||
start_to_close_timeout=timedelta(seconds=600)
|
||||
)
|
||||
|
||||
current_slot_config_handler = workflow.execute_local_activity_method(
|
||||
|
||||
@@ -8,21 +8,13 @@ from orchestrator.activities.slot_manager import SlotManager
|
||||
from orchestrator.activities.formatters import Formatters
|
||||
|
||||
|
||||
@patch('orchestrator.activities.couchbase.Couchbase.__init__')
|
||||
@patch('orchestrator.activities.mongo_db.MongoDB.__init__')
|
||||
@patch('orchestrator.activities.temporal_manager.TemporalManager.__init__')
|
||||
@patch('orchestrator.activities.slot_manager.SlotManager.__init__')
|
||||
@patch('orchestrator.activities.formatters.Formatters.__init__')
|
||||
def test___init__(mock_formatters_init, mock_slot_manager_init,
|
||||
mock_temporal_manager_init,
|
||||
mock_mongodb_init,
|
||||
mock_couchbase_init):
|
||||
|
||||
couchbase_config = {
|
||||
'connection_string': 'couchbase://localhost',
|
||||
'username': 'admin',
|
||||
'password': 'password'
|
||||
}
|
||||
mock_mongodb_init):
|
||||
|
||||
mongo_db_config = {
|
||||
'connection_string': 'mongodb://localhost:27017',
|
||||
@@ -42,7 +34,6 @@ def test___init__(mock_formatters_init, mock_slot_manager_init,
|
||||
|
||||
activities = Activities(
|
||||
temporal_client=temporal_client,
|
||||
# couchbase_config=couchbase_config,
|
||||
redis_config=redis_config,
|
||||
mongodb_config=mongo_db_config,
|
||||
logger=logger,
|
||||
@@ -50,7 +41,6 @@ def test___init__(mock_formatters_init, mock_slot_manager_init,
|
||||
)
|
||||
|
||||
assert isinstance(activities, Activities)
|
||||
# assert isinstance(activities, Couchbase)
|
||||
assert isinstance(activities, MongoDB)
|
||||
assert isinstance(activities, TemporalManager)
|
||||
assert isinstance(activities, SlotManager)
|
||||
@@ -66,15 +56,6 @@ def test___init__(mock_formatters_init, mock_slot_manager_init,
|
||||
notification_handler=notification_handler
|
||||
)
|
||||
|
||||
# mock_couchbase_init.assert_called_once_with(
|
||||
# ANY,
|
||||
# connection_string=couchbase_config['connection_string'],
|
||||
# username=couchbase_config['username'],
|
||||
# password=couchbase_config['password'],
|
||||
# logger=logger,
|
||||
# notification_handler=notification_handler
|
||||
# )
|
||||
|
||||
mock_mongodb_init.assert_called_once_with(
|
||||
ANY,
|
||||
connection_string='mongodb://localhost:27017',
|
||||
|
||||
Reference in New Issue
Block a user