|
4 | 4 |
|
5 | 5 | from aws_library.ec2 import EC2InstanceBootSpecific, EC2Tags |
6 | 6 | from fastapi import FastAPI |
7 | | -from models_library.basic_types import ( |
8 | | - BootModeEnum, |
9 | | - BuildTargetEnum, |
10 | | - LogLevel, |
11 | | - PortInt, |
12 | | - VersionTag, |
13 | | -) |
| 7 | +from models_library.basic_types import LogLevel, PortInt, VersionTag |
14 | 8 | from models_library.clusters import ClusterAuthentication |
15 | 9 | from models_library.docker import DockerLabelKey |
16 | 10 | from pydantic import ( |
17 | 11 | AliasChoices, |
18 | 12 | AnyUrl, |
19 | 13 | Field, |
20 | 14 | NonNegativeInt, |
21 | | - PositiveInt, |
22 | 15 | TypeAdapter, |
23 | 16 | field_validator, |
24 | 17 | model_validator, |
25 | 18 | ) |
26 | 19 | from pydantic_settings import SettingsConfigDict |
27 | 20 | from servicelib.logging_utils_filtering import LoggerName, MessageSubstring |
| 21 | +from settings_library.application import BaseApplicationSettings |
28 | 22 | from settings_library.base import BaseCustomSettings |
29 | 23 | from settings_library.docker_registry import RegistrySettings |
30 | 24 | from settings_library.ec2 import EC2Settings |
@@ -239,34 +233,12 @@ class DaskMonitoringSettings(BaseCustomSettings): |
239 | 233 | ] |
240 | 234 |
|
241 | 235 |
|
242 | | -class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings): |
| 236 | +class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings): |
243 | 237 | # CODE STATICS --------------------------------------------------------- |
244 | 238 | API_VERSION: str = API_VERSION |
245 | 239 | APP_NAME: str = APP_NAME |
246 | 240 | API_VTAG: VersionTag = API_VTAG |
247 | 241 |
|
248 | | - # IMAGE BUILDTIME ------------------------------------------------------ |
249 | | - # @Makefile |
250 | | - SC_BUILD_DATE: str | None = None |
251 | | - SC_BUILD_TARGET: BuildTargetEnum | None = None |
252 | | - SC_VCS_REF: str | None = None |
253 | | - SC_VCS_URL: str | None = None |
254 | | - |
255 | | - # @Dockerfile |
256 | | - SC_BOOT_MODE: BootModeEnum | None = None |
257 | | - SC_BOOT_TARGET: BuildTargetEnum | None = None |
258 | | - SC_HEALTHCHECK_TIMEOUT: Annotated[ |
259 | | - PositiveInt | None, |
260 | | - Field( |
261 | | - None, |
262 | | - description="If a single run of the check takes longer than timeout seconds " |
263 | | - "then the check is considered to have failed." |
264 | | - "It takes retries consecutive failures of the health check for the container to be considered unhealthy.", |
265 | | - ), |
266 | | - ] |
267 | | - SC_USER_ID: int | None = None |
268 | | - SC_USER_NAME: str | None = None |
269 | | - |
270 | 242 | # RUNTIME ----------------------------------------------------------- |
271 | 243 | AUTOSCALING_DEBUG: Annotated[ |
272 | 244 | bool, |
|
0 commit comments