fixed

Author: ragingwind

react/src/components/Chat/ChatCard.tsx

@@ -19,13 +19,14 @@ import { extractReasoningMiddleware, streamText, wrapLanguageModel } from 'ai';
 import { Alert, App, Card, CardProps } from 'antd';
 import { createStyles } from 'antd-style';
 import graphql from 'babel-plugin-relay/macro';
-import { includes, isEmpty, map } from 'lodash';
+import _ from 'lodash';
 import React, {
   startTransition,
   useEffect,
   useMemo,
   useRef,
   useState,
+  useTransition,
 } from 'react';
 import { useFragment } from 'react-relay';
 
@@ -143,15 +144,15 @@ function useModels(
     },
   });
 
-  const models = map(modelsResult?.data, (m) => ({
+  const models = _.map(modelsResult?.data || [], (m) => ({
     id: m.id,
     name: m.id,
   })) as BAIModel[];
 
   const selectedModelId = useMemo(
     () =>
       provider.modelId &&
-      includes(map(modelsResult?.data, 'id'), provider.modelId)
+      _.includes(_.map(modelsResult?.data || [], 'id'), provider.modelId)
         ? provider.modelId
         : (modelsResult?.data?.[0]?.id ?? 'custom'),
     [modelsResult?.data, provider.modelId],
@@ -208,6 +209,8 @@ const ChatCard: React.FC<ChatCardProps> = ({
   const {
     styles: { chatCard: chatCardStyle, alert: alertStyle, ...chatCardStyles },
   } = useStyles();
+  const [isPendingUpdate, startUpdateTransition] = useTransition();
+
   const dropContainerRef = useRef<HTMLDivElement>(null);
   const [fetchKey, updateFetchKey] = useUpdatableState('first');
   const [startTime, setStartTime] = useState<number | null>(null);
@@ -308,19 +311,22 @@ const ChatCard: React.FC<ChatCardProps> = ({
       }
       ref={dropContainerRef}
     >
-      {isEmpty(models) && (
+      {_.isEmpty(models) && (
         <CustomModelForm
           baseURL={baseURL}
           token={token}
           endpointId={endpoint?.endpoint_id}
+          loading={isPendingUpdate}
           onSubmit={(data) => {
-            updateFetchKey();
-            setBaseURL(data.baseURL);
-            setToken(data.token);
+            startUpdateTransition(() => {
+              updateFetchKey();
+              setBaseURL(data.baseURL);
+              setToken(data.token);
+            });
           }}
         />
       )}
-      {!isEmpty(error?.message) ? (
+      {!_.isEmpty(error?.message) ? (
         <Alert
           message={error?.message}
           type="error"

react/src/components/Chat/CustomModelForm.tsx

@@ -3,7 +3,7 @@ import EndpointTokenSelect from './EndpointTokenSelect';
 import { ReloadOutlined } from '@ant-design/icons';
 import { Alert, Button, Form, Input, theme } from 'antd';
 import type { FormInstance } from 'antd';
-import { useRef, useTransition } from 'react';
+import { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 export type CustomModelFormValues = {
@@ -15,6 +15,7 @@ type CustomModelFormProps = {
   baseURL?: string;
   token?: string;
   endpointId?: string | null;
+  loading: boolean;
   onSubmit?: (formData: CustomModelFormValues) => void;
 };
 
@@ -30,13 +31,13 @@ const CustomModelForm: React.FC<CustomModelFormProps> = ({
   baseURL,
   token,
   endpointId,
+  loading,
   onSubmit,
 }) => {
   const { t } = useTranslation();
   const { token: themeToken } = theme.useToken();
   const formRef = useRef<FormInstance>(null);
 
-  const [isPendingSubmit, startSubmitTransition] = useTransition();
   const { origin, pathname: basePath } = parseBaseURL(baseURL);
 
   return (
@@ -76,21 +77,18 @@ const CustomModelForm: React.FC<CustomModelFormProps> = ({
           />
         </Form.Item>
         <Form.Item label={t('modelService.Token')} name="token">
-          <EndpointTokenSelect
-            loading={isPendingSubmit}
-            endpointId={endpointId}
-          />
+          <EndpointTokenSelect loading={loading} endpointId={endpointId} />
         </Form.Item>
         <Button
           icon={<ReloadOutlined />}
-          loading={isPendingSubmit}
+          loading={loading}
           onClick={() => {
-            startSubmitTransition(() => {
-              const basePath = formRef.current?.getFieldValue('basePath') ?? '';
-              onSubmit?.({
-                baseURL: new URL(basePath, origin).toString(),
-                token: formRef.current?.getFieldValue('token'),
-              });
+            onSubmit?.({
+              baseURL: new URL(
+                formRef.current?.getFieldValue('basePath') ?? '',
+                origin,
+              ).toString(),
+              token: formRef.current?.getFieldValue('token'),
             });
           }}
         >

react/src/components/Chat/EndpointTokenSelect.tsx

@@ -72,7 +72,7 @@ const EndpointTokenSelect: React.FC<EndpointTokenSelectProps> = ({
     <Input onChange={(e) => setControllableValue(e.target.value)} />
   ) : (
     <Select
-      placeholder={t('chatui.SelectEndpoint')}
+      placeholder={t('chatui.SelectToken')}
       style={{
         fontWeight: 'normal',
         width: '200px',

resources/i18n/de.json

@@ -106,6 +106,7 @@
     "NewChat": "Neuer Chat",
     "SelectEndpoint": "Wählen Sie Endpunkt aus",
     "SelectModel": "Wählen Sie Modell aus",
+    "SelectToken": "Token auswählen",
     "SyncInput": "Synchronisiert",
     "Thinking": "Denken",
     "UploadFiles": "Dateien hochladen",

resources/i18n/el.json

@@ -106,6 +106,7 @@
     "NewChat": "Νέα συνομιλία",
     "SelectEndpoint": "Επιλέξτε Τελικό σημείο",
     "SelectModel": "Επιλέξτε Μοντέλο",
+    "SelectToken": "Επιλέξτε Token",
     "SyncInput": "Συγχρονισμένο",
     "Thinking": "Σκέψη",
     "UploadFiles": "Μεταφόρτωση αρχείων",

resources/i18n/en.json

@@ -108,6 +108,7 @@
     "NewChat": "New Chat",
     "SelectEndpoint": "Select Endpoint",
     "SelectModel": "Select Model",
+    "SelectToken": "Select Token",
     "SyncInput": "Synced",
     "Thinking": "Thinking",
     "UploadFiles": "Upload files",

resources/i18n/es.json

@@ -106,6 +106,7 @@
     "NewChat": "Nueva conversación",
     "SelectEndpoint": "Seleccionar punto final",
     "SelectModel": "Seleccionar modelo",
+    "SelectToken": "Seleccionar ficha",
     "SyncInput": "Sincronizado",
     "Thinking": "Pensamiento",
     "UploadFiles": "Subir archivos",

resources/i18n/fi.json

@@ -105,6 +105,7 @@
     "DropFileHere": "Pudota tiedosto tähän",
     "SelectEndpoint": "Valitse Päätepiste",
     "SelectModel": "Valitse Malli",
+    "SelectToken": "Valitse Token",
     "SyncInput": "Synkronoitu",
     "Thinking": "Ajattelu",
     "UploadFiles": "Lataa tiedostoja",

resources/i18n/fr.json

@@ -106,6 +106,7 @@
     "NewChat": "Nouvelle discussion",
     "SelectEndpoint": "Sélectionnez le point de terminaison",
     "SelectModel": "Sélectionnez le modèle",
+    "SelectToken": "Sélectionner le jeton",
     "SyncInput": "Synchronisé",
     "Thinking": "Pensée",
     "UploadFiles": "Télécharger des fichiers",

resources/i18n/id.json

@@ -105,6 +105,7 @@
     "NewChat": "Obrolan Baru",
     "SelectEndpoint": "Pilih Titik Akhir",
     "SelectModel": "Pilih Model",
+    "SelectToken": "Pilih Token",
     "SyncInput": "Disinkronkan",
     "Thinking": "Pemikiran",
     "UploadFiles": "Unggah file",