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
24c0dbec
"deploy/vscode:/vscode.git/clone" did not exist on "491e2ef3e01efe51f411010c16f09f14da81c0f7"
Commit
24c0dbec
authored
May 04, 2024
by
Timothy J. Baek
Browse files
fix: pending permission issue
parent
0a8dae63
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
8 deletions
+15
-8
backend/apps/ollama/main.py
backend/apps/ollama/main.py
+15
-8
No files found.
backend/apps/ollama/main.py
View file @
24c0dbec
...
@@ -31,7 +31,12 @@ from typing import Optional, List, Union
...
@@ -31,7 +31,12 @@ from typing import Optional, List, Union
from
apps.web.models.users
import
Users
from
apps.web.models.users
import
Users
from
constants
import
ERROR_MESSAGES
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_verified_user
,
get_admin_user
,
)
from
config
import
(
from
config
import
(
...
@@ -164,7 +169,7 @@ async def get_all_models():
...
@@ -164,7 +169,7 @@ async def get_all_models():
@
app
.
get
(
"/api/tags"
)
@
app
.
get
(
"/api/tags"
)
@
app
.
get
(
"/api/tags/{url_idx}"
)
@
app
.
get
(
"/api/tags/{url_idx}"
)
async
def
get_ollama_tags
(
async
def
get_ollama_tags
(
url_idx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_
current
_user
)
url_idx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_
verified
_user
)
):
):
if
url_idx
==
None
:
if
url_idx
==
None
:
models
=
await
get_all_models
()
models
=
await
get_all_models
()
...
@@ -563,7 +568,7 @@ async def delete_model(
...
@@ -563,7 +568,7 @@ async def delete_model(
@
app
.
post
(
"/api/show"
)
@
app
.
post
(
"/api/show"
)
async
def
show_model_info
(
form_data
:
ModelNameForm
,
user
=
Depends
(
get_
current
_user
)):
async
def
show_model_info
(
form_data
:
ModelNameForm
,
user
=
Depends
(
get_
verified
_user
)):
if
form_data
.
name
not
in
app
.
state
.
MODELS
:
if
form_data
.
name
not
in
app
.
state
.
MODELS
:
raise
HTTPException
(
raise
HTTPException
(
status_code
=
400
,
status_code
=
400
,
...
@@ -612,7 +617,7 @@ class GenerateEmbeddingsForm(BaseModel):
...
@@ -612,7 +617,7 @@ class GenerateEmbeddingsForm(BaseModel):
async
def
generate_embeddings
(
async
def
generate_embeddings
(
form_data
:
GenerateEmbeddingsForm
,
form_data
:
GenerateEmbeddingsForm
,
url_idx
:
Optional
[
int
]
=
None
,
url_idx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_
current
_user
),
user
=
Depends
(
get_
verified
_user
),
):
):
if
url_idx
==
None
:
if
url_idx
==
None
:
model
=
form_data
.
model
model
=
form_data
.
model
...
@@ -730,7 +735,7 @@ class GenerateCompletionForm(BaseModel):
...
@@ -730,7 +735,7 @@ class GenerateCompletionForm(BaseModel):
async
def
generate_completion
(
async
def
generate_completion
(
form_data
:
GenerateCompletionForm
,
form_data
:
GenerateCompletionForm
,
url_idx
:
Optional
[
int
]
=
None
,
url_idx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_
current
_user
),
user
=
Depends
(
get_
verified
_user
),
):
):
if
url_idx
==
None
:
if
url_idx
==
None
:
...
@@ -833,7 +838,7 @@ class GenerateChatCompletionForm(BaseModel):
...
@@ -833,7 +838,7 @@ class GenerateChatCompletionForm(BaseModel):
async
def
generate_chat_completion
(
async
def
generate_chat_completion
(
form_data
:
GenerateChatCompletionForm
,
form_data
:
GenerateChatCompletionForm
,
url_idx
:
Optional
[
int
]
=
None
,
url_idx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_
current
_user
),
user
=
Depends
(
get_
verified
_user
),
):
):
if
url_idx
==
None
:
if
url_idx
==
None
:
...
@@ -942,7 +947,7 @@ class OpenAIChatCompletionForm(BaseModel):
...
@@ -942,7 +947,7 @@ class OpenAIChatCompletionForm(BaseModel):
async
def
generate_openai_chat_completion
(
async
def
generate_openai_chat_completion
(
form_data
:
OpenAIChatCompletionForm
,
form_data
:
OpenAIChatCompletionForm
,
url_idx
:
Optional
[
int
]
=
None
,
url_idx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_
current
_user
),
user
=
Depends
(
get_
verified
_user
),
):
):
if
url_idx
==
None
:
if
url_idx
==
None
:
...
@@ -1241,7 +1246,9 @@ def upload_model(file: UploadFile = File(...), url_idx: Optional[int] = None):
...
@@ -1241,7 +1246,9 @@ def upload_model(file: UploadFile = File(...), url_idx: Optional[int] = None):
@
app
.
api_route
(
"/{path:path}"
,
methods
=
[
"GET"
,
"POST"
,
"PUT"
,
"DELETE"
])
@
app
.
api_route
(
"/{path:path}"
,
methods
=
[
"GET"
,
"POST"
,
"PUT"
,
"DELETE"
])
async
def
deprecated_proxy
(
path
:
str
,
request
:
Request
,
user
=
Depends
(
get_current_user
)):
async
def
deprecated_proxy
(
path
:
str
,
request
:
Request
,
user
=
Depends
(
get_verified_user
)
):
url
=
app
.
state
.
OLLAMA_BASE_URLS
[
0
]
url
=
app
.
state
.
OLLAMA_BASE_URLS
[
0
]
target_url
=
f
"
{
url
}
/
{
path
}
"
target_url
=
f
"
{
url
}
/
{
path
}
"
...
...
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