Skip to content

Commit

Permalink
Merge pull request #100 from Project-OMOTES/99-set-workflow-config-fi…
Browse files Browse the repository at this point in the history
…le-as-env-var

make workflow config env var and add new NWN config file
MarkTNO authored Sep 13, 2024
2 parents 3f0de39 + 0f986c2 commit cf5a261
Showing 5 changed files with 49 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -22,4 +22,6 @@ INFLUXDB_WRITE_USER_PASSWORD=write9012
INFLUXDB_FRONTEND_ADMIN_USER=front1
INFLUXDB_FRONTEND_ADMIN_USER_PASSWORD=front9012

WORKFLOW_SETTINGS_FILE=./config/workflow_config_nwn_9sept2024.json

LOG_LEVEL=INFO
29 changes: 22 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -8,10 +8,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [mvp.4.RC2] - 2024-0x-xx

### Omotes-system
* 47: Add README.md and ci scripts for system_tests and example_sdk_client providing easy info and access to using them locally. Also add Legal considerations in root README.md and alter reconnect.py example to fully show reconnect. by @lfse-slafleur in https://github.com/Project-OMOTES/omotes-system/pull/68
* 71: Only load .env if it exists on setup.sh and exit with error if any env variables from .env-template are missing. by @lfse-slafleur in https://github.com/Project-OMOTES/omotes-system/pull/72
* 74: Reference .env.template from _load_dot_env.sh relative to the root of the repository instead of relative to current working directory. by @lfse-slafleur in https://github.com/Project-OMOTES/omotes-system/pull/75
* 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

* 47: Add README.md and ci scripts for system_tests and example_sdk_client providing easy info and
access to using them locally. Also add Legal considerations in root README.md and alter
reconnect.py example to fully show reconnect. by @lfse-slafleur
in https://github.com/Project-OMOTES/omotes-system/pull/68
* 71: Only load .env if it exists on setup.sh and exit with error if any env variables from
.env-template are missing. by @lfse-slafleur
in https://github.com/Project-OMOTES/omotes-system/pull/72
* 74: Reference .env.template from _load_dot_env.sh relative to the root of the repository instead
of relative to current working directory. by @lfse-slafleur
in https://github.com/Project-OMOTES/omotes-system/pull/75
* 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
* 99: Set the workflows definitions file via environment variable by @MarkTNO in
in https://github.com/Project-OMOTES/omotes-system/pull/100
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ Each workflow parameter must have a `parameter_type` and `key_name`, all others
See `config/workflow_config_example.json` for options for
the `string`, `boolean`, `integer`, `float` and `datetime` parameter formats.

In `docker-compose.yml` the config file to use is specified in the `orchestrator` service in
the `volumes` section.
Set the environment variable `WORKFLOW_SETTINGS_FILE` to the file to be used by the orchestrator,
which will pass the workflows definitions to the sdk.

### Start infrastructure

22 changes: 22 additions & 0 deletions config/workflow_config_nwn_9sept2024.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"workflow_type_name": "grow_optimizer_no_heat_losses",
"workflow_type_description_name": "Draft Design - Quickscan Validation"
},
{
"workflow_type_name": "grow_optimizer_default",
"workflow_type_description_name": "Draft Design - Optimization"
},
{
"workflow_type_name": "grow_optimizer_with_pressure",
"workflow_type_description_name": "Draft Design - Optimization with Pressure Drops"
},
{
"workflow_type_name": "grow_simulator",
"workflow_type_description_name": "Draft Design - Simulation with Source Merit Order"
},
{
"workflow_type_name": "simulator",
"workflow_type_description_name": "Conceptual Design - Simulation"
}
]
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ services:
networks:
- omotes
volumes:
- "./config/workflow_config_nwn.json:/config/workflow_config.json"
- "${WORKFLOW_SETTINGS_FILE}:/config/workflow_config.json"
environment:
CELERY_RABBITMQ_USERNAME: ${RABBITMQ_CELERY_USER_NAME}
CELERY_RABBITMQ_PASSWORD: ${RABBITMQ_CELERY_USER_PASSWORD}

0 comments on commit cf5a261

Please sign in to comment.