apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

lint(gui): build API URLs consistently

This commit is contained in:
Sean Sube 2023-01-12 23:14:18 -06:00
parent eac6f542d9
commit 4efa433d5b
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gui/src/api/client.ts
View File

@ -60,6 +60,10 @@ export interface ApiResponse {
params: Txt2ImgResponse; params: Txt2ImgResponse;
} }
export interface ApiReady {
ready: boolean;
}
export interface ApiClient { export interface ApiClient {
models(): Promise<Array<string>>; models(): Promise<Array<string>>;
params(): Promise<ConfigParams>; params(): Promise<ConfigParams>;
@ -72,7 +76,7 @@ export interface ApiClient {
inpaint(params: InpaintParams): Promise<ApiResponse>; inpaint(params: InpaintParams): Promise<ApiResponse>;
outpaint(params: OutpaintParams): Promise<ApiResponse>; outpaint(params: OutpaintParams): Promise<ApiResponse>;
ready(params: ApiResponse): Promise<{ready: boolean}>; ready(params: ApiResponse): Promise<ApiReady>;
} }
export const STATUS_SUCCESS = 200; export const STATUS_SUCCESS = 200;
@ -98,26 +102,12 @@ export function joinPath(...parts: Array<string>): string {
return parts.join('/'); return parts.join('/');
} }
export async function imageFromResponse(root: string, res: Response): Promise<ApiResponse> { export function makeApiUrl(root: string, ...path: Array<string>) {
type LimitedResponse = Omit<ApiResponse, 'output'> & {output: string}; return new URL(joinPath('api', ...path), root);
if (res.status === STATUS_SUCCESS) {
const data = await res.json() as LimitedResponse;
const url = new URL(joinPath('api', 'output', data.output), root).toString();
return {
output: {
key: data.output,
url,
},
params: data.params,
};
} else {
throw new Error('request error');
}
} }
export function makeImageURL(root: string, type: string, params: BaseImgParams): URL { export function makeImageURL(root: string, type: string, params: BaseImgParams): URL {
const url = new URL(joinPath('api', type), root); const url = makeApiUrl(root, type);
url.searchParams.append('cfg', params.cfg.toFixed(1)); url.searchParams.append('cfg', params.cfg.toFixed(1));
url.searchParams.append('steps', params.steps.toFixed(0)); url.searchParams.append('steps', params.steps.toFixed(0));
@ -151,29 +141,29 @@ export function makeClient(root: string, f = fetch): ApiClient {
let pending: Promise<ApiResponse> | undefined; let pending: Promise<ApiResponse> | undefined;
function throttleRequest(url: URL, options: RequestInit): Promise<ApiResponse> { function throttleRequest(url: URL, options: RequestInit): Promise<ApiResponse> {
return f(url, options).then((res) => imageFromResponse(root, res)).finally(() => { return f(url, options).then((res) => parseApiResponse(root, res)).finally(() => {
pending = undefined; pending = undefined;
}); });
} }
return { return {
async models(): Promise<Array<string>> { async models(): Promise<Array<string>> {
const path = new URL(joinPath('api', 'settings', 'models'), root); const path = makeApiUrl(root, 'settings', 'models');
const res = await f(path); const res = await f(path);
return await res.json() as Array<string>; return await res.json() as Array<string>;
}, },
async params(): Promise<ConfigParams> { async params(): Promise<ConfigParams> {
const path = new URL(joinPath('api', 'settings', 'params'), root); const path = makeApiUrl(root, 'settings', 'params');
const res = await f(path); const res = await f(path);
return await res.json() as ConfigParams; return await res.json() as ConfigParams;
}, },
async schedulers(): Promise<Array<string>> { async schedulers(): Promise<Array<string>> {
const path = new URL(joinPath('api', 'settings', 'schedulers'), root); const path = makeApiUrl(root, 'settings', 'schedulers');
const res = await f(path); const res = await f(path);
return await res.json() as Array<string>; return await res.json() as Array<string>;
}, },
async platforms(): Promise<Array<string>> { async platforms(): Promise<Array<string>> {
const path = new URL(joinPath('api', 'settings', 'platforms'), root); const path = makeApiUrl(root, 'settings', 'platforms');
const res = await f(path); const res = await f(path);
return await res.json() as Array<string>; return await res.json() as Array<string>;
}, },
@ -239,12 +229,30 @@ export function makeClient(root: string, f = fetch): ApiClient {
async outpaint() { async outpaint() {
throw new NotImplementedError(); throw new NotImplementedError();
}, },
async ready(params: ApiResponse): Promise<{ready: boolean}> { async ready(params: ApiResponse): Promise<ApiReady> {
const path = new URL(joinPath('api', 'ready'), root); const path = makeApiUrl(root, 'ready');
path.searchParams.append('output', params.output.key); path.searchParams.append('output', params.output.key);
const res = await f(path); const res = await f(path);
return await res.json() as {ready: boolean}; return await res.json() as ApiReady;
} }
}; };
} }
export async function parseApiResponse(root: string, res: Response): Promise<ApiResponse> {
type LimitedResponse = Omit<ApiResponse, 'output'> & {output: string};
if (res.status === STATUS_SUCCESS) {
const data = await res.json() as LimitedResponse;
const url = makeApiUrl(root, 'output', data.output).toString();
return {
output: {
key: data.output,
url,
},
params: data.params,
};
} else {
throw new Error('request error');
}
}