fix: chat

labring · Jul 15, 2024 · 5f35f73 · 5f35f73
1 parent 356a94d
commit 5f35f73
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 24 deletions.
diff --git a/packages/web/components/common/Textarea/JsonEditor/index.tsx b/packages/web/components/common/Textarea/JsonEditor/index.tsx
@@ -23,6 +23,8 @@ type Props = Omit<BoxProps, 'resize' | 'onChange'> & {
   variables?: EditorVariablePickerType[];
   defaultHeight?: number;
   placeholder?: string;
+  isDisabled?: boolean;
+  isInvalid?: boolean;
 };
 
 const options = {
@@ -55,6 +57,8 @@ const JSONEditor = ({
   variables = [],
   placeholder,
   defaultHeight = 100,
+  isDisabled = false,
+  isInvalid = false,
   ...props
 }: Props) => {
   const { toast } = useToast();
@@ -209,9 +213,9 @@ const JSONEditor = ({
 
   return (
     <Box
-      borderWidth={'1px'}
+      borderWidth={isInvalid ? '2px' : '1px'}
       borderRadius={'md'}
-      borderColor={'myGray.200'}
+      borderColor={isInvalid ? 'red.500' : 'myGray.200'}
       py={2}
       height={height}
       position={'relative'}

diff --git a/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderInput.tsx b/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderInput.tsx
@@ -11,7 +11,11 @@ const RenderInput = () => {
     useContextSelector(PluginRunContext, (v) => v);
 
   const { t } = useTranslation();
-  const { control, handleSubmit } = variablesForm;
+  const {
+    control,
+    handleSubmit,
+    formState: { errors }
+  } = variablesForm;
   const isDisabledInput = histories.length > 0;
 
   return (
@@ -36,6 +40,7 @@ const RenderInput = () => {
                   required={input.required}
                   min={input.min}
                   max={input.max}
+                  isInvalid={errors && Object.keys(errors).includes(input.key)}
                 />
               );
             }}

diff --git a/.../app/src/components/core/chat/ChatContainer/PluginRunBox/components/renderPluginInput.tsx b/.../app/src/components/core/chat/ChatContainer/PluginRunBox/components/renderPluginInput.tsx
@@ -26,7 +26,8 @@ const RenderPluginInput = ({
   placeholder,
   required,
   min,
-  max
+  max,
+  isInvalid
 }: {
   value: any;
   onChange: () => void;
@@ -38,6 +39,7 @@ const RenderPluginInput = ({
   required?: boolean;
   min?: number;
   max?: number;
+  isInvalid: boolean;
 }) => {
   const { t } = useTranslation();
 
@@ -50,12 +52,20 @@ const RenderPluginInput = ({
           isDisabled={isDisabled}
           placeholder={t(placeholder)}
           bg={'myGray.50'}
+          isInvalid={isInvalid}
         />
       );
     }
     if (valueType === WorkflowIOValueTypeEnum.number) {
       return (
-        <NumberInput step={1} min={min} max={max} bg={'myGray.50'} isDisabled={isDisabled}>
+        <NumberInput
+          step={1}
+          min={min}
+          max={max}
+          bg={'myGray.50'}
+          isDisabled={isDisabled}
+          isInvalid={isInvalid}
+        >
           <NumberInputField value={value} onChange={onChange} />
           <NumberInputStepper>
             <NumberIncrementStepper />
@@ -65,7 +75,14 @@ const RenderPluginInput = ({
       );
     }
     if (valueType === WorkflowIOValueTypeEnum.boolean) {
-      return <Switch isChecked={value} onChange={onChange} isDisabled={isDisabled} />;
+      return (
+        <Switch
+          isChecked={value}
+          onChange={onChange}
+          isDisabled={isDisabled}
+          isInvalid={isInvalid}
+        />
+      );
     }
 
     return (
@@ -75,6 +92,7 @@ const RenderPluginInput = ({
         resize
         value={value}
         onChange={onChange}
+        isInvalid={isInvalid}
       />
     );
   })();

diff --git a/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/context.tsx b/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/context.tsx
@@ -191,23 +191,36 @@ const PluginRunContextProvider = ({
       }
     ]);
 
-    const { responseData } = await onStartChat({
-      messages: [],
-      controller: chatController.current,
-      generatingMessage,
-      variables: e
-    });
-
-    setHistories((state) =>
-      state.map((item, index) => {
-        if (index !== state.length - 1) return item;
-        return {
-          ...item,
-          status: 'finish',
-          responseData
-        };
-      })
-    );
+    try {
+      const { responseData } = await onStartChat({
+        messages: [],
+        controller: chatController.current,
+        generatingMessage,
+        variables: e
+      });
+
+      setHistories((state) =>
+        state.map((item, index) => {
+          if (index !== state.length - 1) return item;
+          return {
+            ...item,
+            status: 'finish',
+            responseData
+          };
+        })
+      );
+    } catch (err: any) {
+      toast({ title: err.message, status: 'error' });
+      setHistories((state) =>
+        state.map((item, index) => {
+          if (index !== state.length - 1) return item;
+          return {
+            ...item,
+            status: 'finish'
+          };
+        })
+      );
+    }
   });
 
   const contextValue: PluginRunContextType = {

diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/ChatTest.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/ChatTest.tsx
@@ -126,7 +126,7 @@ const ChatTest = ({
           </Flex>
         )}
 
-        <Box flex={'1 0 0'}>
+        <Box flex={'1 0 0'} overflow={'auto'}>
           <ChatContainer />
         </Box>
       </Flex>
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,7 +126,7 @@ const ChatTest = ({ @@
               </Flex>
             )}
-            <Box flex={'1 0 0'}>
+            <Box flex={'1 0 0'} overflow={'auto'}>
               <ChatContainer />
             </Box>
           </Flex>
@@ Expand Down @@