Removed application_keys.py

pcrespov · Nov 12, 2018 · 26845b1 · 26845b1
1 parent 984c9b8
commit 26845b1
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 35 deletions.
diff --git a/services/web/server/src/simcore_service_webserver/application.py b/services/web/server/src/simcore_service_webserver/application.py
@@ -6,18 +6,19 @@
 
 from aiohttp import web
 
-from .application_keys import APP_CONFIG_KEY
+from servicelib.application_keys import APP_CONFIG_KEY
+
 from .computation import setup_computation
 from .db import setup_db
-from .login import setup_login
+from .director import setup_director
 from .email import setup_email
+from .login import setup_login
 from .rest import setup_rest
+from .s3 import setup_s3
 from .security import setup_security
 from .session import setup_session
 from .sockets import setup_sockets
 from .statics import setup_statics
-from .director import setup_director
-from .s3 import setup_s3
 
 log = logging.getLogger(__name__)
 

diff --git a/services/web/server/src/simcore_service_webserver/application_keys.py b/services/web/server/src/simcore_service_webserver/application_keys.py
diff --git a/services/web/server/src/simcore_service_webserver/computation.py b/services/web/server/src/simcore_service_webserver/computation.py
@@ -10,9 +10,10 @@
 
 from aiohttp import web
 
-from .application_keys import APP_CONFIG_KEY
-from .computation_subscribe import subscribe
+from servicelib.application_keys import APP_CONFIG_KEY
+
 from .computation_config import CONFIG_SECTION_NAME, SERVICE_NAME
+from .computation_subscribe import subscribe
 
 log = logging.getLogger(__file__)
 

diff --git a/services/web/server/src/simcore_service_webserver/computation_api.py b/services/web/server/src/simcore_service_webserver/computation_api.py
@@ -11,17 +11,17 @@
 
 import sqlalchemy.exc
 from aiohttp import web, web_exceptions
-from sqlalchemy import create_engine, and_
+from sqlalchemy import and_, create_engine
 from sqlalchemy.orm import sessionmaker
 
+from servicelib.application_keys import APP_CONFIG_KEY
 from simcore_director_sdk.rest import ApiException
 from simcore_sdk.models.pipeline_models import (Base, ComputationalPipeline,
                                                 ComputationalTask)
 
-from .director import director_sdk
-from .application_keys import APP_CONFIG_KEY
-from .db_config import CONFIG_SECTION_NAME as CONFIG_DB_SECTION
 from .computation_worker import celery
+from .db_config import CONFIG_SECTION_NAME as CONFIG_DB_SECTION
+from .director import director_sdk
 
 # TODO: this should be coordinated with postgres options from config/server.yaml
 #from simcore_sdk.config.db import Config as DbConfig

diff --git a/services/web/server/src/simcore_service_webserver/computation_subscribe.py b/services/web/server/src/simcore_service_webserver/computation_subscribe.py
@@ -5,9 +5,9 @@
 import aio_pika
 from aiohttp import web
 
+from servicelib.application_keys import APP_CONFIG_KEY
 from simcore_sdk.config.rabbit import eval_broker
 
-from .application_keys import APP_CONFIG_KEY
 from .computation_config import CONFIG_SECTION_NAME
 from .sockets import sio
 

diff --git a/services/web/server/src/simcore_service_webserver/db.py b/services/web/server/src/simcore_service_webserver/db.py
@@ -12,12 +12,12 @@
 from tenacity import before_sleep_log, retry, stop_after_attempt, wait_fixed
 
 from servicelib.aiopg_utils import DBAPIError
+from servicelib.application_keys import (APP_CONFIG_KEY, APP_DB_ENGINE_KEY,
+                                         APP_DB_SESSION_KEY)
 
-from .application_keys import (APP_CONFIG_KEY, APP_DB_ENGINE_KEY,
-                               APP_DB_SESSION_KEY)
 from .computation_api import init_database as _init_db
-from .db_models import metadata
 from .db_config import CONFIG_SECTION_NAME
+from .db_models import metadata
 
 # SETTINGS ----------------------------------------------------
 THIS_MODULE_NAME  = __name__.split(".")[-1]

diff --git a/services/web/server/src/simcore_service_webserver/director/__init__.py b/services/web/server/src/simcore_service_webserver/director/__init__.py
@@ -7,7 +7,8 @@
 
 from aiohttp import web
 
-from ..application_keys import APP_CONFIG_KEY
+from servicelib.application_keys import APP_CONFIG_KEY
+
 from .config import CONFIG_SECTION_NAME
 
 logger = logging.getLogger(__name__)

