92 Commits 99644d1140 ... be3d6c16a9

Autore SHA1 Messaggio Data
  xueyiming be3d6c16a9 修复子任务查询分页和状态问题 2 settimane fa
  xueyiming 1d262b18cd 恢复任务增加查询状态 2 settimane fa
  xueyiming dfdbb71335 修改查询时间戳 2 settimane fa
  xueyiming fedfb97f6e 修改日志报错 3 settimane fa
  xueyiming 06c656adff 删除无用引包 3 settimane fa
  xueyiming 8a69a9d5dc 增加评估类型枚举接口 3 settimane fa
  xueyiming e9919a03f8 删除无用导包 4 settimane fa
  xueyiming b62b8bb32a 增加错误状态 4 settimane fa
  xueyiming 4a038f6b45 调用score计算 4 settimane fa
  luojunhui b673d88f4a 增加评估任务Agent 1 mese fa
  xueyiming a78e7e8e2b 删除无用注释 4 settimane fa
  xueyiming 97af0b985b 增加并发操作 1 mese fa
  xueyiming 609e8dbd2b 增加agent调用 生成对话内容 1 mese fa
  xueyiming 17cff3164d 修改查询分区 1 mese fa
  xueyiming 6b653285e1 删除测试代码 1 mese fa
  xueyiming 40f6ff83dd 修改创建任务为异步操作 1 mese fa
  xueyiming 8f3f105384 增加数据集相关操作,修改单元测试任务 1 mese fa
  xueyiming 0124db7d07 增加数据集相关操作 1 mese fa
  xueyiming 85975ba201 修改数据库操作 改成ORM 1 mese fa
  xueyiming 99966f7384 Agent单元测试init 1 mese fa
  xueyiming 99644d1140 Merge branch 'master' into dev-xym-add-test-task 2 settimane fa
  xueyiming 7a00c14aec 修复子任务查询分页和状态问题 2 settimane fa
  xueyiming 6e5ca915ae 恢复任务增加查询状态 2 settimane fa
  xueyiming 484fc24bb0 修改查询时间戳 2 settimane fa
  xueyiming f94970d60a Merge branch 'master' into dev-xym-add-test-task 2 settimane fa
  xueyiming 13aa7e34db 修改日志报错 3 settimane fa
  xueyiming e5463ec78d 删除无用引包 3 settimane fa
  xueyiming b4b7f6f14d Merge branch 'master' into dev-xym-add-test-task 3 settimane fa
  xueyiming 2cc177faef 增加评估类型枚举接口 3 settimane fa
  xueyiming 3389ca515d 删除无用导包 4 settimane fa
  luojunhui dd1f7ec2cc Merge remote-tracking branch 'origin/dev-xym-add-test-task' into dev-xym-add-test-task 4 settimane fa
  luojunhui a9f9e685fb improve evaluate_agent code 4 settimane fa
  xueyiming 9b134f88ca 增加错误状态 4 settimane fa
  xueyiming a38606b996 删除无用文件 4 settimane fa
  xueyiming 1f4cb1aa64 恢复配置 4 settimane fa
  xueyiming edbb4dfe1e 删除空文件 4 settimane fa
  xueyiming c9788ba903 调用score计算 4 settimane fa
  xueyiming 58dad09f51 Merge remote-tracking branch 'origin/dev-xym-add-test-task' into dev-xym-add-test-task 4 settimane fa
  xueyiming eaeecf0ce3 Merge branch 'feature/dev/20250605-dev' into dev-xym-add-test-task 4 settimane fa
  luojunhui 744e9ad636 merge master 4 settimane fa
  luojunhui 92991f1f55 merge master 4 settimane fa
  xueyiming 0467def4bb 删除无用代码 4 settimane fa
  xueyiming 6ce199111c 删除无用代码 4 settimane fa
  xueyiming ae8834f598 Merge branch 'feature/dev/20250605-dev' into dev-xym-add-test-task 4 settimane fa
  luojunhui e41aba8f7f merge master 4 settimane fa
  xueyiming 07198b8cd8 Merge branch 'master' into dev-xym-add-test-task 4 settimane fa
  luojunhui a6cb55b0e5 Merge remote-tracking branch 'origin/master' into feature/dev/20250605-dev 4 settimane fa
  luojunhui 8e8918e715 temp 4 settimane fa
  xueyiming c7247c0386 删除无用注释 4 settimane fa
  xueyiming 190ab150e5 增加并发操作 1 mese fa
  xueyiming fda54a40bb 增加agent调用 生成对话内容 1 mese fa
  xueyiming 3df6d176e6 Merge branch 'master' into dev-xym-add-test-task 1 mese fa
  luojunhui 8792f46829 merge master 1 mese fa
  luojunhui 08e44460a1 merge master 1 mese fa
  luojunhui 90536ccab3 merge master 1 mese fa
  luojunhui 634dc1972a merge master 1 mese fa
  luojunhui 6896b7cfff merge master 1 mese fa
  xueyiming 1c60b713e2 修改查询分区 1 mese fa
  xueyiming 1baa0e71bb 删除测试代码 1 mese fa
  xueyiming c095ef3669 Merge remote-tracking branch 'origin/master' into dev-xym-add-test-task 1 mese fa
  xueyiming d002b019e3 修改创建任务为异步操作 1 mese fa
  xueyiming d26aa2c638 增加数据集相关操作,修改单元测试任务 1 mese fa
  luojunhui 20a8d26fb0 merge master 1 mese fa
  luojunhui 0e2d805092 generate_data_set.py 1 mese fa
  luojunhui 5406cd61d7 generate_data_set.py 1 mese fa
  luojunhui eba4d6ff64 generate_data_set.py 1 mese fa
  luojunhui 7be55a30e7 generate_data_set.py 1 mese fa
  luojunhui e90441dccc generate_data_set.py 1 mese fa
  luojunhui d5d686c19c generate_data_set.py 1 mese fa
  luojunhui 67fdb4a1bd add data-set 1 mese fa
  xueyiming 1c34dfb410 增加数据集相关操作 1 mese fa
  xueyiming c0d80e7552 修改数据库操作 改成ORM 1 mese fa
  xueyiming c7245a6672 Merge branch 'master' into dev-xym-add-test-task 1 mese fa
  xueyiming 43322f9cf7 修改数据库操作 改成ORM 1 mese fa
  xueyiming 3f5113e75b 修改数据库操作 改成ORM 1 mese fa
  xueyiming 1d423c0524 修改数据库操作 改成ORM 1 mese fa
  xueyiming 521023ed60 agent单元测试 修改模拟score 1 mese fa
  xueyiming 0857d318e9 agent单元测试 增加模块id 1 mese fa
  xueyiming e50bc0df86 agent单元测试 1 mese fa
  xueyiming 6f1722eb18 agent单元测试 1 mese fa
  xueyiming 5b8a59b0c7 Merge branch 'master' into dev-xym-add-test-task 1 mese fa
  xueyiming c96f4839dd agent单元测试 1 mese fa
  xueyiming 6af2c4a51d agent单元测试 1 mese fa
  luojunhui 919ac9b1b2 add data-set 1 mese fa
  luojunhui f3a9595c89 add data-set 1 mese fa
  luojunhui 5f953d7406 add data-set 1 mese fa
  luojunhui 63e0d9f462 add log.txt 1 mese fa
  luojunhui 63470c3757 add file 1 mese fa
  luojunhui 1e9cc0ff5e add data-set 1 mese fa
  luojunhui b117728393 add data-set 1 mese fa
  luojunhui c40d087461 add data-set 1 mese fa
  luojunhui 9a15222680 dev-server 1 mese fa
