chore: Fix lint

PiperOrigin-RevId: 552860665

Author: yinghsienwu

.pre-commit-config.yaml

@@ -26,6 +26,6 @@ repos:
  hooks:
  - id: black
 - repo: https://github.com/pycqa/flake8
- rev: 3.9.2
+ rev: 6.1.0
  hooks:
  - id: flake8

google/cloud/aiplatform/jobs.py

@@ -685,7 +685,7 @@ def create(
  else:
  input_config.instances_format = instances_format
  input_config.gcs_source = gca_io_compat.GcsSource(
- uris=gcs_source if type(gcs_source) == list else [gcs_source]
+ uris=gcs_source if isinstance(gcs_source, list) else [gcs_source]
  )
 
  if bigquery_destination_prefix:

noxfile.py

@@ -25,6 +25,7 @@
 
 import nox
 
+FLAKE8_VERSION = "flake8==6.1.0"
 BLACK_VERSION = "black==22.3.0"
 ISORT_VERSION = "isort==5.10.1"
 LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
@@ -85,7 +86,7 @@ def lint(session):
  Returns a failure if the linters find linting errors or sufficiently
  serious code quality issues.
  """
- session.install("flake8", BLACK_VERSION)
+ session.install(FLAKE8_VERSION, BLACK_VERSION)
  session.run(
  "black",
  "--check",

samples/snippets/conftest.py

@@ -282,7 +282,9 @@ def teardown_batch_read_feature_values(shared_state, bigquery_client):
 def create_endpoint(shared_state, endpoint_client):
  def create(project, location, test_name="temp_deploy_model_test"):
  parent = f"projects/{project}/locations/{location}"
- endpoint = aiplatform.gapic.Endpoint(display_name=f"{test_name}_{uuid4()}",)
+ endpoint = aiplatform.gapic.Endpoint(
+ display_name=f"{test_name}_{uuid4()}",
+ )
  create_endpoint_response = endpoint_client.create_endpoint(
  parent=parent, endpoint=endpoint
  )

samples/snippets/helpers.py

@@ -24,7 +24,7 @@
 
 
 def get_name(out, key="name"):
- pattern = re.compile(fr'{key}:\s*"([\-a-zA-Z0-9/]+)"')
+ pattern = re.compile(rf'{key}:\s*"([\-a-zA-Z0-9/]+)"')
  name = re.search(pattern, out).group(1)
 
  return name
@@ -38,7 +38,7 @@ def get_state(out):
 
 
 def get_featurestore_resource_name(out, key="name"):
- pattern = re.compile(fr'{key}:\s*"([\_\-a-zA-Z0-9/]+)"')
+ pattern = re.compile(rf'{key}:\s*"([\_\-a-zA-Z0-9/]+)"')
  name = re.search(pattern, out).group(1)
 
  return name
@@ -51,7 +51,7 @@ def wait_for_job_state(
  timeout: int = 90,
  freq: float = 1.5,
 ) -> None:
- """ Waits until the Job state of provided resource name is a particular state.
+ """Waits until the Job state of provided resource name is a particular state.
 
  Args:
  get_job_method: Callable[[str], "proto.Message"]
@@ -91,12 +91,12 @@ def flaky_test_diagnostic(file_name, test_name, N=20):
  timing_dict = collections.defaultdict(list)
  for ri in range(N):
  start = timer()
- result = pytest.main(['-s', f'{file_name}::{test_name}'])
+ result = pytest.main(["-s", f"{file_name}::{test_name}"])
  end = timer()
- delta = end-start
+ delta = end - start
  if result == pytest.ExitCode.OK:
- timing_dict['SUCCESS'].append(delta)
+ timing_dict["SUCCESS"].append(delta)
  else:
- timing_dict['FAILURE'].append(delta)
+ timing_dict["FAILURE"].append(delta)
 
  return timing_dict

samples/snippets/noxfile.py

@@ -160,6 +160,7 @@ def blacken(session: nox.sessions.Session) -> None:
 # format = isort + black
 #
 
+
 @nox.session
 def format(session: nox.sessions.Session) -> None:
  """
@@ -187,7 +188,9 @@ def _session_tests(
  session: nox.sessions.Session, post_install: Callable = None
 ) -> None:
  # check for presence of tests
- test_list = glob.glob("**/*_test.py", recursive=True) + glob.glob("**/test_*.py", recursive=True)
+ test_list = glob.glob("**/*_test.py", recursive=True) + glob.glob(
+ "**/test_*.py", recursive=True
+ )
  test_list.extend(glob.glob("**/tests", recursive=True))
 
  if len(test_list) == 0:
@@ -209,9 +212,7 @@ def _session_tests(
 
  if os.path.exists("requirements-test.txt"):
  if os.path.exists("constraints-test.txt"):
- session.install(
- "-r", "requirements-test.txt", "-c", "constraints-test.txt"
- )
+ session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt")
  else:
  session.install("-r", "requirements-test.txt")
  with open("requirements-test.txt") as rtfile:
@@ -224,9 +225,9 @@ def _session_tests(
  post_install(session)
 
  if "pytest-parallel" in packages:
- concurrent_args.extend(['--workers', 'auto', '--tests-per-worker', 'auto'])
+ concurrent_args.extend(["--workers", "auto", "--tests-per-worker", "auto"])
  elif "pytest-xdist" in packages:
- concurrent_args.extend(['-n', 'auto'])
+ concurrent_args.extend(["-n", "auto"])
 
  session.run(
  "pytest",
@@ -256,7 +257,7 @@ def py(session: nox.sessions.Session) -> None:
 
 
 def _get_repo_root() -> Optional[str]:
- """ Returns the root folder of the project. """
+ """Returns the root folder of the project."""
  # Get root of this repository. Assume we don't have directories nested deeper than 10 items.
  p = Path(os.getcwd())
  for i in range(10):

samples/snippets/noxfile_config.py

@@ -30,6 +30,6 @@
  # secrets here. These values will override predefined values.
  "envs": {
  "DATA_LABELING_API_ENDPOINT": "us-central1-autopush-aiplatform.sandbox.googleapis.com",
- "PYTEST_ADDOPTS": "-n=auto" # Run tests parallel using all available CPUs
+ "PYTEST_ADDOPTS": "-n=auto", # Run tests parallel using all available CPUs
  },
 }

samples/snippets/prediction_service/explain_tabular_sample_test.py

@@ -34,4 +34,4 @@ def test_ucaip_generated_explain_tabular_sample(capsys):
  )
 
  out, _ = capsys.readouterr()
- assert 'attribution' in out
+ assert "attribution" in out

samples/snippets/prediction_service/predict_custom_trained_model_sample.py

@@ -37,7 +37,7 @@ def predict_custom_trained_model_sample(
  # This client only needs to be created once, and can be reused for multiple requests.
  client = aiplatform.gapic.PredictionServiceClient(client_options=client_options)
  # The format of each instance should conform to the deployed model's prediction input schema.
- instances = instances if type(instances) == list else [instances]
+ instances = instances if isinstance(instances, list) else [instances]
  instances = [
  json_format.ParseDict(instance_dict, Value()) for instance_dict in instances
  ]

samples/snippets/prediction_service/predict_image_classification_sample.py

@@ -42,7 +42,8 @@ def predict_image_classification_sample(
  instances = [instance]
  # See gs://google-cloud-aiplatform/schema/predict/params/image_classification_1.0.0.yaml for the format of the parameters.
  parameters = predict.params.ImageClassificationPredictionParams(
- confidence_threshold=0.5, max_predictions=5,
+ confidence_threshold=0.5,
+ max_predictions=5,
  ).to_value()
  endpoint = client.endpoint_path(
  project=project, location=location, endpoint=endpoint_id