Fix/memory mcp2 1 (#188)
* 优化快速检索的回复内容 * 优化快速检索的回复内容 * 路径的BUG修复 * 路径的BUG修复 * 路径的BUG修复 * 路径的BUG修复 * 路径的BUG修复 * LLM生存缺少config_id认证,修复BUG * LLM生存缺少config_id认证,修复BUG * LLM生存缺少config_id认证,修复BUG
This commit is contained in:
@@ -262,9 +262,7 @@ async def read_server(
|
|||||||
"""
|
"""
|
||||||
config_id = user_input.config_id
|
config_id = user_input.config_id
|
||||||
workspace_id = current_user.current_workspace_id
|
workspace_id = current_user.current_workspace_id
|
||||||
api_logger.info(f"Read service: workspace_id={workspace_id}, config_id={config_id}")
|
|
||||||
|
|
||||||
# 获取 storage_type,如果为 None 则使用默认值
|
|
||||||
storage_type = workspace_service.get_workspace_storage_type(
|
storage_type = workspace_service.get_workspace_storage_type(
|
||||||
db=db,
|
db=db,
|
||||||
workspace_id=workspace_id,
|
workspace_id=workspace_id,
|
||||||
@@ -300,6 +298,7 @@ async def read_server(
|
|||||||
|
|
||||||
# 调用 memory_agent_service 的方法生成最终答案
|
# 调用 memory_agent_service 的方法生成最终答案
|
||||||
result['answer'] = await memory_agent_service.generate_summary_from_retrieve(
|
result['answer'] = await memory_agent_service.generate_summary_from_retrieve(
|
||||||
|
group_id=user_input.group_id,
|
||||||
retrieve_info=retrieve_info,
|
retrieve_info=retrieve_info,
|
||||||
history=history,
|
history=history,
|
||||||
query=query,
|
query=query,
|
||||||
|
|||||||
@@ -410,8 +410,8 @@ class MemoryAgentService:
|
|||||||
# Resolve config_id if None using end_user's connected config
|
# Resolve config_id if None using end_user's connected config
|
||||||
if config_id is None:
|
if config_id is None:
|
||||||
try:
|
try:
|
||||||
connected_config = get_end_user_connected_config(group_id, db)
|
config_id = get_end_user_connected_config(group_id, db)
|
||||||
config_id = connected_config.get("memory_config_id")
|
config_id=config_id.get('memory_config_id')
|
||||||
if config_id is None:
|
if config_id is None:
|
||||||
raise ValueError(f"No memory configuration found for end_user {group_id}. Please ensure the user has a connected memory configuration.")
|
raise ValueError(f"No memory configuration found for end_user {group_id}. Please ensure the user has a connected memory configuration.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -670,6 +670,8 @@ class MemoryAgentService:
|
|||||||
"""
|
"""
|
||||||
logger.info("Classifying message type")
|
logger.info("Classifying message type")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Load configuration to get LLM model ID
|
# Load configuration to get LLM model ID
|
||||||
config_service = MemoryConfigService(db)
|
config_service = MemoryConfigService(db)
|
||||||
memory_config = config_service.load_memory_config(
|
memory_config = config_service.load_memory_config(
|
||||||
@@ -683,6 +685,7 @@ class MemoryAgentService:
|
|||||||
|
|
||||||
async def generate_summary_from_retrieve(
|
async def generate_summary_from_retrieve(
|
||||||
self,
|
self,
|
||||||
|
group_id: str,
|
||||||
retrieve_info: str,
|
retrieve_info: str,
|
||||||
history: List[Dict],
|
history: List[Dict],
|
||||||
query: str,
|
query: str,
|
||||||
@@ -704,6 +707,18 @@ class MemoryAgentService:
|
|||||||
Returns:
|
Returns:
|
||||||
生成的答案文本
|
生成的答案文本
|
||||||
"""
|
"""
|
||||||
|
if config_id is None:
|
||||||
|
try:
|
||||||
|
config_id = get_end_user_connected_config(group_id, db)
|
||||||
|
config_id = config_id.get('memory_config_id')
|
||||||
|
if config_id is None:
|
||||||
|
raise ValueError(
|
||||||
|
f"No memory configuration found for end_user {group_id}. Please ensure the user has a connected memory configuration.")
|
||||||
|
except Exception as e:
|
||||||
|
if "No memory configuration found" in str(e):
|
||||||
|
raise # Re-raise our specific error
|
||||||
|
logger.error(f"Failed to get connected config for end_user {group_id}: {e}")
|
||||||
|
raise ValueError(f"Unable to determine memory configuration for end_user {group_id}: {e}")
|
||||||
logger.info(f"Generating summary from retrieve info for query: {query[:50]}...")
|
logger.info(f"Generating summary from retrieve info for query: {query[:50]}...")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -713,7 +728,6 @@ class MemoryAgentService:
|
|||||||
config_id=config_id,
|
config_id=config_id,
|
||||||
service_name="MemoryAgentService"
|
service_name="MemoryAgentService"
|
||||||
)
|
)
|
||||||
|
|
||||||
# 导入必要的模块
|
# 导入必要的模块
|
||||||
from app.core.memory.agent.langgraph_graph.nodes.summary_nodes import summary_llm
|
from app.core.memory.agent.langgraph_graph.nodes.summary_nodes import summary_llm
|
||||||
from app.core.memory.agent.models.summary_models import RetrieveSummaryResponse
|
from app.core.memory.agent.models.summary_models import RetrieveSummaryResponse
|
||||||
|
|||||||
Reference in New Issue
Block a user