From a442174fb87c0a79053b22040c249181a6279037 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Tue, 27 Aug 2024 10:29:01 +0200 Subject: [PATCH 1/4] 95: Update optimizer-workers to 2.0.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8a1cc4d..7c2d8a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -125,7 +125,7 @@ services: condition: service_healthy grow_worker_optimizer: &grow_worker - image: ghcr.io/project-omotes/omotes-grow-optimizer-worker:2.0.1 + image: ghcr.io/project-omotes/omotes-grow-optimizer-worker:2.0.2 restart: unless-stopped deploy: replicas: 2 From 5000dd8d7ff88be00de1d0c6dd37897dc6a71e21 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Tue, 27 Aug 2024 10:30:41 +0200 Subject: [PATCH 2/4] 95: Append this PR To changelog. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d37bd5..eeeee2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,3 +14,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * 77: Update optimizer worker to 2.0.0 to include mesido 0.1.5.2 which also includes influxdb schema changes. by @lfse-slafleur in https://github.com/Project-OMOTES/omotes-system/pull/78 * 66: Workflow definitions are now shared by orchestrator with the SDK and are updated on any changes. by @MarkTNO in https://github.com/Project-OMOTES/omotes-system/pull/67 * 92: Update to SDK 3.0.0 and orchestrator 1.0.0 to integrate single job submission queue and multi-sdk support for sharing workflow definitions from the orchestrator to any SDK. by @lfse-slafleur in https://github.com/Project-OMOTES/omotes-system/pull/93 +* 95: Update optimizer worker to 2.0.2 which includes mesido 0.1.7.0. by @lfse-slafleur in https://github.com/Project-OMOTES/omotes-system/pull/96 From bd6b6b19a38a96c797bdf96c95ffc47e4364a6d6 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Wed, 4 Sep 2024 09:57:10 +0200 Subject: [PATCH 3/4] 95: Update expected output ESDLs for system test. Simulator changed the way dates work and optimizer now uses uuid for asset ids instead of the asset name. --- ...t__grow_optimizer_default__happy_path.esdl | 785 ++++++------- ...optimizer_default__happy_path_1source.esdl | 774 ++++++------- ...timizer_default__happy_path_2ndsource.esdl | 785 ++++++------- ...py_path_2ndsource_merit_order_swapped.esdl | 785 ++++++------- ..._optimizer_no_heat_losses__happy_path.esdl | 761 +++++++------ ...w_optimizer_with_pressure__happy_path.esdl | 849 +++++++------- .../test__grow_simulator__happy_path.esdl | 1002 ++++++++--------- .../output/test__simulator__happy_path.esdl | 104 +- 8 files changed, 3012 insertions(+), 2833 deletions(-) diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path.esdl index f143687..b1fc783 100644 --- a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path.esdl +++ b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path.esdl @@ -1,570 +1,603 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + - - - + + + + + + + + + + - + + + + + + - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - + + + + + + + - - + + - - - - - - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - + + - - + + - - - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - + + + + + + - - + + - + - + - + - - - - + + + + + - - + + - - + + - - - - + + + + + - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - + + + + + + + + + + + + + - + - - + + - - - - + + + + - - + + - - + + - + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_1source.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_1source.esdl index aa1a6e6..84204fc 100644 --- a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_1source.esdl +++ b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_1source.esdl @@ -1,570 +1,592 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + - - - + + + + + + + + + + - + + + + + + - - - + + + - - - - + + + + - - + + - - + + + - + - + - + - + + + + + + + - - + + - - - - - - - - - + + - - - - + + + + - - + + - - + + + - + - + - + - + + - - + + - - - - - + + + - - - - + + + + - - + + - - + + + - + - + - + - - - - - - - - - - + + + + - + + + + + + - - + + - - - - + + + + - - + + - - + + + - + - + - + - - - - + + + + + - - - - + + - - - - + + + + - - + + - - + + + - + - + - + - - - - - - - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource.esdl index 82be9a8..6b75ac2 100644 --- a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource.esdl +++ b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource.esdl @@ -1,570 +1,603 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + - - - + + + + + + + + + + - + + + + + + - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - + + + + + + + - - + + - - - - - - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - + + - - + + - - - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - + + + + + + - - + + - + - + - + - - - - + + + + + - - + + - - + + - - - - + + + + + - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - + + + + + + + + + + + + + - + - - + + - - - - + + + + - - + + - - + + - + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource_merit_order_swapped.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource_merit_order_swapped.esdl index 82b9407..83e30db 100644 --- a/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource_merit_order_swapped.esdl +++ b/system_tests/src/test_esdl/output/test__grow_optimizer_default__happy_path_2ndsource_merit_order_swapped.esdl @@ -1,570 +1,603 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + - - - + + + + + + + + + + - + + + + + + - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - + + + + + + + - - + + - - - - - - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - + + - - + + - - - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - + + + + + + - - + + - + - + - + - - - - + + + + + - - + + - - + + - - - - + + + + + - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - + + + + + + + + + + + + + - + - - + + - - - - + + + + - - + + - - + + - + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl index a3f12b7..832d39e 100644 --- a/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl +++ b/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl @@ -1,81 +1,167 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + - - - + + + + + + + + + + - + + + + + + - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - + + + + + + + - - + + - - - - - - - - - + + @@ -88,30 +174,30 @@ - - - - + + + + + - - + + - - + + - + + - - + + - - - - - + + + @@ -124,34 +210,34 @@ - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - + + + + + + - - + + @@ -164,29 +250,29 @@ - - - - + + + + + - - + + - - + + - - - - + + + + + - - - - + + @@ -199,372 +285,319 @@ - - - - + + + + + - - + + - - + + - - - - - - - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - + + + + + + + + + + + + + - + - - + + - - - - + + + + - - + + - - + + - + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl index 74caae5..4f4f103 100644 --- a/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl +++ b/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl @@ -1,615 +1,648 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + - - - + + + + + + + + + + + + + + + + - + + + + + + - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - - + + - + + + + + + + - - + + - - - - - - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - - + + - + + - - + + - - - - - + + + - + - + - + - - - - + + + + + - - + + - - + + - - + + - - - - - - - - - - + + + + - + + + + + + - - + + - + - + - + - - - - + + + + + - - + + - - + + - - + + - - - - + + + + + - - - - + + - + - + - + - - - - + + + + + - - + + - - + + - - + + - - - - - - - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - + + - - + + + + + + + + + + + + + - + - - + + - - - - + + + + - - + + - - + + - - + + - + - - - + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + diff --git a/system_tests/src/test_esdl/output/test__grow_simulator__happy_path.esdl b/system_tests/src/test_esdl/output/test__grow_simulator__happy_path.esdl index 4716b2b..e3c3c7a 100644 --- a/system_tests/src/test_esdl/output/test__grow_simulator__happy_path.esdl +++ b/system_tests/src/test_esdl/output/test__grow_simulator__happy_path.esdl @@ -1,716 +1,708 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + - + - - - - + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - + + - + - + - + - - - - + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - + + + - + - + - + - - - - + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - + + - + - + - + - - - - + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - + + - + - - - + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - + - - - - - - - - - - - - - - - - - + + + + - + - - - - + + - - - - + + + + - - + + - - + + - - + + - - - - - - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - + + + + + + - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - + + + - - + + - - + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl b/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl index a98ed51..8cc9e2b 100644 --- a/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl +++ b/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl @@ -1,115 +1,115 @@ - - - - - - - - - - + - + - - - + + + - + - - + + - - + + - + - + - - - - - + + + + + - + - + - - + + - + - + - - + + - + - - - + + + - + - + - + - - - + + + - - + + - + - - - + + + - + - + + + + + + + + + + From d032655d8da6135ccaaeb41a638f2b6960ad9e7d Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Wed, 4 Sep 2024 10:07:07 +0200 Subject: [PATCH 4/4] Revert simulator output change as it turned out to be a bug in simulator worker which changes the simulator worker if a different timezone is used on host machine. --- .../output/test__simulator__happy_path.esdl | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl b/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl index 8cc9e2b..a98ed51 100644 --- a/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl +++ b/system_tests/src/test_esdl/output/test__simulator__happy_path.esdl @@ -1,115 +1,115 @@ - + + + + + + + + + + - + - - - + + + - + - - + + - - + + - + - + - - - - - + + + + + - + - + - - + + - + - + - - + + - + - - - + + + - + - + - + - - - + + + - - + + - + - - - + + + - + - + - - - - - - - - -