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
be3ab88c
Commit
be3ab88c
authored
Mar 12, 2024
by
Timothy J. Baek
Browse files
fix: error handling
parent
e3fc9724
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
backend/apps/ollama/main.py
backend/apps/ollama/main.py
+13
-4
backend/constants.py
backend/constants.py
+1
-0
No files found.
backend/apps/ollama/main.py
View file @
be3ab88c
...
@@ -123,6 +123,7 @@ async def get_all_models():
...
@@ -123,6 +123,7 @@ async def get_all_models():
map
(
lambda
response
:
response
[
"models"
],
responses
)
map
(
lambda
response
:
response
[
"models"
],
responses
)
)
)
}
}
app
.
state
.
MODELS
=
{
model
[
"model"
]:
model
for
model
in
models
[
"models"
]}
app
.
state
.
MODELS
=
{
model
[
"model"
]:
model
for
model
in
models
[
"models"
]}
return
models
return
models
...
@@ -181,11 +182,19 @@ async def get_ollama_versions(url_idx: Optional[int] = None):
...
@@ -181,11 +182,19 @@ async def get_ollama_versions(url_idx: Optional[int] = None):
responses
=
await
asyncio
.
gather
(
*
tasks
)
responses
=
await
asyncio
.
gather
(
*
tasks
)
responses
=
list
(
filter
(
lambda
x
:
x
is
not
None
,
responses
))
responses
=
list
(
filter
(
lambda
x
:
x
is
not
None
,
responses
))
lowest_version
=
min
(
print
(
responses
)
responses
,
key
=
lambda
x
:
tuple
(
map
(
int
,
x
[
"version"
].
split
(
"."
)))
)
if
len
(
responses
)
>
0
:
lowest_version
=
min
(
responses
,
key
=
lambda
x
:
tuple
(
map
(
int
,
x
[
"version"
].
split
(
"."
)))
)
return
{
"version"
:
lowest_version
[
"version"
]}
return
{
"version"
:
lowest_version
[
"version"
]}
else
:
raise
HTTPException
(
status_code
=
500
,
detail
=
ERROR_MESSAGES
.
OLLAMA_NOT_FOUND
,
)
else
:
else
:
url
=
app
.
state
.
OLLAMA_BASE_URLS
[
url_idx
]
url
=
app
.
state
.
OLLAMA_BASE_URLS
[
url_idx
]
try
:
try
:
...
...
backend/constants.py
View file @
be3ab88c
...
@@ -52,3 +52,4 @@ class ERROR_MESSAGES(str, Enum):
...
@@ -52,3 +52,4 @@ class ERROR_MESSAGES(str, Enum):
MODEL_NOT_FOUND
=
lambda
name
=
""
:
f
"Model '
{
name
}
' was not found"
MODEL_NOT_FOUND
=
lambda
name
=
""
:
f
"Model '
{
name
}
' was not found"
OPENAI_NOT_FOUND
=
lambda
name
=
""
:
f
"OpenAI API was not found"
OPENAI_NOT_FOUND
=
lambda
name
=
""
:
f
"OpenAI API was not found"
OLLAMA_NOT_FOUND
=
"WebUI could not connect to Ollama"
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