[Search] Consolidate ML model fetch calls

x-pack/plugins/enterprise_search/common/ml_inference_pipeline/index.ts

@@ -17,6 +17,7 @@ import {
   TRAINED_MODEL_TYPE,
   BUILT_IN_MODEL_TAG,
 } from '@kbn/ml-trained-models-utils';
+import { MlModel } from '../types/ml';
 
 import {
   MlInferencePipeline,
@@ -33,7 +34,7 @@ export interface MlInferencePipelineParams {
   description?: string;
   fieldMappings: FieldMapping[];
   inferenceConfig?: InferencePipelineInferenceConfig;
-  model: MlTrainedModelConfig;
+  model: MlModel;
   pipelineName: string;
 }
 
@@ -90,7 +91,7 @@ export const generateMlInferencePipelineBody = ({
             model_version: model.version,
             pipeline: pipelineName,
             processed_timestamp: '{{{ _ingest.timestamp }}}',
-            types: getMlModelTypesForModelConfig(model),
+            types: model.types,
           },
         ],
       },
@@ -104,19 +105,19 @@ export const getInferenceProcessor = (
   sourceField: string,
   targetField: string,
   inferenceConfig: InferencePipelineInferenceConfig | undefined,
-  model: MlTrainedModelConfig,
+  model: MlModel,
   pipelineName: string
 ): IngestInferenceProcessor => {
   // If model returned no input field, insert a placeholder
   const modelInputField =
-    model.input?.field_names?.length > 0 ? model.input.field_names[0] : 'MODEL_INPUT_FIELD';
+    model.inputFieldNames.length > 0 ? model.inputFieldNames[0] : 'MODEL_INPUT_FIELD';
 
   return {
     field_map: {
       [sourceField]: modelInputField,
     },
     inference_config: inferenceConfig,
-    model_id: model.model_id,
+    model_id: model.modelId,
     on_failure: [
       {
         append: {

x-pack/plugins/enterprise_search/common/types/ml.ts

@@ -27,6 +27,10 @@ export interface MlModel {
   modelId: string;
   /** Model inference type, e.g. ner, text_classification */
   type: string;
+  /** Type-related tags: model type (e.g. pytorch), inference type, built-in tag */
+  types: string[];
+  /** Field names in inference input configuration */
+  inputFieldNames: string[];
   title: string;
   description?: string;
   licenseType?: string;
@@ -44,4 +48,5 @@ export interface MlModel {
   isPlaceholder: boolean;
   /** Does this model have deployment stats? */
   hasStats: boolean;
+  version?: string;
 }