合并冲突报错

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

@@ -3,23 +3,7 @@ import os
 from enum import Enum
 
 class BaseConfig(BaseModel):
-	projectInfo:str = os.getenv("PROJECT_TITLE","您好，我是博微工程理解小助手，您可以问我有关[线路工程]工程数据的相关问题！")
-
-	def ParamterCfg(self,**args):
-		projectInfo = args.get('projectInfo')
-		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": {
-class BaseConfig(BaseModel):
-	projectInfo:str = os.getenv("PROJECT_TITLE","您好，我是博微工程理解小助手，您可以问我有关[线路工程]工程数据的相关问题！")
+	projectInfo:str = os.getenv("PROJECT_TITLE","会话提示消息")
 
 	def ParamterCfg(self):
 		questions = os.getenv("CONVERSATION_STARTERS", "dev")
@@ -54,7 +38,7 @@ class BaseConfig(BaseModel):
 						"type": "select",
 						"max_length": 48,
 						"required": True,
-						"options": projectInfo
+						"options": self.projectInfo
 					}
 				}
 			],
@@ -71,9 +55,9 @@ class BaseConfig(BaseModel):
 				}
 			},
 			"system_parameters": {
-				"image_file_size_limit": "10"
+				"image_file_size_limit": "10",
 				"language": "",
-				"voice": ""
+				"voice": "",
 			},
 			"retriever_resource": {
 				"enabled": True
@@ -84,22 +68,6 @@ class BaseConfig(BaseModel):
 			"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"
-			}
 		}
 	
 	def ConversationCfg(self):