Skip to content

Commit

Permalink
Merge pull request #39 from Project-OMOTES/32-use-omotes-sdk-pythonty…
Browse files Browse the repository at this point in the history
…pesparamsdict-instead-of-defining-paramsdict-in-rest-interfacepy

32: Remove redefinition of ParamsDict and rely on SDK definition of P…
  • Loading branch information
lfse-slafleur authored Oct 28, 2024
2 parents 3fbeee8 + 5d27945 commit dbbbbd5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
8 changes: 4 additions & 4 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -155,7 +155,7 @@ werkzeug==3.0.4
# via
# flask
# flask-smorest
yarl==1.15.2
yarl==1.15.3
# via
# aio-pika
# aiormq
Expand Down
4 changes: 1 addition & 3 deletions src/omotes_rest/rest_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit dbbbbd5

Please sign in to comment.