Skip to content

Commit 4232278

Browse files
committed
further name changes zipping -> data_export
1 parent 5ad9ea2 commit 4232278

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

packages/models-library/src/models_library/api_schemas_storage/zipping_tasks.py renamed to packages/models-library/src/models_library/api_schemas_storage/data_export_tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
from pydantic import BaseModel, Field
66

77

8-
class ZipTaskStartInput(BaseModel):
8+
class DataExportTaskStartInput(BaseModel):
99
paths: list[Path] = Field(..., min_length=1)
1010

1111

12-
class ZipTaskAbortOutput(BaseModel):
12+
class DataExportTaskAbortOutput(BaseModel):
1313
result: bool
1414
task_id: TaskRpcId

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
TaskRpcStatus,
88
)
99
from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
10-
from models_library.api_schemas_storage.zipping_tasks import (
11-
ZipTaskAbortOutput,
12-
ZipTaskStartInput,
10+
from models_library.api_schemas_storage.data_export_tasks import (
11+
DataExportTaskAbortOutput,
12+
DataExportTaskStartInput,
1313
)
1414
from models_library.rabbitmq_basic_types import RPCMethodName
1515
from pydantic import NonNegativeInt, TypeAdapter
@@ -22,7 +22,7 @@
2222

2323

2424
async def start_data_export(
25-
rabbitmq_rpc_client: RabbitMQRPCClient, *, paths: ZipTaskStartInput
25+
rabbitmq_rpc_client: RabbitMQRPCClient, *, paths: DataExportTaskStartInput
2626
) -> TaskRpcGet:
2727
result = await rabbitmq_rpc_client.request(
2828
STORAGE_RPC_NAMESPACE,
@@ -36,14 +36,14 @@ async def start_data_export(
3636

3737
async def abort_data_export(
3838
rabbitmq_rpc_client: RabbitMQRPCClient, *, task_id: TaskRpcId
39-
) -> ZipTaskAbortOutput:
39+
) -> DataExportTaskAbortOutput:
4040
result = await rabbitmq_rpc_client.request(
4141
STORAGE_RPC_NAMESPACE,
4242
_RPC_METHOD_NAME_ADAPTER.validate_python("abort_data_export"),
4343
task_id=task_id,
4444
timeout_s=_DEFAULT_TIMEOUT_S,
4545
)
46-
assert isinstance(result, ZipTaskAbortOutput)
46+
assert isinstance(result, DataExportTaskAbortOutput)
4747
return result
4848

4949

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@
88
TaskRpcResult,
99
TaskRpcStatus,
1010
)
11-
from models_library.api_schemas_storage.zipping_tasks import (
12-
ZipTaskAbortOutput,
13-
ZipTaskStartInput,
11+
from models_library.api_schemas_storage.data_export_tasks import (
12+
DataExportTaskAbortOutput,
13+
DataExportTaskStartInput,
1414
)
1515
from servicelib.rabbitmq import RPCRouter
1616

1717
router = RPCRouter()
1818

1919

2020
@router.expose()
21-
async def start_data_export(app: FastAPI, paths: ZipTaskStartInput) -> TaskRpcGet:
21+
async def start_data_export(
22+
app: FastAPI, paths: DataExportTaskStartInput
23+
) -> TaskRpcGet:
2224
assert app # nosec
2325
return TaskRpcGet(
2426
task_id=uuid4(),
@@ -27,9 +29,11 @@ async def start_data_export(app: FastAPI, paths: ZipTaskStartInput) -> TaskRpcGe
2729

2830

2931
@router.expose()
30-
async def abort_data_export(app: FastAPI, task_id: TaskRpcId) -> ZipTaskAbortOutput:
32+
async def abort_data_export(
33+
app: FastAPI, task_id: TaskRpcId
34+
) -> DataExportTaskAbortOutput:
3135
assert app # nosec
32-
return ZipTaskAbortOutput(result=True, task_id=task_id)
36+
return DataExportTaskAbortOutput(result=True, task_id=task_id)
3337

3438

3539
@router.expose()

services/storage/tests/unit/test_data_export.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
TaskRpcResult,
1313
TaskRpcStatus,
1414
)
15-
from models_library.api_schemas_storage.zipping_tasks import (
16-
ZipTaskAbortOutput,
17-
ZipTaskStartInput,
15+
from models_library.api_schemas_storage.data_export_tasks import (
16+
DataExportTaskAbortOutput,
17+
DataExportTaskStartInput,
1818
)
1919
from pytest_mock import MockerFixture
2020
from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
@@ -75,15 +75,15 @@ async def rpc_client(
7575

7676
async def test_start_data_export(rpc_client: RabbitMQRPCClient, faker: Faker):
7777
result = await data_export.start_data_export(
78-
rpc_client, paths=ZipTaskStartInput(paths=[Path(faker.file_path())])
78+
rpc_client, paths=DataExportTaskStartInput(paths=[Path(faker.file_path())])
7979
)
8080
assert isinstance(result, TaskRpcGet)
8181

8282

8383
async def test_abort_data_export(rpc_client: RabbitMQRPCClient, faker: Faker):
8484
_task_id = TaskRpcId(faker.uuid4())
8585
result = await data_export.abort_data_export(rpc_client, task_id=_task_id)
86-
assert isinstance(result, ZipTaskAbortOutput)
86+
assert isinstance(result, DataExportTaskAbortOutput)
8787
assert result.task_id == _task_id
8888

8989

0 commit comments

Comments
 (0)