google-cloud-pipeline-components 2.12.0__py3-none-any.whl → 2.13.1__py3-none-any.whl

google_cloud_pipeline_components/_implementation/llm/deployment_graph.py

@@ -55,11 +55,6 @@ def pipeline(
     endpoint_resource_name: Path the Online Prediction Endpoint. This will be an empty string if the model was not deployed.
   """
   # fmt: on
-  adapter_artifact = kfp.dsl.importer(
-      artifact_uri=output_adapter_path,
-      artifact_class=kfp.dsl.Artifact,
-  ).set_display_name('Import Tuned Adapter')
-
   regional_endpoint = function_based.resolve_regional_endpoint(
       upload_location=upload_location
   ).set_display_name('Resolve Regional Endpoint')
@@ -86,7 +81,7 @@ def pipeline(
       project=_placeholders.PROJECT_ID_PLACEHOLDER,
       location=upload_location,
       regional_endpoint=regional_endpoint.output,
-      artifact_uri=adapter_artifact.output,
+      artifact_uri=output_adapter_path,
       model_display_name=display_name.output,
       model_reference_name=large_model_reference,
       upload_model=upload_model.output,

google_cloud_pipeline_components/_implementation/llm/env.py

@@ -19,7 +19,7 @@ from google_cloud_pipeline_components._implementation.llm.generated import refin
 
 
 def get_private_image_tag() -> str:
-  return os.getenv('PRIVATE_IMAGE_TAG') or refined_image_versions.IMAGE_TAG
+  return os.getenv('PRIVATE_IMAGE_TAG') or '20240330_0352_RC00'
 
 
 def get_autosxs_image_tag() -> str:

google_cloud_pipeline_components/_implementation/llm/function_based.py

@@ -278,6 +278,15 @@ def resolve_reference_model_metadata(
           reward_model_path='gs://vertex-rlhf-restricted/pretrained_models/palm/t5x_otter_pretrain/',
           is_supported=True,
       ),
+      'text-bison@002': reference_model_metadata(
+          large_model_reference='BISON_002',
+          reference_model_path=(
+              'gs://vertex-rlhf-restricted/pretrained_models/palm/t5x_bison_002/'
+          ),
+          reward_model_reference='BISON_002',
+          reward_model_path='gs://vertex-rlhf-restricted/pretrained_models/palm/t5x_bison_002/',
+          is_supported=True,
+      ),
       'chat-bison@001': reference_model_metadata(
           large_model_reference='BISON',
           reference_model_path=(
@@ -444,7 +453,7 @@ def resolve_deploy_model(
     deploy_model: bool, large_model_reference: str
 ) -> bool:
   """Resolves runtime parameter that determines whether the tuned model should be deployed."""
-  supported_models = {'BISON'}
+  supported_models = {'BISON', 'BISON_002'}
   if deploy_model and large_model_reference in supported_models:
     return True
   return False
@@ -468,7 +477,7 @@ def value_exists(value: Optional[str] = None) -> bool:
 @dsl.component(base_image=_image.GCPC_IMAGE_TAG, install_kfp_package=False)
 def resolve_upload_model(large_model_reference: str) -> bool:
   """Returns whether the model should be uploaded."""
-  supported_models = {'BISON'}
+  supported_models = {'BISON', 'BISON_002'}
   if large_model_reference in supported_models:
     return True
   return False

google_cloud_pipeline_components/_implementation/llm/upload_llm_model.py

@@ -26,7 +26,7 @@ from kfp import dsl
 def refined_upload_llm_model(
     project: str,
     location: str,
-    artifact_uri: dsl.Input[dsl.Artifact],
+    artifact_uri: str,
     model_reference_name: str,
     model_display_name: str,
     regional_endpoint: str,
@@ -41,7 +41,7 @@ def refined_upload_llm_model(
   Args:
       project: Name of the GCP project.
       location: Location for model upload and deployment.
-      artifact_uri: KFP Artifact for adapter.
+      artifact_uri: Path to the artifact to upload.
       model_reference_name: Large model reference name.
       model_display_name: Name of the model (shown in Model Registry).
       regional_endpoint: Regional API endpoint.
@@ -88,7 +88,7 @@ def refined_upload_llm_model(
             'largeModelReference': {'name': model_reference_name},
             'labels': labels,
             'generatedModelSource': {'genie_source': {'base_model_uri': ''}},
-            'artifactUri': artifact_uri.uri,
+            'artifactUri': artifact_uri,
         }
     }
     if encryption_spec_key_name:

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

@@ -39,9 +39,9 @@ def autosxs_pipeline(
     evaluation_dataset: str,
     task: str,
     id_columns: List[str],
+    autorater_prompt_parameters: Dict[str, Dict[str, str]],
     model_a: str = '',
     model_b: str = '',
-    autorater_prompt_parameters: Dict[str, Dict[str, str]] = {},
     model_a_prompt_parameters: Dict[str, Dict[str, str]] = {},
     model_b_prompt_parameters: Dict[str, Dict[str, str]] = {},
     response_column_a: str = '',
@@ -63,9 +63,9 @@ def autosxs_pipeline(
     evaluation_dataset: A BigQuery table or comma-separated list of GCS paths to a JSONL dataset containing evaluation examples.
     task: Evaluation task in the form `{task}@{version}`. task can be one of `[summarization, question_answering]`. Version is an integer with 3 digits or "latest". Ex: `summarization@001` or `question_answering@latest`.
     id_columns: The columns which distinguish unique evaluation examples.
+    autorater_prompt_parameters: Map of autorater prompt parameters to columns or templates. The expected parameters are: `inference_instruction` (details on how to perform a task) and `inference_context` (content to reference to perform the task). As an example, `{'inference_context': {'column': 'my_prompt'}}` uses the evaluation dataset's `my_prompt` column for the AutoRater's context.
     model_a: A fully-qualified model resource name (`projects/{project}/locations/{location}/models/{model}@{version}`) or publisher model resource name (`publishers/{publisher}/models/{model}`).  This parameter is optional if Model A responses are specified.
     model_b: A fully-qualified model resource name (`projects/{project}/locations/{location}/models/{model}@{version}`) or publisher model resource name (`publishers/{publisher}/models/{model}`).  This parameter is optional if Model B responses are specified.
-    autorater_prompt_parameters: Map of autorater prompt parameters to columns or templates. The expected parameters are: `inference_instruction` (details on how to perform a task) and `inference_context` (content to reference to perform the task). As an example, `{'inference_context': {'column': 'my_prompt'}}` uses the evaluation dataset's `my_prompt` column for the AutoRater's context.
     model_a_prompt_parameters: Map of Model A prompt template parameters to columns or templates. This parameter is optional if Model A predictions are predefined. Example - `{'prompt': {'column': 'my_prompt'}}` uses the evaluation dataset's `my_prompt` column for the prompt parameter named `prompt`.
     model_b_prompt_parameters: Map of Model B prompt template parameters to columns or templates. This parameter is optional if Model B predictions are predefined. Example - `{'prompt': {'column': 'my_prompt'}}` uses the evaluation dataset's `my_prompt` column for the prompt parameter named `prompt`.
     response_column_a: Either the name of a column in the evaluation dataset containing predefined predictions, or the name of the column in the Model A output containing predictions. If no value is provided, the correct model output column name will attempt to be inferred.

google_cloud_pipeline_components/proto/template_metadata_pb2.py

@@ -15,8 +15,9 @@ from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
 
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-    b'\n\x13template_metadata.proto\x12\x11template_metadata\x1a\x1cgoogle/protobuf/struct.proto"F\n\x10TemplateMetadata\x12\x32\n\x0bio_metadata\x18\x01'
-    b' \x01(\x0b\x32\x1d.template_metadata.IOMetadata"L\n\nIOMetadata\x12&\n\x05pages\x18\x01'
+    b'\n\x13template_metadata.proto\x12\x11template_metadata\x1a\x1cgoogle/protobuf/struct.proto"\x89\x01\n\x10TemplateMetadata\x12\x32\n\x0bio_metadata\x18\x01'
+    b' \x01(\x0b\x32\x1d.template_metadata.IOMetadata\x12\x41\n\x15preflight_validations\x18\x02'
+    b' \x01(\x0b\x32".template_metadata.ValidationItems"L\n\nIOMetadata\x12&\n\x05pages\x18\x01'
     b' \x03(\x0b\x32\x17.template_metadata.Page\x12\x16\n\x0eschema_version\x18\x02'
     b' \x01(\t"W\n\x04Page\x12\x0c\n\x04name\x18\x01'
     b' \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02'
@@ -24,11 +25,12 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
     b' \x03(\x0b\x32\x1a.template_metadata.Section"V\n\x07Section\x12\x0c\n\x04name\x18\x01'
     b' \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02'
     b' \x01(\t\x12(\n\x06inputs\x18\x03'
-    b' \x03(\x0b\x32\x18.template_metadata.Input"\x9a\x01\n\x05Input\x12\x14\n\x0c\x64isplay_name\x18\x01'
-    b' \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02'
-    b' \x01(\t\x12\x1b\n\x13\x64\x65\x66\x61ult_explanation\x18\x03'
-    b' \x01(\t\x12\x11\n\thelp_text\x18\x04'
-    b' \x01(\t\x12\x36\n\rsemantic_type\x18\x05'
+    b' \x03(\x0b\x32\x18.template_metadata.Input"\xa8\x01\n\x05Input\x12\x0c\n\x04name\x18\x01'
+    b' \x01(\t\x12\x14\n\x0c\x64isplay_name\x18\x02'
+    b' \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03'
+    b' \x01(\t\x12\x1b\n\x13\x64\x65\x66\x61ult_explanation\x18\x04'
+    b' \x01(\t\x12\x11\n\thelp_text\x18\x05'
+    b' \x01(\t\x12\x36\n\rsemantic_type\x18\x06'
     b' \x01(\x0b\x32\x1f.template_metadata.SemanticType"\xf6\x02\n\x0cSemanticType\x12.\n\nfloat_type\x18\x01'
     b' \x01(\x0b\x32\x18.template_metadata.FloatH\x00\x12\x32\n\x0cinteger_type\x18\x02'
     b' \x01(\x0b\x32\x1a.template_metadata.IntegerH\x00\x12\x30\n\x0bstring_type\x18\x03'
@@ -65,7 +67,18 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
     b' \x01(\x0b\x32\x1a.template_metadata.OptionsH\x00\x42\x08\n\x06values"U\n\x0bMachineType\x12\r\n\x03\x61ny\x18\x01'
     b' \x01(\x08H\x00\x12-\n\x07options\x18\x02'
     b' \x01(\x0b\x32\x1a.template_metadata.OptionsH\x00\x42\x08\n\x06values"1\n\x07Options\x12&\n\x06values\x18\x01'
-    b' \x03(\x0b\x32\x16.google.protobuf.Value*G\n\x04Size\x12\x0e\n\nSIZE_UNSET\x10\x00\x12\x0e\n\nSIZE_SMALL\x10\x01\x12\x0f\n\x0bSIZE_MEDIUM\x10\x02\x12\x0e\n\nSIZE_LARGE\x10\x03*\x82\x01\n\x0b\x43ontentType\x12\x11\n\rUNSET_CONTENT\x10\x00\x12\x10\n\x0cYAML_CONTENT\x10\x01\x12\x10\n\x0cJSON_CONTENT\x10\x02\x12\x14\n\x10MARKDOWN_CONTENT\x10\x03\x12\x10\n\x0cHTML_CONTENT\x10\x04\x12\x14\n\x10\x44\x41TETIME_CONTENT\x10\x05*a\n\x07UriType\x12\x0b\n\x07\x41NY_URI\x10\x00\x12\x0f\n\x0bGCS_ANY_URI\x10\x01\x12\x12\n\x0eGCS_BUCKET_URI\x10\x02\x12\x12\n\x0eGCS_OBJECT_URI\x10\x03\x12\x10\n\x0c\x42IGQUERY_URI\x10\x04\x42\x02P\x01\x62\x06proto3'
+    b' \x03(\x0b\x32\x16.google.protobuf.Value"\x82\x02\n\x0fValidationItems\x12N\n\x0esa_validations\x18\x01'
+    b' \x03(\x0b\x32\x36.template_metadata.GoogleCloudServiceAccountValidation\x12O\n\x11quota_validations\x18\x02'
+    b' \x03(\x0b\x32\x34.template_metadata.GoogleCloudProjectQuotaValidation\x12N\n\x0f\x61pi_validations\x18\x03'
+    b' \x03(\x0b\x32\x35.template_metadata.GoogleCloudApiEnablementValidation"p\n!GoogleCloudProjectQuotaValidation\x12\x13\n\x0bmetric_name\x18\x01'
+    b' \x01(\t\x12\x15\n\x0bint64_value\x18\x02'
+    b' \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x03'
+    b' \x01(\x01H\x00\x42\x07\n\x05value"\x8d\x01\n#GoogleCloudServiceAccountValidation\x12\x1f\n\x17\x64\x65\x66\x61ult_principal_email\x18\x01'
+    b' \x01(\t\x12\x1c\n\x14override_placeholder\x18\x02'
+    b' \x01(\t\x12\x13\n\x0bpermissions\x18\x03'
+    b' \x03(\t\x12\x12\n\nrole_names\x18\x04'
+    b' \x03(\t";\n"GoogleCloudApiEnablementValidation\x12\x15\n\rservice_names\x18\x01'
+    b' \x03(\t*G\n\x04Size\x12\x0e\n\nSIZE_UNSET\x10\x00\x12\x0e\n\nSIZE_SMALL\x10\x01\x12\x0f\n\x0bSIZE_MEDIUM\x10\x02\x12\x0e\n\nSIZE_LARGE\x10\x03*\x82\x01\n\x0b\x43ontentType\x12\x11\n\rUNSET_CONTENT\x10\x00\x12\x10\n\x0cYAML_CONTENT\x10\x01\x12\x10\n\x0cJSON_CONTENT\x10\x02\x12\x14\n\x10MARKDOWN_CONTENT\x10\x03\x12\x10\n\x0cHTML_CONTENT\x10\x04\x12\x14\n\x10\x44\x41TETIME_CONTENT\x10\x05*a\n\x07UriType\x12\x0b\n\x07\x41NY_URI\x10\x00\x12\x0f\n\x0bGCS_ANY_URI\x10\x01\x12\x12\n\x0eGCS_BUCKET_URI\x10\x02\x12\x12\n\x0eGCS_OBJECT_URI\x10\x03\x12\x10\n\x0c\x42IGQUERY_URI\x10\x04\x42\x02P\x01\x62\x06proto3'
 )
 
 _globals = globals()
@@ -78,48 +91,56 @@ _builder.BuildTopDescriptorsAndMessages(
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
   _globals['DESCRIPTOR']._serialized_options = b'P\001'
-  _globals['_SIZE']._serialized_start = 2225
-  _globals['_SIZE']._serialized_end = 2296
-  _globals['_CONTENTTYPE']._serialized_start = 2299
-  _globals['_CONTENTTYPE']._serialized_end = 2429
-  _globals['_URITYPE']._serialized_start = 2431
-  _globals['_URITYPE']._serialized_end = 2528
-  _globals['_TEMPLATEMETADATA']._serialized_start = 163
-  _globals['_TEMPLATEMETADATA']._serialized_end = 233
-  _globals['_IOMETADATA']._serialized_start = 235
-  _globals['_IOMETADATA']._serialized_end = 311
-  _globals['_PAGE']._serialized_start = 313
-  _globals['_PAGE']._serialized_end = 400
-  _globals['_SECTION']._serialized_start = 402
-  _globals['_SECTION']._serialized_end = 488
-  _globals['_INPUT']._serialized_start = 491
-  _globals['_INPUT']._serialized_end = 645
-  _globals['_SEMANTICTYPE']._serialized_start = 648
-  _globals['_SEMANTICTYPE']._serialized_end = 1022
-  _globals['_FLOAT']._serialized_start = 1024
-  _globals['_FLOAT']._serialized_end = 1083
-  _globals['_INTEGER']._serialized_start = 1085
-  _globals['_INTEGER']._serialized_end = 1146
-  _globals['_STRING']._serialized_start = 1149
-  _globals['_STRING']._serialized_end = 1315
-  _globals['_BOOLEAN']._serialized_start = 1317
-  _globals['_BOOLEAN']._serialized_end = 1326
-  _globals['_LIST']._serialized_start = 1329
-  _globals['_LIST']._serialized_end = 1495
-  _globals['_STRUCT']._serialized_start = 1497
-  _globals['_STRUCT']._serialized_end = 1505
-  _globals['_ARTIFACT']._serialized_start = 1507
-  _globals['_ARTIFACT']._serialized_end = 1584
-  _globals['_FREEFORM']._serialized_start = 1587
-  _globals['_FREEFORM']._serialized_end = 1731
-  _globals['_SELECTONE']._serialized_start = 1734
-  _globals['_SELECTONE']._serialized_end = 1924
-  _globals['_SELECTMANY']._serialized_start = 1926
-  _globals['_SELECTMANY']._serialized_end = 2001
-  _globals['_LOCATION']._serialized_start = 2003
-  _globals['_LOCATION']._serialized_end = 2085
-  _globals['_MACHINETYPE']._serialized_start = 2087
-  _globals['_MACHINETYPE']._serialized_end = 2172
-  _globals['_OPTIONS']._serialized_start = 2174
-  _globals['_OPTIONS']._serialized_end = 2223
+  _globals['_SIZE']._serialized_start = 2887
+  _globals['_SIZE']._serialized_end = 2958
+  _globals['_CONTENTTYPE']._serialized_start = 2961
+  _globals['_CONTENTTYPE']._serialized_end = 3091
+  _globals['_URITYPE']._serialized_start = 3093
+  _globals['_URITYPE']._serialized_end = 3190
+  _globals['_TEMPLATEMETADATA']._serialized_start = 164
+  _globals['_TEMPLATEMETADATA']._serialized_end = 301
+  _globals['_IOMETADATA']._serialized_start = 303
+  _globals['_IOMETADATA']._serialized_end = 379
+  _globals['_PAGE']._serialized_start = 381
+  _globals['_PAGE']._serialized_end = 468
+  _globals['_SECTION']._serialized_start = 470
+  _globals['_SECTION']._serialized_end = 556
+  _globals['_INPUT']._serialized_start = 559
+  _globals['_INPUT']._serialized_end = 727
+  _globals['_SEMANTICTYPE']._serialized_start = 730
+  _globals['_SEMANTICTYPE']._serialized_end = 1104
+  _globals['_FLOAT']._serialized_start = 1106
+  _globals['_FLOAT']._serialized_end = 1165
+  _globals['_INTEGER']._serialized_start = 1167
+  _globals['_INTEGER']._serialized_end = 1228
+  _globals['_STRING']._serialized_start = 1231
+  _globals['_STRING']._serialized_end = 1397
+  _globals['_BOOLEAN']._serialized_start = 1399
+  _globals['_BOOLEAN']._serialized_end = 1408
+  _globals['_LIST']._serialized_start = 1411
+  _globals['_LIST']._serialized_end = 1577
+  _globals['_STRUCT']._serialized_start = 1579
+  _globals['_STRUCT']._serialized_end = 1587
+  _globals['_ARTIFACT']._serialized_start = 1589
+  _globals['_ARTIFACT']._serialized_end = 1666
+  _globals['_FREEFORM']._serialized_start = 1669
+  _globals['_FREEFORM']._serialized_end = 1813
+  _globals['_SELECTONE']._serialized_start = 1816
+  _globals['_SELECTONE']._serialized_end = 2006
+  _globals['_SELECTMANY']._serialized_start = 2008
+  _globals['_SELECTMANY']._serialized_end = 2083
+  _globals['_LOCATION']._serialized_start = 2085
+  _globals['_LOCATION']._serialized_end = 2167
+  _globals['_MACHINETYPE']._serialized_start = 2169
+  _globals['_MACHINETYPE']._serialized_end = 2254
+  _globals['_OPTIONS']._serialized_start = 2256
+  _globals['_OPTIONS']._serialized_end = 2305
+  _globals['_VALIDATIONITEMS']._serialized_start = 2308
+  _globals['_VALIDATIONITEMS']._serialized_end = 2566
+  _globals['_GOOGLECLOUDPROJECTQUOTAVALIDATION']._serialized_start = 2568
+  _globals['_GOOGLECLOUDPROJECTQUOTAVALIDATION']._serialized_end = 2680
+  _globals['_GOOGLECLOUDSERVICEACCOUNTVALIDATION']._serialized_start = 2683
+  _globals['_GOOGLECLOUDSERVICEACCOUNTVALIDATION']._serialized_end = 2824
+  _globals['_GOOGLECLOUDAPIENABLEMENTVALIDATION']._serialized_start = 2826
+  _globals['_GOOGLECLOUDAPIENABLEMENTVALIDATION']._serialized_end = 2885
 # @@protoc_insertion_point(module_scope)

google_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_classification_pipeline.py

@@ -176,9 +176,18 @@ def evaluation_llm_classification_pipeline(  # pylint: disable=dangerous-default
       encryption_spec_key_name=encryption_spec_key_name,
   )
 
+  get_vertex_eval_model_task = dsl.importer(
+      artifact_uri=(
+          f'https://{location}-aiplatform.googleapis.com/v1/{model_name}'
+      ),
+      artifact_class=VertexModel,
+      metadata={'resourceName': model_name},
+  )
+  get_vertex_eval_model_task.set_display_name('get-vertex-eval-model')
+
   import_evaluation_task = ModelImportEvaluationOp(
       classification_metrics=eval_task.outputs['evaluation_metrics'],
-      model=get_vertex_model_task.outputs['artifact'],
+      model=get_vertex_eval_model_task.outputs['artifact'],
       dataset_type=batch_predict_instances_format,
       dataset_paths=batch_predict_gcs_source_uris,
       display_name=evaluation_display_name,

google_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_text_generation_pipeline.py

@@ -34,7 +34,6 @@ def evaluation_llm_text_generation_pipeline(  # pylint: disable=dangerous-defaul
     location: str,
     batch_predict_gcs_source_uris: List[str],
     batch_predict_gcs_destination_output_uri: str,
-    service_account: str,
     model_name: str = 'publishers/google/models/text-bison@002',
     evaluation_task: str = 'text-generation',
     input_field_name: str = 'input_text',
@@ -44,6 +43,7 @@ def evaluation_llm_text_generation_pipeline(  # pylint: disable=dangerous-defaul
     batch_predict_model_parameters: Dict[str, str] = {},
     enable_row_based_metrics: bool = False,
     machine_type: str = 'e2-standard-4',
+    service_account: str = '',
     network: str = '',
     encryption_spec_key_name: str = '',
     evaluation_display_name: str = 'evaluation-llm-text-generation-pipeline-{{$.pipeline_job_uuid}}',
@@ -72,7 +72,6 @@ def evaluation_llm_text_generation_pipeline(  # pylint: disable=dangerous-defaul
           "output_text": "your ground truth output text"
         }
     batch_predict_gcs_destination_output_uri: Required. The Google Cloud Storage location of the directory where the eval pipeline output is to be written to.
-    service_account: Required. Sets the default service account for workload run-as account. The service account running the pipeline (https://cloud.google.com/vertex-ai/docs/pipelines/configure-project#service-account) submitting jobs must have act-as permission on this run-as account.
     model_name: The Model name used to run evaluation. Must be a publisher Model or a managed Model sharing the same ancestor location. Starting this job has no impact on any existing deployments of the Model and their resources.
     evaluation_task: The task that the large language model will be evaluated on. The evaluation component computes a set of metrics relevant to that specific task. Currently supported tasks are: `summarization`, `question-answering`, `text-generation`.
     input_field_name: The field name of the input eval dataset instances that contains the input prompts to the LLM.
@@ -82,6 +81,7 @@ def evaluation_llm_text_generation_pipeline(  # pylint: disable=dangerous-defaul
     batch_predict_model_parameters: A map of parameters that govern the predictions. Some acceptable parameters include: maxOutputTokens, topK, topP, and temperature.
     enable_row_based_metrics: Flag of if row based metrics is enabled, default value is false.
     machine_type: The machine type of this custom job. If not set, defaulted to `e2-standard-4`. More details: https://cloud.google.com/compute/docs/machine-resource
+    service_account: Sets the default service account for workload run-as account. The service account running the pipeline (https://cloud.google.com/vertex-ai/docs/pipelines/configure-project#service-account) submitting jobs must have act-as permission on this run-as account. If unspecified, the Vertex AI Custom Code Service Agent(https://cloud.google.com/vertex-ai/docs/general/access-control#service-agents) for the CustomJob's project.
     network: The full name of the Compute Engine network to which the job should be peered. For example, `projects/12345/global/networks/myVPC`. Format is of the form `projects/{project}/global/networks/{network}`. Where `{project}` is a project number, as in `12345`, and `{network}` is a network name, as in `myVPC`. To specify this field, you must have already configured VPC Network Peering for Vertex AI (https://cloud.google.com/vertex-ai/docs/general/vpc-peering). If left unspecified, the job is not peered with any network.
     encryption_spec_key_name:  Customer-managed encryption key options. If set, resources created by this pipeline will be encrypted with the provided encryption key. Has the form: `projects/my-project/locations/my-location/keyRings/my-kr/cryptoKeys/my-key`. The key needs to be in the same region as where the compute resource is created.
     evaluation_display_name: The display name of the uploaded evaluation resource to the Vertex AI model.
@@ -158,11 +158,20 @@ def evaluation_llm_text_generation_pipeline(  # pylint: disable=dangerous-defaul
       encryption_spec_key_name=encryption_spec_key_name,
   )
 
+  get_vertex_eval_model_task = dsl.importer(
+      artifact_uri=(
+          f'https://{location}-aiplatform.googleapis.com/v1/{model_name}'
+      ),
+      artifact_class=VertexModel,
+      metadata={'resourceName': model_name},
+  )
+  get_vertex_eval_model_task.set_display_name('get-vertex-eval-model')
+
   with dsl.If(enable_row_based_metrics == True):
     import_evaluation_task_with_row_based_metrics = ModelImportEvaluationOp(
         metrics=eval_task.outputs['evaluation_metrics'],
         row_based_metrics=eval_task.outputs['row_based_metrics'],
-        model=get_vertex_model_task.outputs['artifact'],
+        model=get_vertex_eval_model_task.outputs['artifact'],
         problem_type=evaluation_task,
         dataset_type=batch_predict_predictions_format,
         dataset_paths=batch_predict_gcs_source_uris,
@@ -171,7 +180,7 @@ def evaluation_llm_text_generation_pipeline(  # pylint: disable=dangerous-defaul
   with dsl.Else():
     import_evaluation_task = ModelImportEvaluationOp(
         metrics=eval_task.outputs['evaluation_metrics'],
-        model=get_vertex_model_task.outputs['artifact'],
+        model=get_vertex_eval_model_task.outputs['artifact'],
         problem_type=evaluation_task,
         dataset_type=batch_predict_predictions_format,
         dataset_paths=batch_predict_gcs_source_uris,

google_cloud_pipeline_components/version.py

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

{google_cloud_pipeline_components-2.12.0.dist-info → google_cloud_pipeline_components-2.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-pipeline-components
-Version: 2.12.0
+Version: 2.13.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
@@ -31,24 +31,25 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.7.0,<3.12.0
 Description-Content-Type: text/markdown
-Requires-Dist: google-api-core (!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0,<3.0.0dev,>=1.31.5)
-Requires-Dist: kfp (<=2.7.0,>=2.6.0)
-Requires-Dist: google-cloud-aiplatform (<2,>=1.14.0)
-Requires-Dist: Jinja2 (<4,>=3.1.2)
+License-File: LICENSE
+Requires-Dist: google-api-core !=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0,<3.0.0dev,>=1.31.5
+Requires-Dist: kfp <=2.7.0,>=2.6.0
+Requires-Dist: google-cloud-aiplatform <2,>=1.14.0
+Requires-Dist: Jinja2 <4,>=3.1.2
 Provides-Extra: docs
-Requires-Dist: protobuf (<5,>=4.21.1) ; extra == 'docs'
-Requires-Dist: grpcio-status (<=1.47.0) ; extra == 'docs'
-Requires-Dist: commonmark (==0.9.1) ; extra == 'docs'
-Requires-Dist: autodocsumm (==0.2.9) ; extra == 'docs'
-Requires-Dist: sphinx (<6.0.0,>=5.0.2) ; extra == 'docs'
-Requires-Dist: sphinx-immaterial (==0.9.0) ; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme (==2.0.0) ; extra == 'docs'
-Requires-Dist: m2r2 (==0.3.3.post2) ; extra == 'docs'
-Requires-Dist: sphinx-notfound-page (==0.8.3) ; extra == 'docs'
+Requires-Dist: protobuf <5,>=4.21.1 ; extra == 'docs'
+Requires-Dist: grpcio-status <=1.47.0 ; extra == 'docs'
+Requires-Dist: commonmark ==0.9.1 ; extra == 'docs'
+Requires-Dist: autodocsumm ==0.2.9 ; extra == 'docs'
+Requires-Dist: sphinx <6.0.0,>=5.0.2 ; extra == 'docs'
+Requires-Dist: sphinx-immaterial ==0.9.0 ; extra == 'docs'
+Requires-Dist: sphinx-rtd-theme ==2.0.0 ; extra == 'docs'
+Requires-Dist: m2r2 ==0.3.3.post2 ; extra == 'docs'
+Requires-Dist: sphinx-notfound-page ==0.8.3 ; extra == 'docs'
 Provides-Extra: tests
-Requires-Dist: mock (>=4.0.0) ; extra == 'tests'
-Requires-Dist: flake8 (>=3.0.0) ; extra == 'tests'
-Requires-Dist: pytest (>=6.0.0) ; extra == 'tests'
+Requires-Dist: mock >=4.0.0 ; extra == 'tests'
+Requires-Dist: flake8 >=3.0.0 ; extra == 'tests'
+Requires-Dist: pytest >=6.0.0 ; extra == 'tests'
 
 # Google Cloud Pipeline Components
 

{google_cloud_pipeline_components-2.12.0.dist-info → google_cloud_pipeline_components-2.13.1.dist-info}/RECORD

@@ -2,15 +2,15 @@ google_cloud_pipeline_components/__init__.py,sha256=3Mr8_YbBkTzArlgPDkUKoMzoKHZx
 google_cloud_pipeline_components/_image.py,sha256=lANDYNk1WSuGZSoTTRcWdjsUvCkkA-PmwouTM9Et7fY,828
 google_cloud_pipeline_components/_placeholders.py,sha256=517N_NQthPEBFJtsy8NE3WkBJm_dmwmlXdYNtk5gH-c,1233
 google_cloud_pipeline_components/utils.py,sha256=9FG7umyEXhyUvtNeC46NuQ04olDMR3o-Wp78V1xs8GY,11045
-google_cloud_pipeline_components/version.py,sha256=NH1ZheZhE2081vUwDDmf6XB3U_sRDSXENrEAPZaux5E,678
+google_cloud_pipeline_components/version.py,sha256=6tNJDHp5NYpbYbjFyHX68BAokEj_vJem_7m_7kOze30,678
 google_cloud_pipeline_components/_implementation/__init__.py,sha256=sb6SfJl6rt3AKjiWxd-KO9DSiZ3PzGZRcsqKuc1A2Cg,606
 google_cloud_pipeline_components/_implementation/llm/__init__.py,sha256=sb6SfJl6rt3AKjiWxd-KO9DSiZ3PzGZRcsqKuc1A2Cg,606
 google_cloud_pipeline_components/_implementation/llm/batch_prediction_pairwise.py,sha256=mARB-tDYFr0tpBrLCIh481H4LDuXdr_8UyKVUaOF5Cw,7569
 google_cloud_pipeline_components/_implementation/llm/bulk_inferrer.py,sha256=k-MHsyESWboHdNeRm9q3MOGwbtZr37QNGm_Y_cGsETA,3958
 google_cloud_pipeline_components/_implementation/llm/deploy_llm_model.py,sha256=Jjme37_M32AK1r_MmHMHZvW8k9LJiqfZ4eJEquWoTt4,5029
-google_cloud_pipeline_components/_implementation/llm/deployment_graph.py,sha256=Rpy_qVngv-uUmiEr_vhC8Xn0aw26ptK70cwAvDNkij0,5200
-google_cloud_pipeline_components/_implementation/llm/env.py,sha256=zY5glHO9oPWsALfYquR0euJHJnXbv2w-21mWVNit2Gw,1864
-google_cloud_pipeline_components/_implementation/llm/function_based.py,sha256=dggSFXOtzAreNThA9zDYk3qoRxs6Z9Z8i0XUwk3rGtg,18415
+google_cloud_pipeline_components/_implementation/llm/deployment_graph.py,sha256=T6UgAco2Xk8Y0PjP5AfLSHSkE0V8m4OhrT4wTUdjGI4,5032
+google_cloud_pipeline_components/_implementation/llm/env.py,sha256=cnzBS0-a2_T-w54T2E6RtshjbEg8CJuycqoIsVrOJZI,1852
+google_cloud_pipeline_components/_implementation/llm/function_based.py,sha256=EPAY7uGukSfCJt9wkYOvXwJ_6WnkZBTBijYaMUCUcEg,18845
 google_cloud_pipeline_components/_implementation/llm/model_evaluation_text_generation_pairwise.py,sha256=W64FNFfbarOcDw1sSG9J-BQCVPUYx3zLAmwLhhGhth0,5102
 google_cloud_pipeline_components/_implementation/llm/online_evaluation_pairwise.py,sha256=khEli4fSoIQlaiReXOm3zsvsM7BIdbJOXFGUzjcvxOI,5299
 google_cloud_pipeline_components/_implementation/llm/preference_data_formatter.py,sha256=xqgvMsFgFIuiDAv3V3lf4XJSnLjZSTCHknGkmUcP9fs,5025
@@ -23,7 +23,7 @@ google_cloud_pipeline_components/_implementation/llm/reward_model_graph.py,sha25
 google_cloud_pipeline_components/_implementation/llm/reward_model_trainer.py,sha256=xkj2hnHpZMLutGNxoewTVUsRR2bkLNkVUhWwjY9EXKA,5596
 google_cloud_pipeline_components/_implementation/llm/rlhf_preprocessor.py,sha256=IqwZ2PXGOOfBNeDIp3exKeqPn6kGwaSaozJEr4cbhDs,2510
 google_cloud_pipeline_components/_implementation/llm/supervised_fine_tuner.py,sha256=5HzjhMXMRmaWGv3BlAi8lBg6MMlaaHlbqKez3ZcX5Ss,4951
-google_cloud_pipeline_components/_implementation/llm/upload_llm_model.py,sha256=e9LiGzrsIuLnPzfib9zT_bMbGxUUvFoZJNUO3Yiijaw,4742
+google_cloud_pipeline_components/_implementation/llm/upload_llm_model.py,sha256=iLtHLtrXzDbRHbgOW99SA9XDdhr_8omhLX1bTP-tsaE,4724
 google_cloud_pipeline_components/_implementation/llm/upload_tensorboard_metrics.py,sha256=BN-0TQFl49TcE54ltBRt4iZYTjO7718eCLwHKR58ips,4010
 google_cloud_pipeline_components/_implementation/llm/utils.py,sha256=E250cmvw0QUnt8NLDl5crK6K1o1FguUglQIdBVqfwQI,5548
 google_cloud_pipeline_components/_implementation/llm/utils_test.py,sha256=co8gWyrowY5CpkFNsaLGQlD_gpIykkVI7czxIizp5cM,2864
@@ -338,11 +338,11 @@ google_cloud_pipeline_components/preview/model_evaluation/model_bias_component.p
 google_cloud_pipeline_components/preview/model_evaluation/utils.py,sha256=oRlEvA3zMSTzgxJklZD0A-BzFDx0-PsBHBXZ4kmaREY,7539
 google_cloud_pipeline_components/preview/model_evaluation/model_based_llm_evaluation/__init__.py,sha256=ee_EyGhwqXIjR3Rx9t-o2gV9TssU-VErMU7LtDA7s9k,838
 google_cloud_pipeline_components/preview/model_evaluation/model_based_llm_evaluation/autosxs/__init__.py,sha256=sb6SfJl6rt3AKjiWxd-KO9DSiZ3PzGZRcsqKuc1A2Cg,606
-google_cloud_pipeline_components/preview/model_evaluation/model_based_llm_evaluation/autosxs/autosxs_pipeline.py,sha256=Sw-OvuJnDId9l1kmpX6zgOA-nEskUV9EQ7rcHqShI9g,8856
+google_cloud_pipeline_components/preview/model_evaluation/model_based_llm_evaluation/autosxs/autosxs_pipeline.py,sha256=Jzrd6sQsj0E_ECqsODJ-95dk85T6KgsITsvJh6qVpxc,8851
 google_cloud_pipeline_components/proto/__init__.py,sha256=aiPUc6gpQwG9cRTYfw3ChFCJfDr3vAIsm2eMYUDJjJQ,661
 google_cloud_pipeline_components/proto/gcp_resources_pb2.py,sha256=ssNNm4zjiWbuBUS7IH6kyrvvfmcC_Z5F7hOAuQe_YLk,2134
 google_cloud_pipeline_components/proto/preflight_validations_pb2.py,sha256=5MioLb12O4to8LYXFv-irH31BKot2LGtXvxOeXZSQlQ,2588
-google_cloud_pipeline_components/proto/template_metadata_pb2.py,sha256=chzvvNZj5XEvifJbN77L7ZJv7jta-4ycHUKjTLZYCAg,7773
+google_cloud_pipeline_components/proto/template_metadata_pb2.py,sha256=RfVbgljtitUcLS9PX9dGbPpLYUdVqXNJS_mzUjPgtAg,9432
 google_cloud_pipeline_components/types/__init__.py,sha256=1WFkL49QEy-gNb6ywQOE4yZkD7DoULAeiL1tLdb3S28,606
 google_cloud_pipeline_components/types/artifact_types.py,sha256=zvwvzRuFb_s1VS1mtKkltOOACATJk-kG7dVFOUasfw4,23725
 google_cloud_pipeline_components/v1/__init__.py,sha256=E1Fie3Gq3KKLHEBGUUBeuao-Eo1uwuBfAWWhx2siwaE,765
@@ -515,16 +515,16 @@ google_cloud_pipeline_components/v1/model_evaluation/evaluation_automl_tabular_f
 google_cloud_pipeline_components/v1/model_evaluation/evaluation_automl_tabular_pipeline.py,sha256=p-GH_tVqffHwck5Sll0BHsnvVAHQk48WNAUohZxATcs,37108
 google_cloud_pipeline_components/v1/model_evaluation/evaluation_automl_unstructure_data_pipeline.py,sha256=aiZOK5BE5mdqJL3s4pU1Y_ynHvWBE9JIxl9UrJuNsco,42404
 google_cloud_pipeline_components/v1/model_evaluation/evaluation_feature_attribution_pipeline.py,sha256=ChDwHvPCn0prrK1FLvEhAbaTmA153M9NG3Wj3QIlNHs,51173
-google_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_classification_pipeline.py,sha256=Vf_O-8VWKZlR_tCmFNNcQWp6VWK8c67IBWKxbt3ZQBg,11672
-google_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_text_generation_pipeline.py,sha256=ufVZwpEerSLLo_yGJVh7cgBBTeL3RmkVuWKHkCiaQ9U,11056
+google_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_classification_pipeline.py,sha256=hwQrgFL79hyLiwMeIRdOzGZGNtXPS1G0n9_YnZDhf0w,11981
+google_cloud_pipeline_components/v1/model_evaluation/evaluation_llm_text_generation_pipeline.py,sha256=z1Bx8p603cxGC_nre3tUs-3KF1O5t5xBwAWmK2H9R3U,11529
 google_cloud_pipeline_components/v1/model_evaluation/forecasting_component.py,sha256=gOnvKAJWa3velczeuVBCzW6b_tcc2v_lNFqHXGhjD44,10017
 google_cloud_pipeline_components/v1/model_evaluation/regression_component.py,sha256=eFrjrKQot3-SlRCoKoTOEsyp2Xj0GfDtrjpxTDKAHYY,9117
 google_cloud_pipeline_components/v1/vertex_notification_email/__init__.py,sha256=YIRljNy_oHY_vRda-kfhm5QiulNd_SIIPbmpzOiYJ0k,863
 google_cloud_pipeline_components/v1/vertex_notification_email/component.py,sha256=Dau8ZI0mzLBnLOUBQm6EtK8gbtX1u57t76Ud5qlg9xc,2163
 google_cloud_pipeline_components/v1/wait_gcp_resources/__init__.py,sha256=w6dfz-rYsYnxFapRH1Dix3GVz0mhPW0m1IVpE6z8jbg,878
 google_cloud_pipeline_components/v1/wait_gcp_resources/component.py,sha256=Nsfj5c3eeZq83fHLvv2IlpK4jrjxLxRksFYOl5W6JnA,2468
-google_cloud_pipeline_components-2.12.0.dist-info/LICENSE,sha256=VAc1R5OxOELKsX5L5Ldp5THfNtxtt1cMIZBaC0Jdj5Q,13118
-google_cloud_pipeline_components-2.12.0.dist-info/METADATA,sha256=GeF9-FA9p-AwA9y2--CTyacsia2uBSyr8i2aTNUwyOk,5890
-google_cloud_pipeline_components-2.12.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-google_cloud_pipeline_components-2.12.0.dist-info/top_level.txt,sha256=E8T4T8KGMGLXbHvt2goa98oezRpxryPC6QhWBZ27Hhc,33
-google_cloud_pipeline_components-2.12.0.dist-info/RECORD,,
+google_cloud_pipeline_components-2.13.1.dist-info/LICENSE,sha256=VAc1R5OxOELKsX5L5Ldp5THfNtxtt1cMIZBaC0Jdj5Q,13118
+google_cloud_pipeline_components-2.13.1.dist-info/METADATA,sha256=0K2BCv2dfLs18vTVeEjTD4TkLAIOX5KMH5d1BMurowM,5880
+google_cloud_pipeline_components-2.13.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+google_cloud_pipeline_components-2.13.1.dist-info/top_level.txt,sha256=E8T4T8KGMGLXbHvt2goa98oezRpxryPC6QhWBZ27Hhc,33
+google_cloud_pipeline_components-2.13.1.dist-info/RECORD,,

{google_cloud_pipeline_components-2.12.0.dist-info → google_cloud_pipeline_components-2.13.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any