mirror of
https://github.com/open-webui/open-webui
synced 2025-01-22 10:45:47 +00:00
chore: format backend
This commit is contained in:
parent
a1e33a82f0
commit
bdc60e7850
@ -492,17 +492,17 @@ OAUTH_ALLOWED_DOMAINS = PersistentConfig(
|
|||||||
def load_oauth_providers():
|
def load_oauth_providers():
|
||||||
OAUTH_PROVIDERS.clear()
|
OAUTH_PROVIDERS.clear()
|
||||||
if GOOGLE_CLIENT_ID.value and GOOGLE_CLIENT_SECRET.value:
|
if GOOGLE_CLIENT_ID.value and GOOGLE_CLIENT_SECRET.value:
|
||||||
|
|
||||||
def google_oauth_register(client):
|
def google_oauth_register(client):
|
||||||
client.register(
|
client.register(
|
||||||
name="google",
|
name="google",
|
||||||
client_id=GOOGLE_CLIENT_ID.value,
|
client_id=GOOGLE_CLIENT_ID.value,
|
||||||
client_secret=GOOGLE_CLIENT_SECRET.value,
|
client_secret=GOOGLE_CLIENT_SECRET.value,
|
||||||
server_metadata_url="https://accounts.google.com/.well-known/openid-configuration",
|
server_metadata_url="https://accounts.google.com/.well-known/openid-configuration",
|
||||||
client_kwargs={
|
client_kwargs={"scope": GOOGLE_OAUTH_SCOPE.value},
|
||||||
"scope": GOOGLE_OAUTH_SCOPE.value
|
|
||||||
},
|
|
||||||
redirect_uri=GOOGLE_REDIRECT_URI.value,
|
redirect_uri=GOOGLE_REDIRECT_URI.value,
|
||||||
)
|
)
|
||||||
|
|
||||||
OAUTH_PROVIDERS["google"] = {
|
OAUTH_PROVIDERS["google"] = {
|
||||||
"redirect_uri": GOOGLE_REDIRECT_URI.value,
|
"redirect_uri": GOOGLE_REDIRECT_URI.value,
|
||||||
"register": google_oauth_register,
|
"register": google_oauth_register,
|
||||||
@ -513,6 +513,7 @@ def load_oauth_providers():
|
|||||||
and MICROSOFT_CLIENT_SECRET.value
|
and MICROSOFT_CLIENT_SECRET.value
|
||||||
and MICROSOFT_CLIENT_TENANT_ID.value
|
and MICROSOFT_CLIENT_TENANT_ID.value
|
||||||
):
|
):
|
||||||
|
|
||||||
def microsoft_oauth_register(client):
|
def microsoft_oauth_register(client):
|
||||||
client.register(
|
client.register(
|
||||||
name="microsoft",
|
name="microsoft",
|
||||||
@ -524,6 +525,7 @@ def load_oauth_providers():
|
|||||||
},
|
},
|
||||||
redirect_uri=MICROSOFT_REDIRECT_URI.value,
|
redirect_uri=MICROSOFT_REDIRECT_URI.value,
|
||||||
)
|
)
|
||||||
|
|
||||||
OAUTH_PROVIDERS["microsoft"] = {
|
OAUTH_PROVIDERS["microsoft"] = {
|
||||||
"redirect_uri": MICROSOFT_REDIRECT_URI.value,
|
"redirect_uri": MICROSOFT_REDIRECT_URI.value,
|
||||||
"picture_url": "https://graph.microsoft.com/v1.0/me/photo/$value",
|
"picture_url": "https://graph.microsoft.com/v1.0/me/photo/$value",
|
||||||
@ -531,6 +533,7 @@ def load_oauth_providers():
|
|||||||
}
|
}
|
||||||
|
|
||||||
if GITHUB_CLIENT_ID.value and GITHUB_CLIENT_SECRET.value:
|
if GITHUB_CLIENT_ID.value and GITHUB_CLIENT_SECRET.value:
|
||||||
|
|
||||||
def github_oauth_register(client):
|
def github_oauth_register(client):
|
||||||
client.register(
|
client.register(
|
||||||
name="github",
|
name="github",
|
||||||
@ -540,11 +543,10 @@ def load_oauth_providers():
|
|||||||
authorize_url="https://github.com/login/oauth/authorize",
|
authorize_url="https://github.com/login/oauth/authorize",
|
||||||
api_base_url="https://api.github.com",
|
api_base_url="https://api.github.com",
|
||||||
userinfo_endpoint="https://api.github.com/user",
|
userinfo_endpoint="https://api.github.com/user",
|
||||||
client_kwargs={
|
client_kwargs={"scope": GITHUB_CLIENT_SCOPE.value},
|
||||||
"scope": GITHUB_CLIENT_SCOPE.value
|
|
||||||
},
|
|
||||||
redirect_uri=GITHUB_CLIENT_REDIRECT_URI.value,
|
redirect_uri=GITHUB_CLIENT_REDIRECT_URI.value,
|
||||||
)
|
)
|
||||||
|
|
||||||
OAUTH_PROVIDERS["github"] = {
|
OAUTH_PROVIDERS["github"] = {
|
||||||
"redirect_uri": GITHUB_CLIENT_REDIRECT_URI.value,
|
"redirect_uri": GITHUB_CLIENT_REDIRECT_URI.value,
|
||||||
"register": github_oauth_register,
|
"register": github_oauth_register,
|
||||||
@ -556,6 +558,7 @@ def load_oauth_providers():
|
|||||||
and OAUTH_CLIENT_SECRET.value
|
and OAUTH_CLIENT_SECRET.value
|
||||||
and OPENID_PROVIDER_URL.value
|
and OPENID_PROVIDER_URL.value
|
||||||
):
|
):
|
||||||
|
|
||||||
def oidc_oauth_register(client):
|
def oidc_oauth_register(client):
|
||||||
client.register(
|
client.register(
|
||||||
name="oidc",
|
name="oidc",
|
||||||
@ -567,6 +570,7 @@ def load_oauth_providers():
|
|||||||
},
|
},
|
||||||
redirect_uri=OPENID_REDIRECT_URI.value,
|
redirect_uri=OPENID_REDIRECT_URI.value,
|
||||||
)
|
)
|
||||||
|
|
||||||
OAUTH_PROVIDERS["oidc"] = {
|
OAUTH_PROVIDERS["oidc"] = {
|
||||||
"name": OAUTH_PROVIDER_NAME.value,
|
"name": OAUTH_PROVIDER_NAME.value,
|
||||||
"redirect_uri": OPENID_REDIRECT_URI.value,
|
"redirect_uri": OPENID_REDIRECT_URI.value,
|
||||||
|
@ -6,7 +6,8 @@ from typing import Optional
|
|||||||
|
|
||||||
from open_webui.retrieval.vector.main import VectorItem, SearchResult, GetResult
|
from open_webui.retrieval.vector.main import VectorItem, SearchResult, GetResult
|
||||||
from open_webui.config import (
|
from open_webui.config import (
|
||||||
MILVUS_URI, MILVUS_DB,
|
MILVUS_URI,
|
||||||
|
MILVUS_DB,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -214,7 +214,11 @@ async def update_knowledge_by_id(
|
|||||||
detail=ERROR_MESSAGES.NOT_FOUND,
|
detail=ERROR_MESSAGES.NOT_FOUND,
|
||||||
)
|
)
|
||||||
# Is the user the original creator, in a group with write access, or an admin
|
# Is the user the original creator, in a group with write access, or an admin
|
||||||
if knowledge.user_id != user.id and not has_access(user.id, "write", knowledge.access_control) and user.role != "admin":
|
if (
|
||||||
|
knowledge.user_id != user.id
|
||||||
|
and not has_access(user.id, "write", knowledge.access_control)
|
||||||
|
and user.role != "admin"
|
||||||
|
):
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
|
detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
|
||||||
|
@ -111,9 +111,13 @@ async def update_prompt_by_command(
|
|||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
detail=ERROR_MESSAGES.NOT_FOUND,
|
detail=ERROR_MESSAGES.NOT_FOUND,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Is the user the original creator, in a group with write access, or an admin
|
# Is the user the original creator, in a group with write access, or an admin
|
||||||
if prompt.user_id != user.id and not has_access(user.id, "write", prompt.access_control) and user.role != "admin":
|
if (
|
||||||
|
prompt.user_id != user.id
|
||||||
|
and not has_access(user.id, "write", prompt.access_control)
|
||||||
|
and user.role != "admin"
|
||||||
|
):
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
|
detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
|
||||||
|
@ -166,7 +166,11 @@ async def update_tools_by_id(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Is the user the original creator, in a group with write access, or an admin
|
# Is the user the original creator, in a group with write access, or an admin
|
||||||
if tools.user_id != user.id and not has_access(user.id, "write", tools.access_control) and user.role != "admin":
|
if (
|
||||||
|
tools.user_id != user.id
|
||||||
|
and not has_access(user.id, "write", tools.access_control)
|
||||||
|
and user.role != "admin"
|
||||||
|
):
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
||||||
|
Loading…
Reference in New Issue
Block a user