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
c1cabf14
Commit
c1cabf14
authored
May 29, 2024
by
Timothy J. Baek
Browse files
feat: multiple pipelines server support
parent
2981caa3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
192 additions
and
71 deletions
+192
-71
backend/main.py
backend/main.py
+29
-2
src/lib/apis/index.ts
src/lib/apis/index.ts
+36
-2
src/lib/components/admin/Settings/Pipelines.svelte
src/lib/components/admin/Settings/Pipelines.svelte
+127
-67
No files found.
backend/main.py
View file @
c1cabf14
...
...
@@ -464,10 +464,37 @@ async def get_models(user=Depends(get_verified_user)):
return
{
"data"
:
models
}
@
app
.
get
(
"/api/pipelines/list"
)
async
def
get_pipelines_list
(
user
=
Depends
(
get_admin_user
)):
models
=
await
get_all_models
()
urlIdxs
=
list
(
set
([
model
[
"urlIdx"
]
for
model
in
models
if
"pipeline"
in
model
]))
return
{
"data"
:
[
{
"url"
:
openai_app
.
state
.
config
.
OPENAI_API_BASE_URLS
[
urlIdx
],
"idx"
:
urlIdx
,
}
for
urlIdx
in
urlIdxs
]
}
@
app
.
get
(
"/api/pipelines"
)
async
def
get_pipelines
(
user
=
Depends
(
get_admin_user
)):
async
def
get_pipelines
(
urlIdx
:
Optional
[
int
]
=
None
,
user
=
Depends
(
get_admin_user
)):
models
=
await
get_all_models
()
print
(
urlIdx
)
if
urlIdx
is
None
:
pipelines
=
[
model
for
model
in
models
if
"pipeline"
in
model
]
else
:
pipelines
=
[
model
for
model
in
models
if
"pipeline"
in
model
and
model
[
"urlIdx"
]
==
urlIdx
]
return
{
"data"
:
pipelines
}
...
...
src/lib/apis/index.ts
View file @
c1cabf14
...
...
@@ -49,10 +49,44 @@ export const getModels = async (token: string = '') => {
return
models
;
};
export
const
getPipelines
=
async
(
token
:
string
=
''
)
=>
{
export
const
getPipelines
List
=
async
(
token
:
string
=
''
)
=>
{
let
error
=
null
;
const
res
=
await
fetch
(
`
${
WEBUI_BASE_URL
}
/api/pipelines`
,
{
const
res
=
await
fetch
(
`
${
WEBUI_BASE_URL
}
/api/pipelines/list`
,
{
method
:
'
GET
'
,
headers
:
{
Accept
:
'
application/json
'
,
'
Content-Type
'
:
'
application/json
'
,
...(
token
&&
{
authorization
:
`Bearer
${
token
}
`
})
}
})
.
then
(
async
(
res
)
=>
{
if
(
!
res
.
ok
)
throw
await
res
.
json
();
return
res
.
json
();
})
.
catch
((
err
)
=>
{
console
.
log
(
err
);
error
=
err
;
return
null
;
});
if
(
error
)
{
throw
error
;
}
let
pipelines
=
res
?.
data
??
[];
return
pipelines
;
};
export
const
getPipelines
=
async
(
token
:
string
,
urlIdx
?:
string
)
=>
{
let
error
=
null
;
const
searchParams
=
new
URLSearchParams
();
if
(
urlIdx
)
{
searchParams
.
append
(
'
urlIdx
'
,
urlIdx
);
}
const
res
=
await
fetch
(
`
${
WEBUI_BASE_URL
}
/api/pipelines?
${
searchParams
.
toString
()}
`
,
{
method
:
'
GET
'
,
headers
:
{
Accept
:
'
application/json
'
,
...
...
src/lib/components/admin/Settings/Pipelines.svelte
View file @
c1cabf14
<script lang="ts">
import { v4 as uuidv4 } from 'uuid';
import { toast } from 'svelte-sonner';
import { models } from '$lib/stores';
import { getContext, onMount, tick } from 'svelte';
import type { Writable } from 'svelte/store';
import type { i18n as i18nType } from 'i18next';
import { stringify } from 'postcss';
import {
getPipelineValves,
getPipelineValvesSpec,
updatePipelineValves,
getPipelines,
getModels
getModels,
getPipelinesList
} from '$lib/apis';
import Spinner from '$lib/components/common/Spinner.svelte';
import { toast } from 'svelte-sonner';
import { models } from '$lib/stores';
const i18n: Writable<i18nType> = getContext('i18n');
export let saveHandler: Function;
let PIPELINES_LIST = null;
let selectedPipelinesUrlIdx = '';
let pipelines = null;
let valves = null;
let valves_spec = null;
let selectedPipelineIdx = null;
const updateHandler = async () => {
...
...
@@ -54,6 +56,9 @@
};
const getValves = async (idx) => {
valves = null;
valves_spec = null;
valves_spec = await getPipelineValvesSpec(localStorage.token, pipelines[idx].id);
valves = await getPipelineValves(localStorage.token, pipelines[idx].id);
...
...
@@ -63,7 +68,11 @@
};
const setPipelines = async () => {
pipelines = await getPipelines(localStorage.token);
pipelines = null;
valves = null;
valves_spec = null;
pipelines = await getPipelines(localStorage.token, selectedPipelinesUrlIdx);
if (pipelines.length > 0) {
selectedPipelineIdx = 0;
...
...
@@ -72,6 +81,12 @@
};
onMount(async () => {
PIPELINES_LIST = await getPipelinesList(localStorage.token);
if (PIPELINES_LIST.length > 0) {
selectedPipelinesUrlIdx = PIPELINES_LIST[0]['idx'];
}
setPipelines();
});
</script>
...
...
@@ -83,10 +98,48 @@
}}
>
<div class=" space-y-2 pr-1.5 overflow-y-scroll max-h-80 h-full">
{#if pipelines !== null && pipelines.length > 0}
{#if PIPELINES_LIST !== null}
<div class="flex w-full justify-between mb-2">
<div class=" self-center text-sm font-semibold">
{$i18n.t('Manage Pipelines')}
</div>
</div>
{#if PIPELINES_LIST.length > 0}
<div class="space-y-1">
<div class="flex gap-2">
<div class="flex-1">
<select
class="w-full rounded-lg py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-850 outline-none"
bind:value={selectedPipelinesUrlIdx}
placeholder={$i18n.t('Select a pipeline url')}
on:change={async () => {
await tick();
await setPipelines();
}}
>
<option value="" selected disabled class="bg-gray-100 dark:bg-gray-700"
>{$i18n.t('Select a pipeline url')}</option
>
{#each PIPELINES_LIST as pipelines, idx}
<option value={pipelines.idx} class="bg-gray-100 dark:bg-gray-700"
>{pipelines.url}</option
>
{/each}
</select>
</div>
</div>
</div>
{/if}
<hr class=" dark:border-gray-800 my-3 w-full" />
{#if pipelines !== null}
{#if pipelines.length > 0}
<div class="flex w-full justify-between mb-2">
<div class=" self-center text-sm font-semibold">
{$i18n.t('Pipelines')}
{$i18n.t('Pipelines
Valves
')}
</div>
</div>
<div class="space-y-1">
...
...
@@ -112,8 +165,6 @@
</div>
{/if}
<div class="text-sm font-medium">{$i18n.t('Valves')}</div>
<div class="space-y-1">
{#if pipelines[selectedPipelineIdx].pipeline.valves}
{#if valves}
...
...
@@ -162,16 +213,25 @@
{/if}
</div>
</div>
{:else if
pipelines !== null &&
pipelines.length === 0}
{:else if pipelines.length === 0}
<div>Pipelines Not Detected</div>
{/if}
{:else}
<div class="flex h-full justify-center">
<div class="flex justify-center">
<div class="my-auto">
<Spinner className="size-4" />
</div>
</div>
{/if}
{:else}
<div class="flex justify-center h-full">
<div class="my-auto">
<Spinner className="size-6" />
</div>
</div>
{/if}
</div>
<div class="flex justify-end pt-3 text-sm font-medium">
<button
class=" px-4 py-2 bg-emerald-700 hover:bg-emerald-800 text-gray-100 transition rounded-lg"
...
...
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