diff --git a/bd/__init__.py b/bd/__init__.py index 2f56e6c..60f821b 100644 --- a/bd/__init__.py +++ b/bd/__init__.py @@ -1,6 +1,5 @@ # Database configuration package from pydantic import BaseModel -import re import os import urllib.parse @@ -11,24 +10,7 @@ class Settings(BaseModel): DB_PASS: str = os.getenv("DB_PASS", "") DB_NAME: str = os.getenv("DB_NAME", "profi") - @classmethod - def validate_db_port(cls, v): - # Проверка и преобразование DB_PORT - if isinstance(v, str): - # Используем регулярное выражение для извлечения целого числа - match = re.search(r'\d+', v) - if match: - return int(match.group()) - else: - raise ValueError(f"Invalid DB_PORT value: {v}") - return v - - @property - def DATABASE_URL_asyncpg(self) -> str: - pwd = urllib.parse.quote_plus(str(self.DB_PASS)) - return f"postgresql+asyncpg://{self.DB_USER}:{pwd}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}" - - @property + @property def DATABASE_URL_syncpg(self) -> str: pwd = urllib.parse.quote_plus(str(self.DB_PASS)) return f"postgresql+pg8000://{self.DB_USER}:{pwd}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}"