Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

app/api/agent.py

@@ -140,8 +140,27 @@ async def session_log(agent_id: str, conversation_id: str, db: Session = Depends
         except Exception as e:
             raise HTTPException(status_code=500, detail=str(e))
     elif agent.agent_type == AgentType.BASIC:
+        data = []
         session = db.query(SessionModel).filter(SessionModel.id == conversation_id).first()
-        return JSONResponse(status_code=200, content={"code": 200, "data": session.log_to_json() if session else {}})
+        if session:
+            tmp_data = {}
+            for i in session.log_to_json().get("message", []):
+                if i.get("role") == "user":
+                    tmp_data["question"]=i.get("content")
+                elif i.get("role") == "assistant":
+                    if isinstance(i.get("content"), dict):
+                        tmp_data["answer"] = i.get("content", {}).get("message")
+                        if "file_name" in i.get("content", {}):
+                            tmp_data["files"] = [{"file_name":i.get("content", {}).get("file_name"), "file_url":i.get("content", {}).get("file_url")}]
+                    else:
+                        tmp_data["answer"] = i.get("content")
+                    data.append(tmp_data)
+                    tmp_data = {}
+
+            if tmp_data:
+                data.append(tmp_data)
+
+        return JSONResponse(status_code=200, content={"code": 200, "data": data})
     else:
         return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"})
 

app/models/dialog_model.py

@@ -57,5 +57,6 @@ class ConversationModel(Base):
         return {
             'id': self.id,
             'updated_time': self.update_time,
+            'update_date': self.update_time.strftime('%Y-%m-%d %H:%M:%S'),
             'name': self.name,
         }

app/service/bisheng.py

@@ -68,7 +68,8 @@ class BishengService:
                 {
                     "id": item["chat_id"],
                     "name": item["latest_message"]["message"],
-                    "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
+                    "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000),
+                    "update_date": item["update_time"]
                 }
                 for item in data
                 if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
@@ -93,6 +94,7 @@ class BishengService:
                 {
                     "id": item["chat_id"],
                     "name": process_name(item),
+                    "update_date": item["update_time"],
                     "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
                 }
                 for item in data

app/service/ragflow.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 import httpx
 from typing import Union, Dict, List
 from fastapi import HTTPException
@@ -97,7 +99,8 @@ class RagflowService:
                 {
                     "id": item["id"],
                     "name": item["name"],
-                    "updated_time": item["update_time"]
+                    "updated_time": item["update_time"],
+                    "update_date": datetime.utcfromtimestamp(item["update_time"] / 1000.0).strftime('%Y-%m-%d %H:%M:%S')
                 }
                 for item in data
                 if "id" in item and "name" in item and item["name"]