Skip to content

Add profile information #62

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
samvanderzwan merged 25 commits into from
Dec 8, 2025
Merged

Add profile information #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8c7c3b6
support multiple workflow types
MarkTNO Jun 17, 2025
dee3475
Added datasource to the profile and added input type.
samvanderzwan Oct 2, 2025
8de3625
Added datasources to the esdl and put reference creation in the loop …
samvanderzwan Oct 2, 2025
3f28891
Corrected info in the datasource
samvanderzwan Oct 2, 2025
24be3c9
fixed linting error
samvanderzwan Oct 2, 2025
32b3c0b
Upgraded simulator core to latest version
samvanderzwan Oct 9, 2025
52df70f
update omotes-sdk-python and pyesdl
MarkTNO Oct 10, 2025
f513bb4
merge main
MarkTNO Oct 10, 2025
fdb5a7a
updated deps
MarkTNO Oct 10, 2025
f0a14c7
Merge pull request #56 from Project-OMOTES/55-support-multiple-workfl…
MarkTNO Oct 10, 2025
bec866d
Added datasource to the profile and added input type.
samvanderzwan Oct 2, 2025
a253cd8
Added datasources to the esdl and put reference creation in the loop …
samvanderzwan Oct 2, 2025
ab23c13
Corrected info in the datasource
samvanderzwan Oct 2, 2025
1615eb5
fixed linting error
samvanderzwan Oct 2, 2025
a563afa
Upgraded simulator core to latest version
samvanderzwan Oct 9, 2025
05fd68c
Merge branch 'add-profile-information' of https://github.com/Project-…
samvanderzwan Oct 17, 2025
d1753cf
Updated to use pyesdl newest version
samvanderzwan Oct 17, 2025
14a09b8
Set versiion correct and set output isntead of input
samvanderzwan Oct 20, 2025
35dbf80
Added missing import
samvanderzwan Oct 20, 2025
59495d2
Increased version number of simulator core
samvanderzwan Oct 23, 2025
07e797f
Increased version nuber of java and simulator core
samvanderzwan Oct 24, 2025
8c37a6d
Changed to JAVA 21,
samvanderzwan Oct 24, 2025
9dcc5a0
Increased to use lates release of simulator core
samvanderzwan Nov 14, 2025
06380da
Upgrade to latest version of simualtor core
samvanderzwan Dec 8, 2025
1b5c6ae
update dev requriements
samvanderzwan Dec 8, 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
18 changes: 14 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@ FROM python:3.11-slim-bookworm

WORKDIR /app/simulator_worker

# Install OpenJDK-17
RUN apt-get -y update && \
apt-get install -y openjdk-17-jdk && \
apt-get clean;

# Install required tools and OpenJDK 21 manually
RUN apt-get update && \
apt-get install -y wget tar ca-certificates && \
apt-get clean && \
wget https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz && \
tar -xzf openjdk-21.0.2_linux-x64_bin.tar.gz && \
mv jdk-21.0.2 /usr/local/openjdk-21 && \
rm openjdk-21.0.2_linux-x64_bin.tar.gz

# Set environment variables for Java
ENV JAVA_HOME=/usr/local/openjdk-21
ENV PATH="$JAVA_HOME/bin:$PATH"


