ddd instead of sa @matusdrobuliak66 @pcrespov

Author: bisgaard-itis

api/specs/web-server/_catalog.py

@@ -15,7 +15,7 @@
 from models_library.generics import Envelope
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.catalog._controller_rest import (
+from simcore_service_webserver.catalog._rest_controller import (
     ListServiceParams,
     ServicePathParams,
     _FromServiceOutputParams,

api/specs/web-server/_catalog_tags.py

@@ -10,7 +10,7 @@
 from models_library.api_schemas_webserver.catalog import CatalogServiceGet
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.catalog._controller_rest_tags import (
+from simcore_service_webserver.catalog._rest_tags_controller import (
     ServicePathParams,
     ServiceTagPathParams,
 )

services/web/server/src/simcore_service_webserver/catalog/_service_catalog_rest_client.py renamed to services/web/server/src/simcore_service_webserver/catalog/_catalog_rest_client_service.py

@@ -38,7 +38,7 @@
 from ..resource_usage.service import get_default_service_pricing_plan
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
-from . import _service, _service_catalog_rest_client
+from . import _catalog_rest_client_service, _service
 from ._exceptions import (
     DefaultPricingUnitForServiceNotFoundError,
     handle_plugin_requests_exceptions,
@@ -337,7 +337,7 @@ async def get_service_resources(request: Request):
     ctx = CatalogRequestContext.create(request)
     path_params = parse_request_path_parameters_as(ServicePathParams, request)
     service_resources: ServiceResourcesDict = (
-        await _service_catalog_rest_client.get_service_resources(
+        await _catalog_rest_client_service.get_service_resources(
             request.app,
             user_id=ctx.user_id,
             service_key=path_params.service_key,

services/web/server/src/simcore_service_webserver/catalog/_controller_rest.py renamed to services/web/server/src/simcore_service_webserver/catalog/_rest_controller.py

@@ -27,8 +27,8 @@
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
 from ..rabbitmq import get_rabbitmq_rpc_client
-from . import _service_catalog_rest_client
-from ._service_units import can_connect, replace_service_input_outputs
+from . import _catalog_rest_client_service
+from ._units_service import can_connect, replace_service_input_outputs
 from .controller_rest_schemas import (
     CatalogRequestContext,
     ServiceInputGetFactory,
@@ -170,7 +170,7 @@ async def update_service_v2(
 async def list_service_inputs(
     service_key: ServiceKey, service_version: ServiceVersion, ctx: CatalogRequestContext
 ) -> list[ServiceInputGet]:
-    service = await _service_catalog_rest_client.get_service(
+    service = await _catalog_rest_client_service.get_service(
         ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
     )
     return [
@@ -187,7 +187,7 @@ async def get_service_input(
     input_key: ServiceInputKey,
     ctx: CatalogRequestContext,
 ) -> ServiceInputGet:
-    service = await _service_catalog_rest_client.get_service(
+    service = await _catalog_rest_client_service.get_service(
         ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
     )
     service_input: ServiceInputGet = (
@@ -246,7 +246,7 @@ async def list_service_outputs(
     service_version: ServiceVersion,
     ctx: CatalogRequestContext,
 ) -> list[ServiceOutputGet]:
-    service = await _service_catalog_rest_client.get_service(
+    service = await _catalog_rest_client_service.get_service(
         ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
     )
     return [
@@ -263,7 +263,7 @@ async def get_service_output(
     output_key: ServiceOutputKey,
     ctx: CatalogRequestContext,
 ) -> ServiceOutputGet:
-    service = await _service_catalog_rest_client.get_service(
+    service = await _catalog_rest_client_service.get_service(
         ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
     )
     return cast(  # mypy -> aiocache is not typed.

services/web/server/src/simcore_service_webserver/catalog/_controller_rest_tags.py renamed to services/web/server/src/simcore_service_webserver/catalog/_rest_tags_controller.py

@@ -1,12 +1,12 @@
-from ._service import batch_get_my_services  # noqa
-from ._service_catalog_rest_client import (  # noqa
+from ._catalog_rest_client_service import (  # noqa
     get_service,
     get_service_access_rights,
     get_service_resources,
     get_services_for_user_in_product,
     is_catalog_service_responsive,
     to_backend_service,
 )
+from ._service import batch_get_my_services  # noqa
 
 __all__: tuple[str, ...] = (
     "is_catalog_service_responsive",

services/web/server/src/simcore_service_webserver/catalog/_service.py

@@ -6,7 +6,7 @@
 from pint import UnitRegistry
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
-from . import _controller_rest, _controller_rest_tags
+from . import _rest_controller, _rest_tags_controller
 
 _logger = logging.getLogger(__name__)
 
@@ -22,11 +22,11 @@ def setup_catalog(app: web.Application):
     # ensures routes are names that corresponds to function names
     assert all(  # nosec
         route_def.kwargs["name"] == route_def.handler.__name__  # type: ignore[attr-defined] # route_def is a RouteDef not an Abstract
-        for route_def in _controller_rest.routes
+        for route_def in _rest_controller.routes
     )
 
-    app.add_routes(_controller_rest.routes)
-    app.add_routes(_controller_rest_tags.routes)
+    app.add_routes(_rest_controller.routes)
+    app.add_routes(_rest_tags_controller.routes)
 
     # prepares units registry
     app[UnitRegistry.__name__] = UnitRegistry()

services/web/server/src/simcore_service_webserver/catalog/_service_units.py renamed to services/web/server/src/simcore_service_webserver/catalog/_units_service.py

@@ -9,7 +9,7 @@
 from models_library.function_services_catalog.services import demo_units
 from models_library.services import ServiceInput, ServiceOutput
 from pint import UnitRegistry
-from simcore_service_webserver.catalog._service_units import can_connect
+from simcore_service_webserver.catalog._units_service import can_connect
 
 
 def _create_port_data(schema: dict[str, Any]):