Skip to content

GitLab

"...git@developer.sourcefind.cn:chenpangpang/open-webui.git" did not exist on "b7fcf14f6eefdefeebb7616641767c0004c0d640"
Commit 340b399f authored by Timothy J. Baek's avatar Timothy J. Baek
Browse files

refac: pipelines

parent 12e60d8e
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 155 deletions
backend/main.py
View file @ 340b399f
...@@ -568,167 +568,158 @@ async def delete_pipeline(form_data: DeletePipelineForm, user=Depends(get_admin_ ...@@ -568,167 +568,158 @@ async def delete_pipeline(form_data: DeletePipelineForm, user=Depends(get_admin_
@app.get("/api/pipelines") @app.get("/api/pipelines")
async def get_pipelines(urlIdx: Optional[int] = None, user=Depends(get_admin_user)): async def get_pipelines(urlIdx: Optional[int] = None, user=Depends(get_admin_user)):
models = await get_all_models() r = None
try:
urlIdx
print(urlIdx) url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
if urlIdx is None: headers = {"Authorization": f"Bearer {key}"}
pipelines = [model for model in models if "pipeline" in model] r = requests.get(f"{url}/pipelines", headers=headers)
else:
pipelines = [
model
for model in models
if "pipeline" in model and model["urlIdx"] == urlIdx
]
return {"data": pipelines} r.raise_for_status()
data = r.json()
return {**data}
except Exception as e:
# Handle connection error here
print(f"Connection error: {e}")
@app.get("/api/pipelines/{pipeline_id}/valves") detail = "Pipeline not found"
async def get_pipeline_valves(pipeline_id: str, user=Depends(get_admin_user)): if r is not None:
models = await get_all_models() try:
if pipeline_id in app.state.MODELS and "pipeline" in app.state.MODELS[pipeline_id]: res = r.json()
pipeline = app.state.MODELS[pipeline_id] if "detail" in res:
detail = res["detail"]
except:
pass
raise HTTPException(
status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
detail=detail,
)
r = None
try:
urlIdx = pipeline["urlIdx"]
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx] @app.get("/api/pipelines/{pipeline_id}/valves")
key = openai_app.state.config.OPENAI_API_KEYS[urlIdx] async def get_pipeline_valves(
urlIdx: Optional[int], pipeline_id: str, user=Depends(get_admin_user)
):
models = await get_all_models()
r = None
try:
headers = {"Authorization": f"Bearer {key}"} url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
r = requests.get(f"{url}/{pipeline['id']}/valves", headers=headers) key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
r.raise_for_status() headers = {"Authorization": f"Bearer {key}"}
data = r.json() r = requests.get(f"{url}/{pipeline_id}/valves", headers=headers)
return {**data} r.raise_for_status()
except Exception as e: data = r.json()
# Handle connection error here
print(f"Connection error: {e}")
detail = "Pipeline not found" return {**data}
except Exception as e:
# Handle connection error here
print(f"Connection error: {e}")
if r is not None: detail = "Pipeline not found"
try:
res = r.json()
if "detail" in res:
detail = res["detail"]
except:
pass
raise HTTPException( if r is not None:
status_code=( try:
r.status_code if r is not None else status.HTTP_404_NOT_FOUND res = r.json()
), if "detail" in res:
detail=detail, detail = res["detail"]
) except:
pass
else:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
detail="Pipeline not found", detail=detail,
) )
@app.get("/api/pipelines/{pipeline_id}/valves/spec") @app.get("/api/pipelines/{pipeline_id}/valves/spec")
async def get_pipeline_valves_spec(pipeline_id: str, user=Depends(get_admin_user)): async def get_pipeline_valves_spec(
urlIdx: Optional[int], pipeline_id: str, user=Depends(get_admin_user)
):
models = await get_all_models() models = await get_all_models()
if pipeline_id in app.state.MODELS and "pipeline" in app.state.MODELS[pipeline_id]:
pipeline = app.state.MODELS[pipeline_id]
r = None r = None
try: try:
urlIdx = pipeline["urlIdx"] url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
headers = {"Authorization": f"Bearer {key}"} headers = {"Authorization": f"Bearer {key}"}
r = requests.get(f"{url}/{pipeline['id']}/valves/spec", headers=headers) r = requests.get(f"{url}/{pipeline_id}/valves/spec", headers=headers)
r.raise_for_status() r.raise_for_status()
data = r.json() data = r.json()
return {**data} return {**data}
except Exception as e: except Exception as e:
# Handle connection error here # Handle connection error here
print(f"Connection error: {e}") print(f"Connection error: {e}")
detail = "Pipeline not found" detail = "Pipeline not found"
if r is not None: if r is not None:
try: try:
res = r.json() res = r.json()
if "detail" in res: if "detail" in res:
detail = res["detail"] detail = res["detail"]
except: except:
pass pass
raise HTTPException(
status_code=(
r.status_code if r is not None else status.HTTP_404_NOT_FOUND
),
detail=detail,
)
else:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
detail="Pipeline not found", detail=detail,
) )
@app.post("/api/pipelines/{pipeline_id}/valves/update") @app.post("/api/pipelines/{pipeline_id}/valves/update")
async def update_pipeline_valves( async def update_pipeline_valves(
pipeline_id: str, form_data: dict, user=Depends(get_admin_user) urlIdx: Optional[int],
pipeline_id: str,
form_data: dict,
user=Depends(get_admin_user),
): ):
models = await get_all_models() models = await get_all_models()
if pipeline_id in app.state.MODELS and "pipeline" in app.state.MODELS[pipeline_id]: r = None
pipeline = app.state.MODELS[pipeline_id] try:
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
r = None key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
try:
urlIdx = pipeline["urlIdx"]
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
headers = {"Authorization": f"Bearer {key}"} headers = {"Authorization": f"Bearer {key}"}
r = requests.post( r = requests.post(
f"{url}/{pipeline['id']}/valves/update", f"{url}/{pipeline_id}/valves/update",
headers=headers, headers=headers,
json={**form_data}, json={**form_data},
) )
r.raise_for_status() r.raise_for_status()
data = r.json() data = r.json()
return {**data} return {**data}
except Exception as e: except Exception as e:
# Handle connection error here # Handle connection error here
print(f"Connection error: {e}") print(f"Connection error: {e}")
detail = "Pipeline not found" detail = "Pipeline not found"
if r is not None: if r is not None:
try: try:
res = r.json() res = r.json()
if "detail" in res: if "detail" in res:
detail = res["detail"] detail = res["detail"]
except: except:
pass pass
raise HTTPException(
status_code=(
r.status_code if r is not None else status.HTTP_404_NOT_FOUND
),
detail=detail,
)
else:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, status_code=(
detail="Pipeline not found", r.status_code if r is not None else status.HTTP_404_NOT_FOUND
),
detail=detail,
) )
......
src/lib/apis/index.ts
View file @ 340b399f
...@@ -184,17 +184,25 @@ export const getPipelines = async (token: string, urlIdx?: string) => { ...@@ -184,17 +184,25 @@ export const getPipelines = async (token: string, urlIdx?: string) => {
return pipelines; return pipelines;
}; };
export const getPipelineValves = async (token: string = '', pipeline_id: string) => { export const getPipelineValves = async (token: string, pipeline_id: string, urlIdx: string) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_BASE_URL}/api/pipelines/${pipeline_id}/valves`, { const searchParams = new URLSearchParams();
method: 'GET', if (urlIdx) {
headers: { searchParams.append('urlIdx', urlIdx);
Accept: 'application/json', }
'Content-Type': 'application/json',
...(token && { authorization: `Bearer ${token}` }) const res = await fetch(
`${WEBUI_BASE_URL}/api/pipelines/${pipeline_id}/valves?${searchParams.toString()}`,
{
method: 'GET',
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
...(token && { authorization: `Bearer ${token}` })
}
} }
}) )
.then(async (res) => { .then(async (res) => {
if (!res.ok) throw await res.json(); if (!res.ok) throw await res.json();
return res.json(); return res.json();
...@@ -212,17 +220,25 @@ export const getPipelineValves = async (token: string = '', pipeline_id: string) ...@@ -212,17 +220,25 @@ export const getPipelineValves = async (token: string = '', pipeline_id: string)
return res; return res;
}; };
export const getPipelineValvesSpec = async (token: string = '', pipeline_id: string) => { export const getPipelineValvesSpec = async (token: string, pipeline_id: string, urlIdx: string) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_BASE_URL}/api/pipelines/${pipeline_id}/valves/spec`, { const searchParams = new URLSearchParams();
method: 'GET', if (urlIdx) {
headers: { searchParams.append('urlIdx', urlIdx);
Accept: 'application/json', }
'Content-Type': 'application/json',
...(token && { authorization: `Bearer ${token}` }) const res = await fetch(
`${WEBUI_BASE_URL}/api/pipelines/${pipeline_id}/valves/spec?${searchParams.toString()}`,
{
method: 'GET',
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
...(token && { authorization: `Bearer ${token}` })
}
} }
}) )
.then(async (res) => { .then(async (res) => {
if (!res.ok) throw await res.json(); if (!res.ok) throw await res.json();
return res.json(); return res.json();
...@@ -243,19 +259,28 @@ export const getPipelineValvesSpec = async (token: string = '', pipeline_id: str ...@@ -243,19 +259,28 @@ export const getPipelineValvesSpec = async (token: string = '', pipeline_id: str
export const updatePipelineValves = async ( export const updatePipelineValves = async (
token: string = '', token: string = '',
pipeline_id: string, pipeline_id: string,
valves: object valves: object,
urlIdx: string
) => { ) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_BASE_URL}/api/pipelines/${pipeline_id}/valves/update`, { const searchParams = new URLSearchParams();
method: 'POST', if (urlIdx) {
headers: { searchParams.append('urlIdx', urlIdx);
Accept: 'application/json', }
'Content-Type': 'application/json',
...(token && { authorization: `Bearer ${token}` }) const res = await fetch(
}, `${WEBUI_BASE_URL}/api/pipelines/${pipeline_id}/valves/update?${searchParams.toString()}`,
body: JSON.stringify(valves) {
}) method: 'POST',
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
...(token && { authorization: `Bearer ${token}` })
},
body: JSON.stringify(valves)
}
)
.then(async (res) => { .then(async (res) => {
if (!res.ok) throw await res.json(); if (!res.ok) throw await res.json();
return res.json(); return res.json();
......
src/lib/components/admin/Settings/Pipelines.svelte
View file @ 340b399f
...@@ -39,16 +39,19 @@ ...@@ -39,16 +39,19 @@
const updateHandler = async () => { const updateHandler = async () => {
const pipeline = pipelines[selectedPipelineIdx]; const pipeline = pipelines[selectedPipelineIdx];
if (pipeline && (pipeline?.pipeline?.valves ?? false)) { if (pipeline && (pipeline?.valves ?? false)) {
if (valves?.pipelines ?? false) { if (valves?.pipelines ?? false) {
valves.pipelines = valves.pipelines.split(',').map((v) => v.trim()); valves.pipelines = valves.pipelines.split(',').map((v) => v.trim());
} }
const res = await updatePipelineValves(localStorage.token, pipeline.id, valves).catch( const res = await updatePipelineValves(
(error) => { localStorage.token,
toast.error(error); pipeline.id,
} valves,
); selectedPipelinesUrlIdx
).catch((error) => {
toast.error(error);
});
if (res) { if (res) {
toast.success('Valves updated successfully'); toast.success('Valves updated successfully');
...@@ -65,8 +68,16 @@ ...@@ -65,8 +68,16 @@
valves = null; valves = null;
valves_spec = null; valves_spec = null;
valves_spec = await getPipelineValvesSpec(localStorage.token, pipelines[idx].id); valves_spec = await getPipelineValvesSpec(
valves = await getPipelineValves(localStorage.token, pipelines[idx].id); localStorage.token,
pipelines[idx].id,
selectedPipelinesUrlIdx
);
valves = await getPipelineValves(
localStorage.token,
pipelines[idx].id,
selectedPipelinesUrlIdx
);
if (valves?.pipelines ?? false) { if (valves?.pipelines ?? false) {
valves.pipelines = valves.pipelines.join(','); valves.pipelines = valves.pipelines.join(',');
...@@ -269,7 +280,7 @@ ...@@ -269,7 +280,7 @@
> >
{#each pipelines as pipeline, idx} {#each pipelines as pipeline, idx}
<option value={idx} class="bg-gray-100 dark:bg-gray-700" <option value={idx} class="bg-gray-100 dark:bg-gray-700"
>{pipeline.name} ({pipeline.pipeline.type ?? 'pipe'})</option >{pipeline.name} ({pipeline.type ?? 'pipe'})</option
> >
{/each} {/each}
</select> </select>
...@@ -299,7 +310,7 @@ ...@@ -299,7 +310,7 @@
{/if} {/if}
<div class="space-y-1"> <div class="space-y-1">
{#if pipelines[selectedPipelineIdx].pipeline.valves} {#if pipelines[selectedPipelineIdx].valves}
{#if valves} {#if valves}
{#each Object.keys(valves_spec.properties) as property, idx} {#each Object.keys(valves_spec.properties) as property, idx}
<div class=" py-0.5 w-full justify-between"> <div class=" py-0.5 w-full justify-between">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment