feat(backend): 更新核心模块和文件处理
- 更新配置模块 (config.py) - 更新数据库连接 (database.py) - 更新主应用入口 (main.py) - 更新数据模型 (models.py) - 更新基础 Schema (base.py) - 更新文件处理器 (docx, excel, pdf) - 更新 Dockerfile Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2,25 +2,32 @@
|
||||
Database Configuration and Session Management
|
||||
支持 SQLite 和 PostgreSQL
|
||||
"""
|
||||
|
||||
import logging
|
||||
from contextlib import asynccontextmanager
|
||||
from typing import AsyncGenerator
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
|
||||
from sqlalchemy.orm import DeclarativeBase
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy import create_engine, event
|
||||
from sqlalchemy.pool import NullPool
|
||||
|
||||
from app.core.config import get_settings
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
settings = get_settings()
|
||||
|
||||
|
||||
def get_engine_config():
|
||||
"""根据数据库类型返回引擎配置"""
|
||||
if settings.DATABASE_URL.startswith("sqlite"):
|
||||
return {"echo": settings.DEBUG}
|
||||
return {"echo": settings.DEBUG, "poolclass": NullPool}
|
||||
else:
|
||||
return {
|
||||
"echo": settings.DEBUG,
|
||||
"pool_pre_ping": True,
|
||||
"pool_size": 10,
|
||||
"max_overflow": 20,
|
||||
"pool_recycle": 3600,
|
||||
"pool_timeout": 30,
|
||||
}
|
||||
|
||||
|
||||
@@ -30,14 +37,14 @@ async_engine = create_async_engine(
|
||||
**get_engine_config()
|
||||
)
|
||||
|
||||
# Sync engine for migrations
|
||||
# Sync engine for migrations (use NullPool for SQLite)
|
||||
sync_engine = create_engine(
|
||||
settings.DATABASE_URL_SYNC,
|
||||
echo=settings.DEBUG,
|
||||
pool_pre_ping=True,
|
||||
poolclass=NullPool if settings.DATABASE_URL_SYNC.startswith("sqlite") else None,
|
||||
)
|
||||
|
||||
|
||||
# Async session factory
|
||||
AsyncSessionLocal = async_sessionmaker(
|
||||
async_engine,
|
||||
@@ -55,8 +62,31 @@ class Base(DeclarativeBase):
|
||||
|
||||
async def init_db():
|
||||
"""Initialize database tables"""
|
||||
logger.info("Initializing database...")
|
||||
async with async_engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
logger.info("Database initialized successfully")
|
||||
|
||||
|
||||
async def close_db():
|
||||
"""Close database connections"""
|
||||
logger.info("Closing database connections...")
|
||||
await async_engine.dispose()
|
||||
logger.info("Database connections closed")
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def get_db_session() -> AsyncGenerator[AsyncSession, None]:
|
||||
"""Context manager for database sessions with automatic cleanup"""
|
||||
session = AsyncSessionLocal()
|
||||
try:
|
||||
yield session
|
||||
except Exception as e:
|
||||
logger.error(f"Database session error: {str(e)}")
|
||||
await session.rollback()
|
||||
raise
|
||||
finally:
|
||||
await session.close()
|
||||
|
||||
|
||||
async def get_db() -> AsyncSession:
|
||||
@@ -64,5 +94,9 @@ async def get_db() -> AsyncSession:
|
||||
async with AsyncSessionLocal() as session:
|
||||
try:
|
||||
yield session
|
||||
except Exception as e:
|
||||
logger.error(f"Database error in dependency: {str(e)}")
|
||||
await session.rollback()
|
||||
raise
|
||||
finally:
|
||||
await session.close()
|
||||
|
||||
Reference in New Issue
Block a user