合并Dev分支代码

backend/app/api/routers/request/dbOrm.py

@@ -2,7 +2,7 @@ import os
 from typing import Dict, List, Any
 
 from pydantic import BaseModel
-from sqlalchemy import create_engine, Column, String, Integer, JSON
+from sqlalchemy import create_engine, Column, String, Integer, JSON,Float
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.orm import sessionmaker, declarative_base
 
@@ -24,10 +24,6 @@ class ConversationOrm(Base):
         if 'name' in data:
             self.name = data['name']
 
-
-
-
-
 class UserOrm(Base):
     __tablename__ = "user"
 
@@ -51,6 +47,14 @@ class MessagesOrm(Base):
     query = Column(String)
     answer = Column(String)
 
+class FeedBackOrm(Base):
+    __tablename__ = "feedbacks"
+
+    message_id = Column(String,primary_key=True)
+    query = Column(String)
+    answer = Column(String)
+    rating = Column(String)
+
 #数据结构
 class ConversationModel(BaseModel):
     id: str
@@ -61,7 +65,6 @@ class ConversationModel(BaseModel):
     created_at: int
 
     class Config:
-        #orm_mode = True
         from_attributes=True
 
     @classmethod
@@ -73,7 +76,6 @@ class UserModel(BaseModel):
     createtime: str
 
     class Config:
-        #orm_mode = True
         from_attributes=True
 
     @classmethod
@@ -86,7 +88,6 @@ class ParametersModel(BaseModel):
     value : Dict[str, Any]
 
     class Config:
-        #orm_mode = True
         from_attributes=True
 
     @classmethod
@@ -101,13 +102,25 @@ class MessagesModel(BaseModel):
     answer : str
 
     class Config:
-        #orm_mode = True
         from_attributes=True
 
     @classmethod
     def orm(cls):
         return MessagesOrm
 
+class FeedBackModel(BaseModel):
+    message_id :str
+    query :str
+    answer :str
+    rating :str
+
+    class Config:
+        from_attributes=True
+
+    @classmethod
+    def orm(cls):
+        return FeedBackOrm
+
 class DBManager:
     def __init__(self) -> None:
         DATABASE_URL = os.getenv("SQLITE_DATABASE_URL")