Update admin/config.py

admin/config.py

@@ -1,83 +1,58 @@
 from __future__ import annotations
-from pathlib import Path
-from typing import TYPE_CHECKING
+import os
 
-from pydantic_settings import BaseSettings, SettingsConfigDict
+from dotenv import load_dotenv
 
-if TYPE_CHECKING:
-    from sqlalchemy.engine.url import URL
+load_dotenv()
 
-DIR = Path(__file__).absolute().parent.parent.parent
-BOT_DIR = Path(__file__).absolute().parent.parent
-LOCALES_DIR = f"{BOT_DIR}/locales"
-I18N_DOMAIN = "messages"
-DEFAULT_LOCALE = "en"
+ADMIN_HOST: str = os.getenv("ADMIN_HOST") or "localhost"
+ADMIN_PORT: int = int(os.getenv("ADMIN_PORT") or 5000)
+DEFAULT_ADMIN_EMAIL: str = os.getenv("DEFAULT_ADMIN_EMAIL") or "admin@example.com"
+DEFAULT_ADMIN_PASSWORD: str = os.getenv("DEFAULT_ADMIN_PASSWORD") or "admin"
 
+DEBUG: bool = str(os.getenv("DEBUG")).lower() == "true"
 
-class EnvBaseSettings(BaseSettings):
-    model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8", extra="ignore")
+BABEL_DEFAULT_LOCALE = os.getenv("BABEL_DEFAULT_LOCALE") or "en"
 
+# Create dummy secrey key so we can use sessions
+SECRET_KEY: str = os.getenv("SECRET_KEY") or "x%#3&%giwv8f0+%r946en7z&d@9*rc$sl0qoql56xr%bh^w2mj"
 
-class WebhookSettings(EnvBaseSettings):
-    USE_WEBHOOK: bool = False
-    WEBHOOK_BASE_URL: str = "https://xxx.ngrok-free.app"
-    WEBHOOK_PATH: str = "/webhook"
-    WEBHOOK_SECRET: str = ""
-    WEBHOOK_HOST: str = "localhost"
-    WEBHOOK_PORT: int = 8080
 
-    @property
-    def webhook_url(self) -> str:
-        if self.USE_WEBHOOK:
-            return f"{self.WEBHOOK_BASE_URL}{self.WEBHOOK_PATH}"
-        return f"http://localhost:{self.WEBHOOK_PORT}{self.WEBHOOK_PATH}"
+# SQLAlchemy config
+def database_url() -> str:
+    db_host: str = os.getenv("DB_HOST") or "localhost"
+    db_port: int = int(os.getenv("DB_PORT") or 5432)
+    db_user: str = os.getenv("DB_USER") or "postgres"
+    db_pass: str | None = os.getenv("DB_PASS")
+    db_name: str = os.getenv("DB_NAME") or "postgres"
 
+    if db_pass:
+        return f"postgresql://{db_user}:{db_pass}@{db_host}:{db_port}/{db_name}"
+    return f"postgresql://{db_user}@{db_host}:{db_port}/{db_name}"
 
-class BotSettings(WebhookSettings):
-    BOT_TOKEN: str
-    SUPPORT_URL: str | None = None
-    RATE_LIMIT: int | float = 0.5  # for throttling control
 
+SQLALCHEMY_DATABASE_URI: str = database_url()
+SQLALCHEMY_ECHO = False
+SQLALCHEMY_TRACK_MODIFICATIONS = False
 
-class DBSettings(EnvBaseSettings):
-    DB_HOST: str = "localhost"
-    DB_PORT: int = 5432
-    DB_USER: str = "tgbot"
-    DB_PASS: str | None = None
-    DB_NAME: str = "bot_db"
+# Flask-Security config
+SECURITY_URL_PREFIX = "/admin"
+SECURITY_PASSWORD_HASH: str = os.getenv("SECURITY_PASSWORD_HASH") or "pbkdf2_sha512"
+SECURITY_PASSWORD_SALT: str = os.getenv("SECURITY_PASSWORD_SALT") or "ATGUOHAELKiubahiughaerGOJAEGj"
 
-    @property
-    def database_url(self) -> URL | str:
-        if self.DB_PASS:
-            return f"postgresql+asyncpg://{self.DB_USER}:{self.DB_PASS}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}"
-        return f"postgresql+asyncpg://{self.DB_USER}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}"
+# Flask-Security URLs, overridden because they don't put a / at the end
+SECURITY_LOGIN_URL = "/login/"
+SECURITY_LOGOUT_URL = "/logout/"
+SECURITY_REGISTER_URL = "/register/"
 
-    @property
-    def database_url_psycopg2(self) -> str:
-        if self.DB_PASS:
-            return f"postgresql://{self.DB_USER}:{self.DB_PASS}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}"
-        return f"postgresql://{self.DB_USER}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}"
+SECURITY_POST_LOGIN_VIEW = "/admin/"
+SECURITY_POST_LOGOUT_VIEW = "/admin/"
+SECURITY_POST_REGISTER_VIEW = "/admin/"
 
+# Flask-Security features
+SECURITY_REGISTERABLE = True
+SECURITY_SEND_REGISTER_EMAIL = False
 
-class CacheSettings(EnvBaseSettings):
-    REDIS_HOST: str = "localhost"
-    REDIS_PORT: int = 6379
-    REDIS_PASS: str | None = None
-
-    @property
-    def redis_url(self) -> str:
-        if self.REDIS_PASS:
-            return f"redis://{self.REDIS_PASS}@{self.REDIS_HOST}:{self.REDIS_PORT}/0"
-        return f"redis://{self.REDIS_HOST}:{self.REDIS_PORT}/0"
-
-
-class Settings(BotSettings, DBSettings, CacheSettings):
-    DEBUG: bool = False
-
-    SENTRY_DSN: str | None = None
-
-    AMPLITUDE_API_KEY: str | None = None
-    POSTHOG_API_KEY: str | None = None
-
-
-settings = Settings()
+# Cache config
+CACHE_TYPE = "SimpleCache"
+CACHE_DEFAULT_TIMEOUT = 300