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
5af8d061
"...resnet50_tensorflow.git" did not exist on "513b5d45a9bed2f9ab443f888c79a1dd33401ca2"
Commit
5af8d061
authored
Mar 31, 2024
by
Timothy J. Baek
Browse files
chore: py formatting
parent
d4fabeee
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
77 additions
and
45 deletions
+77
-45
backend/apps/audio/main.py
backend/apps/audio/main.py
+7
-1
backend/apps/ollama/main.py
backend/apps/ollama/main.py
+12
-2
backend/apps/web/models/auths.py
backend/apps/web/models/auths.py
+1
-0
backend/apps/web/models/documents.py
backend/apps/web/models/documents.py
+1
-0
backend/apps/web/models/modelfiles.py
backend/apps/web/models/modelfiles.py
+12
-12
backend/apps/web/models/prompts.py
backend/apps/web/models/prompts.py
+9
-6
backend/apps/web/models/tags.py
backend/apps/web/models/tags.py
+1
-0
backend/apps/web/routers/chats.py
backend/apps/web/routers/chats.py
+1
-0
backend/apps/web/routers/configs.py
backend/apps/web/routers/configs.py
+6
-2
backend/apps/web/routers/modelfiles.py
backend/apps/web/routers/modelfiles.py
+24
-21
backend/apps/web/routers/users.py
backend/apps/web/routers/users.py
+1
-0
backend/utils/webhook.py
backend/utils/webhook.py
+2
-1
No files found.
backend/apps/audio/main.py
View file @
5af8d061
...
@@ -22,7 +22,13 @@ from utils.utils import (
...
@@ -22,7 +22,13 @@ from utils.utils import (
)
)
from
utils.misc
import
calculate_sha256
from
utils.misc
import
calculate_sha256
from
config
import
SRC_LOG_LEVELS
,
CACHE_DIR
,
UPLOAD_DIR
,
WHISPER_MODEL
,
WHISPER_MODEL_DIR
from
config
import
(
SRC_LOG_LEVELS
,
CACHE_DIR
,
UPLOAD_DIR
,
WHISPER_MODEL
,
WHISPER_MODEL_DIR
,
)
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"AUDIO"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"AUDIO"
])
...
...
backend/apps/ollama/main.py
View file @
5af8d061
...
@@ -33,7 +33,13 @@ from constants import ERROR_MESSAGES
...
@@ -33,7 +33,13 @@ from constants import ERROR_MESSAGES
from
utils.utils
import
decode_token
,
get_current_user
,
get_admin_user
from
utils.utils
import
decode_token
,
get_current_user
,
get_admin_user
from
config
import
SRC_LOG_LEVELS
,
OLLAMA_BASE_URLS
,
MODEL_FILTER_ENABLED
,
MODEL_FILTER_LIST
,
UPLOAD_DIR
from
config
import
(
SRC_LOG_LEVELS
,
OLLAMA_BASE_URLS
,
MODEL_FILTER_ENABLED
,
MODEL_FILTER_LIST
,
UPLOAD_DIR
,
)
from
utils.misc
import
calculate_sha256
from
utils.misc
import
calculate_sha256
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
...
@@ -770,7 +776,11 @@ async def generate_chat_completion(
...
@@ -770,7 +776,11 @@ async def generate_chat_completion(
r
=
None
r
=
None
log
.
debug
(
"form_data.model_dump_json(exclude_none=True).encode(): {0} "
.
format
(
form_data
.
model_dump_json
(
exclude_none
=
True
).
encode
()))
log
.
debug
(
"form_data.model_dump_json(exclude_none=True).encode(): {0} "
.
format
(
form_data
.
model_dump_json
(
exclude_none
=
True
).
encode
()
)
)
def
get_request
():
def
get_request
():
nonlocal
form_data
nonlocal
form_data
...
...
backend/apps/web/models/auths.py
View file @
5af8d061
...
@@ -11,6 +11,7 @@ from utils.utils import verify_password
...
@@ -11,6 +11,7 @@ from utils.utils import verify_password
from
apps.web.internal.db
import
DB
from
apps.web.internal.db
import
DB
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
...
...
backend/apps/web/models/documents.py
View file @
5af8d061
...
@@ -13,6 +13,7 @@ from apps.web.internal.db import DB
...
@@ -13,6 +13,7 @@ from apps.web.internal.db import DB
import
json
import
json
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
...
...
backend/apps/web/models/modelfiles.py
View file @
5af8d061
...
@@ -64,8 +64,8 @@ class ModelfilesTable:
...
@@ -64,8 +64,8 @@ class ModelfilesTable:
self
.
db
.
create_tables
([
Modelfile
])
self
.
db
.
create_tables
([
Modelfile
])
def
insert_new_modelfile
(
def
insert_new_modelfile
(
self
,
user_id
:
str
,
self
,
user_id
:
str
,
form_data
:
ModelfileForm
form_data
:
ModelfileForm
)
->
Optional
[
ModelfileModel
]:
)
->
Optional
[
ModelfileModel
]:
if
"tagName"
in
form_data
.
modelfile
:
if
"tagName"
in
form_data
.
modelfile
:
modelfile
=
ModelfileModel
(
modelfile
=
ModelfileModel
(
**
{
**
{
...
@@ -73,7 +73,8 @@ class ModelfilesTable:
...
@@ -73,7 +73,8 @@ class ModelfilesTable:
"tag_name"
:
form_data
.
modelfile
[
"tagName"
],
"tag_name"
:
form_data
.
modelfile
[
"tagName"
],
"modelfile"
:
json
.
dumps
(
form_data
.
modelfile
),
"modelfile"
:
json
.
dumps
(
form_data
.
modelfile
),
"timestamp"
:
int
(
time
.
time
()),
"timestamp"
:
int
(
time
.
time
()),
})
}
)
try
:
try
:
result
=
Modelfile
.
create
(
**
modelfile
.
model_dump
())
result
=
Modelfile
.
create
(
**
modelfile
.
model_dump
())
...
@@ -87,29 +88,28 @@ class ModelfilesTable:
...
@@ -87,29 +88,28 @@ class ModelfilesTable:
else
:
else
:
return
None
return
None
def
get_modelfile_by_tag_name
(
self
,
def
get_modelfile_by_tag_name
(
self
,
tag_name
:
str
)
->
Optional
[
ModelfileModel
]:
tag_name
:
str
)
->
Optional
[
ModelfileModel
]:
try
:
try
:
modelfile
=
Modelfile
.
get
(
Modelfile
.
tag_name
==
tag_name
)
modelfile
=
Modelfile
.
get
(
Modelfile
.
tag_name
==
tag_name
)
return
ModelfileModel
(
**
model_to_dict
(
modelfile
))
return
ModelfileModel
(
**
model_to_dict
(
modelfile
))
except
:
except
:
return
None
return
None
def
get_modelfiles
(
self
,
def
get_modelfiles
(
self
,
skip
:
int
=
0
,
limit
:
int
=
50
)
->
List
[
ModelfileResponse
]:
skip
:
int
=
0
,
limit
:
int
=
50
)
->
List
[
ModelfileResponse
]:
return
[
return
[
ModelfileResponse
(
ModelfileResponse
(
**
{
**
{
**
model_to_dict
(
modelfile
),
**
model_to_dict
(
modelfile
),
"modelfile"
:
"modelfile"
:
json
.
loads
(
modelfile
.
modelfile
),
json
.
loads
(
modelfile
.
modelfile
),
}
})
for
modelfile
in
Modelfile
.
select
()
)
for
modelfile
in
Modelfile
.
select
()
# .limit(limit).offset(skip)
# .limit(limit).offset(skip)
]
]
def
update_modelfile_by_tag_name
(
def
update_modelfile_by_tag_name
(
self
,
tag_name
:
str
,
modelfile
:
dict
)
->
Optional
[
ModelfileModel
]:
self
,
tag_name
:
str
,
modelfile
:
dict
)
->
Optional
[
ModelfileModel
]:
try
:
try
:
query
=
Modelfile
.
update
(
query
=
Modelfile
.
update
(
modelfile
=
json
.
dumps
(
modelfile
),
modelfile
=
json
.
dumps
(
modelfile
),
...
...
backend/apps/web/models/prompts.py
View file @
5af8d061
...
@@ -52,8 +52,9 @@ class PromptsTable:
...
@@ -52,8 +52,9 @@ class PromptsTable:
self
.
db
=
db
self
.
db
=
db
self
.
db
.
create_tables
([
Prompt
])
self
.
db
.
create_tables
([
Prompt
])
def
insert_new_prompt
(
self
,
user_id
:
str
,
def
insert_new_prompt
(
form_data
:
PromptForm
)
->
Optional
[
PromptModel
]:
self
,
user_id
:
str
,
form_data
:
PromptForm
)
->
Optional
[
PromptModel
]:
prompt
=
PromptModel
(
prompt
=
PromptModel
(
**
{
**
{
"user_id"
:
user_id
,
"user_id"
:
user_id
,
...
@@ -61,7 +62,8 @@ class PromptsTable:
...
@@ -61,7 +62,8 @@ class PromptsTable:
"title"
:
form_data
.
title
,
"title"
:
form_data
.
title
,
"content"
:
form_data
.
content
,
"content"
:
form_data
.
content
,
"timestamp"
:
int
(
time
.
time
()),
"timestamp"
:
int
(
time
.
time
()),
})
}
)
try
:
try
:
result
=
Prompt
.
create
(
**
prompt
.
model_dump
())
result
=
Prompt
.
create
(
**
prompt
.
model_dump
())
...
@@ -81,13 +83,14 @@ class PromptsTable:
...
@@ -81,13 +83,14 @@ class PromptsTable:
def
get_prompts
(
self
)
->
List
[
PromptModel
]:
def
get_prompts
(
self
)
->
List
[
PromptModel
]:
return
[
return
[
PromptModel
(
**
model_to_dict
(
prompt
))
for
prompt
in
Prompt
.
select
()
PromptModel
(
**
model_to_dict
(
prompt
))
for
prompt
in
Prompt
.
select
()
# .limit(limit).offset(skip)
# .limit(limit).offset(skip)
]
]
def
update_prompt_by_command
(
def
update_prompt_by_command
(
self
,
command
:
str
,
self
,
command
:
str
,
form_data
:
PromptForm
form_data
:
PromptForm
)
->
Optional
[
PromptModel
]:
)
->
Optional
[
PromptModel
]:
try
:
try
:
query
=
Prompt
.
update
(
query
=
Prompt
.
update
(
title
=
form_data
.
title
,
title
=
form_data
.
title
,
...
...
backend/apps/web/models/tags.py
View file @
5af8d061
...
@@ -11,6 +11,7 @@ import logging
...
@@ -11,6 +11,7 @@ import logging
from
apps.web.internal.db
import
DB
from
apps.web.internal.db
import
DB
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
...
...
backend/apps/web/routers/chats.py
View file @
5af8d061
...
@@ -29,6 +29,7 @@ from apps.web.models.tags import (
...
@@ -29,6 +29,7 @@ from apps.web.models.tags import (
from
constants
import
ERROR_MESSAGES
from
constants
import
ERROR_MESSAGES
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
...
...
backend/apps/web/routers/configs.py
View file @
5af8d061
...
@@ -10,7 +10,12 @@ import uuid
...
@@ -10,7 +10,12 @@ import uuid
from
apps.web.models.users
import
Users
from
apps.web.models.users
import
Users
from
utils.utils
import
get_password_hash
,
get_current_user
,
get_admin_user
,
create_token
from
utils.utils
import
(
get_password_hash
,
get_current_user
,
get_admin_user
,
create_token
,
)
from
utils.misc
import
get_gravatar_url
,
validate_email_format
from
utils.misc
import
get_gravatar_url
,
validate_email_format
from
constants
import
ERROR_MESSAGES
from
constants
import
ERROR_MESSAGES
...
@@ -43,7 +48,6 @@ async def set_global_default_models(
...
@@ -43,7 +48,6 @@ async def set_global_default_models(
return
request
.
app
.
state
.
DEFAULT_MODELS
return
request
.
app
.
state
.
DEFAULT_MODELS
@
router
.
post
(
"/default/suggestions"
,
response_model
=
List
[
PromptSuggestion
])
@
router
.
post
(
"/default/suggestions"
,
response_model
=
List
[
PromptSuggestion
])
async
def
set_global_default_suggestions
(
async
def
set_global_default_suggestions
(
request
:
Request
,
request
:
Request
,
...
...
backend/apps/web/routers/modelfiles.py
View file @
5af8d061
...
@@ -24,9 +24,9 @@ router = APIRouter()
...
@@ -24,9 +24,9 @@ router = APIRouter()
@
router
.
get
(
"/"
,
response_model
=
List
[
ModelfileResponse
])
@
router
.
get
(
"/"
,
response_model
=
List
[
ModelfileResponse
])
async
def
get_modelfiles
(
skip
:
int
=
0
,
async
def
get_modelfiles
(
limit
:
int
=
50
,
skip
:
int
=
0
,
limit
:
int
=
50
,
user
=
Depends
(
get_current_user
)
user
=
Depends
(
get_current_user
)
):
):
return
Modelfiles
.
get_modelfiles
(
skip
,
limit
)
return
Modelfiles
.
get_modelfiles
(
skip
,
limit
)
...
@@ -36,17 +36,16 @@ async def get_modelfiles(skip: int = 0,
...
@@ -36,17 +36,16 @@ async def get_modelfiles(skip: int = 0,
@
router
.
post
(
"/create"
,
response_model
=
Optional
[
ModelfileResponse
])
@
router
.
post
(
"/create"
,
response_model
=
Optional
[
ModelfileResponse
])
async
def
create_new_modelfile
(
form_data
:
ModelfileForm
,
async
def
create_new_modelfile
(
form_data
:
ModelfileForm
,
user
=
Depends
(
get_admin_user
)):
user
=
Depends
(
get_admin_user
)):
modelfile
=
Modelfiles
.
insert_new_modelfile
(
user
.
id
,
form_data
)
modelfile
=
Modelfiles
.
insert_new_modelfile
(
user
.
id
,
form_data
)
if
modelfile
:
if
modelfile
:
return
ModelfileResponse
(
return
ModelfileResponse
(
**
{
**
{
**
modelfile
.
model_dump
(),
**
modelfile
.
model_dump
(),
"modelfile"
:
"modelfile"
:
json
.
loads
(
modelfile
.
modelfile
),
json
.
loads
(
modelfile
.
modelfile
),
}
}
)
)
else
:
else
:
raise
HTTPException
(
raise
HTTPException
(
status_code
=
status
.
HTTP_401_UNAUTHORIZED
,
status_code
=
status
.
HTTP_401_UNAUTHORIZED
,
...
@@ -60,17 +59,18 @@ async def create_new_modelfile(form_data: ModelfileForm,
...
@@ -60,17 +59,18 @@ async def create_new_modelfile(form_data: ModelfileForm,
@
router
.
post
(
"/"
,
response_model
=
Optional
[
ModelfileResponse
])
@
router
.
post
(
"/"
,
response_model
=
Optional
[
ModelfileResponse
])
async
def
get_modelfile_by_tag_name
(
form_data
:
ModelfileTagNameForm
,
async
def
get_modelfile_by_tag_name
(
user
=
Depends
(
get_current_user
)):
form_data
:
ModelfileTagNameForm
,
user
=
Depends
(
get_current_user
)
):
modelfile
=
Modelfiles
.
get_modelfile_by_tag_name
(
form_data
.
tag_name
)
modelfile
=
Modelfiles
.
get_modelfile_by_tag_name
(
form_data
.
tag_name
)
if
modelfile
:
if
modelfile
:
return
ModelfileResponse
(
return
ModelfileResponse
(
**
{
**
{
**
modelfile
.
model_dump
(),
**
modelfile
.
model_dump
(),
"modelfile"
:
"modelfile"
:
json
.
loads
(
modelfile
.
modelfile
),
json
.
loads
(
modelfile
.
modelfile
),
}
}
)
)
else
:
else
:
raise
HTTPException
(
raise
HTTPException
(
status_code
=
status
.
HTTP_401_UNAUTHORIZED
,
status_code
=
status
.
HTTP_401_UNAUTHORIZED
,
...
@@ -84,8 +84,9 @@ async def get_modelfile_by_tag_name(form_data: ModelfileTagNameForm,
...
@@ -84,8 +84,9 @@ async def get_modelfile_by_tag_name(form_data: ModelfileTagNameForm,
@
router
.
post
(
"/update"
,
response_model
=
Optional
[
ModelfileResponse
])
@
router
.
post
(
"/update"
,
response_model
=
Optional
[
ModelfileResponse
])
async
def
update_modelfile_by_tag_name
(
form_data
:
ModelfileUpdateForm
,
async
def
update_modelfile_by_tag_name
(
user
=
Depends
(
get_admin_user
)):
form_data
:
ModelfileUpdateForm
,
user
=
Depends
(
get_admin_user
)
):
modelfile
=
Modelfiles
.
get_modelfile_by_tag_name
(
form_data
.
tag_name
)
modelfile
=
Modelfiles
.
get_modelfile_by_tag_name
(
form_data
.
tag_name
)
if
modelfile
:
if
modelfile
:
updated_modelfile
=
{
updated_modelfile
=
{
...
@@ -94,14 +95,15 @@ async def update_modelfile_by_tag_name(form_data: ModelfileUpdateForm,
...
@@ -94,14 +95,15 @@ async def update_modelfile_by_tag_name(form_data: ModelfileUpdateForm,
}
}
modelfile
=
Modelfiles
.
update_modelfile_by_tag_name
(
modelfile
=
Modelfiles
.
update_modelfile_by_tag_name
(
form_data
.
tag_name
,
updated_modelfile
)
form_data
.
tag_name
,
updated_modelfile
)
return
ModelfileResponse
(
return
ModelfileResponse
(
**
{
**
{
**
modelfile
.
model_dump
(),
**
modelfile
.
model_dump
(),
"modelfile"
:
"modelfile"
:
json
.
loads
(
modelfile
.
modelfile
),
json
.
loads
(
modelfile
.
modelfile
),
}
}
)
)
else
:
else
:
raise
HTTPException
(
raise
HTTPException
(
status_code
=
status
.
HTTP_401_UNAUTHORIZED
,
status_code
=
status
.
HTTP_401_UNAUTHORIZED
,
...
@@ -115,7 +117,8 @@ async def update_modelfile_by_tag_name(form_data: ModelfileUpdateForm,
...
@@ -115,7 +117,8 @@ async def update_modelfile_by_tag_name(form_data: ModelfileUpdateForm,
@
router
.
delete
(
"/delete"
,
response_model
=
bool
)
@
router
.
delete
(
"/delete"
,
response_model
=
bool
)
async
def
delete_modelfile_by_tag_name
(
form_data
:
ModelfileTagNameForm
,
async
def
delete_modelfile_by_tag_name
(
user
=
Depends
(
get_admin_user
)):
form_data
:
ModelfileTagNameForm
,
user
=
Depends
(
get_admin_user
)
):
result
=
Modelfiles
.
delete_modelfile_by_tag_name
(
form_data
.
tag_name
)
result
=
Modelfiles
.
delete_modelfile_by_tag_name
(
form_data
.
tag_name
)
return
result
return
result
backend/apps/web/routers/users.py
View file @
5af8d061
...
@@ -16,6 +16,7 @@ from utils.utils import get_current_user, get_password_hash, get_admin_user
...
@@ -16,6 +16,7 @@ from utils.utils import get_current_user, get_password_hash, get_admin_user
from
constants
import
ERROR_MESSAGES
from
constants
import
ERROR_MESSAGES
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"MODELS"
])
...
...
backend/utils/webhook.py
View file @
5af8d061
...
@@ -2,6 +2,7 @@ import json
...
@@ -2,6 +2,7 @@ import json
import
requests
import
requests
from
config
import
VERSION
,
WEBUI_FAVICON_URL
,
WEBUI_NAME
from
config
import
VERSION
,
WEBUI_FAVICON_URL
,
WEBUI_NAME
def
post_webhook
(
url
:
str
,
message
:
str
,
event_data
:
dict
)
->
bool
:
def
post_webhook
(
url
:
str
,
message
:
str
,
event_data
:
dict
)
->
bool
:
try
:
try
:
payload
=
{}
payload
=
{}
...
...
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