rename service

Author: pcrespov

services/web/server/src/simcore_service_webserver/studies_dispatcher/_controller/rest/nih.py

@@ -11,8 +11,8 @@
 from ...._meta import API_VTAG
 from ....products import products_web
 from ....utils_aiohttp import envelope_json_response
+from ... import _service
 from ..._catalog import iter_latest_product_services
-from ..._core import list_viewers_info
 from .nih_schemas import ServiceGet, Viewer
 
 _logger = logging.getLogger(__name__)
@@ -46,7 +46,7 @@ async def list_viewers(request: Request):
 
     viewers = [
         Viewer.create(request, viewer).model_dump()
-        for viewer in await list_viewers_info(request.app, file_type=file_type)
+        for viewer in await _service.list_viewers_info(request.app, file_type=file_type)
     ]
     return envelope_json_response(viewers)
 
@@ -58,7 +58,7 @@ async def list_default_viewers(request: Request):
 
     viewers = [
         Viewer.create(request, viewer).model_dump()
-        for viewer in await list_viewers_info(
+        for viewer in await _service.list_viewers_info(
             request.app, file_type=file_type, only_default=True
         )
     ]

services/web/server/src/simcore_service_webserver/studies_dispatcher/_controller/rest/redirects.py

@@ -10,8 +10,8 @@
 from ....dynamic_scheduler import api as dynamic_scheduler_service
 from ....products import products_web
 from ....utils_aiohttp import create_redirect_to_page_response, get_api_base_url
+from ... import _service
 from ..._catalog import ValidService, validate_requested_service
-from ..._core import validate_requested_file, validate_requested_viewer
 from ..._errors import (
     InvalidRedirectionParamsError,
 )
@@ -95,7 +95,7 @@ async def get_redirection_to_viewer(request: web.Request):
         file_params = service_params = query_params
 
         # NOTE: Cannot check file_size in from HEAD in a AWS download link so file_size is just infomative
-        viewer: ViewerInfo = await validate_requested_viewer(
+        viewer: ViewerInfo = await _service.validate_requested_viewer(
             request.app,
             file_type=file_params.file_type,
             file_size=file_params.file_size,
@@ -164,7 +164,7 @@ async def get_redirection_to_viewer(request: web.Request):
     elif isinstance(query_params, FileQueryParams):
         file_params_ = query_params
 
-        validate_requested_file(
+        _service.validate_requested_file(
             app=request.app,
             file_type=file_params_.file_type,
             file_size=file_params_.file_size,

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects.py

@@ -25,7 +25,7 @@
 from ..projects._projects_service import get_project_for_user
 from ..projects.exceptions import ProjectInvalidRightsError, ProjectNotFoundError
 from ..utils import now_str
-from ._core import compose_uuid_from
+from . import _service
 from ._errors import ProjectWorkbenchMismatchError
 from ._models import FileParams, ServiceInfo, ViewerInfo
 from ._users import UserInfo
@@ -42,11 +42,11 @@
 
 
 def _generate_nodeids(project_id: ProjectID) -> tuple[NodeID, NodeID]:
-    file_picker_id = compose_uuid_from(
+    file_picker_id = _service.compose_uuid_from(
         project_id,
         "4c69c0ce-00e4-4bd5-9cf0-59b67b3a9343",
     )
-    viewer_id = compose_uuid_from(
+    viewer_id = _service.compose_uuid_from(
         project_id,
         "fc718e5a-bf07-4abe-b526-d9cafd34830c",
     )
@@ -265,7 +265,9 @@ async def get_or_create_project_with_file_and_service(
     #   - if user requests several times, the same project is reused
     #   - if user is not a guest, the project will be saved in it's account (desired?)
     #
-    project_uid: ProjectID = compose_uuid_from(user.id, viewer.footprint, download_link)
+    project_uid: ProjectID = _service.compose_uuid_from(
+        user.id, viewer.footprint, download_link
+    )
 
     # Ids are linked to produce a footprint (see viewer_project_exists)
     file_picker_id, service_id = _generate_nodeids(project_uid)
@@ -324,7 +326,7 @@ async def get_or_create_project_with_service(
     product_name: str,
     product_api_base_url: str,
 ) -> ProjectNodePair:
-    project_uid: ProjectID = compose_uuid_from(user.id, service_info.footprint)
+    project_uid: ProjectID = _service.compose_uuid_from(user.id, service_info.footprint)
     _, service_id = _generate_nodeids(project_uid)
 
     try:
@@ -362,7 +364,7 @@ async def get_or_create_project_with_file(
     product_name: str,
     product_api_base_url: str,
 ) -> ProjectNodePair:
-    project_uid: ProjectID = compose_uuid_from(user.id, file_params.footprint)
+    project_uid: ProjectID = _service.compose_uuid_from(user.id, file_params.footprint)
     file_picker_id, _ = _generate_nodeids(project_uid)
 
     if not await _project_exists(

services/web/server/src/simcore_service_webserver/studies_dispatcher/_core.py renamed to services/web/server/src/simcore_service_webserver/studies_dispatcher/_service.py

@@ -37,7 +37,7 @@
 from simcore_service_webserver.studies_dispatcher._controller.rest.nih_schemas import (
     ServiceGet,
 )
-from simcore_service_webserver.studies_dispatcher._core import ViewerInfo
+from simcore_service_webserver.studies_dispatcher._models import ViewerInfo
 from sqlalchemy.sql import text
 from yarl import URL