Fixes retrieving openapi to webserver.

Author: Pedro Crespo

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

@@ -32,10 +32,12 @@ def load_from_path(filepath: Path) -> Tuple[Dict, str]:
 
 
 async def load_from_url(url: URL) -> Tuple[Dict, str]:
-    TIMEOUT_SECS = 5*60
-    async with ClientSession(timeout=TIMEOUT_SECS) as session:
+    #TIMEOUT_SECS = 5*60
+    #async with ClientSession(timeout=TIMEOUT_SECS) as session:
+    async with ClientSession() as session:
         async with session.get(url) as resp:
-            spec_dict = yaml.safe_load(resp.content)
+            text = await resp.text()
+            spec_dict = yaml.safe_load(text)
             return spec_dict, str(url)
 
 

packages/simcore-sdk/src/simcore_sdk/config/rabbit.py

@@ -12,6 +12,7 @@
 # TODO: adapt all data below!
 # TODO: can use venv as defaults? e.g. $RABBITMQ_LOG_CHANNEL
 CONFIG_SCHEMA = T.Dict({
+    T.Key("enabled", default=True, optional=True): T.Bool(),
     T.Key("host", default='rabbit', optional=True): T.String(),
     T.Key("port", default=5672, optional=True): T.Int(),
     "user": T.String(),

services/docker-compose.yml

@@ -78,6 +78,7 @@ services:
       - SMTP_PORT=${SMTP_PORT}
     depends_on:
       - webclient
+      - apihub
   #--------------------------------------------------------------------
   rabbit:
     image: rabbitmq:3-management

services/sidecar/requirements/base.txt

@@ -1,5 +1,4 @@
 # Common third party packages
-# Please keep alphabetical order
 celery==4.1.0
 docker==3.5.0
 kombu==4.1.0

services/web/server/src/simcore_service_webserver/computation_config.py

@@ -5,12 +5,10 @@
 """
 from simcore_sdk.config.rabbit import CONFIG_SCHEMA as _RABBIT_SCHEMA
 
-import trafaret as T
+# import trafaret as T
 
 SERVICE_NAME = 'rabbit'
 CONFIG_SECTION_NAME = SERVICE_NAME
 
 
-schema = _RABBIT_SCHEMA.merge(T.Dict({
-    T.Key("enabled", default=True, optional=True): T.Bool()
-}))
+schema = _RABBIT_SCHEMA

services/web/server/src/simcore_service_webserver/rest.py

@@ -10,6 +10,7 @@
 from copy import deepcopy
 
 from aiohttp import web
+from tenacity import before_sleep_log, retry, stop_after_attempt, wait_fixed
 
 from servicelib import openapi
 from servicelib.application_keys import APP_CONFIG_KEY
@@ -22,6 +23,10 @@
 log = logging.getLogger(__name__)
 
 
+RETRY_WAIT_SECS = 2
+RETRY_COUNT = 20
+CONNECT_TIMEOUT_SECS = 30
+
 
 def get_server(servers, url):
     # Development server: http://{host}:{port}/{basePath}
@@ -30,7 +35,13 @@ def get_server(servers, url):
             return server
     raise ValueError("Cannot find server %s in openapi specs" % url)
 
-#-----------------------
+
+@retry( wait=wait_fixed(RETRY_WAIT_SECS),
+        stop=stop_after_attempt(RETRY_COUNT),
+        before_sleep=before_sleep_log(log, logging.INFO) )
+async def get_specs(location):
+    specs = await create_openapi_specs(location)
+    return specs
 
 
 def setup(app: web.Application, *, debug=False):
@@ -43,7 +54,7 @@ def setup(app: web.Application, *, debug=False):
         #specs = await create_openapi_specs(location=cfg["location"])
         loop = asyncio.get_event_loop()
         location = cfg["location"]
-        specs = loop.run_until_complete( create_openapi_specs(location) )
+        specs = loop.run_until_complete( get_specs(location) )
 
         # sets servers variables to current server's config
         extra_api_urls = cfg.get("extra_urls", list())