Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport main] Update new index mappings if selecting from existing index #674

Merged
merged 1 commit into from
Mar 12, 2025
Merged

[Backport main] Update new index mappings if selecting from existing index #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export function SourceData(props: SourceDataProps) {
// helper fn to parse out some useful info from the ML ingest processor config, if applicable
// takes on the assumption the first processor is an ML inference processor, and should
// only be executed for workflows coming from preset vector search use cases.
export function getProcessorInfo(
function getProcessorInfo(
uiConfig: WorkflowConfig,
values: WorkflowFormValues
): {
Expand Down
61 changes: 34 additions & 27 deletions public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import {
} from '@elastic/eui';
import { JsonLinesField } from '../input_fields';
import {
customStringify,
customStringifySingleLine,
FETCH_ALL_QUERY_LARGE,
IConfigField,
IndexMappings,
IngestDocsFormValues,
isVectorSearchUseCase,
JSONLINES_LINK,
MAX_BYTES_FORMATTED,
MAX_DOCS_TO_IMPORT,
Expand All @@ -48,10 +48,10 @@ import {
} from '../../../../store';
import {
getDataSourceId,
getExistingVectorField,
getFieldSchema,
getInitialValue,
} from '../../../../utils';
import { getProcessorInfo } from './source_data';
import '../../../../global-styles.scss';

interface SourceDataProps {
Expand All @@ -71,6 +71,7 @@ export function SourceDataModal(props: SourceDataProps) {
const dataSourceId = getDataSourceId();
const { values, setFieldValue } = useFormikContext<WorkflowFormValues>();
const indices = useSelector((state: AppState) => state.opensearch.indices);
const indexMappingsPath = 'ingest.index.mappings';

// sub-form values/schema
const docsFormValues = {
Expand Down Expand Up @@ -110,33 +111,39 @@ export function SourceDataModal(props: SourceDataProps) {
// 1. Update the form with the temp docs
setFieldValue('ingest.docs', tempDocs);

// 2. Update several form values if an index is selected (and if vector search)
// 2. Update several form values if an index is selected. Persist any preset/existing
// embedding fields in the mappings, if found
if (selectedIndex !== undefined) {
if (isVectorSearchUseCase(props.workflow?.ui_metadata?.type)) {
dispatch(getMappings({ index: selectedIndex, dataSourceId }))
.unwrap()
.then((resp: IndexMappings) => {
const { processorId, inputMapEntry } = getProcessorInfo(
props.uiConfig,
values
);
if (processorId !== undefined && inputMapEntry !== undefined) {
// set/overwrite default text field for the input map. may be empty.
if (inputMapEntry !== undefined) {
const textFieldFormPath = `ingest.enrich.${processorId}.input_map.0.0.value`;
const curTextField = getIn(values, textFieldFormPath) as string;
if (!Object.keys(resp.properties).includes(curTextField)) {
const defaultTextField =
Object.keys(resp.properties).find((fieldName) => {
return resp.properties[fieldName]?.type === 'text';
}) || '';
setFieldValue(textFieldFormPath, defaultTextField);
setIsUpdating(false);
}
dispatch(getMappings({ index: selectedIndex, dataSourceId }))
.unwrap()
.then((resp: IndexMappings) => {
if (!isEmpty(resp)) {
let updatedMappings = resp;
try {
let existingMappingsObj = JSON.parse(
getIn(values, indexMappingsPath)
);
const existingEmbeddingField = getExistingVectorField(
existingMappingsObj
);
const existingEmbeddingFieldValue = getIn(
existingMappingsObj,
`properties.${existingEmbeddingField}`
);
if (
existingEmbeddingField !== undefined &&
existingEmbeddingFieldValue !== undefined
) {
updatedMappings.properties = {
...updatedMappings.properties,
[existingEmbeddingField]: existingEmbeddingFieldValue,
};
}
}
});
}
} catch {}
setFieldValue(indexMappingsPath, customStringify(updatedMappings));
}
setIsUpdating(false);
});
} else {
setIsUpdating(false);
}
Expand Down
14 changes: 10 additions & 4 deletions public/utils/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,10 +897,7 @@ export function removeVectorFieldFromIndexMappings(
): string {
try {
let existingMappingsObj = JSON.parse(existingMappings);
const existingEmbeddingField = findKey(
existingMappingsObj?.properties,
(field) => field.type === 'knn_vector'
);
const existingEmbeddingField = getExistingVectorField(existingMappingsObj);
if (existingEmbeddingField !== undefined) {
unset(existingMappingsObj?.properties, existingEmbeddingField);
}
Expand All @@ -910,6 +907,15 @@ export function removeVectorFieldFromIndexMappings(
}
}

export function getExistingVectorField(
existingMappings: any
): string | undefined {
return findKey(
existingMappings?.properties,
(field) => field.type === 'knn_vector'
);
}

// Parse out any hidden errors within a 2xx ingest response
export function parseErrorsFromIngestResponse(
ingestResponse: any
Expand Down
Loading