Merge branch 'dev' of https://git.97id.com/ly/zjdataai-app into dev

backend/app/api/routers/app.py

@@ -27,8 +27,10 @@ from llama_index.core.settings import Settings
 
 logger = logging.getLogger("uvicorn")
 
+
 v1_router = v = APIRouter()
 
+
 gEvent_handler = None
 
 

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

@@ -7,6 +7,21 @@ class BaseConfig(BaseModel):
 
 	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","您好，我是博微工程理解小助手，您可以问我有关[线路工程]工程数据的相关问题！")
+
+	def ParamterCfg(self):
 		questions = os.getenv("CONVERSATION_STARTERS", "dev")
 		return{
 			"opening_statement": self.projectInfo,
@@ -55,6 +70,33 @@ class BaseConfig(BaseModel):
 					]
 				}
 			},
+			"system_parameters": {
+				"image_file_size_limit": "10"
+				"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"
 			}

backend/app/engine/loaders/__init__.py

@@ -10,6 +10,7 @@ import os
 logger = logging.getLogger(__name__)
 
 def load_configs():
+
     with open("config/loaders.yaml",encoding='utf-8') as f:
         configs = yaml.safe_load(f)
     return configs
@@ -98,6 +99,7 @@ def get_documents(docType:str):
             loader_config = loader_config or []
             match loader_type:
                 case "file":
+
                     document = get_file_documents(FileLoaderConfig(**loader_config),docType)
                 case "web":
                     document = get_web_documents(WebLoaderConfig(**loader_config))
@@ -107,4 +109,4 @@ def get_documents(docType:str):
                     raise ValueError(f"Invalid loader type: {loader_type}")
             documents.extend(document)
 
-    return documents
+

backend/app/settings.py

@@ -67,16 +67,15 @@ class ModelPlatform:
 @register(ModelPlateCategory,'ollama')
 class OllamaPlatform(ModelPlatform):
     def model(self):
-        #from llama_index.embeddings.ollama import OllamaEmbedding
-        #from llama_index.llms.ollama.base import DEFAULT_REQUEST_TIMEOUT, Ollama
-        #
-        # base_url = os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434"
-        # request_timeout = float(
-        #     os.getenv("OLLAMA_REQUEST_TIMEOUT", DEFAULT_REQUEST_TIMEOUT)
-        # )
-        # Settings.llm = Ollama(
-        #     base_url=base_url, model=os.getenv("MODEL"), request_timeout=request_timeout
-        # )
+        from llama_index.llms.ollama.base import DEFAULT_REQUEST_TIMEOUT, Ollama
+
+        base_url = os.getenv("OLLAMA_BASE_URL") or "http://127.0.0.1:11434"
+        request_timeout = float(
+            os.getenv("OLLAMA_REQUEST_TIMEOUT", DEFAULT_REQUEST_TIMEOUT)
+        )
+        Settings.llm = Ollama(
+            base_url=base_url, model=os.getenv("MODEL"), request_timeout=request_timeout
+        )
         pass
 
     def embedding(self):