UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-03-20 03:58:07 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: ollama version request when ollama api is disabled

Browse Source
This commit is contained in:
Timothy J. Baek 2024-06-05 09:08:52 -07:00
parent 1d6bbdf917
commit d077b3dcdb
2 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/apps/ollama/main.py
View File

@ -274,12 +274,13 @@ async def get_ollama_tags(
@app.get("/api/version") @app.get("/api/version")
@app.get("/api/version/{url_idx}") @app.get("/api/version/{url_idx}")
async def get_ollama_versions(url_idx: Optional[int] = None): async def get_ollama_versions(url_idx: Optional[int] = None):
if app.state.config.ENABLE_OLLAMA_API:
if url_idx == None: if url_idx == None:
# returns lowest version # returns lowest version
tasks = [ tasks = [
fetch_url(f"{url}/api/version") for url in app.state.config.OLLAMA_BASE_URLS fetch_url(f"{url}/api/version")
for url in app.state.config.OLLAMA_BASE_URLS
] ]
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))
@ -322,6 +323,8 @@ async def get_ollama_versions(url_idx: Optional[int] = None):
status_code=r.status_code if r else 500, status_code=r.status_code if r else 500,
detail=error_detail, detail=error_detail,
) )
else:
return {"version": False}
class ModelNameForm(BaseModel): class ModelNameForm(BaseModel):

4
backend/constants.py
View File

@ -84,3 +84,7 @@ class ERROR_MESSAGES(str, Enum):
WEB_SEARCH_ERROR = ( WEB_SEARCH_ERROR = (
lambda err="": f"{err if err else 'Oops! Something went wrong while searching the web.'}" lambda err="": f"{err if err else 'Oops! Something went wrong while searching the web.'}"
) )
OLLAMA_API_DISABLED = (
"The Ollama API is disabled. Please enable it to use this feature."
)