[add] Memory configuration adds uniqueness detection
This commit is contained in:
@@ -2,7 +2,7 @@ from typing import Optional
|
|||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, Query
|
from fastapi import APIRouter, Depends, Query
|
||||||
from fastapi.responses import StreamingResponse
|
from fastapi.responses import StreamingResponse, JSONResponse
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from app.core.error_codes import BizCode
|
from app.core.error_codes import BizCode
|
||||||
@@ -85,6 +85,7 @@ def create_config(
|
|||||||
payload: ConfigParamsCreate,
|
payload: ConfigParamsCreate,
|
||||||
current_user: User = Depends(get_current_user),
|
current_user: User = Depends(get_current_user),
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
|
x_language_type: Optional[str] = Header(None, alias="X-Language-Type"),
|
||||||
) -> dict:
|
) -> dict:
|
||||||
workspace_id = current_user.current_workspace_id
|
workspace_id = current_user.current_workspace_id
|
||||||
# 检查用户是否已选择工作空间
|
# 检查用户是否已选择工作空间
|
||||||
@@ -99,6 +100,19 @@ def create_config(
|
|||||||
svc = DataConfigService(db)
|
svc = DataConfigService(db)
|
||||||
result = svc.create(payload)
|
result = svc.create(payload)
|
||||||
return success(data=result, msg="创建成功")
|
return success(data=result, msg="创建成功")
|
||||||
|
except ValueError as e:
|
||||||
|
err_str = str(e)
|
||||||
|
if err_str.startswith("DUPLICATE_CONFIG_NAME:"):
|
||||||
|
config_name = err_str.split(":", 1)[1]
|
||||||
|
api_logger.warning(f"重复的配置名称 '{config_name}' 在工作空间 {workspace_id}")
|
||||||
|
lang = get_language_from_header(x_language_type)
|
||||||
|
if lang == "en":
|
||||||
|
msg = fail(BizCode.BAD_REQUEST, "Config name already exists", f"A config named \"{config_name}\" already exists in the current workspace. Please use a different name.")
|
||||||
|
else:
|
||||||
|
msg = fail(BizCode.BAD_REQUEST, "配置名称已存在", f"当前工作空间下已存在名为「{config_name}」的记忆配置,请使用其他名称")
|
||||||
|
return JSONResponse(status_code=400, content=msg)
|
||||||
|
api_logger.error(f"Create config failed: {err_str}")
|
||||||
|
return fail(BizCode.INTERNAL_ERROR, "创建配置失败", err_str)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
api_logger.error(f"Create config failed: {str(e)}")
|
api_logger.error(f"Create config failed: {str(e)}")
|
||||||
return fail(BizCode.INTERNAL_ERROR, "创建配置失败", str(e))
|
return fail(BizCode.INTERNAL_ERROR, "创建配置失败", str(e))
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String
|
from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String, UniqueConstraint
|
||||||
from sqlalchemy.dialects.postgresql import UUID
|
from sqlalchemy.dialects.postgresql import UUID
|
||||||
|
|
||||||
from app.db import Base
|
from app.db import Base
|
||||||
@@ -9,6 +9,9 @@ from app.db import Base
|
|||||||
class MemoryConfig(Base):
|
class MemoryConfig(Base):
|
||||||
"""记忆配置表 - 用于存储记忆系统的配置参数"""
|
"""记忆配置表 - 用于存储记忆系统的配置参数"""
|
||||||
__tablename__ = "memory_config"
|
__tablename__ = "memory_config"
|
||||||
|
__table_args__ = (
|
||||||
|
UniqueConstraint('workspace_id', 'config_name', name='uq_workspace_config_name'),
|
||||||
|
)
|
||||||
|
|
||||||
# 主键
|
# 主键
|
||||||
config_id = Column(UUID(as_uuid=True), primary_key=True, comment="配置ID")
|
config_id = Column(UUID(as_uuid=True), primary_key=True, comment="配置ID")
|
||||||
|
|||||||
@@ -115,6 +115,17 @@ class DataConfigService: # 数据配置服务类(PostgreSQL)
|
|||||||
|
|
||||||
# --- Create ---
|
# --- Create ---
|
||||||
def create(self, params: ConfigParamsCreate) -> Dict[str, Any]: # 创建配置参数(仅名称与描述)
|
def create(self, params: ConfigParamsCreate) -> Dict[str, Any]: # 创建配置参数(仅名称与描述)
|
||||||
|
# 检查同一工作空间下是否已存在同名配置
|
||||||
|
if params.workspace_id and params.config_name:
|
||||||
|
from app.models.memory_config_model import MemoryConfig
|
||||||
|
existing = (
|
||||||
|
self.db.query(MemoryConfig)
|
||||||
|
.filter_by(workspace_id=params.workspace_id, config_name=params.config_name)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if existing:
|
||||||
|
raise ValueError(f"DUPLICATE_CONFIG_NAME:{params.config_name}")
|
||||||
|
|
||||||
# 如果workspace_id存在且模型字段未全部指定,则自动获取
|
# 如果workspace_id存在且模型字段未全部指定,则自动获取
|
||||||
if params.workspace_id and not all([params.llm_id, params.embedding_id, params.rerank_id]):
|
if params.workspace_id and not all([params.llm_id, params.embedding_id, params.rerank_id]):
|
||||||
configs = self._get_workspace_configs(params.workspace_id)
|
configs = self._get_workspace_configs(params.workspace_id)
|
||||||
|
|||||||
Reference in New Issue
Block a user