Merge pull request #72 from cloudera/dev

Evaluate button in top section is disabled always (now it is fixed)
Re-evaluate does not work properly
The AiAssitant icon has been added for the Generate Custom Prompt button and the position is moved to the top right
MaxToken has been removed from Parameters section.
-Examples & Prompt for Dataset Generator Wizard is swapped
-For the Seed Instructions users can enter multi line seeds and new line will not be removed
-For the Success view of the Dataset Generation the Topics tabbed/table view will have the popover to display the whole seed instruction
-For the custom prompt generation if the examples file has been uploaded will be used to generate the custom prompt
-Minor improvements for the Generate Custom Prompt Modal

Author: Khauneesh-AI

.gitignore

@@ -4,6 +4,7 @@ metadata.db
 document_upload
 test.json
 cml_test.ipynb
+practice.ipynb
 /app/khauneesh_test.ipynb
 .env
 *.pyc

.project-metadata.yaml

@@ -34,10 +34,6 @@ environment_variables:
     default: null
     description: >-
      API key for Cloudera AI Inference
-      
-  
-  
-
 
 # runtimes
 runtimes:

app/client/eslint.config.js

@@ -23,6 +23,7 @@ export default tseslint.config(
         'warn',
         { allowConstantExport: true },
       ],
+      '@typescript-eslint/no-explicit-any': ['warn', { 'fixToUnknown': true, 'ignoreRestArgs': false }]
     },
   },
 )

app/client/package.json

@@ -16,6 +16,8 @@
     "@mui/icons-material": "6.1.7",
     "@mui/material": "6.1.7",
     "@tanstack/react-query": "5.66.0",
+    "ag-grid-community": "33.2.4",
+    "ag-grid-react":"33.2.4",
     "antd": "5.22.1",
     "axios": "1.6.7",
     "lodash": "4.17.21",

app/client/src/Container.tsx

@@ -48,9 +48,6 @@ const PageHeader = styled(Header)`
   height: fit-content;
   padding: 5px 15px
 `;
-const StyledImg = styled.img`
-  height: ${props => props?.height && `${props.height}px`}
-`
 
 const StyledText = styled.div`
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';

app/client/src/api/Datasets/response.ts

@@ -1,3 +1,5 @@
+import { PaginatedResponse } from '../common/pagination';
+
 export type DatasetResponse = {
     id: number;
     timestamp: string;
@@ -37,14 +39,17 @@ export type Example = {
 
 export type DeleteDatasetResponse = {
    message: string;
- };
+};
 
- export type ExportDatasetResponse = {
+export type ExportDatasetResponse = {
     message: Partial<ExportMessageSuccessResponse>;
-  };
+};
 
-  export type ExportMessageSuccessResponse = {
+export type ExportMessageSuccessResponse = {
     job_name: string;
     job_id: string;
     hf_link: string;
-  };
+};
+
+// Add paginated response types
+export type PaginatedDatasetsResponse = PaginatedResponse<DatasetResponse>;

app/client/src/api/Evaluations/response.ts

@@ -1,3 +1,5 @@
+import { PaginatedResponse } from '../common/pagination';
+
 export type EvaluationResponse = { 
     id: string;
     timestamp: Date;
@@ -16,21 +18,24 @@ export type EvaluationResponse = {
     job_id: string;
     job_name: string;
     job_status: string;
- };
+};
 
- export type DeleteEvaluationResponse = {
+export type DeleteEvaluationResponse = {
    message: string;
- };
+};
 
- export type ModelParameters = {
+export type ModelParameters = {
     temperature: number;
     top_p: number;
     min_p: number;
     top_k: number;
     max_tokens: number;
- }
+};
 
- export type Example = {
+export type Example = {
     score: number;
     justification: string;
- }
+};
+
+// Add paginated response types
+export type PaginatedEvaluationsResponse = PaginatedResponse<EvaluationResponse>;

app/client/src/api/Export/export.ts

@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { ExportResponse } from "./response";
+import { ExportResponse, PaginatedExportsResponse } from "./response";
 
 const BASE_API_URL = import.meta.env.VITE_AMP_URL;
 const REFETCHINTERVAL_IN_MS = 10000;
@@ -8,11 +8,11 @@ export const API_ENDPOINTS = {
     getExports: `${BASE_API_URL}/exports/history`,
 };
 
-async function getExportJobs(): Promise<ExportResponse[]> {
+async function getExportJobs(page = 1, pageSize = 10): Promise<PaginatedExportsResponse> {
     let response;
 
     try {
-        response = await fetch(API_ENDPOINTS.getExports);
+        response = await fetch(`${API_ENDPOINTS.getExports}?page=${page}&page_size=${pageSize}`);
 
         if (!response.ok) {
             return Promise.reject(response.statusText);
@@ -21,13 +21,17 @@ async function getExportJobs(): Promise<ExportResponse[]> {
         return Promise.reject(error);
     }
 
-    const exportResponse: ExportResponse[] = await response.json();
+    const exportResponse = await response.json();
     return exportResponse;
 };
 
-
-const useGetExportJobs = () => {
-    return useQuery({ queryKey: [`${API_ENDPOINTS.getExports}`], refetchIntervalInBackground: true, refetchInterval: REFETCHINTERVAL_IN_MS, queryFn: getExportJobs })
+const useGetExportJobs = (page = 1, pageSize = 10) => {
+    return useQuery<PaginatedExportsResponse>({ 
+        queryKey: [`${API_ENDPOINTS.getExports}`, page, pageSize], 
+        queryFn: () => getExportJobs(page, pageSize),
+        refetchIntervalInBackground: true, 
+        refetchInterval: REFETCHINTERVAL_IN_MS 
+    });
 };
 
 export { useGetExportJobs };

app/client/src/api/Export/response.ts

@@ -10,4 +10,7 @@ export interface ExportResponse {
     job_status: JobStatus;
     local_export_path: string;
     timestamp: string;
-}
+};
+
+// Add paginated response types
+export type PaginatedExportsResponse = PaginatedResponse<ExportResponse>;

app/client/src/api/api.ts

@@ -27,8 +27,11 @@ export const useFetchModels = (): UseFetchApiReturn<FetchModelsResp> => {
     return useFetch(url);
 }
 
-export const useFetchDefaultPrompt = (useCase: string): UseFetchApiReturn<FetchDefaultPromptResp> => {
-    const url = `${baseUrl}/${isEmpty(useCase) ? 'custom' : useCase}/gen_prompt`;
+export const useFetchDefaultPrompt = (useCase: string, workflowType?: WorkerType): UseFetchApiReturn<FetchDefaultPromptResp> => {
+    let url = `${baseUrl}/${isEmpty(useCase) ? 'custom' : useCase}/gen_prompt`;
+    if (workflowType && workflowType === 'freeform') {
+        url = `${baseUrl}/${isEmpty(useCase) ? 'custom' : useCase}/gen_freeform_prompt`;
+    }
     return useFetch(url);
 }
 
@@ -42,7 +45,7 @@ export const useFetchDefaultModelParams = (): UseFetchApiReturn<FetchDefaultPara
     return useFetch(url);
 }
 
-export const useTriggerDatagen = <T>() => {
-    const genDatasetUrl = `${import.meta.env.VITE_AMP_URL}/synthesis/generate`;
+export const useTriggerDatagen = <T>(workflow_type: string) => {
+    const genDatasetUrl = `${import.meta.env.VITE_AMP_URL}/synthesis/${workflow_type === 'freeform' ? 'freeform' : 'generate'}`;
     return usePostApi<T>(genDatasetUrl);
 }