Skip to content

Commit ff4fa9c

Browse files
committed
@pcrespov review: use ProductName
1 parent 014e276 commit ff4fa9c

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

packages/pytest-simcore/src/pytest_simcore/docker_compose.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ def _filter_services_and_dump(
392392
service["environment"] = _minio_fix(service["environment"])
393393

394394
if name == "postgres":
395+
# NOTE: # -c fsync=off is not recommended for production as this disable writing to disk https://pythonspeed.com/articles/faster-db-tests/
395396
service["command"] += ["-c", "fsync=off"]
396397

397398
# updates current docker-compose (also versioned ... do not change by hand)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
AsyncJobNameData,
66
)
77
from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
8+
from models_library.products import ProductName
89
from models_library.projects_nodes_io import LocationID
910
from models_library.rabbitmq_basic_types import RPCMethodName
1011
from models_library.users import UserID
@@ -17,7 +18,7 @@ async def compute_path_size(
1718
client: RabbitMQRPCClient,
1819
*,
1920
user_id: UserID,
20-
product_name: str,
21+
product_name: ProductName,
2122
location_id: LocationID,
2223
path: Path,
2324
) -> tuple[AsyncJobGet, AsyncJobNameData]:

services/storage/tests/unit/test_rpc_handlers_paths.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
AsyncJobResult,
2222
)
2323
from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
24+
from models_library.products import ProductName
2425
from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
2526
from models_library.rabbitmq_basic_types import RPCMethodName
2627
from models_library.users import UserID
@@ -61,7 +62,7 @@ async def _assert_compute_path_size(
6162
storage_rpc_client: RabbitMQRPCClient,
6263
location_id: LocationID,
6364
user_id: UserID,
64-
product_name: str,
65+
product_name: ProductName,
6566
*,
6667
path: Path,
6768
expected_total_size: int,
@@ -119,7 +120,7 @@ async def test_path_compute_size(
119120
dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
120121
],
121122
project_params: ProjectWithFilesParams,
122-
product_name: str,
123+
product_name: ProductName,
123124
):
124125
assert (
125126
len(project_params.allowed_file_sizes) == 1
@@ -235,7 +236,7 @@ async def test_path_compute_size_inexistent_path(
235236
user_id: UserID,
236237
faker: Faker,
237238
fake_datcore_tokens: tuple[str, str],
238-
product_name: str,
239+
product_name: ProductName,
239240
):
240241
await _assert_compute_path_size(
241242
storage_rabbitmq_rpc_client,

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
FoldersBody,
3030
)
3131
from models_library.basic_types import SHA256Str
32+
from models_library.products import ProductName
3233
from models_library.projects_nodes_io import NodeID, NodeIDStr, SimcoreS3FileID
3334
from models_library.users import UserID
3435
from pydantic import ByteSize, TypeAdapter
@@ -62,7 +63,7 @@
6263
async def _request_copy_folders(
6364
rpc_client: RabbitMQRPCClient,
6465
user_id: UserID,
65-
product_name: str,
66+
product_name: ProductName,
6667
source_project: dict[str, Any],
6768
dst_project: dict[str, Any],
6869
nodes_map: dict[NodeID, NodeID],
@@ -103,7 +104,7 @@ async def test_copy_folders_from_non_existing_project(
103104
initialized_app: FastAPI,
104105
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
105106
user_id: UserID,
106-
product_name: str,
107+
product_name: ProductName,
107108
create_project: Callable[..., Awaitable[dict[str, Any]]],
108109
faker: Faker,
109110
):
@@ -143,7 +144,7 @@ async def test_copy_folders_from_empty_project(
143144
initialized_app: FastAPI,
144145
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
145146
user_id: UserID,
146-
product_name: str,
147+
product_name: ProductName,
147148
create_project: Callable[[], Awaitable[dict[str, Any]]],
148149
sqlalchemy_async_engine: AsyncEngine,
149150
storage_s3_client: SimcoreS3API,
@@ -204,7 +205,7 @@ async def test_copy_folders_from_valid_project_with_one_large_file(
204205
short_dsm_cleaner_interval: int,
205206
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
206207
user_id: UserID,
207-
product_name: str,
208+
product_name: ProductName,
208209
create_project: Callable[[], Awaitable[dict[str, Any]]],
209210
sqlalchemy_async_engine: AsyncEngine,
210211
random_project_with_files: Callable[
@@ -297,7 +298,7 @@ async def test_copy_folders_from_valid_project(
297298
initialized_app: FastAPI,
298299
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
299300
user_id: UserID,
300-
product_name: str,
301+
product_name: ProductName,
301302
create_project: Callable[[], Awaitable[dict[str, Any]]],
302303
sqlalchemy_async_engine: AsyncEngine,
303304
random_project_with_files: Callable[
@@ -358,7 +359,7 @@ async def _create_and_delete_folders_from_project(
358359
rpc_client: RabbitMQRPCClient,
359360
client: httpx.AsyncClient,
360361
user_id: UserID,
361-
product_name: str,
362+
product_name: ProductName,
362363
project: dict[str, Any],
363364
initialized_app: FastAPI,
364365
project_db_creator: Callable,
@@ -472,7 +473,7 @@ async def test_create_and_delete_folders_from_project(
472473
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
473474
client: httpx.AsyncClient,
474475
user_id: UserID,
475-
product_name: str,
476+
product_name: ProductName,
476477
with_random_project_with_files: tuple[
477478
dict[str, Any],
478479
dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],

services/web/server/src/simcore_service_webserver/projects/_crud_api_create.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from jsonschema import ValidationError as JsonSchemaValidationError
99
from models_library.api_schemas_long_running_tasks.base import ProgressPercent
1010
from models_library.api_schemas_webserver.projects import ProjectGet
11+
from models_library.products import ProductName
1112
from models_library.projects import ProjectID
1213
from models_library.projects_access import Owner
1314
from models_library.projects_nodes_io import NodeID
@@ -71,7 +72,7 @@ async def _prepare_project_copy(
7172
app: web.Application,
7273
*,
7374
user_id: UserID,
74-
product_name: str,
75+
product_name: ProductName,
7576
src_project_uuid: ProjectID,
7677
as_template: bool,
7778
deep_copy: bool,

services/web/server/src/simcore_service_webserver/storage/api.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
PresignedLink,
1818
)
1919
from models_library.generics import Envelope
20+
from models_library.products import ProductName
2021
from models_library.projects import ProjectID
2122
from models_library.projects_nodes_io import LocationID, NodeID, SimCoreFileLink
2223
from models_library.users import UserID
@@ -108,7 +109,7 @@ async def copy_data_folders_from_project(
108109
destination_project: ProjectDict,
109110
nodes_map: NodesMap,
110111
user_id: UserID,
111-
product_name: str,
112+
product_name: ProductName,
112113
) -> AsyncGenerator[AsyncJobComposedResult, None]:
113114
with log_context(_logger, logging.DEBUG, msg=f"copy {nodes_map=}"):
114115
rabbitmq_client = get_rabbitmq_rpc_client(app)

0 commit comments

Comments
 (0)