feat(components): Move ModelImportEvaluationOp component to preview n…

…amespace PiperOrigin-RevId: 628459625
kubeflow · Apr 26, 2024 · 33db128 · 33db128
1 parent efefe34
commit 33db128
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 55 deletions.
diff --git a/components/google-cloud/RELEASE.md b/components/google-cloud/RELEASE.md
@@ -4,6 +4,7 @@
 * Use larger base reward model when tuning `text-bison@001`, `chat-bison@001` and `t5-xxl` with the `preview.llm.rlhf_pipeline`.
 * Move `preview.model_evaluation.autosxs_pipeline` to `v1.model_evaluation.autosxs_pipeline`.
 * Remove default prediction column names in `v1.model_evaluation.classification_component` component to fix pipeline errors when using bigquery data source.
+* Move `_implementation.model_evaluation.ModelImportEvaluationOp` component to preview namespace `preview.model_evaluation.ModelImportEvaluationOp`.
 * Drop support for Python 3.7 since it has reached end-of-life.
 * Expand number of regions supported by `preview.llm.rlhf_pipeline`.
 * Apply latest GCPC image vulnerability resolutions (base OS and software updates).

diff --git a/...oogle-cloud/google_cloud_pipeline_components/_implementation/model_evaluation/__init__.py b/...oogle-cloud/google_cloud_pipeline_components/_implementation/model_evaluation/__init__.py
@@ -25,27 +25,18 @@
 from google_cloud_pipeline_components._implementation.model_evaluation.feature_attribution.feature_attribution_graph_component import feature_attribution_graph_component as FeatureAttributionGraphComponentOp
 from google_cloud_pipeline_components._implementation.model_evaluation.feature_extractor.component import feature_extractor_error_analysis as FeatureExtractorOp
 from google_cloud_pipeline_components._implementation.model_evaluation.import_evaluated_annotation.component import evaluated_annotation_import as ModelImportEvaluatedAnnotationOp
-from google_cloud_pipeline_components._implementation.model_evaluation.import_evaluation.component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_classification_postprocessor.component import llm_classification_predictions_postprocessor_graph_component as LLMEvaluationClassificationPredictionsPostprocessorOp
-from google_cloud_pipeline_components._implementation.model_evaluation.llm_embedding.evaluation_llm_embedding_pipeline import evaluation_llm_embedding_pipeline
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_embedding_retrieval.component import llm_embedding_retrieval as LLMEmbeddingRetrievalOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_evaluation.component import model_evaluation_text_generation as LLMEvaluationTextGenerationOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_evaluation_preprocessor.component import llm_evaluation_dataset_preprocessor_graph_component as LLMEvaluationPreprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_information_retrieval_preprocessor.component import llm_information_retrieval_preprocessor as LLMInformationRetrievalPreprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_retrieval_metrics.component import llm_retrieval_metrics as LLMRetrievalMetricsOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_safety_bias.component import llm_safety_bias_metrics as LLMSafetyBiasMetricsOp
-from google_cloud_pipeline_components._implementation.model_evaluation.llm_safety_bias.evaluation_llm_safety_bias_pipeline import evaluation_llm_safety_bias_pipeline
-from google_cloud_pipeline_components._implementation.model_evaluation.model_inference.component import model_inference_and_evaluation_component
-from google_cloud_pipeline_components._implementation.model_evaluation.model_inference.component import model_inference_component
 from google_cloud_pipeline_components._implementation.model_evaluation.model_name_preprocessor.component import model_name_preprocessor as ModelNamePreprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation.target_field_data_remover.component import target_field_data_remover as TargetFieldDataRemoverOp
-from google_cloud_pipeline_components._implementation.model_evaluation.text2sql.evaluation_llm_text2sql_pipeline import evaluation_llm_text2sql_pipeline
 
 
 __all__ = [
-    'evaluation_llm_safety_bias_pipeline',
-    'evaluation_llm_embedding_pipeline',
-    'evaluation_llm_text2sql_pipeline',
     'evaluation_llm_endpoint_batch_predict_pipeline_graph_component',
     'ChunkingOp',
     'EvaluationDataSamplerOp',
@@ -63,9 +54,6 @@
     'LLMSafetyBiasMetricsOp',
     'ModelEvaluationFeatureAttributionOp',
     'ModelImportEvaluatedAnnotationOp',
-    'ModelImportEvaluationOp',
     'ModelNamePreprocessorOp',
     'TargetFieldDataRemoverOp',
-    'model_inference_component',
-    'model_inference_and_evaluation_component',
 ]
