UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-04-24 16:32:11 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #10755 from softue/check-if-enable-ldap-chroma
Some checks failed
Deploy to HuggingFace Spaces / check-secret (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-main-image (linux/amd64) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-main-image (linux/arm64) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-cuda-image (linux/amd64) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-cuda-image (linux/arm64) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-ollama-image (linux/amd64) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-ollama-image (linux/arm64) (push) Has been cancelled
Details
Python CI / Format Backend (3.11) (push) Has been cancelled
Details
Frontend Build / Format & Build Frontend (push) Has been cancelled
Details
Frontend Build / Frontend Unit Tests (push) Has been cancelled
Details
Deploy to HuggingFace Spaces / deploy (push) Has been cancelled
Details
Create and publish Docker images with specific build args / merge-main-images (push) Has been cancelled
Details
Create and publish Docker images with specific build args / merge-cuda-images (push) Has been cancelled
Details
Create and publish Docker images with specific build args / merge-ollama-images (push) Has been cancelled
Details

Browse Source 
Conditional import of ldap3 and chromadb
This commit is contained in:
Timothy Jaeryang Baek 2025-02-25 16:02:40 -08:00 committed by GitHub
commit 20f0b02b38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
backend/open_webui/config.py
View File

@ -9,7 +9,6 @@ from pathlib import Path
from typing import Generic, Optional, TypeVar from typing import Generic, Optional, TypeVar
from urllib.parse import urlparse from urllib.parse import urlparse
import chromadb
import requests import requests
from pydantic import BaseModel from pydantic import BaseModel
from sqlalchemy import JSON, Column, DateTime, Integer, func from sqlalchemy import JSON, Column, DateTime, Integer, func
@ -1501,22 +1500,24 @@ Ensure that the tools are effectively utilized to achieve the highest-quality an
VECTOR_DB = os.environ.get("VECTOR_DB", "chroma") VECTOR_DB = os.environ.get("VECTOR_DB", "chroma")
# Chroma # Chroma
CHROMA_DATA_PATH = f"{DATA_DIR}/vector_db" if VECTOR_DB == "chroma":
CHROMA_TENANT = os.environ.get("CHROMA_TENANT", chromadb.DEFAULT_TENANT) import chromadb
CHROMA_DATABASE = os.environ.get("CHROMA_DATABASE", chromadb.DEFAULT_DATABASE) CHROMA_DATA_PATH = f"{DATA_DIR}/vector_db"
CHROMA_HTTP_HOST = os.environ.get("CHROMA_HTTP_HOST", "") CHROMA_TENANT = os.environ.get("CHROMA_TENANT", chromadb.DEFAULT_TENANT)
CHROMA_HTTP_PORT = int(os.environ.get("CHROMA_HTTP_PORT", "8000")) CHROMA_DATABASE = os.environ.get("CHROMA_DATABASE", chromadb.DEFAULT_DATABASE)
CHROMA_CLIENT_AUTH_PROVIDER = os.environ.get("CHROMA_CLIENT_AUTH_PROVIDER", "") CHROMA_HTTP_HOST = os.environ.get("CHROMA_HTTP_HOST", "")
CHROMA_CLIENT_AUTH_CREDENTIALS = os.environ.get("CHROMA_CLIENT_AUTH_CREDENTIALS", "") CHROMA_HTTP_PORT = int(os.environ.get("CHROMA_HTTP_PORT", "8000"))
# Comma-separated list of header=value pairs CHROMA_CLIENT_AUTH_PROVIDER = os.environ.get("CHROMA_CLIENT_AUTH_PROVIDER", "")
CHROMA_HTTP_HEADERS = os.environ.get("CHROMA_HTTP_HEADERS", "") CHROMA_CLIENT_AUTH_CREDENTIALS = os.environ.get("CHROMA_CLIENT_AUTH_CREDENTIALS", "")
if CHROMA_HTTP_HEADERS: # Comma-separated list of header=value pairs
CHROMA_HTTP_HEADERS = dict( CHROMA_HTTP_HEADERS = os.environ.get("CHROMA_HTTP_HEADERS", "")
[pair.split("=") for pair in CHROMA_HTTP_HEADERS.split(",")] if CHROMA_HTTP_HEADERS:
) CHROMA_HTTP_HEADERS = dict(
else: [pair.split("=") for pair in CHROMA_HTTP_HEADERS.split(",")]
CHROMA_HTTP_HEADERS = None )
CHROMA_HTTP_SSL = os.environ.get("CHROMA_HTTP_SSL", "false").lower() == "true" else:
CHROMA_HTTP_HEADERS = None
CHROMA_HTTP_SSL = os.environ.get("CHROMA_HTTP_SSL", "false").lower() == "true"
# this uses the model defined in the Dockerfile ENV variable. If you dont use docker or docker based deployments such as k8s, the default embedding model will be used (sentence-transformers/all-MiniLM-L6-v2) # this uses the model defined in the Dockerfile ENV variable. If you dont use docker or docker based deployments such as k8s, the default embedding model will be used (sentence-transformers/all-MiniLM-L6-v2)
# Milvus # Milvus

7
backend/open_webui/routers/auths.py
View File

@ -34,6 +34,7 @@ from fastapi.responses import RedirectResponse, Response
from open_webui.config import ( from open_webui.config import (
OPENID_PROVIDER_URL, OPENID_PROVIDER_URL,
ENABLE_OAUTH_SIGNUP, ENABLE_OAUTH_SIGNUP,
ENABLE_LDAP
) )
from pydantic import BaseModel from pydantic import BaseModel
from open_webui.utils.misc import parse_duration, validate_email_format from open_webui.utils.misc import parse_duration, validate_email_format
@ -51,8 +52,10 @@ from open_webui.utils.access_control import get_permissions
from typing import Optional, List from typing import Optional, List
from ssl import CERT_REQUIRED, PROTOCOL_TLS from ssl import CERT_REQUIRED, PROTOCOL_TLS
from ldap3 import Server, Connection, NONE, Tls
from ldap3.utils.conv import escape_filter_chars if ENABLE_LDAP.value:
from ldap3 import Server, Connection, NONE, Tls
from ldap3.utils.conv import escape_filter_chars
router = APIRouter() router = APIRouter()