This commit is contained in:
@@ -1,102 +1,34 @@
|
||||
import builtins
|
||||
import logging
|
||||
import math
|
||||
import time
|
||||
import traceback
|
||||
import warnings
|
||||
from io import TextIOWrapper
|
||||
from typing import Any, ClassVar, Type, TypeVar, Union
|
||||
from typing import Any, TypeVar
|
||||
|
||||
import orjson
|
||||
import sqlalchemy
|
||||
from sqlalchemy import JSON, Column, Integer, create_engine, event, exc, func, inspect
|
||||
from sqlalchemy import create_engine, event, exc, func, inspect
|
||||
from sqlalchemy.dialects.sqlite import insert
|
||||
from sqlalchemy.engine import Connection, Engine
|
||||
from sqlalchemy.orm import Session, configure_mappers, declarative_base, joinedload
|
||||
from sqlalchemy.orm import Session, configure_mappers, joinedload
|
||||
from sqlalchemy.pool import StaticPool
|
||||
|
||||
from orm.base import BaseModel
|
||||
from settings import DB_URL
|
||||
from utils.logger import root_logger as logger
|
||||
|
||||
# Global variables
|
||||
REGISTRY: dict[str, type["BaseModel"]] = {}
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Database configuration
|
||||
engine = create_engine(DB_URL, echo=False, poolclass=StaticPool if "sqlite" in DB_URL else None)
|
||||
ENGINE = engine # Backward compatibility alias
|
||||
|
||||
inspector = inspect(engine)
|
||||
# Session = sessionmaker(engine)
|
||||
configure_mappers()
|
||||
T = TypeVar("T")
|
||||
FILTERED_FIELDS = ["_sa_instance_state", "search_vector"]
|
||||
|
||||
# Создаем Base для внутреннего использования
|
||||
_Base = declarative_base()
|
||||
|
||||
# Create proper type alias for Base
|
||||
BaseType = Type[_Base] # type: ignore[valid-type]
|
||||
|
||||
|
||||
class BaseModel(_Base): # type: ignore[valid-type,misc]
|
||||
__abstract__ = True
|
||||
__allow_unmapped__ = True
|
||||
__table_args__: ClassVar[Union[dict[str, Any], tuple]] = {"extend_existing": True}
|
||||
|
||||
id = Column(Integer, primary_key=True)
|
||||
|
||||
def __init_subclass__(cls, **kwargs: Any) -> None:
|
||||
REGISTRY[cls.__name__] = cls
|
||||
super().__init_subclass__(**kwargs)
|
||||
|
||||
def dict(self, access: bool = False) -> builtins.dict[str, Any]:
|
||||
"""
|
||||
Конвертирует ORM объект в словарь.
|
||||
|
||||
Пропускает атрибуты, которые отсутствуют в объекте, но присутствуют в колонках таблицы.
|
||||
Преобразует JSON поля в словари.
|
||||
Добавляет синтетическое поле .stat, если оно существует.
|
||||
|
||||
Returns:
|
||||
Dict[str, Any]: Словарь с атрибутами объекта
|
||||
"""
|
||||
column_names = filter(lambda x: x not in FILTERED_FIELDS, self.__table__.columns.keys())
|
||||
data = {}
|
||||
try:
|
||||
for column_name in column_names:
|
||||
try:
|
||||
# Проверяем, существует ли атрибут в объекте
|
||||
if hasattr(self, column_name):
|
||||
value = getattr(self, column_name)
|
||||
# Проверяем, является ли значение JSON и декодируем его при необходимости
|
||||
if isinstance(value, (str, bytes)) and isinstance(
|
||||
self.__table__.columns[column_name].type, JSON
|
||||
):
|
||||
try:
|
||||
data[column_name] = orjson.loads(value)
|
||||
except (TypeError, orjson.JSONDecodeError) as e:
|
||||
logger.exception(f"Error decoding JSON for column '{column_name}': {e}")
|
||||
data[column_name] = value
|
||||
else:
|
||||
data[column_name] = value
|
||||
else:
|
||||
# Пропускаем атрибут, если его нет в объекте (может быть добавлен после миграции)
|
||||
logger.debug(f"Skipping missing attribute '{column_name}' for {self.__class__.__name__}")
|
||||
except AttributeError as e:
|
||||
logger.warning(f"Attribute error for column '{column_name}': {e}")
|
||||
# Добавляем синтетическое поле .stat если оно существует
|
||||
if hasattr(self, "stat"):
|
||||
data["stat"] = self.stat
|
||||
except Exception as e:
|
||||
logger.exception(f"Error occurred while converting object to dictionary: {e}")
|
||||
return data
|
||||
|
||||
def update(self, values: builtins.dict[str, Any]) -> None:
|
||||
for key, value in values.items():
|
||||
if hasattr(self, key):
|
||||
setattr(self, key, value)
|
||||
|
||||
|
||||
# make_searchable(Base.metadata)
|
||||
# Base.metadata.create_all(bind=engine)
|
||||
|
||||
@@ -326,7 +258,5 @@ def local_session(src: str = "") -> Session:
|
||||
return Session(bind=engine, expire_on_commit=False)
|
||||
|
||||
|
||||
# Export Base for backward compatibility
|
||||
Base = _Base
|
||||
# Also export the type for type hints
|
||||
__all__ = ["Base", "BaseModel", "BaseType", "engine", "local_session"]
|
||||
__all__ = ["engine", "local_session"]
|
||||
|
Reference in New Issue
Block a user