diff --git a/..._cloud_pipeline_components/_implementation/model_evaluation/import_evaluation/__init__.py b/..._cloud_pipeline_components/_implementation/model_evaluation/import_evaluation/__init__.py
diff --git a/...nents/_implementation/model_evaluation/llm_embedding/evaluation_llm_embedding_pipeline.py b/...nents/_implementation/model_evaluation/llm_embedding/evaluation_llm_embedding_pipeline.py
@@ -14,11 +14,12 @@
 """LLM embedding evaluation pipeline based on information retrieval (IR) task."""
 
 from typing import Dict, Optional, Union
+
 from google_cloud_pipeline_components._implementation.model_evaluation.endpoint_batch_predict.component import evaluation_llm_endpoint_batch_predict_pipeline_graph_component as LLMEndpointBatchPredictOp
-from google_cloud_pipeline_components._implementation.model_evaluation.import_evaluation.component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_embedding_retrieval.component import llm_embedding_retrieval as LLMEmbeddingRetrievalOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_information_retrieval_preprocessor.component import llm_information_retrieval_preprocessor as LLMInformationRetrievalPreprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation.llm_retrieval_metrics.component import llm_retrieval_metrics as LLMRetrievalMetricsOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.types.artifact_types import VertexModel
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp
 import kfp

diff --git a/...onents/google-cloud/google_cloud_pipeline_components/preview/model_evaluation/__init__.py b/...onents/google-cloud/google_cloud_pipeline_components/preview/model_evaluation/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,10 +17,12 @@
 from google_cloud_pipeline_components.preview.model_evaluation.feature_attribution_component import feature_attribution as ModelEvaluationFeatureAttributionOp
 from google_cloud_pipeline_components.preview.model_evaluation.feature_attribution_graph_component import feature_attribution_graph_component as FeatureAttributionGraphComponentOp
 from google_cloud_pipeline_components.preview.model_evaluation.model_bias_component import detect_model_bias as DetectModelBiasOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.v1.model_evaluation.evaluation_llm_classification_pipeline import evaluation_llm_classification_pipeline
 from google_cloud_pipeline_components.v1.model_evaluation.evaluation_llm_text_generation_pipeline import evaluation_llm_text_generation_pipeline
 from google_cloud_pipeline_components.v1.model_evaluation.model_based_llm_evaluation.autosxs.autosxs_pipeline import autosxs_pipeline
 
+
 __all__ = [
     'autosxs_pipeline',
     'evaluation_llm_classification_pipeline',
@@ -29,4 +31,5 @@
     'FeatureAttributionGraphComponentOp',
     'DetectModelBiasOp',
     'DetectDataBiasOp',
+    'ModelImportEvaluationOp',
 ]