diff --git a/services/web/server/src/simcore_service_webserver/email.py b/services/web/server/src/simcore_service_webserver/email.py
@@ -9,9 +9,10 @@
 import jinja_app_loader
 from aiohttp import web
 
-from .resources import resources
-from .application_keys import APP_CONFIG_KEY
+from servicelib.application_keys import APP_CONFIG_KEY
+
 from .email_config import CONFIG_SECTION_NAME
+from .resources import resources
 
 # TODO: move login/utils.py email functionality here!
 #from email.mime.text import MIMEText

diff --git a/services/web/server/src/simcore_service_webserver/login/__init__.py b/services/web/server/src/simcore_service_webserver/login/__init__.py
@@ -9,13 +9,14 @@
 import asyncpg
 from aiohttp import web
 
-from ..application_keys import APP_CONFIG_KEY, APP_DB_POOL_KEY
+from servicelib.application_keys import APP_CONFIG_KEY, APP_DB_POOL_KEY
+
 from ..db import DSN
 from ..email_config import CONFIG_SECTION_NAME as CONFIG_STMP_SECTION
 from ..rest_config import APP_OPENAPI_SPECS_KEY
-from .cfg import cfg, APP_LOGIN_CONFIG
-from .storage import AsyncpgStorage
+from .cfg import APP_LOGIN_CONFIG, cfg
 from .routes import create_routes
+from .storage import AsyncpgStorage
 
 log = logging.getLogger(__name__)
 

diff --git a/services/web/server/src/simcore_service_webserver/rest.py b/services/web/server/src/simcore_service_webserver/rest.py
@@ -12,11 +12,11 @@
 from aiohttp import web
 
 from servicelib import openapi
+from servicelib.application_keys import APP_CONFIG_KEY
 from servicelib.openapi import create_openapi_specs
 from servicelib.rest_middlewares import append_rest_middlewares
 
 from . import rest_routes
-from .application_keys import APP_CONFIG_KEY
 from .rest_config import APP_OPENAPI_SPECS_KEY, CONFIG_SECTION_NAME
 
 log = logging.getLogger(__name__)

diff --git a/services/web/server/src/simcore_service_webserver/rest_config.py b/services/web/server/src/simcore_service_webserver/rest_config.py
@@ -4,7 +4,8 @@
     - settings
 """
 import trafaret as T
-from .application_keys import APP_OPENAPI_SPECS_KEY
+
+from servicelib.application_keys import APP_OPENAPI_SPECS_KEY
 
 APP_OPENAPI_SPECS_KEY = APP_OPENAPI_SPECS_KEY
 

diff --git a/services/web/server/src/simcore_service_webserver/s3.py b/services/web/server/src/simcore_service_webserver/s3.py
@@ -6,7 +6,8 @@
 
 from aiohttp import web
 
-from .application_keys import APP_CONFIG_KEY
+from servicelib.application_keys import APP_CONFIG_KEY
+
 from .s3_config import CONFIG_SECTION_NAME
 
 #from s3wrapper.s3_client import S3Client

diff --git a/services/web/server/src/simcore_service_webserver/security.py b/services/web/server/src/simcore_service_webserver/security.py
@@ -18,7 +18,8 @@
 from aiohttp_security.session_identity import SessionIdentityPolicy
 from aiopg.sa import Engine
 
-from .application_keys import APP_DB_ENGINE_KEY
+from servicelib.application_keys import APP_DB_ENGINE_KEY
+
 from .db_models import UserRole, UserStatus, users
 from .session import setup_session
 

diff --git a/services/web/server/src/simcore_service_webserver/statics.py b/services/web/server/src/simcore_service_webserver/statics.py
@@ -11,7 +11,7 @@
 
 from aiohttp import web
 
-from .application_keys import APP_CONFIG_KEY
+from servicelib.application_keys import APP_CONFIG_KEY
 
 log = logging.getLogger(__file__)
 

diff --git a/services/web/server/tests/unit/test_rest.py b/services/web/server/tests/unit/test_rest.py
@@ -12,10 +12,9 @@
 from aiohttp import web
 
 import simcore_service_webserver
+from servicelib.application_keys import APP_CONFIG_KEY, APP_OPENAPI_SPECS_KEY
 from servicelib.rest_responses import unwrap_envelope
 from simcore_service_webserver import resources, rest
-from simcore_service_webserver.application_keys import (APP_CONFIG_KEY,
-                                                        APP_OPENAPI_SPECS_KEY)
 from simcore_service_webserver.rest import setup_rest
 from simcore_service_webserver.security import setup_security