google-cloud-pipeline-components 2.14.0__py3-none-any.whl → 2.14.1__py3-none-any.whl

google_cloud_pipeline_components/preview/model_evaluation/model_evaluation_import_component.py

@@ -0,0 +1,209 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from typing import List, Optional
+
+from google_cloud_pipeline_components import _image
+from google_cloud_pipeline_components.types.artifact_types import ClassificationMetrics
+from google_cloud_pipeline_components.types.artifact_types import ForecastingMetrics
+from google_cloud_pipeline_components.types.artifact_types import RegressionMetrics
+from google_cloud_pipeline_components.types.artifact_types import VertexModel
+from kfp import dsl
+from kfp.dsl import Input
+from kfp.dsl import Metrics
+
+
+@dsl.container_component
+def model_evaluation_import(
+    model: Input[VertexModel],
+    gcp_resources: dsl.OutputPath(str),
+    evaluation_resource_name: dsl.OutputPath(str),
+    metrics: Optional[Input[Metrics]] = None,
+    row_based_metrics: Optional[Input[Metrics]] = None,
+    problem_type: Optional[str] = None,
+    classification_metrics: Optional[Input[ClassificationMetrics]] = None,
+    forecasting_metrics: Optional[Input[ForecastingMetrics]] = None,
+    regression_metrics: Optional[Input[RegressionMetrics]] = None,
+    text_generation_metrics: Optional[Input[Metrics]] = None,
+    question_answering_metrics: Optional[Input[Metrics]] = None,
+    summarization_metrics: Optional[Input[Metrics]] = None,
+    explanation: Optional[Input[Metrics]] = None,
+    feature_attributions: Optional[Input[Metrics]] = None,
+    embedding_metrics: Optional[Input[Metrics]] = None,
+    display_name: str = "",
+    dataset_path: str = "",
+    dataset_paths: List[str] = [],
+    dataset_type: str = "",
+):
+  # fmt: off
+  """Imports a model evaluation artifact to an existing Vertex model with
+  ModelService.ImportModelEvaluation.
+
+  For more details, see
+  https://cloud.google.com/vertex-ai/docs/reference/rest/v1/projects.locations.models.evaluations
+  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
+      uploaded evaluation.
+    metrics: Path of metrics generated from an evaluation component.
+    row_based_metrics:
+      Path of row_based_metrics generated from an evaluation component.
+    problem_type: The problem type of the metrics being imported to the
+      VertexModel. `classification`, `regression`, `forecasting`,
+      `text-generation`, `question-answering`, and `summarization` are the
+      currently supported problem types. Must be provided when `metrics` is
+      provided.
+    classification_metrics: google.ClassificationMetrics artifact generated from
+      the ModelEvaluationClassificationOp component.
+    forecasting_metrics: google.ForecastingMetrics artifact generated from
+      the ModelEvaluationForecastingOp component.
+    regression_metrics: google.ClassificationMetrics artifact generated from
+      the ModelEvaluationRegressionOp component.
+    text_generation_metrics: system.Metrics artifact generated from
+      the LLMEvaluationTextGenerationOp component. Subject to change to
+      google.TextGenerationMetrics.
+    question_answering_metrics: system.Metrics artifact generated from
+      the LLMEvaluationTextGenerationOp component. Subject to change to
+      google.QuestionAnsweringMetrics.
+    summarization_metrics: system.Metrics artifact generated from
+      the LLMEvaluationTextGenerationOp component. Subject to change to
+      google.SummarizationMetrics.
+    explanation: Path for model explanation metrics generated from an evaluation
+      component.
+    feature_attributions: The feature attributions metrics artifact generated
+      from the feature attribution component.
+    embedding_metrics: The embedding metrics artifact generated from the
+      embedding retrieval metrics component.
+    display_name: The display name for the uploaded model evaluation resource.
+  """
+  # fmt: on
+  return dsl.ContainerSpec(
+      image=_image.GCPC_IMAGE_TAG,
+      command=[
+          "python3",
+          "-u",
+          "-m",
+          "google_cloud_pipeline_components.container._implementation.model_evaluation.import_model_evaluation",
+      ],
+      args=[
+          dsl.IfPresentPlaceholder(
+              input_name="metrics",
+              then=[
+                  "--metrics",
+                  metrics.uri,
+                  "--metrics_explanation",
+                  metrics.metadata["explanation_gcs_path"],
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="row_based_metrics",
+              then=[
+                  "--row_based_metrics",
+                  row_based_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="explanation",
+              then=[
+                  "--explanation",
+                  explanation.metadata["explanation_gcs_path"],
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="classification_metrics",
+              then=[
+                  "--classification_metrics",
+                  classification_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="forecasting_metrics",
+              then=[
+                  "--forecasting_metrics",
+                  forecasting_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="regression_metrics",
+              then=[
+                  "--regression_metrics",
+                  regression_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="text_generation_metrics",
+              then=[
+                  "--text_generation_metrics",
+                  text_generation_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="question_answering_metrics",
+              then=[
+                  "--question_answering_metrics",
+                  question_answering_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="summarization_metrics",
+              then=[
+                  "--summarization_metrics",
+                  summarization_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="feature_attributions",
+              then=[
+                  "--feature_attributions",
+                  feature_attributions.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="embedding_metrics",
+              then=[
+                  "--embedding_metrics",
+                  embedding_metrics.uri,
+              ],
+          ),
+          dsl.IfPresentPlaceholder(
+              input_name="problem_type",
+              then=[
+                  "--problem_type",
+                  problem_type,
+              ],
+          ),
+          "--display_name",
+          display_name,
+          "--dataset_path",
+          dataset_path,
+          "--dataset_paths",
+          dataset_paths,
+          "--dataset_type",
+          dataset_type,
+          "--pipeline_job_id",
+          dsl.PIPELINE_JOB_ID_PLACEHOLDER,
+          "--pipeline_job_resource_name",
+          dsl.PIPELINE_JOB_RESOURCE_NAME_PLACEHOLDER,
+          "--model_name",
+          model.metadata["resourceName"],
+          "--gcp_resources",
+          gcp_resources,
+          "--evaluation_resource_name",
+          evaluation_resource_name,
+      ],
+  )

google_cloud_pipeline_components/proto/task_error_pb2.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# Protobuf Python Version: 0.20240502.0
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
+    b'\n\x13task_error.proto\x12\ntask_error""\n\tTaskError\x12\x15\n\rerror_message\x18\x01'
+    b' \x01(\tB\x02P\x01\x62\x06proto3'
+)
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(
+    DESCRIPTOR,
+    'google_cloud_pipeline_components.google_cloud_pipeline_components.proto.task_error_pb2',
+    _globals,
+)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'P\001'
+  _globals['_TASKERROR']._serialized_start = 119
+  _globals['_TASKERROR']._serialized_end = 153
+# @@protoc_insertion_point(module_scope)

google_cloud_pipeline_components/v1/automl/forecasting/prophet_predict_pipeline.yaml

@@ -1461,7 +1461,7 @@ deploymentSpec:
           \ = client.create_dataset(dataset=dataset, exists_ok=exists_ok)\n  return\
           \ collections.namedtuple('Outputs', ['project_id', 'dataset_id'])(\n   \
           \   ref.project, ref.dataset_id)\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-bigquery-delete-dataset-with-prefix:
       container:
         args:
@@ -1495,7 +1495,7 @@ deploymentSpec:
           \    if dataset.dataset_id.startswith(dataset_prefix):\n      client.delete_dataset(\n\
           \          dataset=dataset.dataset_id,\n          delete_contents=delete_contents)\n\
           \n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-bigquery-query-job:
       container:
         args:
@@ -1583,7 +1583,7 @@ deploymentSpec:
           \        'datasetId': dataset_id,\n        'tableId': table_id,\n    }\n\
           \  if write_disposition:\n    config['write_disposition'] = write_disposition\n\
           \  return config\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-build-job-configuration-query-2:
       container:
         args:
@@ -1617,7 +1617,7 @@ deploymentSpec:
           \        'datasetId': dataset_id,\n        'tableId': table_id,\n    }\n\
           \  if write_disposition:\n    config['write_disposition'] = write_disposition\n\
           \  return config\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-get-first-valid:
       container:
         args:
@@ -1641,7 +1641,7 @@ deploymentSpec:
           \  import json\n  # pylint: enable=g-import-not-at-top,import-outside-toplevel,redefined-outer-name,reimported\n\
           \n  for value in json.loads(values):\n    if value:\n      return value\n\
           \  raise ValueError('No valid values.')\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-get-table-location:
       container:
         args:
@@ -1677,7 +1677,7 @@ deploymentSpec:
           \  if table.startswith('bq://'):\n    table = table[len('bq://'):]\n  elif\
           \ table.startswith('bigquery://'):\n    table = table[len('bigquery://'):]\n\
           \  return client.get_table(table).location\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-get-table-location-2:
       container:
         args:
@@ -1713,7 +1713,7 @@ deploymentSpec:
           \  if table.startswith('bq://'):\n    table = table[len('bq://'):]\n  elif\
           \ table.startswith('bigquery://'):\n    table = table[len('bigquery://'):]\n\
           \  return client.get_table(table).location\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-load-table-from-uri:
       container:
         args:
@@ -1754,7 +1754,7 @@ deploymentSpec:
           \ source_format=source_format)\n  client.load_table_from_uri(\n      source_uris=csv_list,\n\
           \      destination=destination,\n      project=project,\n      location=location,\n\
           \      job_config=job_config).result()\n  return destination\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-make-vertex-model-artifact:
       container:
         args:
@@ -1778,7 +1778,7 @@ deploymentSpec:
           Creates a google.VertexModel artifact.\"\"\"\n  vertex_model.metadata =\
           \ {'resourceName': model_resource_name}\n  vertex_model.uri = (f'https://{location}-aiplatform.googleapis.com'\n\
           \                      f'/v1/{model_resource_name}')\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-maybe-replace-with-default:
       container:
         args:
@@ -1800,7 +1800,7 @@ deploymentSpec:
           \ *\n\ndef maybe_replace_with_default(value: str, default: str = '') ->\
           \ str:\n  \"\"\"Replaces string with another value if it is a dash.\"\"\"\
           \n  return default if not value else value\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-model-batch-predict:
       container:
         args:
@@ -1879,7 +1879,7 @@ deploymentSpec:
           \ if use_bq_prefix:\n    bq_uri = 'bq://' + bq_uri\n  outputs.append(bq_uri)\n\
           \  return collections.namedtuple(\n      'Outputs',\n      ['project_id',\
           \ 'dataset_id', 'table_id', 'uri'],\n  )(*outputs)\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-table-to-uri-2:
       container:
         args:
@@ -1909,7 +1909,7 @@ deploymentSpec:
           \ if use_bq_prefix:\n    bq_uri = 'bq://' + bq_uri\n  outputs.append(bq_uri)\n\
           \  return collections.namedtuple(\n      'Outputs',\n      ['project_id',\
           \ 'dataset_id', 'table_id', 'uri'],\n  )(*outputs)\n\n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
     exec-validate-inputs:
       container:
         args:
@@ -2005,7 +2005,7 @@ deploymentSpec:
           \   raise ValueError(\n          'Granularity unit should be one of the\
           \ following: '\n          f'{valid_data_granularity_units}, got: {data_granularity_unit}.')\n\
           \n"
-        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240214_1325
+        image: us-docker.pkg.dev/vertex-ai/automl-tabular/kfp-v2-base:20240419_0625
 pipelineInfo:
   description: Creates a batch prediction using a Prophet model.
   name: prophet-predict

google_cloud_pipeline_components/v1/automl/forecasting/prophet_trainer.py

@@ -180,6 +180,16 @@ def prophet_trainer(
                   '--dataflow_use_public_ips=',
                   dataflow_use_public_ips,
                   '", "',
+                  '--dataflow_staging_dir=',
+                  root_dir,
+                  (
+                      f'/{dsl.PIPELINE_JOB_ID_PLACEHOLDER}/{dsl.PIPELINE_TASK_ID_PLACEHOLDER}/dataflow_staging", "'
+                  ),
+                  '--dataflow_tmp_dir=',
+                  root_dir,
+                  (
+                      f'/{dsl.PIPELINE_JOB_ID_PLACEHOLDER}/{dsl.PIPELINE_TASK_ID_PLACEHOLDER}/dataflow_tmp", "'
+                  ),
                   '--gcp_resources_path=',
                   gcp_resources,
                   '", "',

google_cloud_pipeline_components/v1/automl/forecasting/prophet_trainer_pipeline.yaml

@@ -2418,7 +2418,10 @@ deploymentSpec:
           "\", \"", "--dataflow_service_account=", "{{$.inputs.parameters[''dataflow_service_account'']}}",
           "\", \"", "--dataflow_subnetwork=", "{{$.inputs.parameters[''dataflow_subnetwork'']}}",
           "\", \"", "--dataflow_use_public_ips=", "{{$.inputs.parameters[''dataflow_use_public_ips'']}}",
-          "\", \"", "--gcp_resources_path=", "{{$.outputs.parameters[''gcp_resources''].output_file}}",
+          "\", \"", "--dataflow_staging_dir=", "{{$.inputs.parameters[''root_dir'']}}",
+          "/{{$.pipeline_job_uuid}}/{{$.pipeline_task_uuid}}/dataflow_staging\", \"",
+          "--dataflow_tmp_dir=", "{{$.inputs.parameters[''root_dir'']}}", "/{{$.pipeline_job_uuid}}/{{$.pipeline_task_uuid}}/dataflow_tmp\",
+          \"", "--gcp_resources_path=", "{{$.outputs.parameters[''gcp_resources''].output_file}}",
           "\", \"", "--executor_input={{$.json_escape[1]}}\"]}}]}}"]}'
         command:
         - python3

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 Ev
 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(

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 import GetVertexMode
 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

google_cloud_pipeline_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 typing import Any, Dict, List, NamedTuple
 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

google_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 typing import Any, List, NamedTuple
 
 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

google_cloud_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 typing import Any, List, NamedTuple
 
 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

google_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 typing import Any, Dict, List, NamedTuple
 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

google_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 typing import Dict, List, NamedTuple
 
 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'

google_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 typing import Dict, List, NamedTuple
 
 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
 
 

google_cloud_pipeline_components/v1/model_evaluation/model_based_llm_evaluation/autosxs/autosxs_pipeline.py

@@ -121,6 +121,7 @@ def autosxs_pipeline(
       project=project,
       location=location,
       encryption_spec_key_name=encryption_spec_key_name,
+      autorater_prompt_parameters=autorater_prompt_parameters,
   ).set_display_name('AutoSxS Autorater')
 
   metrics = model_evaluation_text_generation_pairwise.model_evaluation_text_generation_pairwise(

google_cloud_pipeline_components/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 """Google Cloud Pipeline Components version."""
 
-__version__ = "2.14.0"
+__version__ = "2.14.1"

{google_cloud_pipeline_components-2.14.0.dist-info → google_cloud_pipeline_components-2.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-pipeline-components
-Version: 2.14.0
+Version: 2.14.1
 Summary: This SDK enables a set of First Party (Google owned) pipeline components that allow users to take their experience from Vertex AI SDK and other Google Cloud services and create a corresponding pipeline using KFP or Managed Pipelines.
 Home-page: https://github.com/kubeflow/pipelines/tree/master/components/google-cloud
 Author: The Google Cloud Pipeline Components authors