Is309/storage api specs

.travis.yml

@@ -44,12 +44,12 @@ matrix:
         - chmod +x docker-compose
         - sudo mv docker-compose /usr/local/bin
         - docker-compose --version
-        # shutdown postgres because sometimes is is alrady up ???
+        # shutdown postgres because sometimes is is already up ???
         - sudo service postgresql stop
         # wait for postgresql to shutdown
         - while sudo lsof -Pi :5432 -sTCP:LISTEN -t; do sleep 1; done
 
-      install:        
+      install:
         - pip install --upgrade pip wheel setuptools && pip3 --version
         - pip3 install pytest-travis-fold
         - pip3 install packages/s3wrapper[test]
@@ -67,7 +67,7 @@ matrix:
 
       script:
         - export DOCKER_GID=1042
-        - docker-compose -f services/docker-compose.yml build storage
+        - docker-compose -f services/docker-compose.yml build storage apihub
         - make pylint
         - make test
 

services/storage/src/simcore_service_storage/oas3/v0/openapi.yaml → api/specs/storage/v0/openapi.yaml

@@ -10,20 +10,19 @@ info:
     name: MIT
     url: https://github.com/ITISFoundation/osparc-simcore/blob/master/LICENSE
 servers:
+  - description: API server
+    url: '/v0'
   - description: Development server
-    url: 'http://{host}:{port}/{basePath}'
+    url: http://{host}:{port}/{basePath}
     variables:
       host:
         default: 'localhost'
       port:
         default: '11111'
       basePath:
-        default: 'v0'
-  - description: Production server
-    url: 'http://storage:{port}/v0'
-    variables:
-      port:
-        default: '8080'
+        enum:
+          - v0
+        default: v0
 tags:
 - name: admins
   description: Secured Admin-only calls

packages/service-library/src/servicelib/utils.py

@@ -0,0 +1,29 @@
+""" General utils
+
+IMPORTANT: lowest level module
+   I order to avoid cyclic dependences, please
+   DO NOT IMPORT ANYTHING from .
+"""
+from pathlib import Path
+
+
+def is_osparc_repo_dir(path: Path) -> bool:
+    # TODO: implement with git cli
+    expected = (".github", "packages", "services")
+    got = [p.name for p in path.iterdir() if p.is_dir()]
+    return all(d in got for d in expected)
+
+
+def search_osparc_repo_dir(start, max_iterations=8):
+    """ Returns path to root repo dir or None if it does not exists
+
+        NOTE: assumes starts is a path within repo
+    """
+    max_iterations = max(max_iterations, 1)
+    root_dir = Path(start)
+    it = 1
+    while not is_osparc_repo_dir(root_dir) and it<max_iterations:
+        root_dir = root_dir.parent
+        it += 1
+
+    return root_dir if is_osparc_repo_dir(root_dir) else None

packages/service-library/tests/test_package.py

@@ -39,3 +39,16 @@ def test_no_pdbs_in_place(package_dir):
                 # TODO: should return line number
                 assert not found, "pbd.set_trace found in %s" % pypth
         dirs[:] = [d for d in dirs if d not in EXCLUDE]
+
+
+
+from servicelib.utils import is_osparc_repo_dir, search_osparc_repo_dir
+
+def test_utils(osparc_simcore_root_dir, package_dir):
+
+    assert is_osparc_repo_dir(osparc_simcore_root_dir)
+
+    assert search_osparc_repo_dir(package_dir) == osparc_simcore_root_dir
+    assert search_osparc_repo_dir(osparc_simcore_root_dir) == osparc_simcore_root_dir
+
+    assert not search_osparc_repo_dir(osparc_simcore_root_dir.parent)

packages/simcore-sdk/tests/fixtures/storage.py

@@ -8,8 +8,10 @@
 
 log = logging.getLogger(__name__)
 
+API_VERSION = 'v0'
+
 def _fake_logger_while_building_storage():
-    print("Hey Travis I'm still alive...")
+    print("Hey Travis I'm still alive ... don't give up on me :-)")
 
 def _is_responsive(url, code=200):
     try:
@@ -22,20 +24,20 @@ def _is_responsive(url, code=200):
     return False
 
 @pytest.fixture(scope="module")
-def storage(bucket, engine, docker_ip, docker_services): 
+def storage(bucket, engine, docker_ip, docker_services):
     host = docker_ip
     port = docker_services.port_for('storage', 8080)
-    endpoint = "http://{}:{}".format(host, port)
+    endpoint = "http://{}:{}/{}/".format(host, port, API_VERSION)
+
     # Wait until we can connect
     keep_alive_timer = threading.Timer(interval=60.0, function=_fake_logger_while_building_storage)
     keep_alive_timer.start()
     docker_services.wait_until_responsive(
-        check=lambda: _is_responsive(endpoint, 404),
+        check=lambda: _is_responsive(endpoint, 200),
         timeout=30.0,
         pause=1.0,
     )
     keep_alive_timer.cancel()
-    
+
     yield endpoint
     # cleanup
-

packages/simcore-sdk/tests/node_ports/docker-compose.yml

@@ -1,16 +1,12 @@
 version: '3.6'
 services:
   storage:
-    # build:
-    #   context: ../../../../
-    #   dockerfile: services/storage/Dockerfile
-    #   args:
-    #     - DOCKER_GID_ARG=1500
-    #   target: production        
     image: services_storage:latest
     ports:
       - 11111:8080
     environment:
+      - APIHUB_HOST=apihub
+      - APIHUB_PORT=8043
       - POSTGRES_ENDPOINT=postgres:5432
       - POSTGRES_USER=user
       - POSTGRES_PASSWORD=pwd
