enh: REQUESTS_VERIFY
This commit is contained in:
@@ -669,6 +669,8 @@ except ValueError:
|
|||||||
WEBSOCKET_SERVER_PING_INTERVAL = 25
|
WEBSOCKET_SERVER_PING_INTERVAL = 25
|
||||||
|
|
||||||
|
|
||||||
|
REQUESTS_VERIFY = os.environ.get("REQUESTS_VERIFY", "True").lower() == "true"
|
||||||
|
|
||||||
AIOHTTP_CLIENT_TIMEOUT = os.environ.get("AIOHTTP_CLIENT_TIMEOUT", "")
|
AIOHTTP_CLIENT_TIMEOUT = os.environ.get("AIOHTTP_CLIENT_TIMEOUT", "")
|
||||||
|
|
||||||
if AIOHTTP_CLIENT_TIMEOUT == "":
|
if AIOHTTP_CLIENT_TIMEOUT == "":
|
||||||
@@ -766,7 +768,10 @@ else:
|
|||||||
# When enabled (default), scores are normalized to 0-1 range for proper
|
# When enabled (default), scores are normalized to 0-1 range for proper
|
||||||
# relevance threshold behavior with MS MARCO models.
|
# relevance threshold behavior with MS MARCO models.
|
||||||
SENTENCE_TRANSFORMERS_CROSS_ENCODER_SIGMOID_ACTIVATION_FUNCTION = (
|
SENTENCE_TRANSFORMERS_CROSS_ENCODER_SIGMOID_ACTIVATION_FUNCTION = (
|
||||||
os.environ.get("SENTENCE_TRANSFORMERS_CROSS_ENCODER_SIGMOID_ACTIVATION_FUNCTION", "True").lower() == "true"
|
os.environ.get(
|
||||||
|
"SENTENCE_TRANSFORMERS_CROSS_ENCODER_SIGMOID_ACTIVATION_FUNCTION", "True"
|
||||||
|
).lower()
|
||||||
|
== "true"
|
||||||
)
|
)
|
||||||
|
|
||||||
####################################
|
####################################
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ from open_webui.retrieval.loaders.datalab_marker import DatalabMarkerLoader
|
|||||||
from open_webui.retrieval.loaders.mineru import MinerULoader
|
from open_webui.retrieval.loaders.mineru import MinerULoader
|
||||||
|
|
||||||
|
|
||||||
from open_webui.env import GLOBAL_LOG_LEVEL
|
from open_webui.env import GLOBAL_LOG_LEVEL, REQUESTS_VERIFY
|
||||||
|
|
||||||
logging.basicConfig(stream=sys.stdout, level=GLOBAL_LOG_LEVEL)
|
logging.basicConfig(stream=sys.stdout, level=GLOBAL_LOG_LEVEL)
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@@ -114,7 +114,7 @@ class TikaLoader:
|
|||||||
endpoint += "/"
|
endpoint += "/"
|
||||||
endpoint += "tika/text"
|
endpoint += "tika/text"
|
||||||
|
|
||||||
r = requests.put(endpoint, data=data, headers=headers)
|
r = requests.put(endpoint, data=data, headers=headers, verify=REQUESTS_VERIFY)
|
||||||
|
|
||||||
if r.ok:
|
if r.ok:
|
||||||
raw_metadata = r.json()
|
raw_metadata = r.json()
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from typing import Optional, List, Tuple
|
|||||||
from urllib.parse import quote
|
from urllib.parse import quote
|
||||||
|
|
||||||
|
|
||||||
from open_webui.env import ENABLE_FORWARD_USER_INFO_HEADERS
|
from open_webui.env import ENABLE_FORWARD_USER_INFO_HEADERS, REQUESTS_VERIFY
|
||||||
from open_webui.retrieval.models.base_reranker import BaseReranker
|
from open_webui.retrieval.models.base_reranker import BaseReranker
|
||||||
from open_webui.utils.headers import include_user_info_headers
|
from open_webui.utils.headers import include_user_info_headers
|
||||||
|
|
||||||
@@ -55,6 +55,7 @@ class ExternalReranker(BaseReranker):
|
|||||||
headers=headers,
|
headers=headers,
|
||||||
json=payload,
|
json=payload,
|
||||||
timeout=self.timeout,
|
timeout=self.timeout,
|
||||||
|
verify=REQUESTS_VERIFY,
|
||||||
)
|
)
|
||||||
|
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ from open_webui.retrieval.loaders.youtube import YoutubeLoader
|
|||||||
from open_webui.env import (
|
from open_webui.env import (
|
||||||
OFFLINE_MODE,
|
OFFLINE_MODE,
|
||||||
ENABLE_FORWARD_USER_INFO_HEADERS,
|
ENABLE_FORWARD_USER_INFO_HEADERS,
|
||||||
|
AIOHTTP_CLIENT_SESSION_SSL,
|
||||||
)
|
)
|
||||||
from open_webui.config import (
|
from open_webui.config import (
|
||||||
RAG_EMBEDDING_QUERY_PREFIX,
|
RAG_EMBEDDING_QUERY_PREFIX,
|
||||||
@@ -762,7 +763,10 @@ async def agenerate_ollama_batch_embeddings(
|
|||||||
|
|
||||||
async with aiohttp.ClientSession(trust_env=True) as session:
|
async with aiohttp.ClientSession(trust_env=True) as session:
|
||||||
async with session.post(
|
async with session.post(
|
||||||
f"{url}/api/embed", headers=headers, json=form_data
|
f"{url}/api/embed",
|
||||||
|
headers=headers,
|
||||||
|
json=form_data,
|
||||||
|
ssl=AIOHTTP_CLIENT_SESSION_SSL,
|
||||||
) as r:
|
) as r:
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
data = await r.json()
|
data = await r.json()
|
||||||
|
|||||||
Reference in New Issue
Block a user