checkpoint: SQLite 清理——业务/测试层统一 PostgreSQL(删 aiosqlite/fakeredis)
- setting: DATABASE_TYPE 收窄为 postgres,DB_URI/ASYNC_DB_URI 去 sqlite 分支 - database: create_async_engine_and_session 去 sqlite 分支(同步 psycopg 引擎保留给 jobstore) - number_gen: 去 DATABASE_TYPE 非 postgres 早退(advisory lock 恒定走 PG) - chat/crud: 删 SqliteDb 分支(agno 无硬依赖) - pyproject/requirements/uv.lock: 删 aiosqlite、fakeredis;conftest 口径注释同步 - test_stat_analysis_tc: docstring 口径 SQLite→PG
This commit is contained in:
@@ -10,7 +10,6 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
from app.common.enums import EnvironmentEnum
|
||||
from app.config.path_conf import ENV_DIR, STATIC_DIR
|
||||
|
||||
|
||||
# JWT 开发默认密钥:仅允许 DEV 环境使用,生产命中即拒绝启动
|
||||
_DEV_DEFAULT_SECRET_KEY = "dpb-dev-secret-key-do-not-use-in-production"
|
||||
|
||||
@@ -110,8 +109,8 @@ class Settings(BaseSettings):
|
||||
AUTOFETCH: bool | None = None # AUTOFLUSH 别名(优先级高于 AUTOFLUSH,兼容旧环境变量名)
|
||||
EXPIRE_ON_COMMIT: bool = False # 是否在提交时过期
|
||||
|
||||
# 数据库连接(生产 PostgreSQL;测试套件用 SQLite)
|
||||
DATABASE_TYPE: Literal["postgres", "sqlite"] = "postgres"
|
||||
# 数据库连接(开发与生产统一 PostgreSQL)
|
||||
DATABASE_TYPE: Literal["postgres"] = "postgres"
|
||||
DATABASE_HOST: str = "localhost"
|
||||
DATABASE_PORT: int = 5432
|
||||
DATABASE_USER: str = "dpb"
|
||||
@@ -305,19 +304,11 @@ class Settings(BaseSettings):
|
||||
|
||||
@property
|
||||
def ASYNC_DB_URI(self) -> str:
|
||||
if self.DATABASE_TYPE == "postgres":
|
||||
db_connect = f"postgresql+asyncpg://{self.DATABASE_USER}:{quote_plus(self.DATABASE_PASSWORD)}@{self.DATABASE_HOST}:{self.DATABASE_PORT}/{self.DATABASE_NAME}"
|
||||
else:
|
||||
db_connect = f"sqlite+aiosqlite:///{self.DATABASE_NAME}.db"
|
||||
return db_connect
|
||||
return f"postgresql+asyncpg://{self.DATABASE_USER}:{quote_plus(self.DATABASE_PASSWORD)}@{self.DATABASE_HOST}:{self.DATABASE_PORT}/{self.DATABASE_NAME}"
|
||||
|
||||
@property
|
||||
def DB_URI(self) -> str:
|
||||
if self.DATABASE_TYPE == "postgres":
|
||||
db_connect = f"postgresql+psycopg://{self.DATABASE_USER}:{quote_plus(self.DATABASE_PASSWORD)}@{self.DATABASE_HOST}:{self.DATABASE_PORT}/{self.DATABASE_NAME}"
|
||||
else:
|
||||
db_connect = f"sqlite:///{self.DATABASE_NAME}.db"
|
||||
return db_connect
|
||||
return f"postgresql+psycopg://{self.DATABASE_USER}:{quote_plus(self.DATABASE_PASSWORD)}@{self.DATABASE_HOST}:{self.DATABASE_PORT}/{self.DATABASE_NAME}"
|
||||
|
||||
@property
|
||||
def FASTAPI_CONFIG(self) -> dict[str, Any]:
|
||||
|
||||
Reference in New Issue
Block a user