diff --git a/...evaluation/import_evaluation/component.py → ...tion/model_evaluation_import_component.py b/...evaluation/import_evaluation/component.py → ...tion/model_evaluation_import_component.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,8 +53,9 @@ def model_evaluation_import(
 
   For more details, see
   https://cloud.google.com/vertex-ai/docs/reference/rest/v1/projects.locations.models.evaluations
-  One of the four metrics inputs must be provided, metrics & problem_type,
-  classification_metrics, regression_metrics, or forecasting_metrics.
+  One of the metrics inputs must be provided, metrics & problem_type,
+  classification_metrics, regression_metrics, or forecasting_metrics, text_generation_metrics,
+  question_answering_metrics, summarization_metrics, embedding_metrics.
 
   Args:
     model: Vertex model resource that will be the parent resource of the

diff --git a/...gle-cloud/google_cloud_pipeline_components/v1/model_evaluation/error_analysis_pipeline.py b/...gle-cloud/google_cloud_pipeline_components/v1/model_evaluation/error_analysis_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 from google_cloud_pipeline_components._implementation.model_evaluation import EvaluationDatasetPreprocessorOp as DatasetPreprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation import FeatureExtractorOp
 from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluatedAnnotationOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp
 from google_cloud_pipeline_components.v1.dataset import GetVertexDatasetOp
 from google_cloud_pipeline_components.v1.model_evaluation.classification_component import model_evaluation_classification as ModelEvaluationClassificationOp
@@ -224,14 +224,12 @@ def vision_model_error_analysis_pipeline(  # pylint: disable=dangerous-default-v
     )
 
   with dsl.Condition(
-      (
-          (
-              test_dataset_resource_name == ''
-              and training_dataset_resource_name == ''
-              and test_dataset_annotation_set_name == ''
-              and training_dataset_annotation_set_name == ''
-          )
-      ),
+      ((
+          test_dataset_resource_name == ''
+          and training_dataset_resource_name == ''
+          and test_dataset_annotation_set_name == ''
+          and training_dataset_annotation_set_name == ''
+      )),
       name='CustomDataset',
   ):
     dataset_preprocessor_task = DatasetPreprocessorOp(

diff --git a/...oud/google_cloud_pipeline_components/v1/model_evaluation/evaluated_annotation_pipeline.py b/...oud/google_cloud_pipeline_components/v1/model_evaluation/evaluated_annotation_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 from google_cloud_pipeline_components._implementation.model_evaluation import EvaluatedAnnotationOp
 from google_cloud_pipeline_components._implementation.model_evaluation import EvaluationDatasetPreprocessorOp as DatasetPreprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluatedAnnotationOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp
 from google_cloud_pipeline_components.v1.dataset import GetVertexDatasetOp
 from google_cloud_pipeline_components.v1.model_evaluation.classification_component import model_evaluation_classification as ModelEvaluationClassificationOp

diff --git a/..._components/v1/model_evaluation/evaluation_automl_tabular_feature_attribution_pipeline.py b/..._components/v1/model_evaluation/evaluation_automl_tabular_feature_attribution_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 from google_cloud_pipeline_components import _placeholders
 from google_cloud_pipeline_components._implementation.model import GetVertexModelOp
 from google_cloud_pipeline_components._implementation.model_evaluation import FeatureAttributionGraphComponentOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.types.artifact_types import ClassificationMetrics
 from google_cloud_pipeline_components.types.artifact_types import RegressionMetrics
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp

diff --git a/...oogle_cloud_pipeline_components/v1/model_evaluation/evaluation_automl_tabular_pipeline.py b/...oogle_cloud_pipeline_components/v1/model_evaluation/evaluation_automl_tabular_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 from google_cloud_pipeline_components import _placeholders
 from google_cloud_pipeline_components._implementation.model import GetVertexModelOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.types.artifact_types import ClassificationMetrics
 from google_cloud_pipeline_components.types.artifact_types import RegressionMetrics
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp

diff --git a/...ud_pipeline_components/v1/model_evaluation/evaluation_automl_unstructure_data_pipeline.py b/...ud_pipeline_components/v1/model_evaluation/evaluation_automl_unstructure_data_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 from google_cloud_pipeline_components import _placeholders
 from google_cloud_pipeline_components._implementation.model import GetVertexModelOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
 from google_cloud_pipeline_components._implementation.model_evaluation import TargetFieldDataRemoverOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.types.artifact_types import ClassificationMetrics
 from google_cloud_pipeline_components.types.artifact_types import RegressionMetrics
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp

diff --git a/..._cloud_pipeline_components/v1/model_evaluation/evaluation_feature_attribution_pipeline.py b/..._cloud_pipeline_components/v1/model_evaluation/evaluation_feature_attribution_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 from google_cloud_pipeline_components import _placeholders
 from google_cloud_pipeline_components._implementation.model import GetVertexModelOp
 from google_cloud_pipeline_components._implementation.model_evaluation import FeatureAttributionGraphComponentOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
 from google_cloud_pipeline_components._implementation.model_evaluation import TargetFieldDataRemoverOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.types.artifact_types import ClassificationMetrics
 from google_cloud_pipeline_components.types.artifact_types import RegressionMetrics
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp

diff --git a/...e_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_classification_pipeline.py b/...e_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_classification_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,13 +17,15 @@
 
 from google_cloud_pipeline_components._implementation.model_evaluation import LLMEvaluationClassificationPredictionsPostprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation import LLMEvaluationPreprocessorOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
 from google_cloud_pipeline_components._implementation.model_evaluation import ModelNamePreprocessorOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.types.artifact_types import ClassificationMetrics
 from google_cloud_pipeline_components.types.artifact_types import VertexModel
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp
 from google_cloud_pipeline_components.v1.model_evaluation.classification_component import model_evaluation_classification as ModelEvaluationClassificationOp
 from kfp import dsl
+
+
 # pylint: disable=unused-argument, unexpected-keyword-arg
 
 _PIPELINE_NAME = 'evaluation-llm-classification-pipeline'

diff --git a/..._cloud_pipeline_components/v1/model_evaluation/evaluation_llm_text_generation_pipeline.py b/..._cloud_pipeline_components/v1/model_evaluation/evaluation_llm_text_generation_pipeline.py
@@ -1,4 +1,4 @@
-# Copyright 2023 The Kubeflow Authors. All Rights Reserved.
+# Copyright 2024 The Kubeflow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 
 from google_cloud_pipeline_components._implementation.model_evaluation import LLMEvaluationPreprocessorOp
 from google_cloud_pipeline_components._implementation.model_evaluation import LLMEvaluationTextGenerationOp
-from google_cloud_pipeline_components._implementation.model_evaluation import ModelImportEvaluationOp
 from google_cloud_pipeline_components._implementation.model_evaluation import ModelNamePreprocessorOp
+from google_cloud_pipeline_components.preview.model_evaluation.model_evaluation_import_component import model_evaluation_import as ModelImportEvaluationOp
 from google_cloud_pipeline_components.types.artifact_types import VertexModel
 from google_cloud_pipeline_components.v1.batch_predict_job import ModelBatchPredictOp
 from kfp import dsl
+
+
 # pylint: disable=unused-argument, unexpected-keyword-arg