Skip to content

78: Add parameter relation config to simulator workflow in workflow_c… #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lfse-slafleur merged 6 commits into from
Apr 15, 2025
Merged

78: Add parameter relation config to simulator workflow in workflow_c… #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
176e317
78: Add parameter relation config to simulator workflow in workflow_c…
lfse-slafleur Nov 26, 2024
fb3f9b2
Merge branch 'main' into 78-add-variable-conditional-relations-in-wor…
lfse-slafleur Nov 28, 2024
3f4ce94
Merge branch 'main' into 78-add-variable-conditional-relations-in-wor…
lfse-slafleur Apr 8, 2025
85e3e4e
78: Move ParameterRelation from Workflow to the parameter of a workfl…
lfse-slafleur Apr 8, 2025
ee57168
Merge branch 'main' into 78-add-variable-conditional-relations-in-wor…
lfse-slafleur Apr 14, 2025
65bafa1
78: Update SDK.
lfse-slafleur Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion config/workflow_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@
},
{
"parameter_type": "datetime",
"key_name": "start_time"
"key_name": "start_time",
"constraints": [
{
"other_key_name": "end_time",
"relation": "smaller"
}
]
},
{
"parameter_type": "datetime",
Expand Down
21 changes: 18 additions & 3 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@MarkTNO MarkTNO Apr 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the Dockerfile we use 3.11, should this also be used to compile the requirements?

# by the following command:
#
# pip-compile --constraint=requirements.txt --extra=dev --output-file=dev-requirements.txt pyproject.toml
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
9 changes: 6 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@MarkTNO MarkTNO Apr 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use python 3.11?

# by the following command:
#
# pip-compile --output-file=requirements.txt pyproject.toml
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading