From 90b48931d3a978f5d11d440a852b0603168df0f1 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Wed, 16 Oct 2024 16:12:45 +0200 Subject: [PATCH 1/4] 32: Remove redefinition of ParamsDict and rely on SDK definition of ParamsDict. --- src/omotes_rest/rest_interface.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/omotes_rest/rest_interface.py b/src/omotes_rest/rest_interface.py index cf806a3..8294230 100644 --- a/src/omotes_rest/rest_interface.py +++ b/src/omotes_rest/rest_interface.py @@ -2,7 +2,7 @@ from datetime import timedelta, datetime from typing import Union, Any -from omotes_sdk.types import ParamsDictValues +from omotes_sdk.types import ParamsDict from omotes_sdk.omotes_interface import OmotesInterface from omotes_sdk.internal.common.config import EnvRabbitMQConfig from omotes_sdk.omotes_interface import ( @@ -31,8 +31,6 @@ logger = logging.getLogger("omotes_rest") -ParamsDict = dict[str, ParamsDictValues] - def convert_json_forms_values_to_params_dict( workflow_type: WorkflowType, input_params_dict: dict[str, Any] From 68e99f3b0c9fac384abdb07802ce93334e8b5f67 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Wed, 16 Oct 2024 16:48:58 +0200 Subject: [PATCH 2/4] 32: Update SDK to use new type aliases ParamsDict and ProtoStructDict. --- dev-requirements.txt | 8 ++++---- docker-compose.yml | 6 +++--- pyproject.toml | 2 +- requirements.txt | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 0210b83..f5a2124 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -176,11 +176,11 @@ mypy-extensions==1.0.0 # black # mypy # typing-inspect -omotes-sdk-protocol==0.1.6 +omotes-sdk-protocol==0.1.12 # via # -c requirements.txt # omotes-sdk-python -omotes-sdk-python==3.2.2 +omotes-sdk-python==3.2.3 # via # -c requirements.txt # omotes-rest (pyproject.toml) @@ -221,7 +221,7 @@ protobuf==4.25.5 # via # -c requirements.txt # omotes-sdk-protocol -psycopg2-binary==2.9.9 +psycopg2-binary==2.9.10 # via # -c requirements.txt # omotes-rest (pyproject.toml) @@ -322,7 +322,7 @@ werkzeug==3.0.4 # -c requirements.txt # flask # flask-smorest -yarl==1.15.2 +yarl==1.15.3 # via # -c requirements.txt # aio-pika diff --git a/docker-compose.yml b/docker-compose.yml index e02efff..8c8f4e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ networks: omotes: external: true - mapeditor-net: - external: true + # mapeditor-net: + # external: true volumes: db-data: @@ -12,7 +12,7 @@ services: image: ghcr.io/project-omotes/omotes_rest:1.0.2 networks: - omotes - - mapeditor-net +# - mapeditor-net ports: - "9200:9200" environment: diff --git a/pyproject.toml b/pyproject.toml index 72b0a26..39243ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ dependencies = [ "python-dotenv ~= 1.0.0", "structlog ~= 23.1.0", "SQLAlchemy == 2.0.28", - "omotes-sdk-python ~= 3.2.2", + "omotes-sdk-python ~= 3.2.3", "alembic ~= 1.13.1", ] diff --git a/requirements.txt b/requirements.txt index 9bfb7f5..1cef932 100644 --- a/requirements.txt +++ b/requirements.txt @@ -86,9 +86,9 @@ multidict==6.1.0 # via yarl mypy-extensions==1.0.0 # via typing-inspect -omotes-sdk-protocol==0.1.6 +omotes-sdk-protocol==0.1.12 # via omotes-sdk-python -omotes-sdk-python==3.2.2 +omotes-sdk-python==3.2.3 # via omotes-rest (pyproject.toml) ordered-set==4.1.0 # via pyecore @@ -108,7 +108,7 @@ propcache==0.2.0 # via yarl protobuf==4.25.5 # via omotes-sdk-protocol -psycopg2-binary==2.9.9 +psycopg2-binary==2.9.10 # via omotes-rest (pyproject.toml) pyecore==0.12.1 # via pyesdl @@ -155,7 +155,7 @@ werkzeug==3.0.4 # via # flask # flask-smorest -yarl==1.15.2 +yarl==1.15.3 # via # aio-pika # aiormq From 9cd6d16f8744f26b6cc521c3891b9ac6aeb42bef Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Wed, 23 Oct 2024 10:33:05 +0200 Subject: [PATCH 3/4] 32: Revert commenting out mapeditor-net external network in docker-compose.yml. --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8c8f4e8..2487dd3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ networks: omotes: external: true - # mapeditor-net: - # external: true + mapeditor-net: + external: true volumes: db-data: @@ -12,7 +12,7 @@ services: image: ghcr.io/project-omotes/omotes_rest:1.0.2 networks: - omotes -# - mapeditor-net + - mapeditor-net ports: - "9200:9200" environment: From 5d279458db6f00a76fc748925f78b8be62827418 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Wed, 23 Oct 2024 10:33:47 +0200 Subject: [PATCH 4/4] 32: Fix indent of mapeditor-net external network in docker-compose.yml. --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2487dd3..e02efff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ networks: omotes: external: true - mapeditor-net: - external: true + mapeditor-net: + external: true volumes: db-data: