From 1b417d75a8e24e5ec9fd29e9b75ee53049f3b79e Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 17:13:14 +0800
Subject: [PATCH] 跨域问题
---
app/models/dialog_model.py | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/app/models/dialog_model.py b/app/models/dialog_model.py
index bfa4a8c..7a1848a 100644
--- a/app/models/dialog_model.py
+++ b/app/models/dialog_model.py
@@ -1,6 +1,6 @@
from datetime import datetime
-from sqlalchemy import Column, Integer, String, Table, ForeignKey, DateTime, BigInteger, Text, Float, Boolean
+from sqlalchemy import Column, Integer, String, BigInteger, ForeignKey, DateTime, Text, JSON
from sqlalchemy.orm import relationship, backref
from app.models.base_model import Base
@@ -10,29 +10,15 @@
__mapper_args__ = {
# "order_by": 'SEQ'
}
- id = Column(String(32), primary_key=True)
- create_time = Column(BigInteger)
- create_date = Column(DateTime)
- update_time = Column(BigInteger)
- update_date = Column(DateTime)
- tenant_id = Column(String(32))
- name = Column(String(255))
- description = Column(Text)
- icon = Column(Text)
- language = Column(String(32))
- llm_id = Column(String(128))
- llm_setting = Column(Text)
- prompt_type = Column(String(16))
- prompt_config = Column(Text)
- similarity_threshold = Column(Float)
- vector_similarity_weight = Column(Float)
- top_n = Column(Integer)
- top_k = Column(Integer)
- do_refer = Column(String(1))
- rerank_id = Column(String(128))
- kb_ids = Column(Text)
- status = Column(String(1))
- hide = Column(Boolean)
+ id = Column(String(32), primary_key=True) # id
+ create_date = Column(DateTime) # 鍒涘缓鏃堕棿
+ update_date = Column(DateTime) # 鏇存柊鏃堕棿
+ tenant_id = Column(String(32)) # 鍒涘缓浜�
+ name = Column(String(255)) # 鍚嶇О
+ description = Column(Text) # 璇存槑
+ icon = Column(Text) # 鍥炬爣
+ status = Column(String(1)) # 鐘舵��
+ # dialog_type = Column(String(1)) # # 骞冲彴
def get_id(self):
return str(self.id)
@@ -40,23 +26,36 @@
def to_json(self):
return {
'id': self.id,
- 'create_time': self.create_time,
'create_date': self.create_date,
- 'update_time': self.update_time,
'update_date': self.update_date,
'tenant_id': self.tenant_id,
'name': self.name,
'description': self.description,
'icon': self.icon,
- 'language': self.language,
- 'llm_id': self.llm_id,
- 'prompt_type': self.prompt_type,
- 'prompt_config': self.prompt_config,
- 'similarity_threshold': self.similarity_threshold,
- 'vector_similarity_weight': self.vector_similarity_weight,
- 'top_n': self.top_n,
- 'top_k': self.top_k,
- 'do_refer': self.do_refer,
- 'kb_ids': self.kb_ids,
'status': self.status
+ }
+
+
+class ConversationModel(Base):
+ __tablename__ = 'conversation'
+ id = Column(String(32), primary_key=True) # id
+ create_date = Column(DateTime) # 鍒涘缓鏃堕棿
+ create_time = Column(BigInteger)
+ update_date = Column(DateTime) # 鏇存柊鏃堕棿
+ update_time = Column(BigInteger)
+ tenant_id = Column(Integer) # 鍒涘缓浜�
+ dialog_id = Column(String(32))
+ name = Column(String(255)) # 鍚嶇О
+ message = Column(JSON) # 璇存槑
+ reference = Column(JSON) # 鍥炬爣
+
+ def get_id(self):
+ return str(self.id)
+
+
+ def to_json(self):
+ return {
+ 'id': self.id,
+ 'updated_time': self.update_time,
+ 'name': self.name,
}
\ No newline at end of file
--
Gitblit v1.8.0