mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-15 13:55:19 +00:00
refac
This commit is contained in:
parent
bad7d69a58
commit
d1a6c6b209
1 changed files with 30 additions and 19 deletions
|
|
@ -337,14 +337,8 @@ export const getToolServerData = async (token: string, url: string) => {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = {
|
console.log(res);
|
||||||
openapi: res,
|
return res;
|
||||||
info: res.info,
|
|
||||||
specs: convertOpenApiToToolPayload(res)
|
|
||||||
};
|
|
||||||
|
|
||||||
console.log(data);
|
|
||||||
return data;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getToolServersData = async (servers: object[]) => {
|
export const getToolServersData = async (servers: object[]) => {
|
||||||
|
|
@ -356,6 +350,7 @@ export const getToolServersData = async (servers: object[]) => {
|
||||||
let error = null;
|
let error = null;
|
||||||
|
|
||||||
let toolServerToken = null;
|
let toolServerToken = null;
|
||||||
|
|
||||||
const auth_type = server?.auth_type ?? 'bearer';
|
const auth_type = server?.auth_type ?? 'bearer';
|
||||||
if (auth_type === 'bearer') {
|
if (auth_type === 'bearer') {
|
||||||
toolServerToken = server?.key;
|
toolServerToken = server?.key;
|
||||||
|
|
@ -365,18 +360,34 @@ export const getToolServersData = async (servers: object[]) => {
|
||||||
toolServerToken = localStorage.token;
|
toolServerToken = localStorage.token;
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await getToolServerData(
|
let res = null;
|
||||||
toolServerToken,
|
const specType = server?.spec_type ?? 'url';
|
||||||
(server?.path ?? '').includes('://')
|
|
||||||
? server?.path
|
if (specType === 'url') {
|
||||||
: `${server?.url}${(server?.path ?? '').startsWith('/') ? '' : '/'}${server?.path}`
|
res = await getToolServerData(
|
||||||
).catch((err) => {
|
toolServerToken,
|
||||||
error = err;
|
(server?.path ?? '').includes('://')
|
||||||
return null;
|
? server?.path
|
||||||
});
|
: `${server?.url}${(server?.path ?? '').startsWith('/') ? '' : '/'}${server?.path}`
|
||||||
|
).catch((err) => {
|
||||||
|
error = err;
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
} else if ((specType === 'json' && server?.spec) ?? null) {
|
||||||
|
try {
|
||||||
|
res = JSON.parse(server?.spec);
|
||||||
|
} catch (e) {
|
||||||
|
error = 'Failed to parse JSON spec';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res) {
|
||||||
|
const { openapi, info, specs } = {
|
||||||
|
openapi: res,
|
||||||
|
info: res.info,
|
||||||
|
specs: convertOpenApiToToolPayload(res)
|
||||||
|
};
|
||||||
|
|
||||||
if (data) {
|
|
||||||
const { openapi, info, specs } = data;
|
|
||||||
return {
|
return {
|
||||||
url: server?.url,
|
url: server?.url,
|
||||||
openapi: openapi,
|
openapi: openapi,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue