Skip to content

Commit ab28ae1

Browse files
author
Andrei Neagu
committed
fixed test
1 parent 0d61811 commit ab28ae1

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import datetime
22

3+
from models_library.projects_ui import Annotation
34
from pydantic import AliasChoices, Field, TypeAdapter, field_validator
4-
from pydantic_settings import SettingsConfigDict
55
from servicelib.logging_utils_filtering import LoggerName, MessageSubstring
66
from settings_library.application import BaseApplicationSettings
77
from settings_library.basic_types import LogLevel, VersionTag
@@ -24,12 +24,15 @@ class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
2424

2525
# RUNTIME -----------------------------------------------------------
2626

27-
DYNAMIC_SCHEDULER_LOGLEVEL: LogLevel = Field(
28-
default=LogLevel.INFO,
29-
validation_alias=AliasChoices(
30-
"DYNAMIC_SCHEDULER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"
27+
DYNAMIC_SCHEDULER_LOGLEVEL: Annotation[
28+
LogLevel,
29+
Field(
30+
default=LogLevel.INFO,
31+
validation_alias=AliasChoices(
32+
"DYNAMIC_SCHEDULER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"
33+
),
3134
),
32-
)
35+
]
3336
DYNAMIC_SCHEDULER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
3437
default=False,
3538
validation_alias=AliasChoices(
@@ -69,8 +72,6 @@ class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
6972
def _validate_log_level(cls, value: str) -> str:
7073
return cls.validate_log_level(value)
7174

72-
model_config = SettingsConfigDict(extra="allow")
73-
7475

7576
class ApplicationSettings(_BaseApplicationSettings):
7677
"""Web app's environment variables

services/dynamic-scheduler/tests/unit/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_list_settings(cli_runner: CliRunner, app_environment: EnvVarsDict):
3939
assert result.exit_code == os.EX_OK, result.output
4040

4141
print(result.output)
42-
settings = ApplicationSettings.model_validate_json(result.output)
42+
settings = ApplicationSettings(result.output)
4343
assert settings.model_dump() == ApplicationSettings.create_from_envs().model_dump()
4444

4545

0 commit comments

Comments
 (0)