Merge branch 'main' into 78-add-variable-conditional-relations-in-wor…

…kflow-definition-including-smaller-and-greater-than
Project-OMOTES · Nov 28, 2024 · fb3f9b2 · fb3f9b2
2 parents 176e317 + cf5ad69
commit fb3f9b2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -115,11 +115,11 @@ mypy-extensions==1.0.0
     # via
     #   black
     #   mypy
-omotes-sdk-protocol==0.1.6
+omotes-sdk-protocol==0.1.13
     # via
     #   -c requirements.txt
     #   omotes-sdk-python
-omotes-sdk-python==3.2.4
+omotes-sdk-python==3.2.5
     # via
     #   -c requirements.txt
     #   orchestrator (pyproject.toml)

diff --git a/integration_test/docker-compose.override.yml b/integration_test/docker-compose.override.yml
@@ -23,6 +23,9 @@ services:
       RABBITMQ_VIRTUALHOST: omotes_celery
       LOG_LEVEL: ${LOG_LEVEL}
       WORKER_TYPE: NO_FAULT
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
 
   test_hard_crash_worker:
     <<: *test_worker

diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ dependencies = [
     "sqlalchemy ~= 2.0.27",
     "psycopg2-binary ~= 2.9.9",
     "celery ~= 5.3.6",
-    "omotes-sdk-python ~= 3.2.4",
+    "omotes-sdk-python ~= 3.2.5",
     "alembic ~= 1.13.1",
 ]
 

diff --git a/requirements.txt b/requirements.txt
@@ -48,9 +48,9 @@ markupsafe==2.1.5
     # via mako
 multidict==6.0.5
     # via yarl
-omotes-sdk-protocol==0.1.6
+omotes-sdk-protocol==0.1.13
     # via omotes-sdk-python
-omotes-sdk-python==3.2.4
+omotes-sdk-python==3.2.5
     # via orchestrator (pyproject.toml)
 ordered-set==4.1.0
     # via pyecore

diff --git a/src/omotes_orchestrator/main.py b/src/omotes_orchestrator/main.py
@@ -10,7 +10,7 @@
 
 from omotes_orchestrator.postgres_interface import PostgresInterface
 from omotes_orchestrator.postgres_job_manager import PostgresJobManager
-from omotes_sdk.internal.orchestrator_worker_events.messages.task_pb2 import (
+from omotes_sdk_protocol.internal.task_pb2 import (
     TaskResult,
     TaskProgressUpdate,
 )
@@ -477,6 +477,7 @@ def task_result_received(self, task_result: TaskResult) -> None:
                         result_type=JobResult.ResultType.SUCCEEDED,
                         output_esdl=task_result.output_esdl,
                         logs=task_result.logs,
+                        esdl_messages=task_result.esdl_messages,
                     ),
                 )
                 self._cleanup_job(job.id)
@@ -493,6 +494,7 @@ def task_result_received(self, task_result: TaskResult) -> None:
                         result_type=JobResult.ResultType.ERROR,
                         output_esdl=task_result.output_esdl,
                         logs=task_result.logs,
+                        esdl_messages=task_result.esdl_messages,
                     ),
                 )
                 self._cleanup_job(job.id)

diff --git a/src/omotes_orchestrator/worker_interface.py b/src/omotes_orchestrator/worker_interface.py
@@ -3,7 +3,7 @@
 from typing import Callable
 
 from omotes_sdk.internal.common.broker_interface import BrokerInterface, AMQPQueueType
-from omotes_sdk.internal.orchestrator_worker_events.messages.task_pb2 import (
+from omotes_sdk_protocol.internal.task_pb2 import (
     TaskResult,
     TaskProgressUpdate,
 )

diff --git a/unit_test/test_main.py b/unit_test/test_main.py
@@ -11,7 +11,7 @@
 
 from omotes_sdk.job import Job
 from omotes_sdk.workflow_type import WorkflowType
-from omotes_sdk.internal.orchestrator_worker_events.messages.task_pb2 import TaskProgressUpdate
+from omotes_sdk_protocol.internal.task_pb2 import TaskProgressUpdate
 from omotes_sdk_protocol.job_pb2 import JobSubmission, JobProgressUpdate, JobStatusUpdate, JobResult
 from google.protobuf import json_format
 from google.protobuf.struct_pb2 import Struct