Skip to content

Commit 061de08

Browse files
committed
[DOP-28169] Fix resource constraints
1 parent 9f56bb2 commit 061de08

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

syncmaster/schemas/v1/transfers/file/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class FileTransferTarget(BaseModel):
5151

5252
model_config = ConfigDict(arbitrary_types_allowed=True)
5353

54-
FILE_NAME_PATTERN: ClassVar[re.Pattern] = re.compile(r"^[a-zA-Z0-9_.{}-]+$")
54+
FILE_NAME_PATTERN: ClassVar[re.Pattern] = re.compile(r"^[\w.{}-]+$")
5555

5656
@field_validator("directory_path", mode="before")
5757
@classmethod

syncmaster/schemas/v1/transfers/resources.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
# SPDX-License-Identifier: Apache-2.0
33
from pydantic import BaseModel, ByteSize, Field
44

5+
ONE_MB = 2**20 # noqa: WPS432
6+
ONE_GB = 2**30 # noqa: WPS432
7+
58

69
class Resources(BaseModel):
710
max_parallel_tasks: int = Field(default=1, ge=1, le=100, description="Parallel executors")
811
cpu_cores_per_task: int = Field(default=1, ge=1, le=32, description="Cores per executor") # noqa: WPS432
912
ram_bytes_per_task: ByteSize = Field( # type: ignore[arg-type]
10-
default="1GiB",
11-
ge="512MiB", # noqa: WPS432
12-
le="64GiB", # noqa: WPS432
13+
default=ONE_GB,
14+
ge=512 * ONE_MB, # noqa: WPS432
15+
le=64 * ONE_GB, # noqa: WPS432
1316
description="RAM per executor",
1417
)

0 commit comments

Comments
 (0)