From 176e31744ce2fad53a47fdbe33c7d204993dee79 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Tue, 26 Nov 2024 09:59:25 +0100 Subject: [PATCH 1/3] 78: Add parameter relation config to simulator workflow in workflow_config.json. --- config/workflow_config.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/workflow_config.json b/config/workflow_config.json index ca7b200..f8fe35d 100644 --- a/config/workflow_config.json +++ b/config/workflow_config.json @@ -33,6 +33,13 @@ "parameter_type": "datetime", "key_name": "end_time" } + ], + "parameter_relations": [ + { + "key_1": "start_time", + "key_2": "end_time", + "relation": "smaller" + } ] } ] \ No newline at end of file From 85e3e4ec9a7b193cf76546348a5fae0379b8096a Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Tue, 8 Apr 2025 16:34:53 +0200 Subject: [PATCH 2/3] 78: Move ParameterRelation from Workflow to the parameter of a workflow in the default workflow_config.json --- config/workflow_config.json | 15 +++++++-------- omotes-system-at-orchestrator | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config/workflow_config.json b/config/workflow_config.json index f8fe35d..3077972 100644 --- a/config/workflow_config.json +++ b/config/workflow_config.json @@ -27,19 +27,18 @@ }, { "parameter_type": "datetime", - "key_name": "start_time" + "key_name": "start_time", + "constraints": [ + { + "other_key_name": "end_time", + "relation": "smaller" + } + ] }, { "parameter_type": "datetime", "key_name": "end_time" } - ], - "parameter_relations": [ - { - "key_1": "start_time", - "key_2": "end_time", - "relation": "smaller" - } ] } ] \ No newline at end of file diff --git a/omotes-system-at-orchestrator b/omotes-system-at-orchestrator index d51707f..68e4e36 160000 --- a/omotes-system-at-orchestrator +++ b/omotes-system-at-orchestrator @@ -1 +1 @@ -Subproject commit d51707fe6222563572b35d68f0b5ea191d228ea1 +Subproject commit 68e4e3685980cef4aabaa77a5fd79602b4bca909 From 65bafa1465cf4781f1243f9f9ccaf22f17f48784 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Mon, 14 Apr 2025 17:04:45 +0200 Subject: [PATCH 3/3] 78: Update SDK. --- dev-requirements.txt | 21 ++++++++++++++++++--- pyproject.toml | 2 +- requirements.txt | 9 ++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index cb3f0e4..8b67e39 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile --constraint=requirements.txt --extra=dev --output-file=dev-requirements.txt pyproject.toml @@ -69,6 +69,8 @@ dataclass-binder==0.3.4 # via # -c requirements.txt # orchestrator (pyproject.toml) +exceptiongroup==1.2.2 + # via pytest flake8==7.1.1 # via # flake8-bugbear @@ -144,11 +146,11 @@ mypy-extensions==1.0.0 # via # black # mypy -omotes-sdk-protocol==1.1.0 +omotes-sdk-protocol==1.2.0 # via # -c requirements.txt # omotes-sdk-python -omotes-sdk-python==4.1.0 +omotes-sdk-python==4.2.0 # via # -c requirements.txt # orchestrator (pyproject.toml) @@ -251,12 +253,25 @@ streamcapture==1.2.5 # via # -c requirements.txt # omotes-sdk-python +tomli==2.2.1 + # via + # -c requirements.txt + # black + # build + # coverage + # dataclass-binder + # flake8-pyproject + # mypy + # pytest + # setuptools-git-versioning types-protobuf==4.24.0.20240408 # via orchestrator (pyproject.toml) typing-extensions==4.13.2 # via # -c requirements.txt # alembic + # black + # multidict # mypy # omotes-sdk-python # sqlalchemy diff --git a/pyproject.toml b/pyproject.toml index 09c1e74..8ead396 100644 --- 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 ~= 4.1.0", + "omotes-sdk-python ~= 4.2.0", "alembic ~= 1.13.1", "influxdb ~= 5.3.2", ] diff --git a/requirements.txt b/requirements.txt index 8c3ef3b..dec91b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile --output-file=requirements.txt pyproject.toml @@ -58,9 +58,9 @@ msgpack==1.1.0 # via influxdb multidict==6.4.3 # via yarl -omotes-sdk-protocol==1.1.0 +omotes-sdk-protocol==1.2.0 # via omotes-sdk-python -omotes-sdk-python==4.1.0 +omotes-sdk-python==4.2.0 # via orchestrator (pyproject.toml) ordered-set==4.1.0 # via pyecore @@ -102,9 +102,12 @@ sqlalchemy==2.0.40 # orchestrator (pyproject.toml) streamcapture==1.2.5 # via omotes-sdk-python +tomli==2.2.1 + # via dataclass-binder typing-extensions==4.13.2 # via # alembic + # multidict # omotes-sdk-python # sqlalchemy tzdata==2025.2