improve file namings

Author: bisgaard-itis

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._tags_handlers import (
+from simcore_service_webserver.catalog._controller_rest_tags_handlers import (
     ServicePathParams,
     ServiceTagPathParams,
 )
@@ -31,8 +31,7 @@
 )
 def list_service_tags(
     _path_params: Annotated[ServicePathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -41,8 +40,7 @@ def list_service_tags(
 )
 def add_service_tag(
     _path_params: Annotated[ServiceTagPathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -51,5 +49,4 @@ def add_service_tag(
 )
 def remove_service_tag(
     _path_params: Annotated[ServiceTagPathParams, Depends()],
-):
-    ...
+): ...

services/web/server/src/simcore_service_webserver/catalog/_controller_rest.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 _catalog_rest_client, _service
+from . import _service, _service_catalog_rest_client
 from ._exceptions import (
     DefaultPricingUnitForServiceNotFoundError,
     reraise_catalog_exceptions_as_http_errors,
@@ -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 _catalog_rest_client.get_service_resources(
+        await _service_catalog_rest_client.get_service_resources(
             request.app,
             user_id=ctx.user_id,
             service_key=path_params.service_key,

services/web/server/src/simcore_service_webserver/catalog/_tags_handlers.py renamed to services/web/server/src/simcore_service_webserver/catalog/_controller_rest_tags_handlers.py

@@ -27,8 +27,8 @@
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
 from ..rabbitmq import get_rabbitmq_rpc_client
-from . import _catalog_rest_client
-from ._api_units import can_connect, replace_service_input_outputs
+from . import _service_catalog_rest_client
+from ._service_api_units 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 _catalog_rest_client.get_service(
+    service = await _service_catalog_rest_client.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 _catalog_rest_client.get_service(
+    service = await _service_catalog_rest_client.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 _catalog_rest_client.get_service(
+    service = await _service_catalog_rest_client.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 _catalog_rest_client.get_service(
+    service = await _service_catalog_rest_client.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/_service.py

@@ -1,4 +1,4 @@
-from ._catalog_rest_client import *  # noqa
+from ._service_catalog_rest_client import *  # noqa
 
 __all__: tuple[str, ...] = (
     "is_catalog_service_responsive",

services/web/server/src/simcore_service_webserver/catalog/_api_units.py renamed to services/web/server/src/simcore_service_webserver/catalog/_service_api_units.py

@@ -6,7 +6,7 @@
 from pint import UnitRegistry
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
-from . import _controller_rest, _tags_handlers
+from . import _controller_rest, _controller_rest_tags_handlers
 
 _logger = logging.getLogger(__name__)
 
@@ -26,7 +26,7 @@ def setup_catalog(app: web.Application):
     )
 
     app.add_routes(_controller_rest.routes)
-    app.add_routes(_tags_handlers.routes)
+    app.add_routes(_controller_rest_tags_handlers.routes)
 
     # prepares units registry
     app[UnitRegistry.__name__] = UnitRegistry()

services/web/server/src/simcore_service_webserver/catalog/_catalog_rest_client.py renamed to services/web/server/src/simcore_service_webserver/catalog/_service_catalog_rest_client.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._api_units import can_connect
+from simcore_service_webserver.catalog._service_api_units import can_connect
 
 
 def _create_port_data(schema: dict[str, Any]):

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

@@ -9,8 +9,10 @@
 import pytest
 from pint import UnitRegistry
 from pytest_benchmark.fixture import BenchmarkFixture
-from simcore_service_webserver.catalog._api_units import replace_service_input_outputs
 from simcore_service_webserver.catalog._controller_rest import RESPONSE_MODEL_POLICY
+from simcore_service_webserver.catalog._service_api_units import (
+    replace_service_input_outputs,
+)
 
 
 @pytest.fixture(params=["UnitRegistry", None])