2 ha cambiato i file con 41 aggiunte e 30 eliminazioni
  1. 7 1
      pqai_agent/configs/prod.yaml
  2. 34 29
      pqai_agent_server/api_server.py

+ 7 - 1
pqai_agent/configs/prod.yaml

@@ -38,6 +38,12 @@ storage:
   push_record:
     database: ai_agent
     table: agent_push_record
+  agent_configuration:
+    table: agent_configuration
+  test_task:
+    table: agent_test_task
+  test_task_conversations:
+    table: agent_test_task_conversations
 
 chat_api:
   coze:
@@ -82,4 +88,4 @@ mq:
   scheduler_group: agent_scheduler_event
   push_tasks_topic: agent_push_tasks
   push_send_task_group: agent_push_tasks
-  push_generate_task_group: agent_push_generate_task
+  push_generate_task_group: agent_push_generate_task

+ 34 - 29
pqai_agent_server/api_server.py

@@ -9,7 +9,6 @@ import werkzeug.exceptions
 from flask import Flask, request, jsonify
 from sqlalchemy.orm import sessionmaker
 
-import pqai_agent_server
 import pqai_agent_server.utils
 from pqai_agent import chat_service, prompt_templates
 from pqai_agent import configs
@@ -38,6 +37,7 @@ from pqai_agent_server.utils import wrap_response
 app = Flask('agent_api_server')
 const = AgentApiConst()
 
