ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-01-03 23:25:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refac
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, ubuntu-latest) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-main-image (linux/arm64, ubuntu-24.04-arm) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-cuda-image (linux/amd64, ubuntu-latest) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-cuda-image (linux/arm64, ubuntu-24.04-arm) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-cuda126-image (linux/amd64, ubuntu-latest) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-cuda126-image (linux/arm64, ubuntu-24.04-arm) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-ollama-image (linux/amd64, ubuntu-latest) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-ollama-image (linux/arm64, ubuntu-24.04-arm) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-slim-image (linux/amd64, ubuntu-latest) (push) Has been cancelled
Details
Create and publish Docker images with specific build args / build-slim-image (linux/arm64, ubuntu-24.04-arm) (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-cuda126-images (push) Has been cancelled
Details
Create and publish Docker images with specific build args / merge-ollama-images (push) Has been cancelled
Details
Create and publish Docker images with specific build args / merge-slim-images (push) Has been cancelled
Details
Python CI / Format Backend (push) Has been cancelled
Details

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-12-29 02:05:55 +04:00
parent 5649a668fa
commit fe3047d53c
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
backend/open_webui/routers/ollama.py
View file

@ -38,6 +38,9 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import StreamingResponse from fastapi.responses import StreamingResponse
from pydantic import BaseModel, ConfigDict, validator from pydantic import BaseModel, ConfigDict, validator
from starlette.background import BackgroundTask from starlette.background import BackgroundTask
from sqlalchemy.orm import Session
from open_webui.internal.db import get_session
from open_webui.models.models import Models from open_webui.models.models import Models
@ -425,7 +428,7 @@ async def get_filtered_models(models, user, db=None):
# Filter models based on user access control # Filter models based on user access control
filtered_models = [] filtered_models = []
for model in models.get("models", []): for model in models.get("models", []):
model_info = Models.get_model_by_id(model["model"]) model_info = Models.get_model_by_id(model["model"], db=db)
if model_info: if model_info:
if user.id == model_info.user_id or has_access( if user.id == model_info.user_id or has_access(
user.id, type="read", access_control=model_info.access_control, db=db user.id, type="read", access_control=model_info.access_control, db=db
@ -1253,6 +1256,7 @@ async def generate_chat_completion(
url_idx: Optional[int] = None, url_idx: Optional[int] = None,
user=Depends(get_verified_user), user=Depends(get_verified_user),
bypass_filter: Optional[bool] = False, bypass_filter: Optional[bool] = False,
db: Session = Depends(get_session),
): ):
if BYPASS_MODEL_ACCESS_CONTROL: if BYPASS_MODEL_ACCESS_CONTROL:
bypass_filter = True bypass_filter = True
@ -1274,7 +1278,7 @@ async def generate_chat_completion(
del payload["metadata"] del payload["metadata"]
model_id = payload["model"] model_id = payload["model"]
model_info = Models.get_model_by_id(model_id) model_info = Models.get_model_by_id(model_id, db=db)
if model_info: if model_info:
if model_info.base_model_id: if model_info.base_model_id:
@ -1298,7 +1302,7 @@ async def generate_chat_completion(
if not ( if not (
user.id == model_info.user_id user.id == model_info.user_id
or has_access( or has_access(
user.id, type="read", access_control=model_info.access_control user.id, type="read", access_control=model_info.access_control, db=db
) )
): ):
raise HTTPException( raise HTTPException(
@ -1370,6 +1374,7 @@ async def generate_openai_completion(
form_data: dict, form_data: dict,
url_idx: Optional[int] = None, url_idx: Optional[int] = None,
user=Depends(get_verified_user), user=Depends(get_verified_user),
db: Session = Depends(get_session),
): ):
metadata = form_data.pop("metadata", None) metadata = form_data.pop("metadata", None)
@ -1390,7 +1395,7 @@ async def generate_openai_completion(
if ":" not in model_id: if ":" not in model_id:
model_id = f"{model_id}:latest" model_id = f"{model_id}:latest"
model_info = Models.get_model_by_id(model_id) model_info = Models.get_model_by_id(model_id, db=db)
if model_info: if model_info:
if model_info.base_model_id: if model_info.base_model_id:
payload["model"] = model_info.base_model_id payload["model"] = model_info.base_model_id
@ -1404,7 +1409,7 @@ async def generate_openai_completion(
if not ( if not (
user.id == model_info.user_id user.id == model_info.user_id
or has_access( or has_access(
user.id, type="read", access_control=model_info.access_control user.id, type="read", access_control=model_info.access_control, db=db
) )
): ):
raise HTTPException( raise HTTPException(
@ -1449,6 +1454,7 @@ async def generate_openai_chat_completion(
form_data: dict, form_data: dict,
url_idx: Optional[int] = None, url_idx: Optional[int] = None,
user=Depends(get_verified_user), user=Depends(get_verified_user),
db: Session = Depends(get_session),
): ):
metadata = form_data.pop("metadata", None) metadata = form_data.pop("metadata", None)
@ -1469,7 +1475,7 @@ async def generate_openai_chat_completion(
if ":" not in model_id: if ":" not in model_id:
model_id = f"{model_id}:latest" model_id = f"{model_id}:latest"
model_info = Models.get_model_by_id(model_id) model_info = Models.get_model_by_id(model_id, db=db)
if model_info: if model_info:
if model_info.base_model_id: if model_info.base_model_id:
payload["model"] = model_info.base_model_id payload["model"] = model_info.base_model_id
@ -1487,7 +1493,7 @@ async def generate_openai_chat_completion(
if not ( if not (
user.id == model_info.user_id user.id == model_info.user_id
or has_access( or has_access(
user.id, type="read", access_control=model_info.access_control user.id, type="read", access_control=model_info.access_control, db=db
) )
): ):
raise HTTPException( raise HTTPException(
@ -1530,6 +1536,7 @@ async def get_openai_models(
request: Request, request: Request,
url_idx: Optional[int] = None, url_idx: Optional[int] = None,
user=Depends(get_verified_user), user=Depends(get_verified_user),
db: Session = Depends(get_session),
): ):
models = [] models = []
@ -1582,10 +1589,10 @@ async def get_openai_models(
# Filter models based on user access control # Filter models based on user access control
filtered_models = [] filtered_models = []
for model in models: for model in models:
model_info = Models.get_model_by_id(model["id"]) model_info = Models.get_model_by_id(model["id"], db=db)
if model_info: if model_info:
if user.id == model_info.user_id or has_access( if user.id == model_info.user_id or has_access(
user.id, type="read", access_control=model_info.access_control user.id, type="read", access_control=model_info.access_control, db=db
): ):
filtered_models.append(model) filtered_models.append(model)
models = filtered_models models = filtered_models

10
backend/open_webui/routers/openai.py
View file

@ -19,6 +19,9 @@ from fastapi.responses import (
) )
from pydantic import BaseModel from pydantic import BaseModel
from starlette.background import BackgroundTask from starlette.background import BackgroundTask
from sqlalchemy.orm import Session
from open_webui.internal.db import get_session
from open_webui.models.models import Models from open_webui.models.models import Models
from open_webui.config import ( from open_webui.config import (
@ -457,7 +460,7 @@ async def get_filtered_models(models, user, db=None):
# Filter models based on user access control # Filter models based on user access control
filtered_models = [] filtered_models = []
for model in models.get("data", []): for model in models.get("data", []):
model_info = Models.get_model_by_id(model["id"]) model_info = Models.get_model_by_id(model["id"], db=db)
if model_info: if model_info:
if user.id == model_info.user_id or has_access( if user.id == model_info.user_id or has_access(
user.id, type="read", access_control=model_info.access_control, db=db user.id, type="read", access_control=model_info.access_control, db=db
@ -797,6 +800,7 @@ async def generate_chat_completion(
form_data: dict, form_data: dict,
user=Depends(get_verified_user), user=Depends(get_verified_user),
bypass_filter: Optional[bool] = False, bypass_filter: Optional[bool] = False,
db: Session = Depends(get_session),
): ):
if BYPASS_MODEL_ACCESS_CONTROL: if BYPASS_MODEL_ACCESS_CONTROL:
bypass_filter = True bypass_filter = True
@ -807,7 +811,7 @@ async def generate_chat_completion(
metadata = payload.pop("metadata", None) metadata = payload.pop("metadata", None)
model_id = form_data.get("model") model_id = form_data.get("model")
model_info = Models.get_model_by_id(model_id) model_info = Models.get_model_by_id(model_id, db=db)
# Check model info and override the payload # Check model info and override the payload
if model_info: if model_info:
@ -833,7 +837,7 @@ async def generate_chat_completion(
if not ( if not (
user.id == model_info.user_id user.id == model_info.user_id
or has_access( or has_access(
user.id, type="read", access_control=model_info.access_control user.id, type="read", access_control=model_info.access_control, db=db
) )
): ):
raise HTTPException( raise HTTPException(