|
@@ -6,12 +6,11 @@ from typing import Dict
|
|
|
|
|
|
from sqlalchemy import func, select
|
|
|
|
|
|
-from pqai_agent.agents.simple_chat_agent import SimpleOpenAICompatibleChatAgent
|
|
|
from pqai_agent.data_models.agent_configuration import AgentConfiguration
|
|
|
from pqai_agent.data_models.agent_task import AgentTask
|
|
|
from pqai_agent.data_models.agent_task_detail import AgentTaskDetail
|
|
|
from pqai_agent.logging import logger
|
|
|
-from pqai_agent.toolkit import get_tools
|
|
|
+from pqai_agent.utils.agent_utils import create_agent_from_config
|
|
|
from pqai_agent_server.const.status_enum import AgentTaskStatus, get_agent_task_detail_status_desc, \
|
|
|
AgentTaskDetailStatus, get_agent_task_status_desc
|
|
|
|
|
@@ -160,10 +159,7 @@ class AgentTaskManager:
|
|
|
self.update_task_status(task_id, AgentTaskStatus.IN_PROGRESS.value)
|
|
|
agent_task = self.get_agent_task(task_id)
|
|
|
agent_config = self.get_agent_config(agent_task.agent_id)
|
|
|
- tools = get_tools(json.loads(agent_config.tools))
|
|
|
- chat_agent = SimpleOpenAICompatibleChatAgent(model=agent_config.execution_model,
|
|
|
- system_prompt=agent_config.system_prompt,
|
|
|
- tools=tools)
|
|
|
+ chat_agent = create_agent_from_config(agent_config, self.session_maker)
|
|
|
message = chat_agent.run(agent_task.input)
|
|
|
agent_task_details = chat_agent.get_agent_task_details()
|
|
|
for agent_task_detail in agent_task_details:
|