chore(components): use programmatically generated artifact placeholders

PiperOrigin-RevId: 530620105
This commit is contained in:
Connor McCarthy 2023-05-09 08:46:01 -07:00 committed by Google Cloud Pipeline Components maintainers
parent b82c393121
commit 0a787afff3
47 changed files with 115 additions and 115 deletions

View File

@ -199,7 +199,7 @@ def model_evaluation_classification(
input_name='predictions_gcs_source',
then=[
'--batch_prediction_gcs_source',
"{{$.inputs.artifacts['predictions_gcs_source'].uri}}",
predictions_gcs_source.uri,
],
),
IfPresentPlaceholder(
@ -208,11 +208,11 @@ def model_evaluation_classification(
'--batch_prediction_bigquery_source',
ConcatPlaceholder([
'bq://',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['projectId']}}",
predictions_bigquery_source.metadata['projectId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['datasetId']}}",
predictions_bigquery_source.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['tableId']}}",
predictions_bigquery_source.metadata['tableId'],
]),
],
),
@ -220,7 +220,7 @@ def model_evaluation_classification(
input_name='model',
then=[
'--model_name',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
],
),
'--ground_truth_format',

View File

@ -130,7 +130,7 @@ def dataset_preprocessor_error_analysis(
input_name='test_dataset',
then=[
'--test_dataset',
"{{$.inputs.artifacts['test_dataset'].metadata['resourceName']}}",
test_dataset.metadata['resourceName'],
'--test_dataset_annotation_set_name',
test_dataset_annotation_set_name,
],
@ -139,7 +139,7 @@ def dataset_preprocessor_error_analysis(
input_name='training_dataset',
then=[
'--training_dataset',
"{{$.inputs.artifacts['training_dataset'].metadata['resourceName']}}",
training_dataset.metadata['resourceName'],
'--training_dataset_annotation_set_name',
training_dataset_annotation_set_name,
],

View File

@ -117,14 +117,14 @@ def feature_extractor_error_analysis(
IfPresentPlaceholder(
input_name='test_dataset',
then=(
"\", \"--test_dataset_resource_name={{$.inputs.artifacts['test_dataset'].metadata['resourceName']}}"
f"\", \"--test_dataset_resource_name={test_dataset.metadata['resourceName']}"
),
else_='',
),
IfPresentPlaceholder(
input_name='training_dataset',
then=(
"\", \"--training_dataset_resource_name={{$.inputs.artifacts['training_dataset'].metadata['resourceName']}}"
f"\", \"--training_dataset_resource_name={training_dataset.metadata['resourceName']}"
),
else_='',
),

View File

@ -124,7 +124,7 @@ def feature_attribution(
input_name='predictions_gcs_source',
then=[
'--batch_prediction_gcs_source',
"{{$.inputs.artifacts['predictions_gcs_source'].uri}}",
predictions_gcs_source.uri,
],
),
IfPresentPlaceholder(
@ -133,11 +133,11 @@ def feature_attribution(
'--batch_prediction_bigquery_source',
ConcatPlaceholder([
'bq://',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['projectId']}}",
predictions_bigquery_source.metadata['projectId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['datasetId']}}",
predictions_bigquery_source.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['tableId']}}",
predictions_bigquery_source.metadata['tableId'],
]),
],
),

View File

@ -173,7 +173,7 @@ def model_evaluation_forecasting(
input_name='predictions_gcs_source',
then=[
'--batch_prediction_gcs_source',
"{{$.inputs.artifacts['predictions_gcs_source'].uri}}",
predictions_gcs_source.uri,
],
),
IfPresentPlaceholder(
@ -182,11 +182,11 @@ def model_evaluation_forecasting(
'--batch_prediction_bigquery_source',
ConcatPlaceholder([
'bq://',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['projectId']}}",
predictions_bigquery_source.metadata['projectId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['datasetId']}}",
predictions_bigquery_source.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['tableId']}}",
predictions_bigquery_source.metadata['tableId'],
]),
],
),
@ -194,7 +194,7 @@ def model_evaluation_forecasting(
input_name='model',
then=[
'--model_name',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
],
),
'--ground_truth_format',

