From 600d2205367bf914dceaf97e6f082383aa54348c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 22 十一月 2024 09:55:16 +0800
Subject: [PATCH] merge
---
app/api/chat.py | 12 ++++++------
app/service/session.py | 10 +++++++---
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 9784eb9..ee57744 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -209,11 +209,11 @@
question = message.get("message")
try:
SessionService(db).create_session(
- session_id=chat_id,
- name=question,
- agent_id=agent_id,
- agent_type=AgentType.BASIC,
- user_id=current_user.id
+ chat_id,
+ question,
+ agent_id,
+ AgentType.BASIC,
+ current_user.id
)
except Exception as e:
logger.error(e)
@@ -237,7 +237,7 @@
message={"role": "assistant", "content": result})
except Exception as e:
logger.error(e)
- logger.error("-----------------11111111--------------------")
+ logger.error("-----------------杩斿洖鏁版嵁--------------------")
await websocket.send_json(result | data)
except Exception as e2:
diff --git a/app/service/session.py b/app/service/session.py
index dd60c26..6341414 100644
--- a/app/service/session.py
+++ b/app/service/session.py
@@ -22,12 +22,13 @@
杩斿洖:
SessionModel: 鏂板垱寤虹殑浼氳瘽妯″瀷瀹炰緥锛屽鏋滀細璇滻D宸插瓨鍦ㄥ垯杩斿洖None銆�
"""
+ logger.error("-------------xieru")
existing_session = self.get_session_by_id(session_id)
if existing_session:
message=existing_session.message
message.append({"role": "user", "content": name})
self.update_session(session_id, message=message)
-
+ logger.error("-------------xieru------------1")
new_session = SessionModel(
id=session_id,
name=name[0:200],
@@ -68,12 +69,15 @@
session = self.db.query(SessionModel).filter_by(id=session_id).first()
if session:
if "message" in kwargs:
-
message = session.message
+ logger.error(kwargs)
message.append(kwargs["message"])
- session = message
+ session.message = message
+ logger.error("鏇存柊鏁版嵁--------------------------11111111-")
+ logger.error(message)
self.db.commit()
self.db.refresh(session)
+ logger.error("鏇存柊鏁版嵁瀹屾垚--------------------------1111111122222222-")
return session
def delete_session(self, session_id: str) -> None:
--
Gitblit v1.8.0