From 51433cba2f35b9a2571023236006ebc69d1d4d2d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 07 一月 2025 16:04:31 +0800
Subject: [PATCH] tnp
---
app/models/v2/session_model.py | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 12 deletions(-)
diff --git a/app/models/v2/session_model.py b/app/models/v2/session_model.py
index f6894c0..94cf32b 100644
--- a/app/models/v2/session_model.py
+++ b/app/models/v2/session_model.py
@@ -1,31 +1,39 @@
import json
-from datetime import datetime
-from enum import IntEnum
-from typing import Optional
-
import pytz
-from pydantic import BaseModel
-from sqlalchemy import Column, String, Enum as SQLAlchemyEnum, Integer, DateTime, JSON, TEXT
+from datetime import datetime
+from sqlalchemy.orm import Session
+from typing import Optional, Type
+from pydantic import BaseModel
+from sqlalchemy import Column, String, Integer, DateTime, JSON, TEXT, Index
+
+from Log import logger
from app.models.agent_model import AgentType
-# from app.models import current_time
from app.models.base_model import Base
def current_time():
tz = pytz.timezone('Asia/Shanghai')
return datetime.now(tz)
-class SessionModel(Base):
- __tablename__ = "sessions"
- id = Column(String(255), primary_key=True)
+class ChatSessionModel(Base):
+ __tablename__ = "chat_sessions"
+
+ # __table_args__ = (
+ # Index('idx_username', 'username'),
+ # )
+
+ id = Column(Integer, primary_key=True)
name = Column(String(255))
agent_id = Column(String(255))
- agent_type = Column(SQLAlchemyEnum(AgentType), nullable=False) # 鐩墠鍙瓨basic鐨勶紝ragflow鍜宐isheng鐨勮皟鎺ュ彛鑾峰彇
+ agent_type = Column(Integer) # 鐩墠鍙瓨basic鐨勶紝ragflow鍜宐isheng鐨勮皟鎺ュ彛鑾峰彇
create_date = Column(DateTime, default=current_time) # 鍒涘缓鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿
- update_date = Column(DateTime, default=current_time, onupdate=current_time) # 鏇存柊鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿锛屾洿鏂版椂鑷姩鏇存柊
+ update_date = Column(DateTime, default=current_time, onupdate=current_time, index=True) # 鏇存柊鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿锛屾洿鏂版椂鑷姩鏇存柊
tenant_id = Column(Integer) # 鍒涘缓浜�
message = Column(TEXT) # 璇存槑
+ reference = Column(TEXT) # 璇存槑
conversation_id = Column(String(64))
+ session_id = Column(String(36), index=True)
+ chat_mode = Column(Integer)
# to_dict 鏂规硶
def to_dict(self):
@@ -63,3 +71,85 @@
class ChatDialogData(BaseModel):
sessionId: Optional[str] = ""
question: str
+ chatId: str
+
+
+
+class ChatSessionDao:
+ def __init__(self, db: Session):
+ self.db = db
+
+ def create_session(self, session_id: str, name: str, agent_id: str, agent_type: int, user_id: int, message: str,reference:str) -> ChatSessionModel:
+ new_session = ChatSessionModel(
+ id=session_id,
+ name=name[0:255],
+ agent_id=agent_id,
+ agent_type=agent_type,
+ create_date=current_time(),
+ update_date=current_time(),
+ tenant_id=user_id,
+ message=message,
+ reference=reference,
+ )
+ self.db.add(new_session)
+ self.db.commit()
+ self.db.refresh(new_session)
+ return new_session
+
+ def get_session_by_id(self, session_id: str) -> Type[ChatSessionModel] | None:
+ session = self.db.query(ChatSessionModel).filter_by(id=session_id).first()
+ if session and session.message is None:
+ session.message = '[]'
+ return session
+
+ def update_session_by_id(self, session_id: str, **kwargs) -> Type[ChatSessionModel] | None:
+ session = self.get_session_by_id(session_id)
+ if session:
+ if "message" in kwargs:
+ session.add_message(kwargs["message"])
+ # 鏇挎崲鍏朵粬瀛楁
+ for key, value in kwargs.items():
+ if key != "message":
+ setattr(session, key, value)
+ session.update_date = current_time()
+ try:
+ self.db.commit()
+ self.db.refresh(session)
+ except Exception as e:
+ logger.error(e)
+ self.db.rollback()
+ return session
+
+ def create_session(self, session_id: str, name: str, agent_id: str, agent_type: AgentType, user_id: int) -> ChatSessionModel:
+ existing_session = self.get_session_by_id(session_id)
+ if existing_session:
+ existing_session.add_message({"role": "user", "content": name})
+ existing_session.update_date = current_time()
+ self.db.commit()
+ self.db.refresh(existing_session)
+ return existing_session
+
+ new_session = ChatSessionModel(
+ id=session_id,
+ name=name[0:50],
+ agent_id=agent_id,
+ agent_type=agent_type,
+ tenant_id=user_id,
+ message=json.dumps([{"role": "user", "content": name}])
+ )
+ self.db.add(new_session)
+ self.db.commit()
+ self.db.refresh(new_session)
+ return new_session
+
+ def delete_session(self, session_id: str) -> None:
+ """
+ 鍒犻櫎浼氳瘽璁板綍銆�
+
+ 鍙傛暟:
+ session_id (str): 浼氳瘽ID銆�
+ """
+ session = self.get_session_by_id(session_id)
+ if session:
+ self.db.delete(session)
+ self.db.commit()
\ No newline at end of file
--
Gitblit v1.8.0