Skip to content

Commit 1a3999c

Browse files
author
Andrei Neagu
committed
revert adapter pattern
1 parent 237eee5 commit 1a3999c

File tree

2 files changed

+5
-6
lines changed
  • packages/settings-library/src/settings_library
  • services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core

2 files changed

+5
-6
lines changed

packages/settings-library/src/settings_library/basic_types.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
# an extra dependency to a larger models_library (intra-repo library)
55

66
from enum import Enum
7-
from typing import Annotated, Final, TypeAlias
7+
from typing import Annotated, TypeAlias
88

9-
from pydantic import Field, StringConstraints, TypeAdapter
9+
from pydantic import Field, StringConstraints
1010

1111
# port number range
1212
PortInt: TypeAlias = Annotated[int, Field(gt=0, lt=65535)]
1313

1414

1515
# e.g. 'v5'
1616
VersionTag: TypeAlias = Annotated[str, StringConstraints(pattern=r"^v\d$")]
17-
VersionTagAdapter: Final[TypeAdapter[VersionTag]] = TypeAdapter(VersionTag)
1817

1918

2019
class LogLevel(str, Enum):

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/settings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from functools import cached_property
33

44
from common_library.pydantic_validators import timedelta_try_convert_str_to_float
5-
from pydantic import AliasChoices, Field, field_validator
5+
from pydantic import AliasChoices, Field, TypeAdapter, field_validator
66
from pydantic_settings import SettingsConfigDict
77
from settings_library.application import BaseApplicationSettings
8-
from settings_library.basic_types import LogLevel, VersionTag, VersionTagAdapter
8+
from settings_library.basic_types import LogLevel, VersionTag
99
from settings_library.director_v2 import DirectorV2Settings
1010
from settings_library.rabbit import RabbitSettings
1111
from settings_library.redis import RedisSettings
@@ -21,7 +21,7 @@ class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
2121
# CODE STATICS ---------------------------------------------------------
2222
API_VERSION: str = API_VERSION
2323
APP_NAME: str = PROJECT_NAME
24-
API_VTAG: VersionTag = VersionTagAdapter.validate_python(API_VTAG)
24+
API_VTAG: VersionTag = TypeAdapter(VersionTag).validate_python(API_VTAG)
2525

2626
# RUNTIME -----------------------------------------------------------
2727

0 commit comments

Comments
 (0)