@@ -25,9 +21,10 @@ services:
       - BF_API_SECRET="none"
       - BF_API_KEY="none"
     restart: always
-    depends_on: 
+    depends_on:
       - postgres
-      # - minio
+      - apihub
+ # DEPENDENCIES ----------------------------------------------------
   postgres:
     restart: always
     image: postgres:10
@@ -37,10 +34,14 @@ services:
       - POSTGRES_DB=test
     ports:
       - "5432:5432"
-  # monitors databases
+  apihub:
+    image: services_apihub:latest
+    ports:
+      - '8043:8043'
+ # TOOLS -----------------------------------------------------------
   adminer:
     image: adminer
     ports:
       - 18080:8080
     depends_on:
-      - postgres
+      - postgres

packages/simcore-sdk/tests/node_ports/test_item.py

@@ -12,18 +12,18 @@
 
 def create_item(item_type, item_value):
     key = "some key"
-    return Item(SchemaItem(key=key, 
-                    label="a label", 
-                    description="a description", 
-                    type=item_type, 
-                    displayOrder=2), DataItem(key=key, 
+    return Item(SchemaItem(key=key,
+                    label="a label",
+                    description="a description",
+                    type=item_type,
+                    displayOrder=2), DataItem(key=key,
                     value=item_value))
 
 def test_default_item():
     with pytest.raises(exceptions.InvalidProtocolError, message="Expecting InvalidProtocolError"):
         Item(None, None)
 
-@pytest.mark.asyncio
+
 async def test_item():
     key = "my key"
     label = "my label"
@@ -45,20 +45,20 @@ async def test_item():
 
     assert await item.get() == item_value
 
-@pytest.mark.asyncio
+
 async def test_valid_type():
     for item_type in config.TYPE_TO_PYTHON_TYPE_MAP:
         item = create_item(item_type, None)
         assert await item.get() is None
 
-@pytest.mark.asyncio
+
 async def test_invalid_type():
     item = create_item("some wrong type", None)
     with pytest.raises(exceptions.InvalidProtocolError, message="Expecting InvalidProtocolError") as excinfo:
         await item.get()
     assert "Invalid protocol used" in str(excinfo.value)
 
-@pytest.mark.asyncio
+
 async def test_invalid_value_type():
     #pylint: disable=W0612
     with pytest.raises(exceptions.InvalidItemTypeError, message="Expecting InvalidItemTypeError") as excinfo:
@@ -68,11 +68,11 @@ async def test_invalid_value_type():
     ("integer", 26, 26),
     ("number", -746.4748, -746.4748),
 #     ("data:*/*", __file__, {"store":"s3-z43", "path":"undefined/undefined/{filename}".format(filename=Path(__file__).name)}),
-    ("boolean", False, False),    
+    ("boolean", False, False),
     ("string", "test-string", "test-string")
 ])
-@pytest.mark.asyncio
-async def test_set_new_value(bucket, item_type, item_value_to_set, expected_value): # pylint: disable=W0613    
+
+async def test_set_new_value(bucket, item_type, item_value_to_set, expected_value): # pylint: disable=W0613
     mock_method = mock.Mock()
     item = create_item(item_type, None)
     item.new_data_cb = mock_method
@@ -87,7 +87,7 @@ async def test_set_new_value(bucket, item_type, item_value_to_set, expected_valu
     ("boolean", 123),
     ("string", True)
 ])
-@pytest.mark.asyncio
+
 async def test_set_new_invalid_value(bucket, item_type, item_value_to_set): # pylint: disable=W0613
     item = create_item(item_type, None)
     assert await item.get() is None

packages/simcore-sdk/tests/node_ports/test_itemstlist.py

@@ -11,24 +11,24 @@
 
 
 def create_item(key, item_type, item_value):
-    return Item(SchemaItem(key=key, 
-                    label="a label", 
-                    description="a description", 
-                    type=item_type, 
-                    displayOrder=2), 
-                DataItem(key=key, 
+    return Item(SchemaItem(key=key,
+                    label="a label",
+                    description="a description",
+                    type=item_type,
+                    displayOrder=2),
+                DataItem(key=key,
                     value=item_value))
 
 def create_items_list(key_item_value_tuples):
     schemas = SchemaItemsList({key:SchemaItem(key=key, label="a label", description="a description", type=item_type, displayOrder=2) for (key, item_type, _) in key_item_value_tuples})
     payloads = DataItemsList({key:DataItem(key=key, value=item_value) for key,_,item_value in key_item_value_tuples})
     return ItemsList(schemas, payloads)
-    
+
 
 def test_default_list():
     itemslist = ItemsList(SchemaItemsList(), DataItemsList())
 
-    assert not itemslist    
+    assert not itemslist
     assert not itemslist.change_notifier
     assert not itemslist.get_node_from_node_uuid_cb
 
@@ -47,11 +47,11 @@ def test_accessing_by_key():
 
 def test_access_by_wrong_key():
     from simcore_sdk.node_ports import exceptions
-    itemslist = create_items_list([("1", "integer", 333), ("2", "integer", 333), ("3", "integer", 333)])    
+    itemslist = create_items_list([("1", "integer", 333), ("2", "integer", 333), ("3", "integer", 333)])
     with pytest.raises(exceptions.UnboundPortError, message="Expecting UnboundPortError"):
         print(itemslist["fdoiht"])
 
-@pytest.mark.asyncio
+
 async def test_modifying_items_triggers_cb(): #pylint: disable=C0103
     mock_method = mock.Mock()