Skip to content

Commit 0ef5ad6

Browse files
committed
@sanderegg move LOG_FILE_NAME to constants
1 parent 8ad62ba commit 0ef5ad6

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

services/director-v2/src/simcore_service_director_v2/api/rpc/_computations_tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
)
1010
from simcore_sdk.node_ports_common import data_items_utils
1111

12+
from ...constants import LOGS_FILE_NAME
1213
from ...core.errors import PipelineNotFoundError
1314
from ...modules.db.repositories.comp_pipelines import CompPipelinesRepository
1415
from ...modules.db.repositories.comp_tasks import CompTasksRepository
15-
from ...utils import dask as dask_utils
1616
from ...utils.computations_tasks import get_pipeline_info
1717

1818
router = RPCRouter()
@@ -41,7 +41,7 @@ async def get_computation_task_log_file_ids(
4141
TaskLogFileIdGet(
4242
task_id=node_id,
4343
file_id=data_items_utils.create_simcore_file_id(
44-
Path(dask_utils.LOGS_FILE_NAME), f"{project_id}", f"{node_id}"
44+
Path(LOGS_FILE_NAME), f"{project_id}", f"{node_id}"
4545
),
4646
)
4747
for node_id in iter_task_ids

services/director-v2/src/simcore_service_director_v2/constants.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@
1515
# - local
1616
# - itisfoundation
1717
# - 10.0.0.0:8473 (IP & Port)
18-
DYNAMIC_SIDECAR_DOCKER_IMAGE_RE = (
18+
DYNAMIC_SIDECAR_DOCKER_IMAGE_RE: Final[str] = (
1919
r"^(([_a-zA-Z0-9:.-]+)/)?(dynamic-sidecar):([_a-zA-Z0-9.-]+)$"
2020
)
2121

22-
REGEX_DY_SERVICE_SIDECAR = rf"^{DYNAMIC_SIDECAR_SERVICE_PREFIX}_[a-zA-Z0-9-_]*"
23-
REGEX_DY_SERVICE_PROXY = rf"^{DYNAMIC_PROXY_SERVICE_PREFIX}_[a-zA-Z0-9-_]*"
22+
LOGS_FILE_NAME: Final[str] = "logs.zip"
2423

25-
UNDEFINED_STR_METADATA = "undefined-metadata"
26-
UNDEFINED_DOCKER_LABEL = "undefined-label"
27-
UNDEFINED_API_BASE_URL = "https://api.local"
24+
REGEX_DY_SERVICE_SIDECAR: Final[str] = (
25+
rf"^{DYNAMIC_SIDECAR_SERVICE_PREFIX}_[a-zA-Z0-9-_]*"
26+
)
27+
REGEX_DY_SERVICE_PROXY: Final[str] = rf"^{DYNAMIC_PROXY_SERVICE_PREFIX}_[a-zA-Z0-9-_]*"
28+
29+
UNDEFINED_STR_METADATA: Final[str] = "undefined-metadata"
30+
UNDEFINED_DOCKER_LABEL: Final[str] = "undefined-label"
31+
UNDEFINED_API_BASE_URL: Final[str] = "https://api.local"

services/director-v2/src/simcore_service_director_v2/utils/dask.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
from simcore_sdk.node_ports_v2.links import ItemValue as _NPItemValue
4141
from sqlalchemy.ext.asyncio import AsyncEngine
4242

43-
from ..constants import UNDEFINED_API_BASE_URL, UNDEFINED_DOCKER_LABEL
43+
from ..constants import LOGS_FILE_NAME, UNDEFINED_API_BASE_URL, UNDEFINED_DOCKER_LABEL
4444
from ..core.errors import (
4545
ComputationalBackendNotConnectedError,
4646
ComputationalSchedulerChangedError,
@@ -261,9 +261,6 @@ async def compute_output_data_schema(
261261
return TaskOutputDataSchema.model_validate(output_data_schema)
262262

263263

264-
LOGS_FILE_NAME = "logs.zip"
265-
266-
267264
async def compute_service_log_file_upload_link(
268265
user_id: UserID,
269266
project_id: ProjectID,

0 commit comments

Comments
 (0)