fix: 更新main.py逻辑
This commit is contained in:
+13
-1
@@ -9,6 +9,9 @@ from service.auth import decode_token
|
||||
from utils.exceptions import AuthError, ForbiddenError
|
||||
|
||||
|
||||
KNOWLEDGE_OPERATOR_ROLES = {"ADMIN", "KNOWLEDGE_ADMIN", "KNOWLEDGE_OPERATOR", "运营"}
|
||||
|
||||
|
||||
async def get_current_user(
|
||||
request: Request, db: AsyncSession = Depends(get_db)
|
||||
) -> SysUser:
|
||||
@@ -24,4 +27,13 @@ async def get_current_user(
|
||||
raise AuthError("用户不存在")
|
||||
if user.status != "正常":
|
||||
raise ForbiddenError("账号已被禁用或冻结")
|
||||
return user
|
||||
return user
|
||||
|
||||
|
||||
async def require_knowledge_operator(user: SysUser = Depends(get_current_user)) -> SysUser:
|
||||
"""Allow only administrators or explicitly assigned knowledge operators."""
|
||||
if user.user_type == "ADMIN":
|
||||
return user
|
||||
if user.user_type != "EMPLOYEE" or user.employee_role not in KNOWLEDGE_OPERATOR_ROLES:
|
||||
raise ForbiddenError("仅运营人员可以管理知识库")
|
||||
return user
|
||||
|
||||
@@ -3,9 +3,14 @@
|
||||
"""
|
||||
from fastapi import APIRouter
|
||||
|
||||
from api.routers import auth
|
||||
from api.routers import customer_agent
|
||||
from api.routers import knowledge
|
||||
from api.routers import auth, product, questionnaire
|
||||
|
||||
api_router = APIRouter()
|
||||
api_router.include_router(auth.router, prefix="/api", tags=["认证"])
|
||||
api_router.include_router(customer_agent.router, prefix="/api/agent/customer", tags=["客服Agent"])
|
||||
api_router.include_router(knowledge.router, prefix="/api/knowledge", tags=["知识库"])
|
||||
api_router.include_router(product.router, prefix="/api", tags=["产品"])
|
||||
api_router.include_router(questionnaire.router, prefix="/api", tags=["问卷"])
|
||||
|
||||
@@ -24,6 +24,16 @@ def client() -> AsyncMilvusClient:
|
||||
return _client
|
||||
|
||||
|
||||
async def ensure_database(milvus_client: AsyncMilvusClient | None = None) -> None:
|
||||
"""Create the configured project database only when it does not exist."""
|
||||
target = milvus_client or client()
|
||||
database_name = settings.milvus.db_name
|
||||
if not database_name:
|
||||
raise RuntimeError("MILVUS_DB must be configured")
|
||||
if database_name not in await target.list_databases():
|
||||
await target.create_database(database_name)
|
||||
|
||||
|
||||
async def init_db() -> None:
|
||||
client() # 急切建连；失败由注册表重试（config/database/__init__.py）
|
||||
|
||||
@@ -36,4 +46,4 @@ async def dispose() -> None:
|
||||
|
||||
|
||||
async def check_health() -> None:
|
||||
await client().get_server_version()
|
||||
await client().get_server_version()
|
||||
|
||||
+7
-2
@@ -71,12 +71,17 @@ class MilvusCfg(BaseSettings):
|
||||
token: Optional[str] = None # 可缺省（无需鉴权时留空）
|
||||
user: Optional[str] = None
|
||||
password: Optional[str] = None
|
||||
db_name: Optional[str] = None
|
||||
db: Optional[str] = None
|
||||
connect_timeout: int # 建连/通道就绪超时（构造是急切连接，必须短）
|
||||
timeout: int # 数据操作超时，调用处可覆盖
|
||||
|
||||
model_config = SettingsConfigDict(env_prefix="MILVUS_", env_file=_ENV_FILE, extra="ignore")
|
||||
|
||||
@property
|
||||
def db_name(self) -> Optional[str]:
|
||||
"""Compatibility name used by the Milvus client wrapper."""
|
||||
return self.db
|
||||
|
||||
|
||||
class LLMCfg(BaseSettings):
|
||||
"""大模型配置：本地 Ollama / OpenAI 兼容 API 双模式见 tool/llm.py。"""
|
||||
@@ -134,4 +139,4 @@ class Settings(BaseSettings):
|
||||
model_config = SettingsConfigDict(env_file=_ENV_FILE, extra="ignore")
|
||||
|
||||
|
||||
settings = Settings()
|
||||
settings = Settings()
|
||||
|
||||
@@ -5,6 +5,10 @@ from fastapi import FastAPI
|
||||
|
||||
from api.router import api_router
|
||||
from config import database
|
||||
from service.customer_agent.bootstrap import (
|
||||
build_default_knowledge_upload_service,
|
||||
build_default_runtime,
|
||||
)
|
||||
from utils.exceptions import register_exception_handlers
|
||||
from utils.logger import setup_logging
|
||||
from utils.request_id import RequestIdMiddleware
|
||||
@@ -13,6 +17,8 @@ from utils.request_id import RequestIdMiddleware
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
setup_logging() # 幂等：分级日志 + trace_id + 脱敏
|
||||
app.state.customer_agent_runtime = build_default_runtime()
|
||||
app.state.knowledge_upload_service = build_default_knowledge_upload_service()
|
||||
# 四库会话懒创建：启动不连接任何库，首次访问才建，可手动预热：
|
||||
# asyncio.run(database.init_db())
|
||||
yield
|
||||
@@ -28,4 +34,8 @@ app.include_router(api_router)
|
||||
|
||||
@app.get("/")
|
||||
async def root():
|
||||
return {"message": "智能公募基金系统 API", "docs": "/docs"}
|
||||
return {"message": "智能公募基金系统 API", "docs": "/docs"}
|
||||
|
||||
if __name__ == '__main__':
|
||||
import uvicorn
|
||||
uvicorn.run('main:app', host="127.0.0.1", port=8000)
|
||||
|
||||
@@ -1,3 +1,18 @@
|
||||
fastapi
|
||||
python-multipart
|
||||
uvicorn
|
||||
httpx
|
||||
pyjwt
|
||||
pydantic
|
||||
pydantic-settings
|
||||
sqlalchemy
|
||||
aiomysql
|
||||
redis
|
||||
pymilvus
|
||||
neo4j
|
||||
python-dotenv
|
||||
pypdf
|
||||
|
||||
fastapi~=0.141.1
|
||||
sqlalchemy~=2.0.52
|
||||
httpx~=0.28.1
|
||||
|
||||
+3
-2
@@ -265,6 +265,7 @@ CREATE TABLE IF NOT EXISTS conversation_archive (
|
||||
role VARCHAR(16) NOT NULL COMMENT 'user/assistant/system',
|
||||
content MEDIUMTEXT NULL COMMENT '对话内容',
|
||||
tool_calls JSON NULL COMMENT '工具调用记录 [{"tool":"nl2sql",...}]',
|
||||
trace_id VARCHAR(64) NULL COMMENT '请求链路追踪ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
KEY idx_session (session_id),
|
||||
KEY idx_user_time (user_id, create_time),
|
||||
@@ -336,7 +337,7 @@ CREATE TABLE IF NOT EXISTS audit_log (
|
||||
target VARCHAR(128) NULL COMMENT '操作对象（单号/ID）',
|
||||
detail TEXT NULL COMMENT '详情（JSON 字符串）',
|
||||
ip VARCHAR(64) NULL,
|
||||
trace_id VARCHAR(32) NULL COMMENT '链路号',
|
||||
trace_id VARCHAR(64) NULL COMMENT '链路号',
|
||||
status VARCHAR(8) NOT NULL DEFAULT '成功' COMMENT '成功/失败',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
KEY idx_user (user_id),
|
||||
@@ -436,4 +437,4 @@ CREATE TABLE IF NOT EXISTS portfolio_benchmark (
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
UNIQUE KEY uk_risk_level (risk_level)
|
||||
) COMMENT='组合基准配置表（投顾Agent 再平衡参照，运营可调整）';
|
||||
) COMMENT='组合基准配置表（投顾Agent 再平衡参照，运营可调整）';
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ class Code:
|
||||
SERVER_ERROR = 500
|
||||
LLM_FAIL = 1001 # LLM 调用失败
|
||||
KB_NO_RESULT = 1002 # 知识库检索无结果
|
||||
SQL_GEN_FAIL = 1003 # NL2SQL 生成失败
|
||||
SQL_GEN_FAIL = 1003 # nl2sql 生成失败
|
||||
RISK_TRIGGERED = 1004 # 风控规则触发 / 交易被拦截
|
||||
NOT_SUITABLE = 1005 # 适当性不匹配
|
||||
|
||||
|
||||
Reference in New Issue
Block a user