Merge branch 'main' into 200538-so-names

elasticmachine · web-flow · commit f277dda5e7d6 · 2025-01-17T13:30:23.000Z
diff --git a/x-pack/solutions/search/plugins/search_playground/__mocks__/fetch_query_source_fields.mock.ts b/x-pack/solutions/search/plugins/search_playground/__mocks__/fetch_query_source_fields.mock.ts
@@ -11,10 +11,10 @@ export const SPARSE_SEMANTIC_FIELD_FIELD_CAPS = {
   indices: ['test-index2'],
   fields: {
     infer_field: {
-      semantic_text: {
-        type: 'semantic_text',
+      text: {
+        type: 'text',
         metadata_field: false,
-        searchable: false,
+        searchable: true,
         aggregatable: false,
       },
     },
@@ -127,10 +127,10 @@ export const DENSE_SEMANTIC_FIELD_FIELD_CAPS = {
   indices: ['test-index2'],
   fields: {
     infer_field: {
-      semantic_text: {
-        type: 'semantic_text',
+      text: {
+        type: 'text',
         metadata_field: false,
-        searchable: false,
+        searchable: true,
         aggregatable: false,
       },
     },
diff --git a/x-pack/solutions/search/plugins/search_playground/server/lib/fetch_query_source_fields.ts b/x-pack/solutions/search/plugins/search_playground/server/lib/fetch_query_source_fields.ts
@@ -244,10 +244,9 @@ export const parseFieldsCapabilities = (
           (indexModelIdField) => indexModelIdField.index === index
         )!;
         const nestedField = isFieldNested(fieldKey, fieldCapsResponse);
+        const semanticFieldMapping = getSemanticField(fieldKey, semanticTextFields);
 
-        if (isFieldInIndex(field, 'semantic_text', index)) {
-          const semanticFieldMapping = getSemanticField(fieldKey, semanticTextFields);
-
+        if (isFieldInIndex(field, 'text', index) && semanticFieldMapping) {
           // only use this when embeddingType and inferenceId is defined
           // this requires semantic_text field to be set up correctly and ingested
           if (
@@ -260,7 +259,7 @@ export const parseFieldsCapabilities = (
               field: fieldKey,
               inferenceId: semanticFieldMapping.inferenceId,
               embeddingType: semanticFieldMapping.embeddingType,
-              indices: (field.semantic_text.indices as string[]) || indicesPresentIn,
+              indices: (field.text.indices as string[]) || indicesPresentIn,
             };
 
             acc[index].semantic_fields.push(semanticField);
diff --git a/x-pack/solutions/search/plugins/search_playground/server/utils/stream_factory.ts b/x-pack/solutions/search/plugins/search_playground/server/utils/stream_factory.ts
@@ -107,7 +107,7 @@ export function streamFactory(logger: Logger, isCloud: boolean = false): StreamF
     );
 
     if (line === undefined) {
-      logger.error('Stream chunk must not be undefined.');
+      logDebugMessage('Stream chunk must not be undefined.');
       return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ export function streamFactory(logger: Logger, isCloud: boolean = false): StreamF`
`107`	`107`	`);`
`108`	`108`
`109`	`109`	`if (line === undefined) {`
`110`		`- logger.error('Stream chunk must not be undefined.');`
	`110`	`+ logDebugMessage('Stream chunk must not be undefined.');`
`111`	`111`	`return;`
`112`	`112`	`}`
`113`	`113`