Mirrors/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-16 20:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

refac: apps/openai/main.py and utils

Browse Source
This commit is contained in:
Michael Poluektov
2024-08-03 14:24:26 +01:00
parent 774defd184
commit 12c21fac22
8 changed files with 148 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
backend/main.py
View File

@@ -36,6 +36,7 @@ from apps.ollama.main import (
from apps.openai.main import (
app as openai_app,
get_all_models as get_openai_models,
get_all_models_raw as get_openai_models_raw,
generate_chat_completion as generate_openai_chat_completion,
)
@@ -957,7 +958,7 @@ async def get_all_models():
custom_models = Models.get_all_models()
for custom_model in custom_models:
if custom_model.base_model_id == None:
if custom_model.base_model_id is None:
for model in models:
if (
custom_model.id == model["id"]
@@ -1656,13 +1657,13 @@ async def get_tools_function_calling(form_data: dict, user=Depends(get_verified_
@app.get("/api/pipelines/list")
async def get_pipelines_list(user=Depends(get_admin_user)):
responses = await get_openai_models(raw=True)
responses = await get_openai_models_raw()
print(responses)
urlIdxs = [
idx
for idx, response in enumerate(responses)
if response != None and "pipelines" in response
if response is not None and "pipelines" in response
]
return {
@@ -1723,7 +1724,7 @@ async def upload_pipeline(
res = r.json()
if "detail" in res:
detail = res["detail"]
except:
except Exception:
pass
raise HTTPException(
@@ -1769,7 +1770,7 @@ async def add_pipeline(form_data: AddPipelineForm, user=Depends(get_admin_user))
res = r.json()
if "detail" in res:
detail = res["detail"]
except:
except Exception:
pass
raise HTTPException(
@@ -1811,7 +1812,7 @@ async def delete_pipeline(form_data: DeletePipelineForm, user=Depends(get_admin_
res = r.json()
if "detail" in res:
detail = res["detail"]
except:
except Exception:
pass
raise HTTPException(
@@ -1844,7 +1845,7 @@ async def get_pipelines(urlIdx: Optional[int] = None, user=Depends(get_admin_use
res = r.json()
if "detail" in res:
detail = res["detail"]
except:
except Exception:
pass
raise HTTPException(
@@ -1859,7 +1860,6 @@ async def get_pipeline_valves(
pipeline_id: str,
user=Depends(get_admin_user),
):
models = await get_all_models()
r = None
try:
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
@@ -1898,8 +1898,6 @@ async def get_pipeline_valves_spec(
pipeline_id: str,
user=Depends(get_admin_user),
):
models = await get_all_models()
r = None
try:
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
@@ -1922,7 +1920,7 @@ async def get_pipeline_valves_spec(
res = r.json()
if "detail" in res:
detail = res["detail"]
except:
except Exception:
pass
raise HTTPException(
@@ -1938,8 +1936,6 @@ async def update_pipeline_valves(
form_data: dict,
user=Depends(get_admin_user),
):
models = await get_all_models()
r = None
try:
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
@@ -1967,7 +1963,7 @@ async def update_pipeline_valves(
res = r.json()
if "detail" in res:
detail = res["detail"]
except:
except Exception:
pass
raise HTTPException(
@@ -2068,7 +2064,7 @@ async def update_webhook_url(form_data: UrlForm, user=Depends(get_admin_user)):
@app.get("/api/version")
async def get_app_config():
async def get_app_version():
return {
"version": VERSION,
}
@@ -2091,7 +2087,7 @@ async def get_app_latest_release_version():
latest_version = data["tag_name"]
return {"current": VERSION, "latest": latest_version[1:]}
except aiohttp.ClientError as e:
except aiohttp.ClientError:
raise HTTPException(
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
detail=ERROR_MESSAGES.RATE_LIMIT_EXCEEDED,