disable View Training Data if original job no longer exists

elastic · Nov 10, 2023 · a407ee2 · a407ee2
1 parent 85d4522
commit a407ee2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 2 deletions.
diff --git a/x-pack/plugins/ml/common/types/trained_models.ts b/x-pack/plugins/ml/common/types/trained_models.ts
@@ -98,6 +98,7 @@ export type TrainedModelConfigResponse = estypes.MlTrainedModelConfig & {
    * Associated pipelines. Extends response from the ES endpoint.
    */
   pipelines?: Record<string, PipelineDefinition> | null;
+  origin_job_exists?: boolean;
 
   metadata?: {
     analytics_config: DataFrameAnalyticsConfig;

diff --git a/x-pack/plugins/ml/public/application/model_management/model_actions.tsx b/x-pack/plugins/ml/public/application/model_management/model_actions.tsx
@@ -142,6 +142,7 @@ export function useModelActions({
         icon: 'visTable',
         type: 'icon',
         available: (item) => !!item.metadata?.analytics_config?.id,
+        enabled: (item) => item.origin_job_exists === true,
         onClick: async (item) => {
           if (item.metadata?.analytics_config === undefined) return;
 

diff --git a/x-pack/plugins/ml/public/application/model_management/models_list.tsx b/x-pack/plugins/ml/public/application/model_management/models_list.tsx
@@ -79,6 +79,7 @@ export type ModelItem = TrainedModelConfigResponse & {
   type?: string[];
   stats?: Stats & { deployment_stats: TrainedModelDeploymentStatsResponse[] };
   pipelines?: ModelPipelines['pipelines'] | null;
+  origin_job_exists?: boolean;
   deployment_ids: string[];
   putModelConfig?: object;
   state: ModelState;
@@ -214,6 +215,7 @@ export const ModelsList: FC<Props> = ({
       const response = await trainedModelsApiService.getTrainedModels(undefined, {
         with_pipelines: true,
         with_indices: true,
+        with_origin_job_check: true,
       });
 
       const newItems: ModelItem[] = [];

diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
@@ -33,6 +33,7 @@ export interface InferenceQueryParams {
   // Custom kibana endpoint query params
   with_pipelines?: boolean;
   with_indices?: boolean;
+  with_origin_job_check?: boolean;
   include?: 'total_feature_importance' | 'feature_importance_baseline' | string;
 }
 

diff --git a/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts b/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts
@@ -49,6 +49,7 @@ export const getInferenceQuerySchema = schema.object({
   size: schema.maybe(schema.string()),
   with_pipelines: schema.maybe(schema.string()),
   with_indices: schema.maybe(schema.oneOf([schema.string(), schema.boolean()])),
+  with_origin_job_check: schema.maybe(schema.oneOf([schema.string(), schema.boolean()])),
   include: schema.maybe(schema.string()),
 });
 

diff --git a/x-pack/plugins/ml/server/routes/trained_models.ts b/x-pack/plugins/ml/server/routes/trained_models.ts
@@ -90,6 +90,7 @@ export function trainedModelsRoutes(
           const {
             with_pipelines: withPipelines,
             with_indices: withIndicesRaw,
+            with_origin_job_check: withOriginJobCheck,
             ...getTrainedModelsRequestParams
           } = request.query;
 
@@ -191,10 +192,26 @@ export function trainedModelsRoutes(
             mlLog.debug(e);
           }
 
-          const body = filterForEnabledFeatureModels(result, getEnabledFeatures());
+          try {
+            if (withOriginJobCheck) {
+              for (const model of result) {
+                if (typeof model.metadata?.analytics_config?.id === 'string') {
+                  const jobExistsResult = await mlClient.getDataFrameAnalytics({
+                    id: model.metadata?.analytics_config?.id,
+                    size: 1,
+                  });
+                  model.origin_job_exists = jobExistsResult.count === 1;
+                }
+              }
+            }
+          } catch (e) {
+            // Swallow error to prevent blocking trained models result
+          }
+
+          const filteredModels = filterForEnabledFeatureModels(result, getEnabledFeatures());
 
           return response.ok({
-            body,
+            body: filteredModels,
           });
         } catch (e) {
           return response.customError(wrapError(e));