COPY . /app/simulator_worker/
WORKDIR /app/simulator_worker
Expand Down
70 changes: 38 additions & 32 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ amqp==5.3.1
# via
# -c ..\..\requirements.txt
# kombu
attrs==25.3.0
attrs==25.4.0
# via flake8-bugbear
billiard==4.2.1
billiard==4.2.2
# via
# -c ..\..\requirements.txt
# celery
black==24.10.0
# via simulator-worker (..\..\pyproject.toml)
build==1.2.2.post1
# via simulator-worker (..\..\pyproject.toml)
celery==5.5.1
celery==5.5.3
# via
# -c ..\..\requirements.txt
# omotes-sdk-python
certifi==2025.1.31
certifi==2025.10.5
# via
# -c ..\..\requirements.txt
# requests
charset-normalizer==3.4.1
charset-normalizer==3.4.3
# via
# -c ..\..\requirements.txt
# requests
click==8.1.8
click==8.3.0
# via
# -c ..\..\requirements.txt
# black
Expand All @@ -50,7 +50,7 @@ click-didyoumean==0.3.1
# via
# -c ..\..\requirements.txt
# celery
click-plugins==1.1.1
click-plugins==1.1.1.2
# via
# -c ..\..\requirements.txt
# celery
Expand All @@ -68,7 +68,7 @@ coolprop==6.6.0
# via
# -c ..\..\requirements.txt
# omotes-simulator-core
coverage[toml]==7.8.0
coverage[toml]==7.10.7
# via pytest-cov
dataclass-wizard==0.22.3
# via
Expand Down Expand Up @@ -111,57 +111,63 @@ iniconfig==2.1.0
# via pytest
isort==5.13.2
# via simulator-worker (..\..\pyproject.toml)
kombu==5.5.2
kombu==5.5.4
# via
# -c ..\..\requirements.txt
# celery
lxml==5.3.2
lxml==6.0.2
# via
# -c ..\..\requirements.txt
# pyecore
mccabe==0.7.0
# via flake8
msgpack==1.1.0
msgpack==1.1.2
# via
# -c ..\..\requirements.txt
# influxdb
multidict==6.4.3
multidict==6.7.0
# via
# -c ..\..\requirements.txt
# yarl
mypy==1.13.0
# via simulator-worker (..\..\pyproject.toml)
mypy-extensions==1.0.0
mypy-extensions==1.1.0
# via
# black
# mypy
networkx==2.7.1
# via
# -c ..\..\requirements.txt
# omotes-simulator-core
numpy==2.1.3
# via
# -c ..\..\requirements.txt
# omotes-simulator-core
# pandas
# pandas-stubs
# scipy
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.3.2
# via
# -c ..\..\requirements.txt
# simulator-worker (..\..\pyproject.toml)
omotes-simulator-core==0.0.20
omotes-simulator-core==0.0.28
# via
# -c ..\..\requirements.txt
# simulator-worker (..\..\pyproject.toml)
ordered-set==4.1.0
# via
# -c ..\..\requirements.txt
# pyecore
packaging==24.2
packaging==25.0
# via
# -c ..\..\requirements.txt
# black
# build
# kombu
# pytest
# setuptools-git-versioning
pamqp==3.3.0
Expand All @@ -178,31 +184,31 @@ pandas-stubs==2.1.4.231227
# via simulator-worker (..\..\pyproject.toml)
pathspec==0.12.1
# via black
platformdirs==4.3.7
platformdirs==4.5.0
# via black
pluggy==1.5.0
pluggy==1.6.0
# via pytest
prompt-toolkit==3.0.50
prompt-toolkit==3.0.52
# via
# -c ..\..\requirements.txt
# click-repl
propcache==0.3.1
propcache==0.4.1
# via
# -c ..\..\requirements.txt
# yarl
protobuf==5.29.4
protobuf==5.29.5
# via
# -c ..\..\requirements.txt
# omotes-sdk-protocol
pycodestyle==2.12.1
# via flake8
pydocstyle==6.3.0
# via flake8-docstrings
pyecore==0.12.1
pyecore==0.13.2
# via
# -c ..\..\requirements.txt
# pyesdl
pyesdl==24.2
pyesdl==25.7
# via
# -c ..\..\requirements.txt
# omotes-sdk-python
Expand Down Expand Up @@ -237,11 +243,11 @@ pytz==2025.2
# -c ..\..\requirements.txt
# influxdb
# pandas
requests==2.32.3
requests==2.32.5
# via
# -c ..\..\requirements.txt
# influxdb
restrictedpython==8.1a1.dev0
restrictedpython==8.0
# via
# -c ..\..\requirements.txt
# pyecore
Expand All @@ -257,15 +263,15 @@ six==1.17.0
# flake8-tuple
# influxdb
# python-dateutil
snowballstemmer==2.2.0
snowballstemmer==3.0.1
# via pydocstyle
streamcapture==1.2.5
# via
# -c ..\..\requirements.txt
# omotes-sdk-python
types-pytz==2025.2.0.20250326
types-pytz==2025.2.0.20250809
# via pandas-stubs
typing-extensions==4.13.2
typing-extensions==4.15.0
# via
# -c ..\..\requirements.txt
# mypy
Expand All @@ -275,7 +281,7 @@ tzdata==2025.2
# -c ..\..\requirements.txt
# kombu
# pandas
urllib3==2.4.0
urllib3==2.5.0
# via
# -c ..\..\requirements.txt
# requests
Expand All @@ -285,13 +291,13 @@ vine==5.1.0
# amqp
# celery
# kombu
wcwidth==0.2.13
wcwidth==0.2.14
# via
# -c ..\..\requirements.txt
# prompt-toolkit
wheel==0.45.1
# via simulator-worker (..\..\pyproject.toml)
yarl==1.19.0
yarl==1.22.0
# via
# -c ..\..\requirements.txt
# aio-pika
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dynamic = ["version"]
authors = [{ name = "Michiel Tukker", email = "michiel.tukker@deltares.nl" }]
description = "Nieuwe Warmte Nu / OMOTES: simulator-worker."
readme = "README.md"
license = {file = "LICENSE"}
license = { file = "LICENSE" }
classifiers = [
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Programming Language :: Python :: 3",
Expand All @@ -21,9 +21,9 @@ classifiers = [

dependencies = [
"python-dotenv ~= 1.0.0",
"omotes-sdk-python ~= 4.3.1",
"omotes-simulator-core==0.0.21",
"pyesdl==25.5.1",
"omotes-sdk-python ~= 4.3.2",
"omotes-simulator-core==0.0.28",
"pyesdl==25.7",
"pandas ~= 2.2.2"
]

Expand Down
52 changes: 28 additions & 24 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ aiormq==6.8.1
# via aio-pika
amqp==5.3.1
# via kombu
billiard==4.2.1
billiard==4.2.2
# via celery
celery==5.5.1
celery==5.5.3
# via omotes-sdk-python
certifi==2025.1.31
certifi==2025.10.5
# via requests
charset-normalizer==3.4.1
charset-normalizer==3.4.3
# via requests
click==8.1.8
click==8.3.0
# via
# celery
# click-didyoumean
# click-plugins
# click-repl
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
click-plugins==1.1.1.2
# via celery
click-repl==0.3.0
# via celery
Expand All @@ -44,27 +44,31 @@ idna==3.10
# yarl
influxdb==5.3.2
# via omotes-simulator-core
kombu==5.5.2
kombu==5.5.4
# via celery
lxml==5.3.2
lxml==6.0.2
# via pyecore
msgpack==1.1.0
msgpack==1.1.2
# via influxdb
multidict==6.4.3
multidict==6.7.0
# via yarl
networkx==2.7.1
# via omotes-simulator-core
numpy==2.1.3
# via
# omotes-simulator-core
# pandas
# scipy
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.3.2
# via simulator-worker (..\..\pyproject.toml)
omotes-simulator-core==0.0.20
omotes-simulator-core==0.0.28
# via simulator-worker (..\..\pyproject.toml)
ordered-set==4.1.0
# via pyecore
packaging==25.0
# via kombu
pamqp==3.3.0
# via
# aiormq
Expand All @@ -73,15 +77,15 @@ pandas==2.2.3
# via
# omotes-simulator-core
# simulator-worker (..\..\pyproject.toml)
prompt-toolkit==3.0.50
prompt-toolkit==3.0.52
# via click-repl
propcache==0.3.1
propcache==0.4.1
# via yarl
protobuf==5.29.4
protobuf==5.29.5
# via omotes-sdk-protocol
pyecore==0.12.1
pyecore==0.13.2
# via pyesdl
pyesdl==24.2
pyesdl==25.7
# via
# omotes-sdk-python
# omotes-simulator-core
Expand All @@ -99,9 +103,9 @@ pytz==2025.2
# via
# influxdb
# pandas
requests==2.32.3
requests==2.32.5
# via influxdb
restrictedpython==8.1a1.dev0
restrictedpython==8.0
# via pyecore
scipy==1.14.1
# via omotes-simulator-core
Expand All @@ -111,22 +115,22 @@ six==1.17.0
# python-dateutil
streamcapture==1.2.5
# via omotes-sdk-python
typing-extensions==4.13.2
typing-extensions==4.15.0
# via omotes-sdk-python
tzdata==2025.2
# via
# kombu
# pandas
urllib3==2.4.0
urllib3==2.5.0
# via requests
vine==5.1.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.13
wcwidth==0.2.14
# via prompt-toolkit
yarl==1.19.0
yarl==1.22.0
# via
# aio-pika
# aiormq
Expand Down
Loading