优化Web事件代码

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

@@ -25,7 +25,7 @@ class conversations:
         return None
 
     def add(self,id:str, user_id:str, name:str):
-        template = BaseConfig.ConversationCfg
+        template = BaseConfig().ConversationCfg()
         template['id'] = id
         template['user_id'] = user_id
         template['name'] = name
@@ -111,7 +111,7 @@ class message:
         return datas
 
     def add(self,user_id:str,conversation_id:str,query:str,answer:str):
-        template = BaseConfig.MessageCfg
+        template = BaseConfig.MessageCfg()
         template['id'] = str(uuid.uuid4())
         template['user_id'] = user_id
         template['conversation_id'] = conversation_id
@@ -122,4 +122,34 @@ class message:
     def delete(self,user_id:str):
         dbManage.delete(self._tableName,user_id = user_id)
 
+    def query(self,**condition):
+        results = []
+        records = dbManage.query(self._tableName,**condition)
+        for record in records:
+            results.append(record.dict())
+        return results        
 
+class feedback:
+    def __init__(self) -> None:
+        self._tableName = 'feedbacks'
+        dbManage.createTable(self._tableName)
+
+    def add(self,message_id:str,query:str,answer:str,rating:str):
+        record = {
+            'message_id': message_id,
+            'query': query,  
+            'answer': answer,  
+            'rating': rating,  
+        }
+        dbManage.addRecord(self._tableName,record)
+ 
+    def delete(self,message_id:str):
+        cond = {'message_id':message_id}
+        dbManage.delete(self._tableName,**cond)
+    
+    def query(self,message_id:str):
+        cond = {'message_id':message_id}
+        records = dbManage.query(self._tableName,**cond)
+        if len(records) > 0:
+            return records[0].dict()    
+        return None

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

@@ -1,62 +1,71 @@
+from pydantic import BaseModel
+import os
+class BaseConfig(BaseModel):
+	projectInfo:str = os.getenv("PROJECT_TITLE","您好，我是博微工程理解小助手，您可以问我有关[线路工程]工程数据的相关问题！")
 
-class BaseConfig:
-	ParamterCfg = {
-		"opening_statement": "您好，我是配网D3造价软件小助手，您可以问我有关配网造价软件的相关问题！",
-		"suggested_questions": [],
-		"suggested_questions_after_answer": {
-			"enabled": False
-		},
-		"speech_to_text": {
-			"enabled": False
-		},
-		"text_to_speech": {
-			"enabled": False,
-			"language": "",
-			"voice": ""
-		},
-		"retriever_resource": {
-			"enabled": True
-		},
-		"annotation_reply": {
-			"enabled": False
-		},
-		"more_like_this": {
-			"enabled": False
-		},
-		"user_input_form": [],
-		"sensitive_word_avoidance": {
-			"enabled": False
-		},
-		"file_upload": {
-			"image": {
+	def ParamterCfg(self):
+		questions = os.getenv("CONVERSATION_STARTERS", "dev")
+		return{
+			"opening_statement": self.projectInfo,
+			"suggested_questions": questions.split('\n'),
+			"suggested_questions_after_answer": {
+				"enabled": False
+			},
+			"speech_to_text": {
+				"enabled": False
+			},
+			"text_to_speech": {
 				"enabled": False,
-				"number_limits": 3,
-				"transfer_methods": [
-					"remote_url"
-				]
+				"language": "",
+				"voice": ""
+			},
+			"retriever_resource": {
+				"enabled": True
+			},
+			"annotation_reply": {
+				"enabled": False
+			},
+			"more_like_this": {
+				"enabled": False
+			},
+			"user_input_form": [],
+			"sensitive_word_avoidance": {
+				"enabled": False
+			},
+			"file_upload": {
+				"image": {
+					"enabled": False,
+					"number_limits": 3,
+					"transfer_methods": [
+						"remote_url"
+					]
+				}
+			},
+			"system_parameters": {
+				"image_file_size_limit": "10"
 			}
-		},
-		"system_parameters": {
-			"image_file_size_limit": "10"
 		}
-	}
+	
+	def ConversationCfg(self):
+		return{
+			"id": "",
+			'user_id':'',
+			"name": "",
+			"inputs": {},
+			"status": "normal",
+			"introduction": self.projectInfo,
+			"created_at":''
+		}
 
-	ConversationCfg = {
-		"id": "",
-		'user_id':'',
-		"name": "",
-		"inputs": {},
-		"status": "normal",
-		"introduction": ParamterCfg['opening_statement'],
-		"created_at":''
-	}
-
-
-	MessageCfg = {
+	@classmethod 
+	def MessageCfg(cls):
+		return {
 		    "id": "",
 			'user_id':'',
             "conversation_id": "",
             "inputs": {},
             "query": "",
             "answer": ""
-	}
+		}
+
+

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")

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

@@ -1,7 +1,7 @@
 
 from typing import Dict, Any
 from pydantic import BaseModel
-
+from typing import Optional
 
 class ChatRequestData(BaseModel):
     inputs: Dict[str,Any]
@@ -12,4 +12,6 @@ class ChatRequestData(BaseModel):
     conversation_id: str = None
 
 class ChatFileUploadRequest(BaseModel):
-    base64: str
+    base64: str
+
+