Skip to content

Commit 3619eb0

Browse files
kweinmeisterkweinmeister
authored
feat: upgrade sample style (Data-AI) (#9941)
Applied [pyupgrade](https://togithub.com/asottile/pyupgrade) to use f-strings and newer Python features.
1 parent 7ebad54 commit 3619eb0

File tree

212 files changed

+664
-737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+664
-737
lines changed

‎automl/beta/batch_predict_test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import batch_predict
1919

2020
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"]
21-
BUCKET_ID = "{}-lcm".format(PROJECT_ID)
21+
BUCKET_ID = f"{PROJECT_ID}-lcm"
2222
MODEL_ID = "TEN0000000000000000000"
2323
PREFIX = "TEST_EXPORT_OUTPUT_" + datetime.datetime.now().strftime(
2424
"%Y%m%d%H%M%S"
@@ -30,8 +30,8 @@ def test_batch_predict(capsys):
3030
# and confirm that the model was not found, but other elements of the
3131
# request were valid.
3232
try:
33-
input_uri = "gs://{}/entity-extraction/input.jsonl".format(BUCKET_ID)
34-
output_uri = "gs://{}/{}/".format(BUCKET_ID, PREFIX)
33+
input_uri = f"gs://{BUCKET_ID}/entity-extraction/input.jsonl"
34+
output_uri = f"gs://{BUCKET_ID}/{PREFIX}/"
3535
batch_predict.batch_predict(
3636
PROJECT_ID, MODEL_ID, input_uri, output_uri
3737
)

‎automl/beta/cancel_operation.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
#
32
# Copyright 2019 Google LLC
43
#
@@ -41,7 +40,7 @@ def sample_cancel_operation(project, operation_id):
4140

4241
operations_client.cancel_operation(name)
4342

44-
print(u"Cancelled operation: {}".format(name))
43+
print(f"Cancelled operation: {name}")
4544

4645

4746
# [END automl_cancel_operation]

‎automl/beta/delete_dataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ def delete_dataset(project_id="YOUR_PROJECT_ID", dataset_id="YOUR_DATASET_ID"):
2626
)
2727
response = client.delete_dataset(name=dataset_full_id)
2828

29-
print("Dataset deleted. {}".format(response.result()))
29+
print(f"Dataset deleted. {response.result()}")
3030
# [END automl_delete_dataset_beta]

‎automl/beta/delete_dataset_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import delete_dataset
2222

2323
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"]
24-
BUCKET_ID = "{}-lcm".format(PROJECT_ID)
24+
BUCKET_ID = f"{PROJECT_ID}-lcm"
2525

2626

2727
@pytest.fixture(scope="function")
2828
def dataset_id():
2929
client = automl.AutoMlClient()
3030
project_location = f"projects/{PROJECT_ID}/locations/us-central1"
31-
display_name = "test_{}".format(uuid.uuid4()).replace("-", "")[:32]
31+
display_name = f"test_{uuid.uuid4()}".replace("-", "")[:32]
3232
metadata = automl.VideoClassificationDatasetMetadata()
3333
dataset = automl.Dataset(
3434
display_name=display_name, video_classification_dataset_metadata=metadata

‎automl/beta/delete_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ def delete_model(project_id, model_id):
2727
model_full_id = client.model_path(project_id, "us-central1", model_id)
2828
response = client.delete_model(name=model_full_id)
2929

30-
print("Model deleted. {}".format(response.result()))
30+
print(f"Model deleted. {response.result()}")
3131
# [END automl_delete_model_beta]

‎automl/beta/get_model.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ def get_model(project_id, model_id):
3434
deployment_state = "undeployed"
3535

3636
# Display the model information.
37-
print("Model name: {}".format(model.name))
37+
print(f"Model name: {model.name}")
3838
print("Model id: {}".format(model.name.split("/")[-1]))
39-
print("Model display name: {}".format(model.display_name))
40-
print("Model create time: {}".format(model.create_time))
41-
print("Model deployment state: {}".format(deployment_state))
39+
print(f"Model display name: {model.display_name}")
40+
print(f"Model create time: {model.create_time}")
41+
print(f"Model deployment state: {deployment_state}")
4242
# [END automl_get_model_beta]

‎automl/beta/get_model_evaluation.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ def get_model_evaluation(project_id, model_id, model_evaluation_id):
3232
# Get complete detail of the model evaluation.
3333
response = client.get_model_evaluation(name=model_evaluation_full_id)
3434

35-
print("Model evaluation name: {}".format(response.name))
36-
print("Model annotation spec id: {}".format(response.annotation_spec_id))
37-
print("Create Time: {}".format(response.create_time))
35+
print(f"Model evaluation name: {response.name}")
36+
print(f"Model annotation spec id: {response.annotation_spec_id}")
37+
print(f"Create Time: {response.create_time}")
3838
print(
39-
"Evaluation example count: {}".format(response.evaluated_example_count)
39+
f"Evaluation example count: {response.evaluated_example_count}"
4040
)
4141

4242
# [END automl_video_object_tracking_get_model_evaluation_beta]

‎automl/beta/get_model_evaluation_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def model_evaluation_id():
3434
evaluations = client.list_model_evaluations(request=request)
3535
evaluation = next(iter(evaluations))
3636
model_evaluation_id = evaluation.name.split(
37-
"{}/modelEvaluations/".format(MODEL_ID)
37+
f"{MODEL_ID}/modelEvaluations/"
3838
)[1].split("\n")[0]
3939
yield model_evaluation_id
4040

‎automl/beta/get_operation_status.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_operation_status(
2828
operation_full_id
2929
)
3030

31-
print("Name: {}".format(response.name))
31+
print(f"Name: {response.name}")
3232
print("Operation details:")
3333
print(response)
3434
# [END automl_get_operation_status_beta]

‎automl/beta/import_dataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ def import_dataset(
3636
response = client.import_data(name=dataset_full_id, input_config=input_config)
3737

3838
print("Processing import...")
39-
print("Data imported. {}".format(response.result()))
39+
print(f"Data imported. {response.result()}")
4040
# [END automl_import_data_beta]

‎automl/beta/import_dataset_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import import_dataset
1818

1919
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"]
20-
BUCKET_ID = "{}-lcm".format(PROJECT_ID)
20+
BUCKET_ID = f"{PROJECT_ID}-lcm"
2121
DATASET_ID = "VCN0000000000000000000"
2222

2323

@@ -27,7 +27,7 @@ def test_import_dataset(capsys):
2727
# confirm that the dataset was not found, but other elements of the request
2828
# were valid.
2929
try:
30-
data = "gs://{}/video-classification/dataset.csv".format(BUCKET_ID)
30+
data = f"gs://{BUCKET_ID}/video-classification/dataset.csv"
3131
import_dataset.import_dataset(PROJECT_ID, DATASET_ID, data)
3232
out, _ = capsys.readouterr()
3333
assert (

‎automl/beta/list_datasets.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ def list_datasets(project_id="YOUR_PROJECT_ID"):
3030

3131
print("List of datasets:")
3232
for dataset in response:
33-
print("Dataset name: {}".format(dataset.name))
33+
print(f"Dataset name: {dataset.name}")
3434
print("Dataset id: {}".format(dataset.name.split("/")[-1]))
35-
print("Dataset display name: {}".format(dataset.display_name))
36-
print("Dataset create time: {}".format(dataset.create_time))
35+
print(f"Dataset display name: {dataset.display_name}")
36+
print(f"Dataset create time: {dataset.create_time}")
3737
# [END automl_video_object_tracking_list_datasets_beta]
3838

3939
print(

‎automl/beta/list_datasets_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ def test_list_dataset(capsys):
2424
# list datasets
2525
list_datasets.list_datasets(PROJECT_ID)
2626
out, _ = capsys.readouterr()
27-
assert "Dataset id: {}".format(DATASET_ID) in out
27+
assert f"Dataset id: {DATASET_ID}" in out

‎automl/beta/list_models.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ def list_models(project_id):
3838
else:
3939
deployment_state = "undeployed"
4040

41-
print("Model name: {}".format(model.name))
41+
print(f"Model name: {model.name}")
4242
print("Model id: {}".format(model.name.split("/")[-1]))
43-
print("Model display name: {}".format(model.display_name))
44-
print("Model create time: {}".format(model.create_time))
45-
print("Model deployment state: {}".format(deployment_state))
43+
print(f"Model display name: {model.display_name}")
44+
print(f"Model create time: {model.create_time}")
45+
print(f"Model deployment state: {deployment_state}")
4646
# [END automl_list_models_beta]

‎automl/beta/video_classification_create_dataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def create_dataset(
3636
created_dataset = client.create_dataset(parent=project_location, dataset=dataset)
3737

3838
# Display the dataset information
39-
print("Dataset name: {}".format(created_dataset.name))
39+
print(f"Dataset name: {created_dataset.name}")
4040

4141
# To get the dataset id, you have to parse it out of the `name` field.
4242
# As dataset Ids are required for other methods.

‎automl/beta/video_classification_create_dataset_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def teardown():
4040

4141
def test_video_classification_create_dataset(capsys):
4242
# create dataset
43-
dataset_name = "test_{}".format(uuid.uuid4()).replace("-", "")[:32]
43+
dataset_name = f"test_{uuid.uuid4()}".replace("-", "")[:32]
4444
video_classification_create_dataset.create_dataset(
4545
PROJECT_ID, dataset_name
4646
)

‎automl/beta/video_classification_create_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def create_model(
3737
# Create a model with the model metadata in the region.
3838
response = client.create_model(parent=project_location, model=model)
3939

40-
print("Training operation name: {}".format(response.operation.name))
40+
print(f"Training operation name: {response.operation.name}")
4141
print("Training started...")
4242
# [END automl_video_classification_create_model_beta]
4343
return response

‎automl/beta/video_object_tracking_create_dataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ def create_dataset(
3333
# Create a dataset with the dataset metadata in the region.
3434
created_dataset = client.create_dataset(parent=project_location, dataset=dataset)
3535
# Display the dataset information
36-
print("Dataset name: {}".format(created_dataset.name))
36+
print(f"Dataset name: {created_dataset.name}")
3737
print("Dataset id: {}".format(created_dataset.name.split("/")[-1]))
3838
# [END automl_video_object_tracking_create_dataset_beta]

‎automl/beta/video_object_tracking_create_dataset_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def teardown():
3939

4040
def test_video_classification_create_dataset(capsys):
4141
# create dataset
42-
dataset_name = "test_{}".format(uuid.uuid4()).replace("-", "")[:32]
42+
dataset_name = f"test_{uuid.uuid4()}".replace("-", "")[:32]
4343
video_object_tracking_create_dataset.create_dataset(
4444
PROJECT_ID, dataset_name
4545
)

‎automl/beta/video_object_tracking_create_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ def create_model(
3737
# Create a model with the model metadata in the region.
3838
response = client.create_model(parent=project_location, model=model)
3939

40-
print("Training operation name: {}".format(response.operation.name))
40+
print(f"Training operation name: {response.operation.name}")
4141
print("Training started...")
4242
# [END automl_video_object_tracking_create_model_beta]

‎automl/snippets/batch_predict_test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import batch_predict
1919

2020
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"]
21-
BUCKET_ID = "{}-lcm".format(PROJECT_ID)
21+
BUCKET_ID = f"{PROJECT_ID}-lcm"
2222
MODEL_ID = "TEN0000000000000000000"
2323
PREFIX = "TEST_EXPORT_OUTPUT_" + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
2424

@@ -28,8 +28,8 @@ def test_batch_predict(capsys):
2828
# and confirm that the model was not found, but other elements of the
2929
# request were valid.
3030
try:
31-
input_uri = "gs://{}/entity-extraction/input.jsonl".format(BUCKET_ID)
32-
output_uri = "gs://{}/{}/".format(BUCKET_ID, PREFIX)
31+
input_uri = f"gs://{BUCKET_ID}/entity-extraction/input.jsonl"
32+
output_uri = f"gs://{BUCKET_ID}/{PREFIX}/"
3333
batch_predict.batch_predict(PROJECT_ID, MODEL_ID, input_uri, output_uri)
3434
out, _ = capsys.readouterr()
3535
assert "does not exist" in out

‎automl/snippets/delete_dataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ def delete_dataset(project_id, dataset_id):
2727
dataset_full_id = client.dataset_path(project_id, "us-central1", dataset_id)
2828
response = client.delete_dataset(name=dataset_full_id)
2929

30-
print("Dataset deleted. {}".format(response.result()))
30+
print(f"Dataset deleted. {response.result()}")
3131
# [END automl_delete_dataset]

‎automl/snippets/delete_dataset_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import delete_dataset
2222

2323
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"]
24-
BUCKET_ID = "{}-lcm".format(PROJECT_ID)
24+
BUCKET_ID = f"{PROJECT_ID}-lcm"
2525

2626

2727
@pytest.fixture(scope="function")

‎automl/snippets/delete_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ def delete_model(project_id, model_id):
2727
model_full_id = client.model_path(project_id, "us-central1", model_id)
2828
response = client.delete_model(name=model_full_id)
2929

30-
print("Model deleted. {}".format(response.result()))
30+
print(f"Model deleted. {response.result()}")
3131
# [END automl_delete_model]

‎automl/snippets/export_dataset_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import export_dataset
1919

2020
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"]
21-
BUCKET_ID = "{}-lcm".format(PROJECT_ID)
21+
BUCKET_ID = f"{PROJECT_ID}-lcm"
2222
PREFIX = "TEST_EXPORT_OUTPUT_" + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
2323
DATASET_ID = "TEN0000000000000000000"
2424

@@ -30,7 +30,7 @@ def test_export_dataset(capsys):
3030
# valid.
3131
try:
3232
export_dataset.export_dataset(
33-
PROJECT_ID, DATASET_ID, "gs://{}/{}/".format(BUCKET_ID, PREFIX)
33+
PROJECT_ID, DATASET_ID, f"gs://{BUCKET_ID}/{PREFIX}/"
3434
)
3535
out, _ = capsys.readouterr()
3636
assert (

‎automl/snippets/get_dataset.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ def get_dataset(project_id, dataset_id):
3333
dataset = client.get_dataset(name=dataset_full_id)
3434

3535
# Display the dataset information
36-
print("Dataset name: {}".format(dataset.name))
36+
print(f"Dataset name: {dataset.name}")
3737
print("Dataset id: {}".format(dataset.name.split("/")[-1]))
38-
print("Dataset display name: {}".format(dataset.display_name))
39-
print("Dataset create time: {}".format(dataset.create_time))
38+
print(f"Dataset display name: {dataset.display_name}")
39+
print(f"Dataset create time: {dataset.create_time}")
4040
# [END automl_language_sentiment_analysis_get_dataset]
4141
# [END automl_language_text_classification_get_dataset]
4242
# [END automl_translate_get_dataset]

‎automl/snippets/get_model.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ def get_model(project_id, model_id):
3434
deployment_state = "undeployed"
3535

3636
# Display the model information.
37-
print("Model name: {}".format(model.name))
37+
print(f"Model name: {model.name}")
3838
print("Model id: {}".format(model.name.split("/")[-1]))
39-
print("Model display name: {}".format(model.display_name))
40-
print("Model create time: {}".format(model.create_time))
41-
print("Model deployment state: {}".format(deployment_state))
39+
print(f"Model display name: {model.display_name}")
40+
print(f"Model create time: {model.create_time}")
41+
print(f"Model deployment state: {deployment_state}")
4242
# [END automl_get_model]

‎automl/snippets/get_model_evaluation.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ def get_model_evaluation(project_id, model_id, model_evaluation_id):
3636
# Get complete detail of the model evaluation.
3737
response = client.get_model_evaluation(name=model_evaluation_full_id)
3838

39-
print("Model evaluation name: {}".format(response.name))
40-
print("Model annotation spec id: {}".format(response.annotation_spec_id))
41-
print("Create Time: {}".format(response.create_time))
42-
print("Evaluation example count: {}".format(response.evaluated_example_count))
39+
print(f"Model evaluation name: {response.name}")
40+
print(f"Model annotation spec id: {response.annotation_spec_id}")
41+
print(f"Create Time: {response.create_time}")
42+
print(f"Evaluation example count: {response.evaluated_example_count}")
4343
# [END automl_language_sentiment_analysis_get_model_evaluation]
4444
# [END automl_language_text_classification_get_model_evaluation]
4545
# [END automl_translate_get_model_evaluation]

‎automl/snippets/get_model_evaluation_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def model_evaluation_id():
3232
evaluation = e
3333
break
3434
model_evaluation_id = evaluation.name.split(
35-
"{}/modelEvaluations/".format(MODEL_ID)
35+
f"{MODEL_ID}/modelEvaluations/"
3636
)[1].split("\n")[0]
3737
yield model_evaluation_id
3838

‎automl/snippets/get_operation_status.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def get_operation_status(operation_full_id):
2626
# Get the latest state of a long-running operation.
2727
response = client._transport.operations_client.get_operation(operation_full_id)
2828

29-
print("Name: {}".format(response.name))
29+
print(f"Name: {response.name}")
3030
print("Operation details:")
3131
print(response)
3232
# [END automl_get_operation_status]

‎automl/snippets/import_dataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ def import_dataset(project_id, dataset_id, path):
3434
response = client.import_data(name=dataset_full_id, input_config=input_config)
3535

3636
print("Processing import...")
37-
print("Data imported. {}".format(response.result()))
37+
print(f"Data imported. {response.result()}")
3838
# [END automl_import_data]

‎automl/snippets/import_dataset_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import import_dataset
1818

1919
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"]
20-
BUCKET_ID = "{}-lcm".format(PROJECT_ID)
20+
BUCKET_ID = f"{PROJECT_ID}-lcm"
2121
DATASET_ID = "TEN0000000000000000000"
2222

2323

@@ -27,7 +27,7 @@ def test_import_dataset(capsys):
2727
# confirm that the dataset was not found, but other elements of the request
2828
# were valid.
2929
try:
30-
data = "gs://{}/sentiment-analysis/dataset.csv".format(BUCKET_ID)
30+
data = f"gs://{BUCKET_ID}/sentiment-analysis/dataset.csv"
3131
import_dataset.import_dataset(PROJECT_ID, DATASET_ID, data)
3232
out, _ = capsys.readouterr()
3333
assert (

‎automl/snippets/language_entity_extraction_create_dataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ def create_dataset(project_id, display_name):
3737
created_dataset = response.result()
3838

3939
# Display the dataset information
40-
print("Dataset name: {}".format(created_dataset.name))
40+
print(f"Dataset name: {created_dataset.name}")
4141
print("Dataset id: {}".format(created_dataset.name.split("/")[-1]))
4242
# [END automl_language_entity_extraction_create_dataset]

‎automl/snippets/language_entity_extraction_create_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ def create_model(project_id, dataset_id, display_name):
3838
# Create a model with the model metadata in the region.
3939
response = client.create_model(parent=project_location, model=model)
4040

41-
print("Training operation name: {}".format(response.operation.name))
41+
print(f"Training operation name: {response.operation.name}")
4242
print("Training started...")
4343
# [END automl_language_entity_extraction_create_model]

0 commit comments

Comments
 (0)