diff --git a/diracx-core/src/diracx/core/preferences.py b/diracx-core/src/diracx/core/preferences.py index cb1f193b..7a0b6f73 100644 --- a/diracx-core/src/diracx/core/preferences.py +++ b/diracx-core/src/diracx/core/preferences.py @@ -1,16 +1,13 @@ from __future__ import annotations -from pydantic import field_validator -from pydantic_settings import SettingsConfigDict - import logging import sys from enum import Enum, StrEnum from functools import lru_cache from pathlib import Path -from pydantic import AnyHttpUrl, Field -from pydantic_settings import BaseSettings +from pydantic import AnyHttpUrl, Field, field_validator +from pydantic_settings import BaseSettings, SettingsConfigDict from .utils import dotenv_files_from_environment diff --git a/diracx-core/src/diracx/core/settings.py b/diracx-core/src/diracx/core/settings.py index 73035ecb..20bb1f3f 100644 --- a/diracx-core/src/diracx/core/settings.py +++ b/diracx-core/src/diracx/core/settings.py @@ -1,8 +1,5 @@ from __future__ import annotations -from diracx.core.properties import SecurityProperty -from diracx.core.s3 import s3_bucket_exists - import contextlib from collections.abc import AsyncIterator from pathlib import Path @@ -25,6 +22,9 @@ ) from pydantic_settings import BaseSettings, SettingsConfigDict +from diracx.core.properties import SecurityProperty +from diracx.core.s3 import s3_bucket_exists + if TYPE_CHECKING: from types_aiobotocore_s3.client import S3Client