rename

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/tasks/_controller/_rest.py

@@ -25,7 +25,7 @@
 from ...login.decorators import login_required
 from ...long_running_tasks.plugin import webserver_request_context_decorator
 from ...models import AuthenticatedRequestContext, WebServerOwnerMetadata
-from .. import _service
+from .. import _tasks_service
 from ._rest_exceptions import handle_rest_requests_exceptions
 
 log = logging.getLogger(__name__)
@@ -53,7 +53,7 @@ async def get_async_jobs(request: web.Request) -> web.Response:
 
     _req_ctx = AuthenticatedRequestContext.model_validate(request)
 
-    tasks = await _service.list_tasks(
+    tasks = await _tasks_service.list_tasks(
         task_manager=get_task_manager(request.app),
         owner_metadata=OwnerMetadata.model_validate(
             WebServerOwnerMetadata(
@@ -98,7 +98,7 @@ async def get_async_job_status(request: web.Request) -> web.Response:
     _req_ctx = AuthenticatedRequestContext.model_validate(request)
     _path_params = parse_request_path_parameters_as(TaskPathParams, request)
 
-    task_status = await _service.get_task_status(
+    task_status = await _tasks_service.get_task_status(
         task_manager=get_task_manager(request.app),
         owner_metadata=OwnerMetadata.model_validate(
             WebServerOwnerMetadata(
@@ -133,7 +133,7 @@ async def cancel_async_job(request: web.Request) -> web.Response:
     _req_ctx = AuthenticatedRequestContext.model_validate(request)
     _path_params = parse_request_path_parameters_as(TaskPathParams, request)
 
-    await _service.cancel_task(
+    await _tasks_service.cancel_task(
         task_manager=get_task_manager(request.app),
         owner_metadata=OwnerMetadata.model_validate(
             WebServerOwnerMetadata(
@@ -158,7 +158,7 @@ async def get_async_job_result(request: web.Request) -> web.Response:
     _req_ctx = AuthenticatedRequestContext.model_validate(request)
     _path_params = parse_request_path_parameters_as(TaskPathParams, request)
 
-    task_result = await _service.get_task_result(
+    task_result = await _tasks_service.get_task_result(
         task_manager=get_task_manager(request.app),
         owner_metadata=OwnerMetadata.model_validate(
             WebServerOwnerMetadata(

services/web/server/src/simcore_service_webserver/tasks/_service.py renamed to services/web/server/src/simcore_service_webserver/tasks/_tasks_service.py

@@ -0,0 +1,14 @@
+from ._tasks_service import (
+    cancel_task,
+    get_task_result,
+    get_task_status,
+    list_tasks,
+)
+
+__all__: tuple[str, ...] = (
+    "cancel_task",
+    "get_task_result",
+    "get_task_status",
+    "list_tasks",
+)
+# nopycln: file

services/web/server/src/simcore_service_webserver/tasks/tasks_service.py

@@ -61,7 +61,7 @@
 )
 from servicelib.rabbitmq.rpc_interfaces.storage.simcore_s3 import start_export_data
 from simcore_postgres_database.models.users import UserRole
-from simcore_service_webserver.tasks import _service
+from simcore_service_webserver.tasks import _tasks_service
 from simcore_service_webserver.tasks._controller import _rest as tasks_rest
 from yarl import URL
 
@@ -524,7 +524,7 @@ async def test_get_async_jobs_status(
     _job_id = AsyncJobId(_faker.uuid4())
     create_backend_mock(
         tasks_rest.__name__,
-        f"_service.{_service.get_task_status.__name__}",
+        f"_service.{_tasks_service.get_task_status.__name__}",
         backend_result_or_exception,
     )
 
@@ -562,7 +562,7 @@ async def test_cancel_async_jobs(
     _job_id = AsyncJobId(faker.uuid4())
     create_backend_mock(
         tasks_rest.__name__,
-        f"_service.{_service.cancel_task.__name__}",
+        f"_service.{_tasks_service.cancel_task.__name__}",
         backend_result_or_exception,
     )
 
@@ -595,7 +595,7 @@ async def test_get_async_job_result(
     _job_id = AsyncJobId(faker.uuid4())
     create_backend_mock(
         tasks_rest.__name__,
-        f"_service.{_service.get_task_result.__name__}",
+        f"_service.{_tasks_service.get_task_result.__name__}",
         backend_result_or_exception,
     )
 
@@ -630,7 +630,7 @@ async def test_get_user_async_jobs(
 ):
     create_backend_mock(
         tasks_rest.__name__,
-        f"_service.{_service.list_tasks.__name__}",
+        f"_service.{_tasks_service.list_tasks.__name__}",
         backend_result_or_exception,
     )
 
@@ -647,7 +647,7 @@ async def test_get_user_async_jobs(
         (
             "GET",
             "status_href",
-            _service.get_task_status.__name__,
+            _tasks_service.get_task_status.__name__,
             AsyncJobStatus(
                 job_id=AsyncJobId(_faker.uuid4()),
                 progress=ProgressReport(actual_value=0.5, total=1.0),
@@ -659,15 +659,15 @@ async def test_get_user_async_jobs(
         (
             "DELETE",
             "abort_href",
-            _service.cancel_task.__name__,
+            _tasks_service.cancel_task.__name__,
             AsyncJobAbort(result=True, job_id=AsyncJobId(_faker.uuid4())),
             status.HTTP_204_NO_CONTENT,
             None,
         ),
         (
             "GET",
             "result_href",
-            _service.get_task_result.__name__,
+            _tasks_service.get_task_result.__name__,
             AsyncJobResult(result=None),
             status.HTTP_200_OK,
             TaskResult,