mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-13 04:45: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;
|
||||
}
|
||||
|
||||
const data = {
|
||||
openapi: res,
|
||||
info: res.info,
|
||||
specs: convertOpenApiToToolPayload(res)
|
||||
};
|
||||
|
||||
console.log(data);
|
||||
return data;
|
||||
console.log(res);
|
||||
return res;
|
||||
};
|
||||
|
||||
export const getToolServersData = async (servers: object[]) => {
|
||||
|
|
@ -356,6 +350,7 @@ export const getToolServersData = async (servers: object[]) => {
|
|||
let error = null;
|
||||
|
||||
let toolServerToken = null;
|
||||
|
||||
const auth_type = server?.auth_type ?? 'bearer';
|
||||
if (auth_type === 'bearer') {
|
||||
toolServerToken = server?.key;
|
||||
|
|
@ -365,18 +360,34 @@ export const getToolServersData = async (servers: object[]) => {
|
|||
toolServerToken = localStorage.token;
|
||||
}
|
||||
|
||||
const data = await getToolServerData(
|
||||
toolServerToken,
|
||||
(server?.path ?? '').includes('://')
|
||||
? server?.path
|
||||
: `${server?.url}${(server?.path ?? '').startsWith('/') ? '' : '/'}${server?.path}`
|
||||
).catch((err) => {
|
||||
error = err;
|
||||
return null;
|
||||
});
|
||||
let res = null;
|
||||
const specType = server?.spec_type ?? 'url';
|
||||
|
||||
if (specType === 'url') {
|
||||
res = await getToolServerData(
|
||||
toolServerToken,
|
||||
(server?.path ?? '').includes('://')
|
||||
? 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 {
|
||||
url: server?.url,
|
||||
openapi: openapi,
|
||||
|
|
|
|||
Loading…
Reference in a new issue