Merge pull request #78 from cloudera/DSE-45281

This PR makes the following changes:

Increase the refresh rate for the check upgrade call
DSE-45281 - Fix for uploading the topics issue not saved in re-generate flow
Fix for random error popups while in re-generate path/flow
DSE-45283 - Trim the seeds after the upload
DSE-45116 - Errors keep popping up in SDS UI

Author: Khauneesh-AI

app/client/src/pages/DataGenerator/DataGenerator.tsx

@@ -2,6 +2,7 @@ import isEmpty from 'lodash/isEmpty';
 import isString from 'lodash/isString';
 import { useEffect, useRef, useState } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
+
 import { Button, Flex, Form, Layout, Steps } from 'antd';
 import type { FormInstance } from 'antd';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
@@ -17,7 +18,8 @@ import Finish from './Finish';
 
 import { DataGenWizardSteps, WizardStepConfig, WorkflowType } from './types';
 import { WizardCtx } from './utils';
-import { useGetDatasetDetails } from '../DatasetDetails/hooks';
+import { fetchDatasetDetails, useGetDatasetDetails } from '../DatasetDetails/hooks';
+import { useMutation } from '@tanstack/react-query';
 
 const { Content } = Layout;
 // const { Title } = Typography;
@@ -97,28 +99,29 @@ const DataGenerator = () => {
     const [current, setCurrent] = useState(0);
     const [maxStep, setMaxStep] = useState(0);
     const [isStepValid, setIsStepValid] = useState<boolean>(false);
+    
     // Data passed from listing table to prepopulate form
     const location = useLocation();
     const { generate_file_name } = useParams();
     const initialData = location?.state?.data;
-    const datasetDetailsReq = generate_file_name &&  useGetDatasetDetails(generate_file_name);
-    console.log('datasetDetailsReq', datasetDetailsReq);
+    const mutation = useMutation({
+        mutationFn: fetchDatasetDetails
+    });
 
 
     useEffect(() => {
-        if (
-            datasetDetailsReq &&
-            typeof datasetDetailsReq === 'object' &&
-            'dataset' in datasetDetailsReq &&
-            !isEmpty(datasetDetailsReq.dataset)
-        ) {
-            console.log('setting initial dataset....')
+        if (generate_file_name && !mutation.data) {
+            mutation.mutate(generate_file_name);
+        }
+        if (mutation.data && mutation?.data?.dataset) {
             form.setFieldsValue({
                 ...initialData,
-                ...(datasetDetailsReq.dataset as any)
+                ...(mutation?.data?.dataset as any)
             });
         }
-    }, [datasetDetailsReq]);
+
+    }, [generate_file_name]);
+    
 
     if (initialData?.technique) {
         initialData.workflow_type = initialData?.technique === 'sft' ? 

app/client/src/pages/DataGenerator/Finish.tsx

@@ -132,8 +132,9 @@ const Finish = () => {
 
     const isDemo = isDemoMode(num_questions, topics, form);
 
-    useEffect(() => { 
+    useEffect(() => {
         const formValues = form.getFieldsValue(true);
+        
         const doc_paths = formValues.doc_paths;
         if (Array.isArray(doc_paths) && !isEmpty(doc_paths)) {
             if (formValues.workflow_type === WorkflowType.SUPERVISED_FINE_TUNING) {
@@ -183,6 +184,7 @@ const Finish = () => {
         }
 
         const args = {...formValues, is_demo: isDemo, model_params: formValues.model_parameters }
+        console.log('Triggering data generation with args:', args);
         triggerPost(args)
     }, []);
 

app/client/src/pages/DataGenerator/Prompt.tsx

@@ -112,9 +112,10 @@ const Prompt = () => {
     });
 
     useEffect(() => {  
-        if (!isEmpty(mutation.data)) {
-            setItems(mutation.data);
-            form.setFieldValue('topics', mutation.data);
+        if (!isEmpty(mutation.data && !mutation.isError)) {
+            const seeds = mutation.data.map((item: string) => item.trim());
+            setItems(seeds);
+            form.setFieldValue('topics', seeds);
         }
     }, [mutation.data]);
 
@@ -214,6 +215,7 @@ const Prompt = () => {
         setCustomTopic('');
     };
 
+
     const onAddFiles = (files: File[]) => {
         if (!isEmpty (files)) {
             const file = first(files);
@@ -223,6 +225,7 @@ const Prompt = () => {
             }
         };
     }
+    console.log('mutation data:', mutation);
 
     return (
         <Row gutter={[50,0]}>
@@ -315,6 +318,14 @@ const Prompt = () => {
                         workflow_type === WorkflowType.CUSTOM_DATA_GENERATION ||
                         workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION) &&
                     <Flex gap={20} vertical>
+                        {mutation.isError &&
+                            <Alert
+                                message='Error fetching seed instructions'
+                                description={get(mutation.error, 'message', 'An error occurred while fetching seed instructions.')}
+                                type='error'
+                            />
+                        }
+                        {mutation.isPending && <Alert message='Loading seed instructions...' type='info' />}
                         <Flex>
                         <SeedsFormItem
                             name={'topics'}

app/client/src/pages/DataGenerator/Summary.tsx

@@ -53,6 +53,8 @@ const Summary= () => {
         examples = []
     } = form.getFieldsValue(true);
 
+    console.log('Summary form values:', form.getFieldsValue(true));
+
     const cfgStepDataSource = [
         { label: 'Dataset Name', children: display_name },
         { label: 'Usecase', children: use_case },

app/client/src/pages/DatasetDetails/hooks.tsx

@@ -9,7 +9,7 @@ const BASE_API_URL = import.meta.env.VITE_AMP_URL;
 
 
 
-const fetchDatasetDetails = async (generate_file_name: string) => {
+export const fetchDatasetDetails = async (generate_file_name: string) => {
   const dataset_details__resp = await fetch(`${BASE_API_URL}/dataset_details/${generate_file_name}`, {
     method: 'GET',
   });

app/client/src/pages/Home/hooks.ts

@@ -203,7 +203,7 @@ export const useUpgradeStatus = () => {
     {
       queryKey: ["fetchUpgradeStatus", fetchUpgradeStatus],
       queryFn: () => fetchUpgradeStatus(),
-      refetchInterval: 60000
+      refetchInterval: 10 * 60000
     }
   );