+
 @app.route('/api/listStaffs', methods=['GET'])
 def list_staffs():
     staff_data = app.user_relation_manager.list_staffs()
@@ -174,6 +174,7 @@ def run_prompt():
         logger.error(e)
         return wrap_response(500, msg='Error: {}'.format(e))
 
+
 @app.route('/api/formatForPrompt', methods=['POST'])
 def format_data_for_prompt():
     try:
@@ -326,6 +327,7 @@ def enter_human_intervention():
     else:
         return wrap_response(500, msg="error")
 
+
 ## Agent管理接口
 @app.route("/api/getNativeAgentList", methods=["GET"])
 def get_native_agent_list():
@@ -368,6 +370,7 @@ def get_native_agent_list():
     }
     return wrap_response(200, data=ret_data)
 
+
 @app.route("/api/getNativeAgentConfiguration", methods=["GET"])
 def get_native_agent_configuration():
     """
@@ -399,6 +402,7 @@ def get_native_agent_configuration():
         }
         return wrap_response(200, data=data)
 
+
 @app.route("/api/saveNativeAgentConfiguration", methods=["POST"])
 def save_native_agent_configuration():
     """
@@ -466,7 +470,6 @@ def save_native_agent_configuration():
         return wrap_response(200, msg='Agent configuration saved successfully', data={'id': agent.id})
 
 
-
 @app.route("/api/deleteNativeAgentConfiguration", methods=["POST"])
 def delete_native_agent_configuration():
     """
@@ -494,6 +497,7 @@ def delete_native_agent_configuration():
         return wrap_response(200, msg='Agent configuration deleted successfully')
 
 
+
 @app.route("/api/getModuleList", methods=["GET"])
 def get_module_list():
     """
@@ -537,6 +541,7 @@ def get_module_list():
     }
     return wrap_response(200, data=ret_data)
 
+
 @app.route("/api/getModuleConfiguration", methods=["GET"])
 def get_module_configuration():
     """
@@ -563,6 +568,7 @@ def get_module_configuration():
         }
         return wrap_response(200, data=data)
 
+
 @app.route("/api/saveModuleConfiguration", methods=["POST"])
 def save_module_configuration():
     """
@@ -601,6 +607,32 @@ def save_module_configuration():
         session.commit()
         return wrap_response(200, msg='Module configuration saved successfully', data={'id': module.id})
 
+@app.route("/api/getToolList", methods=["GET"])
+def get_tool_list():
+    """
+    获取所有的工具列表
+    :return:
+    """
+    tools = []
+    for tool_name, tool in global_tool_map.items():
+        tools.append({
+            'name': tool_name,
+            'description': tool.get_function_description(),
+            'parameters': tool.parameters if hasattr(tool, 'parameters') else {}
+        })
+    return wrap_response(200, data=tools)
+
+@app.route("/api/getModuleAgentTypes", methods=["GET"])
+def get_agent_types():
+    """
+    获取所有的Agent类型
+    :return:
+    """
+    agent_types = [
+        {'type': 0, 'display_name': '原生'},
+        {'type': 1, 'display_name': 'Coze'}
+    ]
+    return wrap_response(200, data=agent_types)
 
 @app.route("/api/getTestTaskList", methods=["GET"])
 def get_test_task_list():
@@ -745,33 +777,6 @@ def get_conversation_data_list():
     return wrap_response(200, data=response)
 
 
-@app.route("/api/getToolList", methods=["GET"])
-def get_tool_list():
-    """
-    获取所有的工具列表
-    :return:
-    """
-    tools = []
-    for tool_name, tool in global_tool_map.items():
-        tools.append({
-            'name': tool_name,
-            'description': tool.get_function_description(),
-            'parameters': tool.parameters if hasattr(tool, 'parameters') else {}
-        })
-    return wrap_response(200, data=tools)
-
-@app.route("/api/getModuleAgentTypes", methods=["GET"])
-def get_agent_types():
-    """
-    获取所有的Agent类型
-    :return:
-    """
-    agent_types = [
-        {'type': 0, 'display_name': '原生'},
-        {'type': 1, 'display_name': 'Coze'}
-    ]
-    return wrap_response(200, data=agent_types)
-
 @app.errorhandler(werkzeug.exceptions.BadRequest)
 def handle_bad_request(e):
     logger.error(e)