fix(gui): set a reasonable timeout on the initial params fetch

ssube · Jan 19, 2023 · 50fe17b · 50fe17b
1 parent b18567c
commit 50fe17b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/gui/src/components/error/ParamsVersion.tsx b/gui/src/components/error/ParamsVersion.tsx
@@ -1,6 +1,7 @@
 import { Alert, AlertTitle, Typography } from '@mui/material';
 import * as React from 'react';
-import { PARAM_VERSION } from '../../config';
+
+import { PARAM_VERSION } from '../../config.js';
 
 export interface ParamsVersionErrorProps {
   root: string;
@@ -10,7 +11,7 @@ export interface ParamsVersionErrorProps {
 export function ParamsVersionError(props: ParamsVersionErrorProps) {
   return <Alert severity='error'>
     <AlertTitle>
-      Parameter Version Error
+      Parameter version error
     </AlertTitle>
     <Typography>
       The server returned parameters that are too old for the client to load.

diff --git a/gui/src/components/error/ServerParams.tsx b/gui/src/components/error/ServerParams.tsx
@@ -19,7 +19,7 @@ function getErrorMessage(error: unknown): string {
 export function ServerParamsError(props: ServerParamsErrorProps) {
   return <Alert severity='error'>
     <AlertTitle>
-      Server Error
+      Error fetching server parameters
     </AlertTitle>
     <Typography>
       Could not fetch parameters from the ONNX web API server at <code>{props.root}</code>.

diff --git a/gui/src/main.tsx b/gui/src/main.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
-import { mustDefault, mustExist } from '@apextoaster/js-utils';
-import { merge } from 'lodash';
+import { mustDefault, mustExist, timeout } from '@apextoaster/js-utils';
 import * as React from 'react';
 import ReactDOM from 'react-dom/client';
 import { QueryClient, QueryClientProvider } from 'react-query';
@@ -16,6 +15,8 @@ import { OnnxWeb } from './components/OnnxWeb.js';
 import { getApiRoot, loadConfig, mergeConfig, PARAM_VERSION } from './config.js';
 import { ClientContext, ConfigContext, createStateSlices, OnnxState, StateContext } from './state.js';
 
+export const INITIAL_LOAD_TIMEOUT = 5_000;
+
 export async function main() {
   // load config from GUI server
   const config = await loadConfig();
@@ -30,7 +31,7 @@ export async function main() {
 
   try {
     // load full params from the API server and merge with the initial client config
-    const params = await client.params();
+    const params = await timeout(INITIAL_LOAD_TIMEOUT, client.params());
     const version = mustDefault(params.version, '0.0.0');
     if (satisfies(version, PARAM_VERSION)) {
       const completeConfig = mergeConfig(config, params);