renamed

Author: Andrei Neagu

api/specs/web-server/_long_running_tasks.py

@@ -13,7 +13,7 @@
 from servicelib.long_running_tasks._models import TaskGet, TaskStatus
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.tasks._exception_handlers import (
-    _TO_HTTP_ERROR_MAP as data_export_http_error_map,
+    _TO_HTTP_ERROR_MAP as export_data_http_error_map,
 )
 
 router = APIRouter(
@@ -23,9 +23,9 @@
     ],
 )
 
-_data_export_responses: dict[int | str, dict[str, Any]] = {
+_export_data_responses: dict[int | str, dict[str, Any]] = {
     i.status_code: {"model": EnvelopedError}
-    for i in data_export_http_error_map.values()
+    for i in export_data_http_error_map.values()
 }
 
 
@@ -34,7 +34,7 @@
     response_model=Envelope[list[TaskGet]],
     name="list_tasks",
     description="Lists all long running tasks",
-    responses=_data_export_responses,
+    responses=_export_data_responses,
 )
 def get_async_jobs(): ...
 
@@ -44,7 +44,7 @@ def get_async_jobs(): ...
     response_model=Envelope[TaskStatus],
     name="get_task_status",
     description="Retrieves the status of a task",
-    responses=_data_export_responses,
+    responses=_export_data_responses,
 )
 def get_async_job_status(
     _path_params: Annotated[_PathParam, Depends()],
@@ -55,7 +55,7 @@ def get_async_job_status(
     "/tasks/{task_id}",
     name="cancel_and_delete_task",
     description="Cancels and deletes a task",
-    responses=_data_export_responses,
+    responses=_export_data_responses,
     status_code=status.HTTP_204_NO_CONTENT,
 )
 def abort_async_job(
@@ -67,7 +67,7 @@ def abort_async_job(
     "/tasks/{task_id}/result",
     name="get_task_result",
     description="Retrieves the result of a task",
-    responses=_data_export_responses,
+    responses=_export_data_responses,
 )
 def get_async_job_result(
     _path_params: Annotated[_PathParam, Depends()],

api/specs/web-server/_storage.py

@@ -36,7 +36,7 @@
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.storage.schemas import DatasetMetaData, FileMetaData
 from simcore_service_webserver.tasks._exception_handlers import (
-    _TO_HTTP_ERROR_MAP as data_export_http_error_map,
+    _TO_HTTP_ERROR_MAP as export_data_http_error_map,
 )
 
 router = APIRouter(
@@ -221,18 +221,18 @@ async def is_completed_upload_file(
 
 
 # data export
-_data_export_responses: dict[int | str, dict[str, Any]] = {
+_export_data_responses: dict[int | str, dict[str, Any]] = {
     i.status_code: {"model": EnvelopedError}
-    for i in data_export_http_error_map.values()
+    for i in export_data_http_error_map.values()
 }
 
 
 @router.post(
-    "/storage/locations/{location_id}/data-export",
+    "/storage/locations/{location_id}/export-data",
     response_model=Envelope[TaskGet],
-    name="data_export",
+    name="export_data",
     description="Export data",
-    responses=_data_export_responses,
+    responses=_export_data_responses,
 )
-async def data_export(data_export: DataExportPost, location_id: LocationID):
+async def export_data(export_data: DataExportPost, location_id: LocationID):
     """Trigger data export. Returns async job id for getting status and results"""

packages/models-library/src/models_library/api_schemas_storage/data_export_async_jobs.py renamed to packages/models-library/src/models_library/api_schemas_storage/export_data_async_jobs.py

@@ -32,7 +32,7 @@ async def copy_folders_from_project(
     return async_job_rpc_get, job_id_data
 
 
-async def start_data_export(
+async def start_export_data(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     user_id: UserID,
@@ -43,7 +43,7 @@ async def start_data_export(
     async_job_rpc_get = await submit(
         rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
-        method_name=TypeAdapter(RPCMethodName).validate_python("start_data_export"),
+        method_name=TypeAdapter(RPCMethodName).validate_python("start_export_data"),
         job_id_data=job_id_data,
         paths_to_export=paths_to_export,
     )

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/simcore_s3.py

@@ -4,7 +4,7 @@
 
 from aws_library.s3._models import S3ObjectKey
 from celery import Task  # type: ignore[import-untyped]
-from models_library.api_schemas_storage.data_export_async_jobs import AccessRightError
+from models_library.api_schemas_storage.export_data_async_jobs import AccessRightError
 from models_library.api_schemas_storage.storage_schemas import FoldersBody
 from models_library.progress_bar import ProgressReport
 from models_library.projects_nodes_io import StorageFileID

services/storage/src/simcore_service_storage/api/_worker_tasks/_simcore_s3.py

@@ -30,7 +30,7 @@ async def copy_folders_from_project(
 
 
 @router.expose()
-async def start_data_export(
+async def start_export_data(
     app: FastAPI, job_id_data: AsyncJobNameData, paths_to_export: list[S3ObjectKey]
 ) -> AsyncJobGet:
     task_uuid = await get_celery_client(app).send_task(

services/storage/src/simcore_service_storage/api/rpc/_simcore_s3.py

@@ -1,5 +1,5 @@
 import pytest
-from models_library.api_schemas_storage.data_export_async_jobs import AccessRightError
+from models_library.api_schemas_storage.export_data_async_jobs import AccessRightError
 from simcore_service_storage.modules.celery.errors import (
     decode_celery_transferrable_error,
     encore_celery_transferrable_error,

services/storage/tests/unit/test_modules_celery_errors.py

@@ -54,7 +54,7 @@
 from servicelib.rabbitmq.rpc_interfaces.async_jobs.async_jobs import wait_and_get_result
 from servicelib.rabbitmq.rpc_interfaces.storage.simcore_s3 import (
     copy_folders_from_project,
-    start_data_export,
+    start_export_data,
 )
 from simcore_postgres_database.storage_models import file_meta_data
 from simcore_service_storage.modules.celery.worker import CeleryTaskQueueWorker
@@ -511,7 +511,7 @@ async def test_create_and_delete_folders_from_project(
     )
 
 
-async def _request_start_data_export(
+async def _request_start_export_data(
     rpc_client: RabbitMQRPCClient,
     user_id: UserID,
     product_name: ProductName,
@@ -523,7 +523,7 @@ async def _request_start_data_export(
         logging.INFO,
         f"Data export form {paths_to_export=}",
     ) as ctx:
-        async_job_get, async_job_name = await start_data_export(
+        async_job_get, async_job_name = await start_export_data(
             rpc_client,
             user_id=user_id,
             product_name=product_name,
@@ -533,7 +533,7 @@ async def _request_start_data_export(
         async for async_job_result in wait_and_get_result(
             rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
-            method_name=start_data_export.__name__,
+            method_name=start_export_data.__name__,
             job_id=async_job_get.job_id,
             job_id_data=async_job_name,
             client_timeout=client_timeout,
@@ -574,7 +574,7 @@ def task_progress_spy(mocker: MockerFixture) -> Mock:
     ],
     ids=str,
 )
-async def test_start_data_export(
+async def test_start_export_data(
     initialized_app: FastAPI,
     short_dsm_cleaner_interval: int,
     with_storage_celery_worker_controller: TestWorkController,
@@ -598,7 +598,7 @@ async def test_start_data_export(
     for x in src_projects_list.values():
         paths_to_export |= x.keys()
 
-    result = await _request_start_data_export(
+    result = await _request_start_export_data(
         storage_rabbitmq_rpc_client,
         user_id,
         product_name,
@@ -617,7 +617,7 @@ async def test_start_data_export(
     assert progress_updates[-1] == 1
 
 
-async def test_start_data_export_access_error(
+async def test_start_export_data_access_error(
     initialized_app: FastAPI,
     short_dsm_cleaner_interval: int,
     with_storage_celery_worker_controller: TestWorkController,
@@ -630,7 +630,7 @@ async def test_start_data_export_access_error(
         f"{faker.uuid4()}/{faker.uuid4()}/{faker.file_name()}"
     )
     with pytest.raises(JobError) as exc:
-        await _request_start_data_export(
+        await _request_start_export_data(
             storage_rabbitmq_rpc_client,
             user_id,
             product_name,

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

@@ -6556,13 +6556,13 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Envelope_FileUploadCompleteFutureResponse_'
-  /v0/storage/locations/{location_id}/data-export:
+  /v0/storage/locations/{location_id}/export-data:
     post:
       tags:
       - storage
-      summary: Data Export
+      summary: Export Data
       description: Export data
-      operationId: data_export
+      operationId: export_data
       parameters:
       - name: location_id
         in: path

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -44,7 +44,7 @@
 from servicelib.rabbitmq.rpc_interfaces.storage.paths import (
     delete_paths as remote_delete_paths,
 )
-from servicelib.rabbitmq.rpc_interfaces.storage.simcore_s3 import start_data_export
+from servicelib.rabbitmq.rpc_interfaces.storage.simcore_s3 import start_export_data
 from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.rest_responses import unwrap_envelope
 from yarl import URL
@@ -54,7 +54,7 @@
 from ..models import RequestContext
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..security.decorators import permission_required
-from ..tasks._exception_handlers import handle_data_export_exceptions
+from ..tasks._exception_handlers import handle_export_data_exceptions
 from .schemas import StorageFileIDStr
 from .settings import StorageSettings, get_plugin_settings
 
@@ -470,12 +470,12 @@ class _PathParams(BaseModel):
 
 
 @routes.post(
-    _storage_locations_prefix + "/{location_id}/data-export", name="data_export"
+    _storage_locations_prefix + "/{location_id}/export-data", name="export_data"
 )
 @login_required
 @permission_required("storage.files.*")
-@handle_data_export_exceptions
-async def data_export(request: web.Request) -> web.Response:
+@handle_export_data_exceptions
+async def export_data(request: web.Request) -> web.Response:
     class _PathParams(BaseModel):
         location_id: LocationID
 
@@ -490,14 +490,14 @@ def allow_only_simcore(cls, v: int) -> int:
     rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
     _req_ctx = RequestContext.model_validate(request)
     _ = parse_request_path_parameters_as(_PathParams, request)
-    data_export_post = await parse_request_body_as(
+    export_data_post = await parse_request_body_as(
         model_schema_cls=DataExportPost, request=request
     )
-    async_job_rpc_get, _ = await start_data_export(
+    async_job_rpc_get, _ = await start_export_data(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         user_id=_req_ctx.user_id,
         product_name=_req_ctx.product_name,
-        paths_to_export=data_export_post.paths,
+        paths_to_export=export_data_post.paths,
     )
     _job_id = f"{async_job_rpc_get.job_id}"
     return create_data_response(