@pcrespov models.py -> controller_rest_schemas.py

Author: bisgaard-itis

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

@@ -3,7 +3,11 @@
 from models_library.services import BaseServiceIOModel, ServiceInput, ServiceOutput
 from pint import PintError, UnitRegistry
 
-from ._models import ServiceInputGetFactory, ServiceOutputGetFactory, get_unit_name
+from .controller_rest_schemas import (
+    ServiceInputGetFactory,
+    ServiceOutputGetFactory,
+    get_unit_name,
+)
 
 
 def _get_type_name(port: BaseServiceIOModel) -> str:

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

@@ -43,7 +43,11 @@
     DefaultPricingUnitForServiceNotFoundError,
     reraise_catalog_exceptions_as_http_errors,
 )
-from ._models import CatalogRequestContext, ListServiceParams, ServicePathParams
+from .controller_rest_schemas import (
+    CatalogRequestContext,
+    ListServiceParams,
+    ServicePathParams,
+)
 
 _logger = logging.getLogger(__name__)
 

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

@@ -29,7 +29,7 @@
 from ..rabbitmq import get_rabbitmq_rpc_client
 from . import _catalog_rest_client
 from ._api_units import can_connect, replace_service_input_outputs
-from ._models import (
+from .controller_rest_schemas import (
     CatalogRequestContext,
     ServiceInputGetFactory,
     ServiceOutputGetFactory,

services/web/server/src/simcore_service_webserver/catalog/_models.py renamed to services/web/server/src/simcore_service_webserver/catalog/controller_rest_schemas.py

@@ -30,7 +30,10 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from servicelib.aiohttp import status
-from simcore_service_webserver.catalog._models import ServiceInputGet, ServiceOutputGet
+from simcore_service_webserver.catalog.controller_rest_schemas import (
+    ServiceInputGet,
+    ServiceOutputGet,
+)
 from simcore_service_webserver.db.models import UserRole