adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop' into feature/20251219_xjn

Browse Source
This commit is contained in:
谢俊男
2026-01-04 15:35:57 +08:00
parent 0475d80472 aca5be2d1b
commit b731389c81
13 changed files with 200 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/app/services/master_agent_router.py
View File

@@ -361,14 +361,14 @@ class MasterAgentRouter:
"model_name": api_key_config.model_name
}
)
temperature = 0.3 # 决策任务使用较低温度
max_tokens = 1000
if self.model_parameters:
temperature = self.model_parameters.temperature
max_tokens = self.model_parameters.max_tokens
# temperature = 0.3 # 决策任务使用较低温度
# max_tokens = 1000
# if self.model_parameters:
# temperature = self.model_parameters["temperature"]
# max_tokens = self.model_parameters["max_tokens"]
extra_params = {"temperature": temperature,
"max_tokens":max_tokens
extra_params = {"temperature": self.model_parameters.get("temperature", 0.3),
"max_tokens":self.model_parameters.get("max_tokens", 1000)
}
# 创建 RedBearModelConfig
model_config = RedBearModelConfig(

12
api/app/services/multi_agent_service.py
View File

@@ -290,12 +290,22 @@ class MultiAgentService:
else:
execution_config_data = convert_uuids_to_str(data.execution_config.model_dump())
# 处理 model_parameters（可能是 None、字典或 Pydantic 模型）
if data.model_parameters is None:
model_parameters_data = None
elif isinstance(data.model_parameters, dict):
# 过滤掉值为 None 的字段
model_parameters_data = {k: v for k, v in data.model_parameters.items() if v is not None}
else:
# 过滤掉值为 None 的字段
model_parameters_data = {k: v for k, v in data.model_parameters.model_dump().items() if v is not None}
config = MultiAgentConfig(
app_id=app_id,
master_agent_id=data.master_agent_id,
master_agent_name=data.master_agent_name,
default_model_config_id=data.default_model_config_id,
model_parameters=data.model_parameters,
model_parameters=model_parameters_data,
orchestration_mode=data.orchestration_mode,
sub_agents=sub_agents_data,
# routing_rules=routing_rules_data,