修复子任务查询分页和状态问题

pqai_agent_server/task_server.py

@@ -13,7 +13,8 @@ from pqai_agent.data_models.agent_test_task import AgentTestTask
 from pqai_agent.data_models.agent_test_task_conversations import AgentTestTaskConversations
 from pqai_agent.data_models.service_module import ServiceModule
 from pqai_agent.logging import logger
-from pqai_agent_server.const.status_enum import TestTaskConversationsStatus, TestTaskStatus, get_test_task_status_desc
+from pqai_agent_server.const.status_enum import TestTaskConversationsStatus, TestTaskStatus, get_test_task_status_desc, \
+    get_test_task_conversations_status_desc
 from scripts.evaluate_agent import evaluate_agent
 
 
@@ -73,7 +74,8 @@ class TaskManager:
                       .filter(AgentTestTaskConversations.task_id == task_id)
                       .limit(page_size).offset(offset).all())
             # 查询总记录数
-            total = session.query(func.count(AgentTestTaskConversations.id)).scalar()
+            total = session.query(func.count(AgentTestTaskConversations.id)).filter(
+                AgentTestTaskConversations.task_id == task_id).scalar()
 
             total_page = total // page_size + 1 if total % page_size > 0 else total // page_size
             total_page = 1 if total_page <= 0 else total_page
@@ -81,10 +83,12 @@ class TaskManager:
                 {
                     "id": agent_test_task_conversation.id,
                     "agentName": agent_configuration.name,
-                    "input": MultiModalChatAgent.compose_dialogue(json.loads(agent_test_task_conversation.input)),
+                    "input": MultiModalChatAgent.compose_dialogue(json.loads(agent_test_task_conversation.input))
+                    if agent_test_task_conversation.input and agent_test_task_conversation.input.strip()
+                    else None,
                     "output": agent_test_task_conversation.output,
                     "score": agent_test_task_conversation.score,
-                    "statusName": get_test_task_status_desc(agent_test_task_conversation.status),
+                    "statusName": get_test_task_conversations_status_desc(agent_test_task_conversation.status),
                     "createTime": agent_test_task_conversation.create_time.strftime("%Y-%m-%d %H:%M:%S"),
                     "updateTime": agent_test_task_conversation.update_time.strftime("%Y-%m-%d %H:%M:%S")
                 }