Fixes missing argument in Node validator class methods and minio dependency (#2033)

* Adding test for project nodes
* Adds testing around project nodes
* Adds missing requirements from simcore-sdk
* Fixes missing dependencies

Author: pcrespov

packages/models-library/src/models_library/projects_nodes.py

@@ -17,7 +17,7 @@
 )
 from .projects_nodes_ui import Position
 from .projects_state import RunningState
-from .services import SERVICE_KEY_RE, PROPERTY_KEY_RE
+from .services import PROPERTY_KEY_RE, SERVICE_KEY_RE
 
 InputTypes = Union[
     int, bool, str, float, PortLink, SimCoreFileLink, DatCoreFileLink, DownloadLink
@@ -104,14 +104,14 @@ class Node(BaseModel):
 
     @validator("thumbnail", pre=True)
     @classmethod
-    def convert_empty_str_to_none(v):
+    def convert_empty_str_to_none(cls, v):
         if isinstance(v, str) and v == "":
             return None
         return v
 
     @validator("state", pre=True)
     @classmethod
-    def convert_old_enum_name(v):
+    def convert_old_enum_name(cls, v):
         if v == "FAILURE":
             return RunningState.FAILED
         return v

packages/models-library/tests/test_project_nodes.py

@@ -0,0 +1,45 @@
+# pylint:disable=unused-variable
+# pylint:disable=unused-argument
+# pylint:disable=redefined-outer-name
+
+from typing import Dict
+
+import pytest
+from models_library.projects_nodes import Node
+from models_library.projects_state import RunningState
+
+
+@pytest.fixture()
+def minimal_node_data_sample() -> Dict:
+    return dict(
+        key="simcore/services/dynamic/3dviewer",
+        version="1.3.0-alpha",
+        label="3D viewer human message",
+    )
+
+
+def test_create_minimal_node(minimal_node_data_sample):
+    node = Node(**minimal_node_data_sample)
+
+    # a nice way to see how the simplest node looks like
+    assert node.inputs == {}
+    assert node.outputs == {}
+    assert node.state == RunningState.NOT_STARTED
+
+    assert node.parent is None
+    assert node.progress is None
+
+    assert node.dict(exclude_unset=True) == minimal_node_data_sample
+
+
+def test_backwards_compatibility_node_data(minimal_node_data_sample):
+    old_node_data = minimal_node_data_sample
+    # found some old data with this aspect
+    old_node_data.update({"thumbnail": "", "state": "FAILURE"})
+
+    node = Node(**old_node_data)
+
+    assert node.thumbnail is None
+    assert node.state == RunningState.FAILED
+
+    assert node.dict(exclude_unset=True) != old_node_data

packages/simcore-sdk/requirements/_base.in

@@ -2,6 +2,10 @@
 # Specifies third-party dependencies for 'simcore-sdk'
 #
 -c ../../../requirements/constraints.txt
+-r ../../../packages/postgres-database/requirements/_base.in
+-r ../../../packages/s3wrapper/requirements/_base.in
+-r ../../../packages/service-library/requirements/_base.in
+-r ../../../packages/models-library/requirements/_base.in
 
 aiofiles
 aiohttp

packages/simcore-sdk/requirements/_base.txt

@@ -4,25 +4,50 @@
 #
 #    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
+aiodebug==1.1.2           # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiofiles==0.5.0           # via -r requirements/_base.in
-aiohttp==3.7.3            # via -r requirements/_base.in
-aiopg[sa]==1.0.0          # via -r requirements/_base.in
+aiohttp==3.7.3            # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiozipkin
+aiopg[sa]==1.0.0          # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in
+aiozipkin==0.7.1          # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in
 async-timeout==3.0.1      # via aiohttp
-attrs==20.3.0             # via -r requirements/_base.in, aiohttp
+attrs==20.3.0             # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiohttp, jsonschema, openapi-core
+certifi==2020.11.8        # via minio
 chardet==3.0.4            # via aiohttp
+configparser==5.0.1       # via minio
 dataclasses==0.7          # via pydantic
 decorator==4.4.2          # via networkx
+dnspython==2.0.0          # via email-validator
+email-validator==1.1.2    # via pydantic
 idna-ssl==1.1.0           # via aiohttp
-idna==2.10                # via idna-ssl, yarl
+idna==2.10                # via email-validator, idna-ssl, yarl
+importlib-metadata==3.0.0 # via jsonschema
+isodate==0.6.0            # via openapi-core
+jsonschema==3.2.0         # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator
+lazy-object-proxy==1.4.3  # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-core
+minio==6.0.2              # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/s3wrapper/requirements/_base.in
 multidict==4.7.6          # via aiohttp, yarl
 networkx==2.5             # via -r requirements/_base.in
-psycopg2-binary==2.8.6    # via -r requirements/_base.in, aiopg, sqlalchemy
-pydantic==1.7.2           # via -r requirements/_base.in
-pyyaml==5.3.1             # via -c requirements/../../../requirements/constraints.txt, trafaret-config
-six==1.15.0               # via tenacity
-sqlalchemy[postgresql_psycopg2binary]==1.3.20  # via -c requirements/../../../requirements/constraints.txt, aiopg
-tenacity==6.2.0           # via -r requirements/_base.in
+openapi-core==0.12.0      # via -r requirements/../../../packages/service-library/requirements/_base.in
+openapi-spec-validator==0.2.9  # via openapi-core
+prometheus-client==0.9.0  # via -r requirements/../../../packages/service-library/requirements/_base.in
+psycopg2-binary==2.8.6    # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiopg, sqlalchemy
+pydantic[email]==1.7.2    # via -r requirements/../../../packages/models-library/requirements/_base.in, -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in
+pyrsistent==0.17.3        # via jsonschema
+python-dateutil==2.8.1    # via minio
+pytz==2020.4              # via minio
+pyyaml==5.3.1             # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator, trafaret-config
+six==1.15.0               # via isodate, jsonschema, openapi-core, openapi-spec-validator, python-dateutil, tenacity
+sqlalchemy[postgresql_psycopg2binary]==1.3.20  # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/postgres-database/requirements/_base.in, -r requirements/../../../packages/service-library/requirements/_base.in, aiopg
+strict-rfc3339==0.7       # via openapi-core
+tenacity==6.2.0           # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in
 trafaret-config==2.0.2    # via -r requirements/_base.in
-trafaret==2.1.0           # via trafaret-config
+trafaret==2.1.0           # via -r requirements/../../../packages/service-library/requirements/_base.in, trafaret-config
 typing-extensions==3.7.4.3  # via aiohttp, yarl
-yarl==1.5.1               # via aiohttp
+ujson==4.0.1              # via -r requirements/../../../packages/service-library/requirements/_base.in
+urllib3==1.26.2           # via -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/s3wrapper/requirements/../../../requirements/constraints.txt, -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt, -c requirements/../../../requirements/constraints.txt, -r requirements/../../../packages/s3wrapper/requirements/_base.in, minio
+werkzeug==1.0.1           # via -r requirements/../../../packages/service-library/requirements/_base.in
+yarl==1.5.1               # via -r requirements/../../../packages/postgres-database/requirements/_base.in, aiohttp
+zipp==3.4.0               # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

packages/simcore-sdk/requirements/_test.txt

@@ -10,7 +10,7 @@ apipkg==1.5               # via execnet
 astroid==2.4.2            # via pylint
 async-timeout==3.0.1      # via -c requirements/_base.txt, aiohttp
 attrs==20.3.0             # via -c requirements/_base.txt, aiohttp, pytest
-certifi==2020.11.8        # via requests
+certifi==2020.11.8        # via -c requirements/_base.txt, requests
 chardet==3.0.4            # via -c requirements/_base.txt, aiohttp, requests
 coverage==5.3             # via -r requirements/_test.in, coveralls, pytest-cov
 coveralls==2.2.0          # via -r requirements/_test.in
@@ -23,7 +23,7 @@ idna==2.10                # via -c requirements/_base.txt, idna-ssl, requests, y
 importlib-metadata==3.0.0  # via pluggy, pytest
 iniconfig==1.1.1          # via pytest
 isort==5.6.4              # via pylint
-lazy-object-proxy==1.4.3  # via astroid
+lazy-object-proxy==1.4.3  # via -c requirements/_base.txt, astroid
 mccabe==0.6.1             # via pylint
 mock==4.0.2               # via -r requirements/_test.in
 multidict==4.7.6          # via -c requirements/_base.txt, aiohttp, yarl
@@ -50,7 +50,7 @@ termcolor==1.1.0          # via pytest-sugar
 toml==0.10.2              # via pylint, pytest
 typed-ast==1.4.1          # via astroid
 typing-extensions==3.7.4.3  # via -c requirements/_base.txt, aiohttp, yarl
-urllib3==1.26.2           # via requests
+urllib3==1.26.2           # via -c requirements/_base.txt, requests
 websocket-client==0.57.0  # via docker
 wrapt==1.12.1             # via astroid
 yarl==1.5.1               # via -c requirements/_base.txt, aiohttp

requirements/constraints.txt

@@ -18,3 +18,6 @@ urllib3>=1.25.8                               # Vulnerability
 httpx<0.15.0
 # [https://github.com/encode/httpx/releases/tag/0.15.0] due to PR#1285 [https://github.com/encode/httpx/pull/1285]
 respx<0.13.0
+
+# Breaking changes. TODO: review ASAP
+ minio<7.0.0

tests/swarm-deploy/requirements/requirements.in

@@ -1,5 +1,11 @@
 -c ../../../requirements/constraints.txt
 
+-r ../../../packages/s3wrapper/requirements/_base.txt
+-r ../../../packages/postgres-database/requirements/_migration.txt
+-r ../../../packages/simcore-sdk/requirements/_base.txt
+-r ../../../packages/service-library/requirements/_base.txt
+-r ../../../packages/models-library/requirements/_base.txt
+
 aio-pika
 alembic
 click