|
@@ -449,6 +449,7 @@ async def get_rag_config(request: Request, user=Depends(get_admin_user)):
|
|
|
"WEB_SEARCH_TRUST_ENV": request.app.state.config.WEB_SEARCH_TRUST_ENV,
|
|
|
"WEB_SEARCH_RESULT_COUNT": request.app.state.config.WEB_SEARCH_RESULT_COUNT,
|
|
|
"WEB_SEARCH_CONCURRENT_REQUESTS": request.app.state.config.WEB_SEARCH_CONCURRENT_REQUESTS,
|
|
|
+ "WEB_LOADER_CONCURRENT_REQUESTS": request.app.state.config.WEB_LOADER_CONCURRENT_REQUESTS,
|
|
|
"WEB_SEARCH_DOMAIN_FILTER_LIST": request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST,
|
|
|
"BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL": request.app.state.config.BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL,
|
|
|
"BYPASS_WEB_SEARCH_WEB_LOADER": request.app.state.config.BYPASS_WEB_SEARCH_WEB_LOADER,
|
|
@@ -504,6 +505,7 @@ class WebConfig(BaseModel):
|
|
|
WEB_SEARCH_TRUST_ENV: Optional[bool] = None
|
|
|
WEB_SEARCH_RESULT_COUNT: Optional[int] = None
|
|
|
WEB_SEARCH_CONCURRENT_REQUESTS: Optional[int] = None
|
|
|
+ WEB_LOADER_CONCURRENT_REQUESTS: Optional[int] = None
|
|
|
WEB_SEARCH_DOMAIN_FILTER_LIST: Optional[List[str]] = []
|
|
|
BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL: Optional[bool] = None
|
|
|
BYPASS_WEB_SEARCH_WEB_LOADER: Optional[bool] = None
|
|
@@ -916,6 +918,9 @@ async def update_rag_config(
|
|
|
request.app.state.config.WEB_SEARCH_CONCURRENT_REQUESTS = (
|
|
|
form_data.web.WEB_SEARCH_CONCURRENT_REQUESTS
|
|
|
)
|
|
|
+ request.app.state.config.WEB_LOADER_CONCURRENT_REQUESTS = (
|
|
|
+ form_data.web.WEB_LOADER_CONCURRENT_REQUESTS
|
|
|
+ )
|
|
|
request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST = (
|
|
|
form_data.web.WEB_SEARCH_DOMAIN_FILTER_LIST
|
|
|
)
|
|
@@ -1067,6 +1072,7 @@ async def update_rag_config(
|
|
|
"WEB_SEARCH_TRUST_ENV": request.app.state.config.WEB_SEARCH_TRUST_ENV,
|
|
|
"WEB_SEARCH_RESULT_COUNT": request.app.state.config.WEB_SEARCH_RESULT_COUNT,
|
|
|
"WEB_SEARCH_CONCURRENT_REQUESTS": request.app.state.config.WEB_SEARCH_CONCURRENT_REQUESTS,
|
|
|
+ "WEB_LOADER_CONCURRENT_REQUESTS": request.app.state.config.WEB_LOADER_CONCURRENT_REQUESTS,
|
|
|
"WEB_SEARCH_DOMAIN_FILTER_LIST": request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST,
|
|
|
"BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL": request.app.state.config.BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL,
|
|
|
"BYPASS_WEB_SEARCH_WEB_LOADER": request.app.state.config.BYPASS_WEB_SEARCH_WEB_LOADER,
|
|
@@ -1624,7 +1630,7 @@ def process_web(
|
|
|
loader = get_web_loader(
|
|
|
form_data.url,
|
|
|
verify_ssl=request.app.state.config.ENABLE_WEB_LOADER_SSL_VERIFICATION,
|
|
|
- requests_per_second=request.app.state.config.WEB_SEARCH_CONCURRENT_REQUESTS,
|
|
|
+ requests_per_second=request.app.state.config.WEB_LOADER_CONCURRENT_REQUESTS,
|
|
|
)
|
|
|
docs = loader.load()
|
|
|
content = " ".join([doc.page_content for doc in docs])
|
|
@@ -1798,6 +1804,7 @@ def search_web(request: Request, engine: str, query: str) -> list[SearchResult]:
|
|
|
query,
|
|
|
request.app.state.config.WEB_SEARCH_RESULT_COUNT,
|
|
|
request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST,
|
|
|
+ concurrent_requests=request.app.state.config.WEB_SEARCH_CONCURRENT_REQUESTS,
|
|
|
)
|
|
|
elif engine == "tavily":
|
|
|
if request.app.state.config.TAVILY_API_KEY:
|
|
@@ -1971,7 +1978,7 @@ async def process_web_search(
|
|
|
loader = get_web_loader(
|
|
|
urls,
|
|
|
verify_ssl=request.app.state.config.ENABLE_WEB_LOADER_SSL_VERIFICATION,
|
|
|
- requests_per_second=request.app.state.config.WEB_SEARCH_CONCURRENT_REQUESTS,
|
|
|
+ requests_per_second=request.app.state.config.WEB_LOADER_CONCURRENT_REQUESTS,
|
|
|
trust_env=request.app.state.config.WEB_SEARCH_TRUST_ENV,
|
|
|
)
|
|
|
docs = await loader.aload()
|