Add config and client injection with test reorganization.
Introduce typed config objects, optional adapter injection, and .env loading to simplify testing while preserving env-based defaults for production usage. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
co-authored by
Cursor
parent
7ed1b34233
commit
5e32787b90
@@ -0,0 +1,9 @@
|
||||
from .dotenv_loader import load_dotenv as load_dotenv
|
||||
from .minio_config import MinioConfig as MinioConfig
|
||||
from .redis_config import RedisConfig as RedisConfig
|
||||
|
||||
__all__ = [
|
||||
"MinioConfig",
|
||||
"RedisConfig",
|
||||
"load_dotenv",
|
||||
]
|
||||
@@ -0,0 +1,14 @@
|
||||
"""Load environment variables from a .env file."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from dotenv import load_dotenv as _load_dotenv
|
||||
|
||||
|
||||
def load_dotenv(path: str | Path | None = None) -> bool:
|
||||
"""Load .env into os.environ. Idempotent; returns True if a file was loaded."""
|
||||
if path is None:
|
||||
return bool(_load_dotenv())
|
||||
return bool(_load_dotenv(path))
|
||||
@@ -0,0 +1,48 @@
|
||||
"""MinIO connection configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
|
||||
from python_utils import check_env
|
||||
|
||||
from python_repositories.config.dotenv_loader import load_dotenv
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class MinioConfig:
|
||||
"""Configuration for connecting to MinIO."""
|
||||
|
||||
endpoint: str
|
||||
access_key: str
|
||||
secret_key: str
|
||||
bucket: str
|
||||
secure: bool = False
|
||||
|
||||
@classmethod
|
||||
def from_env(
|
||||
cls,
|
||||
endpoint_env_var_name: str = "MINIO_ENDPOINT",
|
||||
access_key_env_var_name: str = "MINIO_ACCESS_KEY",
|
||||
secret_key_env_var_name: str = "MINIO_SECRET_KEY",
|
||||
bucket_env_var_name: str = "MINIO_BUCKET",
|
||||
*,
|
||||
use_dotenv: bool = True,
|
||||
) -> MinioConfig:
|
||||
"""Load configuration from environment variables."""
|
||||
if use_dotenv:
|
||||
load_dotenv()
|
||||
env_var_names = {
|
||||
endpoint_env_var_name,
|
||||
access_key_env_var_name,
|
||||
secret_key_env_var_name,
|
||||
bucket_env_var_name,
|
||||
}
|
||||
check_env(env_var_names)
|
||||
return cls(
|
||||
endpoint=str(os.getenv(endpoint_env_var_name)),
|
||||
access_key=str(os.getenv(access_key_env_var_name)),
|
||||
secret_key=str(os.getenv(secret_key_env_var_name)),
|
||||
bucket=str(os.getenv(bucket_env_var_name)),
|
||||
)
|
||||
@@ -0,0 +1,30 @@
|
||||
"""Redis connection configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
|
||||
from python_utils import check_env
|
||||
|
||||
from python_repositories.config.dotenv_loader import load_dotenv
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class RedisConfig:
|
||||
"""Configuration for connecting to Redis."""
|
||||
|
||||
uri: str
|
||||
|
||||
@classmethod
|
||||
def from_env(
|
||||
cls,
|
||||
uri_env_var_name: str = "REDIS_URI",
|
||||
*,
|
||||
use_dotenv: bool = True,
|
||||
) -> RedisConfig:
|
||||
"""Load configuration from environment variables."""
|
||||
if use_dotenv:
|
||||
load_dotenv()
|
||||
check_env(uri_env_var_name)
|
||||
return cls(uri=str(os.getenv(uri_env_var_name)))
|
||||
Reference in New Issue
Block a user