Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
dbf7b155
Commit
dbf7b155
authored
Apr 26, 2024
by
Timothy J. Baek
Browse files
refac: naming convention
MODEL_FILTER_ENABLED -> ENABLE_MODEL_FILTER
parent
c5eac5a1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
19 deletions
+21
-19
backend/apps/litellm/main.py
backend/apps/litellm/main.py
+3
-3
backend/apps/ollama/main.py
backend/apps/ollama/main.py
+3
-3
backend/apps/openai/main.py
backend/apps/openai/main.py
+3
-3
backend/config.py
backend/config.py
+4
-2
backend/main.py
backend/main.py
+8
-8
No files found.
backend/apps/litellm/main.py
View file @
dbf7b155
...
...
@@ -26,7 +26,7 @@ log.setLevel(SRC_LOG_LEVELS["LITELLM"])
from
config
import
(
MODEL_FILTER
_ENABLED
,
ENABLE_
MODEL_FILTER
,
MODEL_FILTER_LIST
,
DATA_DIR
,
LITELLM_PROXY_PORT
,
...
...
@@ -130,7 +130,7 @@ async def startup_event():
asyncio
.
create_task
(
start_litellm_background
())
app
.
state
.
MODEL_FILTER
_
ENABLE
D
=
MODEL_FILTER
_ENABLED
app
.
state
.
ENABLE_
MODEL_FILTER
=
ENABLE
_
MODEL_FILTER
app
.
state
.
MODEL_FILTER_LIST
=
MODEL_FILTER_LIST
...
...
@@ -209,7 +209,7 @@ async def get_models(user=Depends(get_current_user)):
data
=
r
.
json
()
if
app
.
state
.
MODEL_FILTER
_ENABLED
:
if
app
.
state
.
ENABLE_
MODEL_FILTER
:
if
user
and
user
.
role
==
"user"
:
data
[
"data"
]
=
list
(
filter
(
...
...
backend/apps/ollama/main.py
View file @
dbf7b155
...
...
@@ -36,7 +36,7 @@ from utils.utils import decode_token, get_current_user, get_admin_user
from
config
import
(
SRC_LOG_LEVELS
,
OLLAMA_BASE_URLS
,
MODEL_FILTER
_ENABLED
,
ENABLE_
MODEL_FILTER
,
MODEL_FILTER_LIST
,
UPLOAD_DIR
,
)
...
...
@@ -55,7 +55,7 @@ app.add_middleware(
)
app
.
state
.
MODEL_FILTER
_
ENABLE
D
=
MODEL_FILTER
_ENABLED
app
.
state
.
ENABLE_
MODEL_FILTER
=
ENABLE
_
MODEL_FILTER
app
.
state
.
MODEL_FILTER_LIST
=
MODEL_FILTER_LIST
app
.
state
.
OLLAMA_BASE_URLS
=
OLLAMA_BASE_URLS
...
...
@@ -168,7 +168,7 @@ async def get_ollama_tags(
if
url_idx
==
None
:
models
=
await
get_all_models
()
if
app
.
state
.
MODEL_FILTER
_ENABLED
:
if
app
.
state
.
ENABLE_
MODEL_FILTER
:
if
user
.
role
==
"user"
:
models
[
"models"
]
=
list
(
filter
(
...
...
backend/apps/openai/main.py
View file @
dbf7b155
...
...
@@ -24,7 +24,7 @@ from config import (
OPENAI_API_BASE_URLS
,
OPENAI_API_KEYS
,
CACHE_DIR
,
MODEL_FILTER
_ENABLED
,
ENABLE_
MODEL_FILTER
,
MODEL_FILTER_LIST
,
)
from
typing
import
List
,
Optional
...
...
@@ -45,7 +45,7 @@ app.add_middleware(
allow_headers
=
[
"*"
],
)
app
.
state
.
MODEL_FILTER
_
ENABLE
D
=
MODEL_FILTER
_ENABLED
app
.
state
.
ENABLE_
MODEL_FILTER
=
ENABLE
_
MODEL_FILTER
app
.
state
.
MODEL_FILTER_LIST
=
MODEL_FILTER_LIST
app
.
state
.
OPENAI_API_BASE_URLS
=
OPENAI_API_BASE_URLS
...
...
@@ -225,7 +225,7 @@ async def get_all_models():
async
def
get_models
(
url_idx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_current_user
)):
if
url_idx
==
None
:
models
=
await
get_all_models
()
if
app
.
state
.
MODEL_FILTER
_ENABLED
:
if
app
.
state
.
ENABLE_
MODEL_FILTER
:
if
user
.
role
==
"user"
:
models
[
"data"
]
=
list
(
filter
(
...
...
backend/config.py
View file @
dbf7b155
...
...
@@ -375,8 +375,7 @@ USER_PERMISSIONS_CHAT_DELETION = (
USER_PERMISSIONS
=
{
"chat"
:
{
"deletion"
:
USER_PERMISSIONS_CHAT_DELETION
}}
MODEL_FILTER_ENABLED
=
os
.
environ
.
get
(
"MODEL_FILTER_ENABLED"
,
"False"
).
lower
()
==
"true"
ENABLE_MODEL_FILTER
=
os
.
environ
.
get
(
"ENABLE_MODEL_FILTER"
,
"False"
).
lower
()
==
"true"
MODEL_FILTER_LIST
=
os
.
environ
.
get
(
"MODEL_FILTER_LIST"
,
""
)
MODEL_FILTER_LIST
=
[
model
.
strip
()
for
model
in
MODEL_FILTER_LIST
.
split
(
";"
)]
...
...
@@ -528,6 +527,9 @@ AUDIO_OPENAI_API_KEY = os.getenv("AUDIO_OPENAI_API_KEY", OPENAI_API_KEY)
# LiteLLM
####################################
ENABLE_LITELLM
=
os
.
environ
.
get
(
"ENABLE_LITELLM"
,
"True"
).
lower
()
==
"true"
LITELLM_PROXY_PORT
=
int
(
os
.
getenv
(
"LITELLM_PROXY_PORT"
,
"14365"
))
if
LITELLM_PROXY_PORT
<
0
or
LITELLM_PROXY_PORT
>
65535
:
raise
ValueError
(
"Invalid port number for LITELLM_PROXY_PORT"
)
...
...
backend/main.py
View file @
dbf7b155
...
...
@@ -47,7 +47,7 @@ from config import (
FRONTEND_BUILD_DIR
,
CACHE_DIR
,
STATIC_DIR
,
MODEL_FILTER
_ENABLED
,
ENABLE_
MODEL_FILTER
,
MODEL_FILTER_LIST
,
GLOBAL_LOG_LEVEL
,
SRC_LOG_LEVELS
,
...
...
@@ -89,7 +89,7 @@ https://github.com/open-webui/open-webui
app
=
FastAPI
(
docs_url
=
"/docs"
if
ENV
==
"dev"
else
None
,
redoc_url
=
None
)
app
.
state
.
MODEL_FILTER
_
ENABLE
D
=
MODEL_FILTER
_ENABLED
app
.
state
.
ENABLE_
MODEL_FILTER
=
ENABLE
_
MODEL_FILTER
app
.
state
.
MODEL_FILTER_LIST
=
MODEL_FILTER_LIST
app
.
state
.
WEBHOOK_URL
=
WEBHOOK_URL
...
...
@@ -218,7 +218,7 @@ async def get_app_config():
@
app
.
get
(
"/api/config/model/filter"
)
async
def
get_model_filter_config
(
user
=
Depends
(
get_admin_user
)):
return
{
"enabled"
:
app
.
state
.
MODEL_FILTER
_ENABLED
,
"enabled"
:
app
.
state
.
ENABLE_
MODEL_FILTER
,
"models"
:
app
.
state
.
MODEL_FILTER_LIST
,
}
...
...
@@ -232,20 +232,20 @@ class ModelFilterConfigForm(BaseModel):
async
def
update_model_filter_config
(
form_data
:
ModelFilterConfigForm
,
user
=
Depends
(
get_admin_user
)
):
app
.
state
.
MODEL_FILTER
_ENABLED
=
form_data
.
enabled
app
.
state
.
ENABLE_
MODEL_FILTER
=
form_data
.
enabled
app
.
state
.
MODEL_FILTER_LIST
=
form_data
.
models
ollama_app
.
state
.
MODEL_FILTER
_ENABLED
=
app
.
state
.
MODEL_FILTER
_ENABLED
ollama_app
.
state
.
ENABLE_
MODEL_FILTER
=
app
.
state
.
ENABLE_
MODEL_FILTER
ollama_app
.
state
.
MODEL_FILTER_LIST
=
app
.
state
.
MODEL_FILTER_LIST
openai_app
.
state
.
MODEL_FILTER
_ENABLED
=
app
.
state
.
MODEL_FILTER
_ENABLED
openai_app
.
state
.
ENABLE_
MODEL_FILTER
=
app
.
state
.
ENABLE_
MODEL_FILTER
openai_app
.
state
.
MODEL_FILTER_LIST
=
app
.
state
.
MODEL_FILTER_LIST
litellm_app
.
state
.
MODEL_FILTER
_ENABLED
=
app
.
state
.
MODEL_FILTER
_ENABLED
litellm_app
.
state
.
ENABLE_
MODEL_FILTER
=
app
.
state
.
ENABLE_
MODEL_FILTER
litellm_app
.
state
.
MODEL_FILTER_LIST
=
app
.
state
.
MODEL_FILTER_LIST
return
{
"enabled"
:
app
.
state
.
MODEL_FILTER
_ENABLED
,
"enabled"
:
app
.
state
.
ENABLE_
MODEL_FILTER
,
"models"
:
app
.
state
.
MODEL_FILTER_LIST
,
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment