refac
This commit is contained in:
		
							parent
							
								
									e1103305f5
								
							
						
					
					
						commit
						5b7cf88915
					
				|  | @ -20,18 +20,18 @@ from fastapi import Depends, FastAPI, File, Form, HTTPException, UploadFile, sta | |||
| from fastapi.middleware.cors import CORSMiddleware | ||||
| from pydantic import BaseModel | ||||
| 
 | ||||
| from open_webui.apps.rag.search.main import SearchResult | ||||
| from open_webui.apps.rag.search.brave import search_brave | ||||
| from open_webui.apps.rag.search.duckduckgo import search_duckduckgo | ||||
| from open_webui.apps.rag.search.google_pse import search_google_pse | ||||
| from open_webui.apps.rag.search.jina_search import search_jina | ||||
| from open_webui.apps.rag.search.searchapi import search_searchapi | ||||
| from open_webui.apps.rag.search.searxng import search_searxng | ||||
| from open_webui.apps.rag.search.serper import search_serper | ||||
| from open_webui.apps.rag.search.serply import search_serply | ||||
| from open_webui.apps.rag.search.serpstack import search_serpstack | ||||
| from open_webui.apps.rag.search.tavily import search_tavily | ||||
| from open_webui.apps.rag.utils import ( | ||||
| from open_webui.apps.retrieval.search.main import SearchResult | ||||
| from open_webui.apps.retrieval.search.brave import search_brave | ||||
| from open_webui.apps.retrieval.search.duckduckgo import search_duckduckgo | ||||
| from open_webui.apps.retrieval.search.google_pse import search_google_pse | ||||
| from open_webui.apps.retrieval.search.jina_search import search_jina | ||||
| from open_webui.apps.retrieval.search.searchapi import search_searchapi | ||||
| from open_webui.apps.retrieval.search.searxng import search_searxng | ||||
| from open_webui.apps.retrieval.search.serper import search_serper | ||||
| from open_webui.apps.retrieval.search.serply import search_serply | ||||
| from open_webui.apps.retrieval.search.serpstack import search_serpstack | ||||
| from open_webui.apps.retrieval.search.tavily import search_tavily | ||||
| from open_webui.apps.retrieval.utils import ( | ||||
|     get_embedding_function, | ||||
|     get_model_path, | ||||
|     query_collection, | ||||
|  | @ -98,7 +98,7 @@ from open_webui.utils.misc import ( | |||
|     sanitize_filename, | ||||
| ) | ||||
| from open_webui.utils.utils import get_admin_user, get_verified_user | ||||
| from open_webui.apps.rag.vector.connector import VECTOR_DB_CLIENT | ||||
| from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT | ||||
| 
 | ||||
| from langchain.text_splitter import RecursiveCharacterTextSplitter | ||||
| from langchain_community.document_loaders import ( | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ import logging | |||
| from typing import Optional | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| import logging | ||||
| from typing import Optional | ||||
| 
 | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from duckduckgo_search import DDGS | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ import logging | |||
| from typing import Optional | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| import logging | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult | ||||
| from open_webui.apps.retrieval.search.main import SearchResult | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| from yarl import URL | ||||
| 
 | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ from typing import Optional | |||
| from urllib.parse import urlencode | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ import logging | |||
| from typing import Optional | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ import logging | |||
| from typing import Optional | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ from typing import Optional | |||
| from urllib.parse import urlencode | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ import logging | |||
| from typing import Optional | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.apps.retrieval.search.main import SearchResult, get_filtered_results | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| import logging | ||||
| 
 | ||||
| import requests | ||||
| from open_webui.apps.rag.search.main import SearchResult | ||||
| from open_webui.apps.retrieval.search.main import SearchResult | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
| log = logging.getLogger(__name__) | ||||
|  |  | |||
|  | @ -15,7 +15,7 @@ from open_webui.apps.ollama.main import ( | |||
|     GenerateEmbeddingsForm, | ||||
|     generate_ollama_embeddings, | ||||
| ) | ||||
| from open_webui.apps.rag.vector.connector import VECTOR_DB_CLIENT | ||||
| from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT | ||||
| from open_webui.utils.misc import get_last_user_message | ||||
| 
 | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| from open_webui.apps.rag.vector.dbs.chroma import ChromaClient | ||||
| from open_webui.apps.rag.vector.dbs.milvus import MilvusClient | ||||
| from open_webui.apps.retrieval.vector.dbs.chroma import ChromaClient | ||||
| from open_webui.apps.retrieval.vector.dbs.milvus import MilvusClient | ||||
| 
 | ||||
| 
 | ||||
| from open_webui.config import VECTOR_DB | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ from chromadb.utils.batch_utils import create_batches | |||
| 
 | ||||
| from typing import Optional | ||||
| 
 | ||||
| from open_webui.apps.rag.vector.main import VectorItem, SearchResult, GetResult | ||||
| from open_webui.apps.retrieval.vector.main import VectorItem, SearchResult, GetResult | ||||
| from open_webui.config import ( | ||||
|     CHROMA_DATA_PATH, | ||||
|     CHROMA_HTTP_HOST, | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ import json | |||
| 
 | ||||
| from typing import Optional | ||||
| 
 | ||||
| from open_webui.apps.rag.vector.main import VectorItem, SearchResult, GetResult | ||||
| from open_webui.apps.retrieval.vector.main import VectorItem, SearchResult, GetResult | ||||
| from open_webui.config import ( | ||||
|     MILVUS_URI, | ||||
| ) | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ import logging | |||
| from typing import Optional | ||||
| 
 | ||||
| from open_webui.apps.webui.models.memories import Memories, MemoryModel | ||||
| from open_webui.apps.rag.vector.connector import VECTOR_DB_CLIENT | ||||
| from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT | ||||
| from open_webui.utils.utils import get_verified_user | ||||
| from open_webui.env import SRC_LOG_LEVELS | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue