Browse Source

add const

luojunhui 1 month ago
parent
commit
6e2d70c4ff
3 changed files with 19 additions and 10 deletions
  1. 2 2
      pqai_agent/user_manager.py
  2. 10 8
      pqai_agent_server/api_server.py
  3. 7 0
      pqai_agent_server/const.py

+ 2 - 2
pqai_agent/user_manager.py

@@ -468,16 +468,16 @@ class MySQLUserManager(UserManager):
         }
 
     def get_conversation_list_v1(
-        self, staff_id: str, customer_id: str, page: Optional[int]
+        self, staff_id: str, customer_id: str, page: Optional[int], page_size: int
     ):
         """
         :param staff_id:
         :param customer_id:
         :param page: timestamp
+        :param page_size:
         :return:
         """
         room_id = ":".join(["private", staff_id, customer_id])
-        page_size = 20
         if not page:
             fetch_query = f"""
                 select t1.sender, t2.name, t1.sendtime, t1.content, t2.iconurl, t1.msg_type

+ 10 - 8
pqai_agent_server/api_server.py

@@ -12,6 +12,7 @@ from pqai_agent import configs
 from pqai_agent import logging_service, chat_service, prompt_templates
 from pqai_agent.history_dialogue_service import HistoryDialogueService
 from pqai_agent.user_manager import MySQLUserManager, MySQLUserRelationManager
+from pqai_agent_server.const import AgentApiConst
 from pqai_agent_server.utils import wrap_response, quit_human_intervention_status
 from pqai_agent_server.utils import (
     run_extractor_prompt,
@@ -21,6 +22,7 @@ from pqai_agent_server.utils import (
 
 app = Flask("agent_api_server")
 logger = logging_service.logger
+const = AgentApiConst()
 
 
 @app.route("/api/listStaffs", methods=["GET"])
@@ -167,9 +169,9 @@ def health_check():
 @app.route("/api/getStaffSessionSummary", methods=["GET"])
 def get_staff_session_summary():
     staff_id = request.args.get("staff_id")
-    status = request.args.get("status", 1)
-    page_id = request.args.get("page_id", 1)
-    page_size = request.args.get("page_size", 10)
+    status = request.args.get("status", const.DEFAULT_STAFF_STATUS)
+    page_id = request.args.get("page_id", const.DEFAULT_PAGE_ID)
+    page_size = request.args.get("page_size", const.DEFAULT_PAGE_SIZE)
 
     # check params
     try:
@@ -195,8 +197,8 @@ def get_staff_session_list():
     if not staff_id:
         return wrap_response(404, msg="staff_id is required")
 
-    page_size = request.args.get("page_size", 10)
-    page_id = request.args.get("page_id", 1)
+    page_size = request.args.get("page_size", const.DEFAULT_PAGE_SIZE)
+    page_id = request.args.get("page_id", const.DEFAULT_PAGE_ID)
     staff_session_list = app.user_manager.get_staff_session_list_v1(
         staff_id, page_id, page_size
     )
@@ -208,8 +210,8 @@ def get_staff_session_list():
 
 @app.route("/api/getStaffList", methods=["GET"])
 def get_staff_list():
-    page_size = request.args.get("page_size", 10)
-    page_id = request.args.get("page_id", 1)
+    page_size = request.args.get("page_size", const.DEFAULT_PAGE_SIZE)
+    page_id = request.args.get("page_id", const.DEFAULT_PAGE_ID)
     staff_list = app.user_manager.get_staff_list(page_id, page_size)
     if not staff_list:
         return wrap_response(404, msg="staff not found")
@@ -228,7 +230,7 @@ def get_conversation_list():
         return wrap_response(404, msg="staff_id and customer_id are required")
 
     page = request.args.get("page")
-    response = app.user_manager.get_conversation_list_v1(staff_id, customer_id, page)
+    response = app.user_manager.get_conversation_list_v1(staff_id, customer_id, page, const.DEFAULT_CONVERSATION_SIZE)
     return wrap_response(200, data=response)
 
 

+ 7 - 0
pqai_agent_server/const.py

@@ -0,0 +1,7 @@
+class AgentApiConst:
+    DEFAULT_STAFF_STATUS = 1
+
+    DEFAULT_PAGE_ID = 1
+    DEFAULT_PAGE_SIZE = 10
+
+    DEFAULT_CONVERSATION_SIZE = 20