remove robot_type
This commit is contained in:
parent
e5ee24a765
commit
742eaf0a1c
@ -245,10 +245,6 @@ class AgentConfig:
|
|||||||
system_prompt_from_db = bot_config.get("system_prompt", "")
|
system_prompt_from_db = bot_config.get("system_prompt", "")
|
||||||
preamble_text, system_prompt = get_preamble_text(language, system_prompt_from_db)
|
preamble_text, system_prompt = get_preamble_text(language, system_prompt_from_db)
|
||||||
|
|
||||||
# 获取 robot_type
|
|
||||||
robot_type = bot_config.get("robot_type", "general_agent")
|
|
||||||
if robot_type == "catalog_agent":
|
|
||||||
robot_type = "deep_agent"
|
|
||||||
|
|
||||||
# 从数据库配置获取其他参数
|
# 从数据库配置获取其他参数
|
||||||
enable_thinking = bot_config.get("enable_thinking", False)
|
enable_thinking = bot_config.get("enable_thinking", False)
|
||||||
@ -262,7 +258,6 @@ class AgentConfig:
|
|||||||
language=language,
|
language=language,
|
||||||
system_prompt=system_prompt,
|
system_prompt=system_prompt,
|
||||||
mcp_settings=bot_config.get("mcp_settings", []),
|
mcp_settings=bot_config.get("mcp_settings", []),
|
||||||
robot_type=robot_type,
|
|
||||||
user_identifier=bot_config.get("user_identifier", ""),
|
user_identifier=bot_config.get("user_identifier", ""),
|
||||||
session_id=request.session_id,
|
session_id=request.session_id,
|
||||||
enable_thinking=enable_thinking,
|
enable_thinking=enable_thinking,
|
||||||
|
|||||||
@ -422,7 +422,6 @@ class BotSettingsUpdate(BaseModel):
|
|||||||
"""更新 Bot 设置请求"""
|
"""更新 Bot 设置请求"""
|
||||||
model_id: Optional[str] = None
|
model_id: Optional[str] = None
|
||||||
language: Optional[str] = None
|
language: Optional[str] = None
|
||||||
robot_type: Optional[str] = None
|
|
||||||
avatar_url: Optional[str] = None
|
avatar_url: Optional[str] = None
|
||||||
description: Optional[str] = None
|
description: Optional[str] = None
|
||||||
suggestions: Optional[List[str]] = None
|
suggestions: Optional[List[str]] = None
|
||||||
@ -450,7 +449,6 @@ class BotSettingsResponse(BaseModel):
|
|||||||
model_id: Optional[str]
|
model_id: Optional[str]
|
||||||
model: Optional[ModelInfo] # 关联的模型信息
|
model: Optional[ModelInfo] # 关联的模型信息
|
||||||
language: str
|
language: str
|
||||||
robot_type: Optional[str]
|
|
||||||
avatar_url: Optional[str]
|
avatar_url: Optional[str]
|
||||||
description: Optional[str]
|
description: Optional[str]
|
||||||
suggestions: Optional[List[str]]
|
suggestions: Optional[List[str]]
|
||||||
@ -819,7 +817,6 @@ async def migrate_bot_settings_to_jsonb():
|
|||||||
SET settings = jsonb_build_object(
|
SET settings = jsonb_build_object(
|
||||||
'model_id', s.model_id,
|
'model_id', s.model_id,
|
||||||
'language', COALESCE(s.language, 'zh'),
|
'language', COALESCE(s.language, 'zh'),
|
||||||
'robot_type', s.robot_type,
|
|
||||||
'dataset_ids', s.dataset_ids,
|
'dataset_ids', s.dataset_ids,
|
||||||
'system_prompt', s.system_prompt,
|
'system_prompt', s.system_prompt,
|
||||||
'enable_memori', COALESCE(s.enable_memori, false),
|
'enable_memori', COALESCE(s.enable_memori, false),
|
||||||
@ -1552,7 +1549,6 @@ async def get_bot_settings(bot_uuid: str, authorization: Optional[str] = Header(
|
|||||||
model_id=model_id,
|
model_id=model_id,
|
||||||
model=model_info,
|
model=model_info,
|
||||||
language=settings.get('language', 'zh'),
|
language=settings.get('language', 'zh'),
|
||||||
robot_type=settings.get('robot_type'),
|
|
||||||
avatar_url=settings.get('avatar_url'),
|
avatar_url=settings.get('avatar_url'),
|
||||||
description=settings.get('description'),
|
description=settings.get('description'),
|
||||||
suggestions=settings.get('suggestions'),
|
suggestions=settings.get('suggestions'),
|
||||||
@ -1620,8 +1616,6 @@ async def update_bot_settings(
|
|||||||
update_json['model_id'] = model_id_value if model_id_value else None
|
update_json['model_id'] = model_id_value if model_id_value else None
|
||||||
if request.language is not None:
|
if request.language is not None:
|
||||||
update_json['language'] = request.language
|
update_json['language'] = request.language
|
||||||
if request.robot_type is not None:
|
|
||||||
update_json['robot_type'] = request.robot_type
|
|
||||||
if request.avatar_url is not None:
|
if request.avatar_url is not None:
|
||||||
update_json['avatar_url'] = request.avatar_url
|
update_json['avatar_url'] = request.avatar_url
|
||||||
if request.description is not None:
|
if request.description is not None:
|
||||||
|
|||||||
@ -730,7 +730,6 @@ async def chat_completions_v3(request: ChatRequestV3, authorization: Optional[st
|
|||||||
- language: 回复语言
|
- language: 回复语言
|
||||||
- tool_response: 是否包含工具响应
|
- tool_response: 是否包含工具响应
|
||||||
- system_prompt: 系统提示词
|
- system_prompt: 系统提示词
|
||||||
- robot_type: 机器人类型
|
|
||||||
- dataset_ids: 数据集ID列表
|
- dataset_ids: 数据集ID列表
|
||||||
- mcp_settings: MCP服务器配置
|
- mcp_settings: MCP服务器配置
|
||||||
- user_identifier: 用户标识符
|
- user_identifier: 用户标识符
|
||||||
|
|||||||
@ -501,7 +501,6 @@ async def fetch_bot_config_from_db(bot_user_id: str) -> Dict[str, Any]:
|
|||||||
"api_key": "",
|
"api_key": "",
|
||||||
"model_server": "",
|
"model_server": "",
|
||||||
"language": settings_data.get("language", "zh"),
|
"language": settings_data.get("language", "zh"),
|
||||||
"robot_type": settings_data.get("robot_type", "general_agent"),
|
|
||||||
"dataset_ids": settings_data.get("dataset_ids", []),
|
"dataset_ids": settings_data.get("dataset_ids", []),
|
||||||
"system_prompt": settings_data.get("system_prompt", ""),
|
"system_prompt": settings_data.get("system_prompt", ""),
|
||||||
"user_identifier": settings_data.get("user_identifier", ""),
|
"user_identifier": settings_data.get("user_identifier", ""),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user