WIP

Author: Pedro Crespo

api/specs/webserver/v0/components/schemas/my.yaml

@@ -0,0 +1,80 @@
+Profile:
+  type: object
+  properties:
+    login:
+      type: string
+      format: email
+    gravatar_id:
+      type: string
+    tokens_url:
+      type: string
+      format: url
+  example:
+    login: [email protected]
+    gravatar_id: 205e460b479e2e5b48aec07710c08d50
+    tokens_url: http://simcore.io/my/tokens
+
+Token:
+  description: api keys for third party services
+  type: object
+  properties:
+    service:
+      description: where this token is needed
+      type: string
+    token_key:
+      description: basic token key
+      type: string
+      format: uuid
+    token_secret:
+      type: string
+      format: uuid
+  required:
+    - service
+    - token_key
+  example:
+    service: 'github-api-v1'
+    token_key: foo
+
+
+# enveloped and array versions --------------------------
+
+
+# TODO: move this as base class??
+ErrorEnvelopeModel:
+  type: object
+  properties:
+    error:
+      $ref: "./error.yml#/ErrorType"
+      nullable: true
+
+
+ProfileEnveloped:
+  allOf:
+    - $ref: '#/ErrorEnvelopeModel'
+    - type: object
+      properties:
+        data:
+          $ref: '#/Profile'
+          nullable: true
+
+
+TokenEnveloped:
+  allOf:
+    - $ref: '#/ErrorEnvelopeModel'
+    - type: object
+      properties:
+        data:
+          $ref: '#/Token'
+          nullable: true
+
+
+TokensArrayEnveloped:
+  allOf:
+    - $ref: '#/ErrorEnvelopeModel'
+    - type: object
+      properties:
+        data:
+          type: array
+          items:
+            $ref: '#/Token'
+          nullable: true

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

@@ -1,12 +1,18 @@
 """ Facade for openapi functionality
 
 """
+import warnings
 from pathlib import Path
+from typing import Dict, Tuple
 
 import openapi_core
 import yaml
-from openapi_core.schema.exceptions import OpenAPIError, OpenAPIMappingError #pylint: disable=W0611
+from aiohttp import ClientSession
+from openapi_core.schema.exceptions import \
+    OpenAPIError  # pylint: disable=W0611
+from openapi_core.schema.exceptions import OpenAPIMappingError
 from openapi_core.schema.specs.models import Spec
+from yarl import URL
 
 # Supported version of openapi
 OAI_VERSION = '3.0.1'
@@ -18,7 +24,36 @@
 
 # TODO: ensure openapi_core.__version__ is up-to-date with OAI_VERSION
 
+
+
+def load_from_path(filepath: Path) -> Tuple[Dict, str]:
+    with filepath.open() as f:
+        spec_dict = yaml.safe_load(f)
+        return spec_dict, filepath.as_uri()
+
+
+async def load_from_url(url: URL) -> Tuple[Dict, str]:
+    async with ClientSession() as session:
+        async with session.get(url) as resp:
+            spec_dict = yaml.safe_load(resp.content)
+            return spec_dict, str(url)
+
+
+async def create_openapi_specs(location: str) -> OpenApiSpec:
+    if URL(location).host:
+        spec_dict, spec_url = await load_from_url(URL(location))
+    else:
+        spec_dict, spec_url = load_from_path(Path(location))
+
+    return openapi_core.create_spec(spec_dict, spec_url)
+
+
+
 def create_specs(openapi_path: Path) -> OpenApiSpec:
+    warnings.warn("Use instead create_openapi_specs",
+        category=DeprecationWarning)
+
+
     # TODO: spec_from_file and spec_from_url
     with openapi_path.open() as f:
         spec_dict = yaml.safe_load(f)

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

@@ -0,0 +1,9 @@
+
+
+
+def get_server(servers, url):
+    # Development server: http://{host}:{port}/{basePath}
+    for server in servers:
+        if server.url == url:
+            return server
+    raise ValueError("Cannot find server %s" % url)

services/web/server/scripts/codegen.sh

@@ -9,7 +9,7 @@
 
 REPO_ROOT=../../../..
 SOURCE_DIR=../src/simcore_service_webserver
-INPUT_SPEC=${SOURCE_DIR}/.openapi/v1/test_1.0.0-oas3.yaml
+INPUT_SPEC=${REPO_ROOT}/api/specs/webserver/v0/openapi.yaml
 OUTPUT_DIR=${SOURCE_DIR}/rest
 OUTPUT_DIR_GEN=${SOURCE_DIR}/rest/generated_code
 INIT_FILE_PATH=${OUTPUT_DIR}/__init__.py

services/web/server/setup.py

@@ -34,8 +34,6 @@ def list_packages(*parts):
     package_data={
         '': [
             'config/*.y*ml',
-            'oas3/**/*.yaml',
-            'oas3/**/**/schemas/*.y*ml',
             'templates/**/*.html',
             ]
     },