This commit is contained in:
Classic298 2025-11-23 10:40:05 +01:00 committed by GitHub
parent 7cf07b7e97
commit 60dbde7e19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -534,22 +534,16 @@ def generate_openai_batch_embeddings(
if isinstance(RAG_EMBEDDING_PREFIX_FIELD_NAME, str) and isinstance(prefix, str): if isinstance(RAG_EMBEDDING_PREFIX_FIELD_NAME, str) and isinstance(prefix, str):
json_data[RAG_EMBEDDING_PREFIX_FIELD_NAME] = prefix json_data[RAG_EMBEDDING_PREFIX_FIELD_NAME] = prefix
r = requests.post(
f"{url}/embeddings",
headers = { headers = {
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": f"Bearer {key}", "Authorization": f"Bearer {key}",
**(
{
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
"X-OpenWebUI-User-Id": user.id,
"X-OpenWebUI-User-Email": user.email,
"X-OpenWebUI-User-Role": user.role,
} }
if ENABLE_FORWARD_USER_INFO_HEADERS and user if ENABLE_FORWARD_USER_INFO_HEADERS and user:
else {} headers = include_user_info_headers(headers, user)
),
}, r = requests.post(
f"{url}/embeddings",
headers=headers,
json=json_data, json=json_data,
) )
r.raise_for_status() r.raise_for_status()
@ -621,22 +615,16 @@ def generate_azure_openai_batch_embeddings(
url = f"{url}/openai/deployments/{model}/embeddings?api-version={version}" url = f"{url}/openai/deployments/{model}/embeddings?api-version={version}"
for _ in range(5): for _ in range(5):
r = requests.post(
url,
headers = { headers = {
"Content-Type": "application/json", "Content-Type": "application/json",
"api-key": key, "api-key": key,
**(
{
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
"X-OpenWebUI-User-Id": user.id,
"X-OpenWebUI-User-Email": user.email,
"X-OpenWebUI-User-Role": user.role,
} }
if ENABLE_FORWARD_USER_INFO_HEADERS and user if ENABLE_FORWARD_USER_INFO_HEADERS and user:
else {} headers = include_user_info_headers(headers, user)
),
}, r = requests.post(
url,
headers=headers,
json=json_data, json=json_data,
) )
if r.status_code == 429: if r.status_code == 429:
@ -710,22 +698,16 @@ def generate_ollama_batch_embeddings(
if isinstance(RAG_EMBEDDING_PREFIX_FIELD_NAME, str) and isinstance(prefix, str): if isinstance(RAG_EMBEDDING_PREFIX_FIELD_NAME, str) and isinstance(prefix, str):
json_data[RAG_EMBEDDING_PREFIX_FIELD_NAME] = prefix json_data[RAG_EMBEDDING_PREFIX_FIELD_NAME] = prefix
r = requests.post(
f"{url}/api/embed",
headers = { headers = {
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": f"Bearer {key}", "Authorization": f"Bearer {key}",
**(
{
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
"X-OpenWebUI-User-Id": user.id,
"X-OpenWebUI-User-Email": user.email,
"X-OpenWebUI-User-Role": user.role,
} }
if ENABLE_FORWARD_USER_INFO_HEADERS if ENABLE_FORWARD_USER_INFO_HEADERS and user:
else {} headers = include_user_info_headers(headers, user)
),
}, r = requests.post(
f"{url}/api/embed",
headers=headers,
json=json_data, json=json_data,
) )
r.raise_for_status() r.raise_for_status()