View File

@ -155,7 +155,7 @@ def model_evaluation_regression(
input_name='predictions_gcs_source',
then=[
'--batch_prediction_gcs_source',
"{{$.inputs.artifacts['predictions_gcs_source'].uri}}",
predictions_gcs_source.uri,
],
),
IfPresentPlaceholder(
@ -164,11 +164,11 @@ def model_evaluation_regression(
'--batch_prediction_bigquery_source',
ConcatPlaceholder([
'bq://',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['projectId']}}",
predictions_bigquery_source.metadata['projectId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['datasetId']}}",
predictions_bigquery_source.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['predictions_bigquery_source'].metadata['tableId']}}",
predictions_bigquery_source.metadata['tableId'],
]),
],
),
@ -176,7 +176,7 @@ def model_evaluation_regression(
input_name='model',
then=[
'--model_name',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
],
),
'--ground_truth_format',

View File

@ -414,7 +414,7 @@ def automl_forecasting_training_job(
'--method.data_granularity_count',
data_granularity_count,
'--method.dataset',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
dsl.IfPresentPlaceholder(
input_name='optimization_objective',
then=['--init.optimization_objective', optimization_objective],

View File

@ -265,7 +265,7 @@ def automl_image_training_job(
'--init.labels',
labels,
'--method.dataset',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
'--method.disable_early_stopping',
disable_early_stopping,
dsl.IfPresentPlaceholder(
@ -330,7 +330,7 @@ def automl_image_training_job(
input_name='base_model',
then=[
'--init.base_model',
"{{$.inputs.artifacts['base_model'].metadata['resourceName']}}",
base_model.metadata['resourceName'],
],
),
dsl.IfPresentPlaceholder(

View File

@ -327,7 +327,7 @@ def automl_tabular_training_job(
'--init.optimization_prediction_type',
optimization_prediction_type,
'--method.dataset',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
'--method.target_column',
target_column,
dsl.IfPresentPlaceholder(

View File

@ -187,7 +187,7 @@ def automl_text_training_job(
'--init.sentiment_max',
sentiment_max,
'--method.dataset',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
dsl.IfPresentPlaceholder(
input_name='training_encryption_spec_key_name',
then=[

View File

@ -186,7 +186,7 @@ def automl_video_training_job(
'--init.model_type',
model_type,
'--method.dataset',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
dsl.IfPresentPlaceholder(
input_name='training_encryption_spec_key_name',
then=[

View File

@ -271,7 +271,7 @@ def model_batch_predict(
input_name='model',
then=ConcatPlaceholder([
'"model": "',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
'",',
]),
),

View File

@ -133,11 +133,11 @@ def bigquery_detect_anomalies_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -87,11 +87,11 @@ def bigquery_drop_model_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -122,11 +122,11 @@ def bigquery_evaluate_model_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -116,11 +116,11 @@ def bigquery_explain_forecast_model_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--horizon',
horizon,

View File

@ -137,11 +137,11 @@ def bigquery_explain_predict_model_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -88,11 +88,11 @@ def bigquery_export_model_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--model_destination_path',
model_destination_path,

View File

@ -103,11 +103,11 @@ def bigquery_ml_feature_importance_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -116,11 +116,11 @@ def bigquery_forecast_model_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--horizon',
horizon,

View File

@ -87,11 +87,11 @@ def bigquery_ml_global_explain_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--class_level_explain',
class_level_explain,

View File

@ -96,11 +96,11 @@ def bigquery_ml_advanced_weights_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -98,11 +98,11 @@ def bigquery_ml_arima_coefficients(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -112,11 +112,11 @@ def bigquery_ml_arima_evaluate_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--show_all_candidate_models',
show_all_candidate_models,

View File

@ -110,11 +110,11 @@ def bigquery_ml_centroids_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--standardize',
standardize,

View File

@ -110,11 +110,11 @@ def bigquery_ml_confusion_matrix_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -96,11 +96,11 @@ def bigquery_ml_feature_info_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -107,11 +107,11 @@ def bigquery_ml_principal_component_info_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -106,11 +106,11 @@ def bigquery_ml_principal_components_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -115,11 +115,11 @@ def bigquery_ml_recommend_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -115,11 +115,11 @@ def bigquery_ml_reconstruction_loss_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -110,11 +110,11 @@ def bigquery_ml_roc_curve_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -97,11 +97,11 @@ def bigquery_ml_training_info_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -103,11 +103,11 @@ def bigquery_ml_trial_info_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -97,11 +97,11 @@ def bigquery_ml_weights_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--payload',
ConcatPlaceholder([

View File

@ -123,11 +123,11 @@ def bigquery_predict_model_job(
location,
'--model_name',
ConcatPlaceholder([
"{{$.inputs.artifacts['model'].metadata['projectId']}}",
model.metadata['projectId'],
'.',
"{{$.inputs.artifacts['model'].metadata['datasetId']}}",
model.metadata['datasetId'],
'.',
"{{$.inputs.artifacts['model'].metadata['modelId']}}",
model.metadata['modelId'],
]),
'--table_name',
table_name,

View File

@ -69,7 +69,7 @@ def image_dataset_export(
],
args=[
'--init.dataset_name',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
'--init.project',
project,
'--init.location',

View File

@ -69,7 +69,7 @@ def tabular_dataset_export(
],
args=[
'--init.dataset_name',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
'--init.project',
project,
'--init.location',

View File

@ -69,7 +69,7 @@ def text_dataset_export(
],
args=[
'--init.dataset_name',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
'--init.project',
project,
'--init.location',

View File

@ -69,7 +69,7 @@ def time_series_dataset_export(
],
args=[
'--init.dataset_name',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
'--init.project',
project,
'--init.location',

View File

@ -69,7 +69,7 @@ def video_dataset_export(
],
args=[
'--init.dataset_name',
"{{$.inputs.artifacts['dataset'].metadata['resourceName']}}",
dataset.metadata['resourceName'],
'--init.project',
project,
'--init.location',

View File

@ -54,7 +54,7 @@ def endpoint_delete(
dsl.ConcatPlaceholder([
'{',
'"endpoint": "',
"{{$.inputs.artifacts['endpoint'].metadata['resourceName']}}",
endpoint.metadata['resourceName'],
'"',
'}',
]),

View File

@ -177,13 +177,13 @@ def model_deploy(
ConcatPlaceholder([
'{',
'"endpoint": "',
"{{$.inputs.artifacts['endpoint'].metadata['resourceName']}}",
endpoint.metadata['resourceName'],
'"',
', "traffic_split": ',
traffic_split,
', "deployed_model": {',
'"model": "',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
'"',
', "dedicated_resources": {',
'"machine_spec": {',

View File

@ -67,10 +67,10 @@ def model_undeploy(
dsl.ConcatPlaceholder([
'{',
'"endpoint": "',
"{{$.inputs.artifacts['endpoint'].metadata['resourceName']}}",
endpoint.metadata['resourceName'],
'"',
', "model": "',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
'"',
', "traffic_split": ',
traffic_split,

View File

@ -50,7 +50,7 @@ def model_delete(model: Input[VertexModel], gcp_resources: dsl.OutputPath(str)):
dsl.ConcatPlaceholder([
'{',
'"model": "',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
'"',
'}',
]),

View File

@ -95,7 +95,7 @@ def model_export(
ConcatPlaceholder([
'{',
'"name": "',
"{{$.inputs.artifacts['model'].metadata['resourceName']}}",
model.metadata['resourceName'],
'"',
', "output_config": {',
'"export_format_id": "',

View File

@ -160,7 +160,7 @@ def model_upload(
input_name='parent_model',
then=ConcatPlaceholder([
'--parent_model_name ',
"{{$.inputs.artifacts['parent_model'].metadata['resourceName']}}",
parent_model.metadata['resourceName'],
]),
),
],