diff --git a/gui/src/config.ts b/gui/src/config.ts index 04d40034..86cdc63b 100644 --- a/gui/src/config.ts +++ b/gui/src/config.ts @@ -1,4 +1,4 @@ -import { Maybe } from '@apextoaster/js-utils'; +import { doesExist, Maybe } from '@apextoaster/js-utils'; import { Img2ImgParams, InpaintParams, ModelParams, OutpaintParams, STATUS_SUCCESS, Txt2ImgParams, UpscaleParams } from './client.js'; @@ -76,3 +76,14 @@ export async function loadConfig(): Promise { throw new Error('could not load config'); } } + +export function getApiRoot(config: Config): string { + const query = new URLSearchParams(window.location.search); + const api = query.get('api'); + + if (doesExist(api)) { + return api; + } else { + return config.api.root; + } +} diff --git a/gui/src/main.tsx b/gui/src/main.tsx index 308f4340..a1cb00d5 100644 --- a/gui/src/main.tsx +++ b/gui/src/main.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { doesExist, mustDefault, mustExist } from '@apextoaster/js-utils'; +import { mustDefault, mustExist } from '@apextoaster/js-utils'; import { merge } from 'lodash'; import * as React from 'react'; import ReactDOM from 'react-dom/client'; @@ -13,20 +13,9 @@ import { ParamsVersionError } from './components/error/ParamsVersion.js'; import { ServerParamsError } from './components/error/ServerParams.js'; import { OnnxError } from './components/OnnxError.js'; import { OnnxWeb } from './components/OnnxWeb.js'; -import { Config, loadConfig, PARAM_VERSION } from './config.js'; +import { getApiRoot, loadConfig, PARAM_VERSION } from './config.js'; import { ClientContext, ConfigContext, createStateSlices, OnnxState, StateContext } from './state.js'; -export function getApiRoot(config: Config): string { - const query = new URLSearchParams(window.location.search); - const api = query.get('api'); - - if (doesExist(api)) { - return api; - } else { - return config.api.root; - } -} - export async function main() { // load config from GUI server const config = await loadConfig();