Update preset filter fns

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>

Author: ohltyler

common/utils.ts

@@ -44,15 +44,26 @@ export function customStringifySingleLine(jsonObj: {}): string {
   return JSON.stringify(jsonObj, undefined, 0);
 }
 
-export function isVectorSearchUseCase(workflow: Workflow | undefined): boolean {
+export function isVectorSearchUseCase(workflowType?: WORKFLOW_TYPE): boolean {
   return (
-    workflow?.ui_metadata?.type !== undefined &&
+    workflowType !== undefined &&
     [
-      WORKFLOW_TYPE.HYBRID_SEARCH,
-      WORKFLOW_TYPE.MULTIMODAL_SEARCH,
       WORKFLOW_TYPE.SEMANTIC_SEARCH,
+      WORKFLOW_TYPE.MULTIMODAL_SEARCH,
+      WORKFLOW_TYPE.HYBRID_SEARCH,
+      WORKFLOW_TYPE.VECTOR_SEARCH_WITH_RAG,
+      WORKFLOW_TYPE.HYBRID_SEARCH_WITH_RAG,
+    ].includes(workflowType)
+  );
+}
+
+export function isRAGUseCase(workflowType?: WORKFLOW_TYPE): boolean {
+  return (
+    workflowType !== undefined &&
+    [
+      WORKFLOW_TYPE.RAG,
       WORKFLOW_TYPE.VECTOR_SEARCH_WITH_RAG,
       WORKFLOW_TYPE.HYBRID_SEARCH_WITH_RAG,
-    ].includes(workflow?.ui_metadata?.type)
+    ].includes(workflowType)
   );
 }

public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data.tsx

