From 3644f7a6c20601c44ded326c0c900c686ffb512e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 Sep 2025 20:03:50 +0000 Subject: [PATCH] Automated autoyapf fixes --- main.py | 1 - src/configuration/Settings.py | 120 +++++++++++++--------------------- src/utils/CommonFields.py | 1 - 3 files changed, 47 insertions(+), 75 deletions(-) diff --git a/main.py b/main.py index 68a55c0..0a3b842 100644 --- a/main.py +++ b/main.py @@ -6,7 +6,6 @@ from fastapi_sqlalchemy import DBSessionMiddleware from fastapi_utils.tasks import repeat_every - from src.configuration.Settings import settings from src.impl.Mail.service import MailService from src.versions.v1 import router as v1_router diff --git a/src/configuration/Settings.py b/src/configuration/Settings.py index 24a24f7..e5dc699 100644 --- a/src/configuration/Settings.py +++ b/src/configuration/Settings.py @@ -5,106 +5,80 @@ class MailSettings(BaseSettings): - username: str = Field( - default="username", - description="Mail service username", - env="MAIL__USERNAME" - ) - password: str = Field( - default="password", - description="Mail service password", - env="MAIL__PASSWORD" - ) + username: str = Field(default="username", + description="Mail service username", + env="MAIL__USERNAME") + password: str = Field(default="password", + description="Mail service password", + env="MAIL__PASSWORD") from_mail: str = Field( - default="from@example.com", + default="from@example.com", description="Email address used in the 'From' header", - env="MAIL__FROM" - ) - port: int = Field( - default=587, - description="Mail service port", - env="MAIL__PORT" - ) - server: str = Field( - default="smtp.example.com", - description="Mail service SMTP server", - env="MAIL__SERVER" - ) - from_name: str = Field( - default="Example Service", - description="Name used in the 'From' header", - env="MAIL__FROM_NAME" - ) + env="MAIL__FROM") + port: int = Field(default=587, + description="Mail service port", + env="MAIL__PORT") + server: str = Field(default="smtp.example.com", + description="Mail service SMTP server", + env="MAIL__SERVER") + from_name: str = Field(default="Example Service", + description="Name used in the 'From' header", + env="MAIL__FROM_NAME") send_mails: bool = Field( - default=False, - description="Flag to enable/disable sending emails", - env="MAIL__SEND_MAILS" - ) + default=False, + description="Flag to enable/disable sending emails", + env="MAIL__SEND_MAILS") class DatabaseSettings(BaseSettings): - url: str = Field( - ..., - description="Database connection URL", - env="DATABASE__URL" - ) + url: str = Field(..., + description="Database connection URL", + env="DATABASE__URL") class ClientSettings(BaseSettings): - url: str = Field( - ..., - description="Mail service URL", - env="CLIENTS__MAIL_CLIENT__URL" - ) + url: str = Field(..., + description="Mail service URL", + env="CLIENTS__MAIL_CLIENT__URL") class Settings(BaseSettings): - model_config = SettingsConfigDict( - env_file=".env", - env_file_encoding="utf-8", - env_nested_delimiter="__", - case_sensitive=False, - extra="allow" - ) - + model_config = SettingsConfigDict(env_file=".env", + env_file_encoding="utf-8", + env_nested_delimiter="__", + case_sensitive=False, + extra="allow") + # General settings front_url: str = Field( default="https://frontend.integration.lleidahack.dev/hackeps", description="Frontend URL", - env="FRONT_URL" - ) - back_url: str = Field( - default="http://localhost:8000/", - description="Backend URL", - env="BACK_URL" - ) - static_folder: str = Field( - default="static", - description="Static files folder path", - env="STATIC_FOLDER" - ) - contact_mail: str = Field( - default="contacte@lleidahack.dev", - description="Contact email address", - env="CONTACT_MAIL" - ) + env="FRONT_URL") + back_url: str = Field(default="http://localhost:8000/", + description="Backend URL", + env="BACK_URL") + static_folder: str = Field(default="static", + description="Static files folder path", + env="STATIC_FOLDER") + contact_mail: str = Field(default="contacte@lleidahack.dev", + description="Contact email address", + env="CONTACT_MAIL") initial_templates_path: str = Field( default="src/templates/emails/initial.html", description="Path to the initial email template", - env="INITIAL_TEMPLATES_PATH" - ) - + env="INITIAL_TEMPLATES_PATH") + # Nested settings mail: MailSettings = Field(default_factory=MailSettings) database: DatabaseSettings clients: ClientSettings - + def __init__(self, **kwargs): # Handle environment-specific defaults # env = os.environ.get('ENV', 'main') - + super().__init__(**kwargs) # Global settings instance -settings = Settings() \ No newline at end of file +settings = Settings() diff --git a/src/utils/CommonFields.py b/src/utils/CommonFields.py index 06dda5b..ba8faba 100644 --- a/src/utils/CommonFields.py +++ b/src/utils/CommonFields.py @@ -1,6 +1,5 @@ from enum import Enum - from src.configuration.Settings import settings