소스 검색

Fix api_server

StrayWarrior 1 일 전
부모
커밋
0c5287da5a
1개의 변경된 파일15개의 추가작업 그리고 15개의 파일을 삭제
  1. 15 15
      pqai_agent_server/api_server.py

+ 15 - 15
pqai_agent_server/api_server.py

@@ -320,19 +320,19 @@ def get_native_agent_list():
     :return:
     """
     page = request.args.get('page', 1)
-    page_size = request.args.get('page_size', 20)
+    page_size = request.args.get('page_size', 50)
     create_user = request.args.get('create_user', None)
     update_user = request.args.get('update_user', None)
 
     offset = (int(page) - 1) * int(page_size)
     with app.session_maker() as session:
         query = session.query(AgentConfiguration) \
-            .filter(AgentConfiguration.is_delete == 0) \
-            .offset(offset).limit(int(page_size))
+            .filter(AgentConfiguration.is_delete == 0)
         if create_user:
             query = query.filter(AgentConfiguration.create_user == create_user)
         if update_user:
             query = query.filter(AgentConfiguration.update_user == update_user)
+        query = query.offset(offset).limit(int(page_size))
         data = query.all()
     ret_data = [
         {
@@ -341,15 +341,15 @@ def get_native_agent_list():
             'display_name': agent.display_name,
             'type': agent.type,
             'execution_model': agent.execution_model,
-            'created_at': agent.created_at.strftime('%Y-%m-%d %H:%M:%S'),
-            'updated_at': agent.updated_at.strftime('%Y-%m-%d %H:%M:%S')
+            'create_time': agent.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+            'update_time': agent.update_time.strftime('%Y-%m-%d %H:%M:%S')
         }
         for agent in data
     ]
     return wrap_response(200, data=ret_data)
 
-@app.route("/api/getAgentConfiguration", methods=["GET"])
-def get_agent_configuration():
+@app.route("/api/getNativeAgentConfiguration", methods=["GET"])
+def get_native_agent_configuration():
     """
     获取指定Agent的配置
     :return:
@@ -374,13 +374,13 @@ def get_agent_configuration():
             'tools': agent.tools,
             'sub_agents': agent.sub_agents,
             'extra_params': agent.extra_params,
-            'created_at': agent.created_at.strftime('%Y-%m-%d %H:%M:%S'),
-            'updated_at': agent.updated_at.strftime('%Y-%m-%d %H:%M:%S')
+            'create_time': agent.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+            'update_time': agent.update_time.strftime('%Y-%m-%d %H:%M:%S')
         }
         return wrap_response(200, data=data)
 
-@app.route("/api/saveAgentConfiguration", methods=["POST"])
-def save_agent_configuration():
+@app.route("/api/saveNativeAgentConfiguration", methods=["POST"])
+def save_native_agent_configuration():
     """
     保存Agent配置
     :return:
@@ -449,8 +449,8 @@ def get_module_list():
             'display_name': module.display_name,
             'default_agent_type': module.default_agent_type,
             'default_agent_id': module.default_agent_id,
-            'created_at': module.created_at.strftime('%Y-%m-%d %H:%M:%S'),
-            'updated_at': module.updated_at.strftime('%Y-%m-%d %H:%M:%S')
+            'create_time': module.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+            'update_time': module.update_time.strftime('%Y-%m-%d %H:%M:%S')
         }
         for module in data
     ]
@@ -477,8 +477,8 @@ def get_module_configuration():
             'display_name': module.display_name,
             'default_agent_type': module.default_agent_type,
             'default_agent_id': module.default_agent_id,
-            'created_at': module.created_at.strftime('%Y-%m-%d %H:%M:%S'),
-            'updated_at': module.updated_at.strftime('%Y-%m-%d %H:%M:%S')
+            'create_time': module.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+            'updated_time': module.updated_time.strftime('%Y-%m-%d %H:%M:%S')
         }
         return wrap_response(200, data=data)