forked from open-webui/open-webui
		
	feat: better error handling
This commit is contained in:
		
							parent
							
								
									c91a5d8b1f
								
							
						
					
					
						commit
						6307adfba1
					
				
					 2 changed files with 55 additions and 40 deletions
				
			
		|  | @ -115,6 +115,7 @@ class CollectionNameForm(BaseModel): | |||
| class StoreWebForm(CollectionNameForm): | ||||
|     url: str | ||||
| 
 | ||||
| 
 | ||||
| @app.get("/") | ||||
| async def get_status(): | ||||
|     return { | ||||
|  | @ -297,13 +298,18 @@ def store_web(form_data: StoreWebForm, user=Depends(get_current_user)): | |||
| 
 | ||||
| 
 | ||||
| def store_data_in_vector_db(data, collection_name, overwrite: bool = False) -> bool: | ||||
| 
 | ||||
|     text_splitter = RecursiveCharacterTextSplitter( | ||||
|         chunk_size=app.state.CHUNK_SIZE, | ||||
|         chunk_overlap=app.state.CHUNK_OVERLAP, | ||||
|         add_start_index=True, | ||||
|     ) | ||||
|     docs = text_splitter.split_documents(data) | ||||
|     return store_docs_in_vector_db(docs, collection_name, overwrite) | ||||
| 
 | ||||
|     if len(docs) > 0: | ||||
|         return store_docs_in_vector_db(docs, collection_name, overwrite), None | ||||
|     else: | ||||
|         raise ValueError(ERROR_MESSAGES.EMPTY_CONTENT) | ||||
| 
 | ||||
| 
 | ||||
| def store_text_in_vector_db( | ||||
|  | @ -319,6 +325,7 @@ def store_text_in_vector_db( | |||
| 
 | ||||
| 
 | ||||
| def store_docs_in_vector_db(docs, collection_name, overwrite: bool = False) -> bool: | ||||
| 
 | ||||
|     texts = [doc.page_content for doc in docs] | ||||
|     metadatas = [doc.metadata for doc in docs] | ||||
| 
 | ||||
|  | @ -455,6 +462,8 @@ def store_doc( | |||
| 
 | ||||
|         loader, known_type = get_loader(file.filename, file.content_type, file_path) | ||||
|         data = loader.load() | ||||
| 
 | ||||
|         try: | ||||
|             result = store_data_in_vector_db(data, collection_name) | ||||
| 
 | ||||
|             if result: | ||||
|  | @ -464,10 +473,10 @@ def store_doc( | |||
|                     "filename": filename, | ||||
|                     "known_type": known_type, | ||||
|                 } | ||||
|         else: | ||||
|         except Exception as e: | ||||
|             raise HTTPException( | ||||
|                 status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, | ||||
|                 detail=ERROR_MESSAGES.DEFAULT(), | ||||
|                 detail=e, | ||||
|             ) | ||||
|     except Exception as e: | ||||
|         log.exception(e) | ||||
|  | @ -532,6 +541,7 @@ def scan_docs_dir(user=Depends(get_admin_user)): | |||
|                 ) | ||||
|                 data = loader.load() | ||||
| 
 | ||||
|                 try: | ||||
|                     result = store_data_in_vector_db(data, collection_name) | ||||
| 
 | ||||
|                     if result: | ||||
|  | @ -564,6 +574,9 @@ def scan_docs_dir(user=Depends(get_admin_user)): | |||
|                                     } | ||||
|                                 ), | ||||
|                             ) | ||||
|                 except Exception as e: | ||||
|                     print(e) | ||||
|                     pass | ||||
| 
 | ||||
|         except Exception as e: | ||||
|             log.exception(e) | ||||
|  |  | |||
|  | @ -60,3 +60,5 @@ class ERROR_MESSAGES(str, Enum): | |||
|     MODEL_NOT_FOUND = lambda name="": f"Model '{name}' was not found" | ||||
|     OPENAI_NOT_FOUND = lambda name="": f"OpenAI API was not found" | ||||
|     OLLAMA_NOT_FOUND = "WebUI could not connect to Ollama" | ||||
| 
 | ||||
|     EMPTY_CONTENT = "The content provided is empty. Please ensure that there is text or data present before proceeding." | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Timothy J. Baek
						Timothy J. Baek