@@ -68,7 +68,7 @@ export function SourceData(props: SourceDataProps) {
 
     // try to clear out any default values for the ML ingest processor, if applicable
     if (
-      isVectorSearchUseCase(props.workflow) &&
+      isVectorSearchUseCase(props.workflow?.ui_metadata?.type) &&
       isEditModalOpen &&
       selectedOption !== SOURCE_OPTIONS.EXISTING_INDEX
     ) {

public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data_modal.tsx

@@ -112,7 +112,7 @@ export function SourceDataModal(props: SourceDataProps) {
 
     // 2. Update several form values if an index is selected (and if vector search)
     if (selectedIndex !== undefined) {
-      if (isVectorSearchUseCase(props.workflow)) {
+      if (isVectorSearchUseCase(props.workflow?.ui_metadata?.type)) {
         dispatch(getMappings({ index: selectedIndex, dataSourceId }))
           .unwrap()
           .then((resp: IndexMappings) => {

public/pages/workflows/new_workflow/quick_configure_modal.tsx

@@ -59,6 +59,7 @@ import {
   MODEL_STATE,
   ML_REMOTE_MODEL_LINK,
   MODEL_CATEGORY,
+  isRAGUseCase,
 } from '../../../../common';
 import { APP_PATH, getInitialValue } from '../../../utils';
 import { AppState, createWorkflow, useAppDispatch } from '../../../store';
@@ -140,11 +141,7 @@ export function QuickConfigureModal(props: QuickConfigureModalProps) {
     // If not custom/blank, we will have more req'd form fields for the users to supply
     if (workflowType !== WORKFLOW_TYPE.CUSTOM) {
       // if a RAG workflow, require an LLM
-      if (
-        workflowType === WORKFLOW_TYPE.RAG ||
-        workflowType === WORKFLOW_TYPE.VECTOR_SEARCH_WITH_RAG ||
-        workflowType === WORKFLOW_TYPE.HYBRID_SEARCH_WITH_RAG
-      ) {
+      if (isRAGUseCase(workflowType)) {
         tempFormValues = {
           ...tempFormValues,
           llm: getInitialValue('model'),
@@ -298,30 +295,25 @@ export function QuickConfigureModal(props: QuickConfigureModalProps) {
                       />
                     </EuiFlexItem>
                   )}
-                {(props.workflow?.ui_metadata?.type === WORKFLOW_TYPE.RAG ||
-                  props.workflow?.ui_metadata?.type ===
-                    WORKFLOW_TYPE.VECTOR_SEARCH_WITH_RAG ||
-                  props.workflow?.ui_metadata?.type ===
-                    WORKFLOW_TYPE.HYBRID_SEARCH_WITH_RAG) &&
-                  !isEmpty(deployedModels) && (
-                    <EuiFlexItem>
-                      <ModelField
-                        modelCategory={MODEL_CATEGORY.LLM}
-                        fieldPath="llm"
-                        showMissingInterfaceCallout={false}
-                        label="Large language model"
-                        helpText="The large language model to generate user-friendly responses."
-                        fullWidth={true}
-                        showError={true}
-                        onModelChange={(modelId) =>
-                          setQuickConfigureFields({
-                            ...quickConfigureFields,
-                            llmId: modelId,
-                          })
-                        }
-                      />
-                    </EuiFlexItem>
-                  )}
+                {isRAGUseCase(props.workflow?.ui_metadata?.type) && (
+                  <EuiFlexItem>
+                    <ModelField
+                      modelCategory={MODEL_CATEGORY.LLM}
+                      fieldPath="llm"
+                      showMissingInterfaceCallout={false}
+                      label="Large language model"
+                      helpText="The large language model to generate user-friendly responses."
+                      fullWidth={true}
+                      showError={true}
+                      onModelChange={(modelId) =>
+                        setQuickConfigureFields({
+                          ...quickConfigureFields,
+                          llmId: modelId,
+                        })
+                      }
+                    />
+                  </EuiFlexItem>
+                )}
                 {props.workflow?.ui_metadata?.type !== WORKFLOW_TYPE.CUSTOM &&
                   props.workflow?.ui_metadata?.type !== WORKFLOW_TYPE.RAG &&
                   !isEmpty(deployedModels) && (
@@ -452,7 +444,7 @@ function injectQuickConfigureFields(
             workflow.ui_metadata.config,
             quickConfigureFields,
             embeddingModelInterface,
-            isVectorSearchUseCase(workflow)
+            isVectorSearchUseCase(workflow?.ui_metadata?.type)
           );
           workflow.ui_metadata.config = updateIndexConfig(
             workflow.ui_metadata.config,
@@ -466,7 +458,7 @@ function injectQuickConfigureFields(
             workflow.ui_metadata.config,
             quickConfigureFields,
             embeddingModelInterface,
-            isVectorSearchUseCase(workflow)
+            isVectorSearchUseCase(workflow?.ui_metadata?.type)
           );
         }
         break;
@@ -492,7 +484,7 @@ function injectQuickConfigureFields(
             workflow.ui_metadata.config,
             quickConfigureFields,
             embeddingModelInterface,
-            isVectorSearchUseCase(workflow)
+            isVectorSearchUseCase(workflow?.ui_metadata?.type)
           );
           workflow.ui_metadata.config = updateIndexConfig(
             workflow.ui_metadata.config,
@@ -506,7 +498,7 @@ function injectQuickConfigureFields(
             workflow.ui_metadata.config,
             quickConfigureFields,
             embeddingModelInterface,
-            isVectorSearchUseCase(workflow)
+            isVectorSearchUseCase(workflow?.ui_metadata?.type)
           );
           workflow.ui_metadata.config = updateRAGSearchResponseProcessors(
             workflow.ui_metadata.config,

public/pages/workflows/new_workflow/quick_configure_optional_fields.tsx

@@ -26,6 +26,8 @@ import {
   ModelInterface,
   QuickConfigureFields,
   WORKFLOW_TYPE,
+  isRAGUseCase,
+  isVectorSearchUseCase,
 } from '../../../../common';
 import { AppState } from '../../../store';
 import { getEmbeddingModelDimensions, parseModelInputs } from '../../../utils';
@@ -199,11 +201,7 @@ export function QuickConfigureOptionalFields(
             <EuiSpacer size="s" />
           </>
         )}
-        {(props.workflowType === WORKFLOW_TYPE.SEMANTIC_SEARCH ||
-          props.workflowType === WORKFLOW_TYPE.MULTIMODAL_SEARCH ||
-          props.workflowType === WORKFLOW_TYPE.HYBRID_SEARCH ||
-          props.workflowType === WORKFLOW_TYPE.VECTOR_SEARCH_WITH_RAG ||
-          props.workflowType === WORKFLOW_TYPE.HYBRID_SEARCH_WITH_RAG) && (
+        {isVectorSearchUseCase(props.workflowType) && (
           <>
             <EuiCompressedFormRow
               fullWidth={true}
@@ -246,9 +244,7 @@ export function QuickConfigureOptionalFields(
             )}
           </>
         )}
-        {(props.workflowType === WORKFLOW_TYPE.RAG ||
-          props.workflowType === WORKFLOW_TYPE.VECTOR_SEARCH_WITH_RAG ||
-          props.workflowType === WORKFLOW_TYPE.HYBRID_SEARCH_WITH_RAG) && (
+        {isRAGUseCase(props.workflowType) && (
           <>
             <EuiCompressedFormRow
               fullWidth={true}