@sanderegg review: relative imports

Author: pcrespov

services/web/server/src/simcore_service_webserver/api_keys/_repository.py

@@ -8,11 +8,11 @@
 from models_library.users import UserID
 from simcore_postgres_database.models.api_keys import api_keys
 from simcore_postgres_database.utils_repos import transaction_context
-from simcore_service_webserver.api_keys._models import ApiKey
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from ..db.plugin import get_asyncpg_engine
+from ._models import ApiKey
 from .errors import ApiKeyDuplicatedDisplayNameError
 
 _logger = logging.getLogger(__name__)

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

@@ -25,7 +25,6 @@
 from settings_library.tracing import TracingSettings
 from settings_library.utils_logging import MixinLoggingSettings
 from settings_library.utils_service import DEFAULT_AIOHTTP_PORT
-from simcore_service_webserver.licenses.settings import LicensesSettings
 
 from ._meta import API_VERSION, API_VTAG, APP_NAME
 from .catalog.settings import CatalogSettings
@@ -36,6 +35,7 @@
 from .exporter.settings import ExporterSettings
 from .garbage_collector.settings import GarbageCollectorSettings
 from .invitations.settings import InvitationsSettings
+from .licenses.settings import LicensesSettings
 from .login.settings import LoginSettings
 from .payments.settings import PaymentsSettings
 from .projects.settings import ProjectsSettings

services/web/server/src/simcore_service_webserver/diagnostics/plugin.py

@@ -6,8 +6,8 @@
 from servicelib.aiohttp import monitor_slow_callbacks
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 from servicelib.aiohttp.profiler_middleware import profiling_middleware
-from simcore_service_webserver.application_settings import get_application_settings
 
+from ..application_settings import get_application_settings
 from ..rest.healthcheck import HealthCheck
 from ..rest.plugin import setup_rest
 from . import _handlers

services/web/server/src/simcore_service_webserver/director_v2/_core_computations.py

@@ -21,7 +21,7 @@
 from servicelib.aiohttp import status
 from servicelib.logging_utils import log_decorator
 
-from ..products.products_service import get_product
+from ..products import products_service
 from ._api_utils import get_wallet_info
 from ._core_base import DataType, request_director_v2
 from .exceptions import ComputationNotFoundError, DirectorServiceError
@@ -107,7 +107,7 @@ async def create_or_update_pipeline(
         "product_name": product_name,
         "wallet_info": await get_wallet_info(
             app,
-            product=get_product(app, product_name),
+            product=products_service.get_product(app, product_name),
             user_id=user_id,
             project_id=project_id,
             product_name=product_name,

services/web/server/src/simcore_service_webserver/dynamic_scheduler/plugin.py

@@ -6,9 +6,9 @@
 
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
-from simcore_service_webserver.rabbitmq import setup_rabbitmq
 
 from ..constants import APP_SETTINGS_KEY
+from ..rabbitmq import setup_rabbitmq
 
 _logger = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/garbage_collector/plugin.py

@@ -3,10 +3,10 @@
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 from servicelib.logging_utils import set_parent_module_log_level
-from simcore_service_webserver.products.plugin import setup_products
 
 from ..application_settings import get_application_settings
 from ..login.plugin import setup_login_storage
+from ..products.plugin import setup_products
 from ..projects.db import setup_projects_db
 from ..socketio.plugin import setup_socketio
 from . import _tasks_api_keys, _tasks_core, _tasks_trash, _tasks_users

services/web/server/src/simcore_service_webserver/invitations/_rest.py

@@ -11,14 +11,14 @@
 from pydantic import Field
 from servicelib.aiohttp.requests_validation import parse_request_body_as
 from servicelib.request_keys import RQT_USERID_KEY
-from simcore_service_webserver.utils_aiohttp import envelope_json_response
 from yarl import URL
 
 from .._meta import API_VTAG as VTAG
 from ..constants import RQ_PRODUCT_KEY
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from ..users.api import get_user_name_and_email
+from ..utils_aiohttp import envelope_json_response
 from . import api
 
 routes = web.RouteTableDef()

services/web/server/src/simcore_service_webserver/invitations/plugin.py

@@ -6,7 +6,6 @@
 
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
-from simcore_service_webserver.products.plugin import setup_products
 
 from ..constants import APP_SETTINGS_KEY
 from ..db.plugin import setup_db

services/web/server/src/simcore_service_webserver/login/handlers_change.py

@@ -8,9 +8,9 @@
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.utils_users import UsersRepo
-from simcore_service_webserver.db.plugin import get_database_engine
 
 from .._meta import API_VTAG
+from ..db.plugin import get_database_engine
 from ..products import products_web
 from ..products.models import Product
 from ..security.api import check_password, encrypt_password

services/web/server/src/simcore_service_webserver/payments/_events.py

@@ -6,8 +6,8 @@
 
 from aiohttp import web
 
+from ..products import products_service
 from ..products.errors import BelowMinimumPaymentError
-from ..products.products_service import list_products
 from .settings import get_plugin_settings
 
 _logger = logging.getLogger(__name__)
@@ -16,7 +16,7 @@
 async def validate_prices_in_product_settings_on_startup(app: web.Application):
     payment_settings = get_plugin_settings(app)
 
-    for product in list_products(app):
+    for product in products_service.list_products(app):
         if product.min_payment_amount_usd is not None:
             if (
                 product.min_payment_amount_usd