From b6a7d82e865df89dd8030a31e9e4733600b6ce7d Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 20:48:24 -0400
Subject: [PATCH] chore(python): add nox session to sort python imports (#312)

Source-Link: https://github.com/googleapis/synthtool/commit/1b71c10e20de7ed3f97f692f99a0e3399b67049f
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .../snippets/batch_parse_form_v1beta2_test.py |  3 ---
 .../batch_parse_table_v1beta2_test.py         |  3 ---
 .../batch_process_documents_sample_test.py    |  2 --
 documentai/snippets/noxfile.py                | 23 ++++++++++++++++++-
 .../snippets/parse_form_v1beta2_test.py       |  1 -
 .../snippets/parse_table_v1beta2_test.py      |  1 -
 .../snippets/parse_with_model_v1beta2_test.py |  1 -
 .../process_document_form_sample_test.py      |  1 -
 .../process_document_quality_sample_test.py   |  1 -
 .../snippets/process_document_sample_test.py  |  1 -
 ...rocess_document_specialized_sample_test.py |  1 -
 .../process_document_splitter_sample_test.py  |  1 -
 .../snippets/quickstart_v1beta2_test.py       |  1 -
 .../snippets/set_endpoint_v1beta2_test.py     |  1 -
 14 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/documentai/snippets/batch_parse_form_v1beta2_test.py b/documentai/snippets/batch_parse_form_v1beta2_test.py
index f42cb249c040..c4bad1ad14a6 100644
--- a/documentai/snippets/batch_parse_form_v1beta2_test.py
+++ b/documentai/snippets/batch_parse_form_v1beta2_test.py
@@ -16,12 +16,9 @@
 import uuid
 
 from google.cloud import storage
-
 import pytest
-
 from samples.snippets import batch_parse_form_v1beta2
 
-
 BUCKET = "document-ai-{}".format(uuid.uuid4())
 OUTPUT_PREFIX = "TEST_OUTPUT_{}".format(uuid.uuid4())
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
diff --git a/documentai/snippets/batch_parse_table_v1beta2_test.py b/documentai/snippets/batch_parse_table_v1beta2_test.py
index 0818d8c00e0e..faf268567e68 100644
--- a/documentai/snippets/batch_parse_table_v1beta2_test.py
+++ b/documentai/snippets/batch_parse_table_v1beta2_test.py
@@ -16,12 +16,9 @@
 import uuid
 
 from google.cloud import storage
-
 import pytest
-
 from samples.snippets import batch_parse_table_v1beta2
 
-
 BUCKET = "document-ai-{}".format(uuid.uuid4())
 OUTPUT_PREFIX = "TEST_OUTPUT_{}".format(uuid.uuid4())
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
diff --git a/documentai/snippets/batch_process_documents_sample_test.py b/documentai/snippets/batch_process_documents_sample_test.py
index 7168d5a77fd4..d3018fb6a587 100644
--- a/documentai/snippets/batch_process_documents_sample_test.py
+++ b/documentai/snippets/batch_process_documents_sample_test.py
@@ -18,9 +18,7 @@
 
 from google.cloud import storage
 from google.cloud.exceptions import NotFound
-
 import pytest
-
 from samples.snippets import batch_process_documents_sample
 
 location = "us"
diff --git a/documentai/snippets/noxfile.py b/documentai/snippets/noxfile.py
index 25f87a215d4c..3b3ffa5d2b0f 100644
--- a/documentai/snippets/noxfile.py
+++ b/documentai/snippets/noxfile.py
@@ -22,7 +22,6 @@
 
 import nox
 
-
 # WARNING - WARNING - WARNING - WARNING - WARNING
 # WARNING - WARNING - WARNING - WARNING - WARNING
 #           DO NOT EDIT THIS FILE EVER!
@@ -30,6 +29,7 @@
 # WARNING - WARNING - WARNING - WARNING - WARNING
 
 BLACK_VERSION = "black==22.3.0"
+ISORT_VERSION = "isort==5.10.1"
 
 # Copy `noxfile_config.py` to your directory and modify it instead.
 
@@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None:
 
 @nox.session
 def blacken(session: nox.sessions.Session) -> None:
+    """Run black. Format code to uniform standard."""
     session.install(BLACK_VERSION)
     python_files = [path for path in os.listdir(".") if path.endswith(".py")]
 
     session.run("black", *python_files)
 
 
+#
+# format = isort + black
+#
+
+
+@nox.session
+def format(session: nox.sessions.Session) -> None:
+    """
+    Run isort to sort imports. Then run black
+    to format code to uniform standard.
+    """
+    session.install(BLACK_VERSION, ISORT_VERSION)
+    python_files = [path for path in os.listdir(".") if path.endswith(".py")]
+
+    # Use the --fss option to sort imports using strict alphabetical order.
+    # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
+    session.run("isort", "--fss", *python_files)
+    session.run("black", *python_files)
+
+
 #
 # Sample Tests
 #
diff --git a/documentai/snippets/parse_form_v1beta2_test.py b/documentai/snippets/parse_form_v1beta2_test.py
index 6987612aef9f..c2b33eec9f92 100644
--- a/documentai/snippets/parse_form_v1beta2_test.py
+++ b/documentai/snippets/parse_form_v1beta2_test.py
@@ -16,7 +16,6 @@
 
 from samples.snippets import parse_form_v1beta2
 
-
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 INPUT_URI = "gs://cloud-samples-data/documentai/form.pdf"
 
diff --git a/documentai/snippets/parse_table_v1beta2_test.py b/documentai/snippets/parse_table_v1beta2_test.py
index 4102c926b487..f59e9a828a16 100644
--- a/documentai/snippets/parse_table_v1beta2_test.py
+++ b/documentai/snippets/parse_table_v1beta2_test.py
@@ -16,7 +16,6 @@
 
 from samples.snippets import parse_table_v1beta2
 
-
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"
 
diff --git a/documentai/snippets/parse_with_model_v1beta2_test.py b/documentai/snippets/parse_with_model_v1beta2_test.py
index 4b5d3ca52b31..e3934b65c027 100644
--- a/documentai/snippets/parse_with_model_v1beta2_test.py
+++ b/documentai/snippets/parse_with_model_v1beta2_test.py
@@ -16,7 +16,6 @@
 
 from samples.snippets import parse_with_model_v1beta2
 
-
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"
 AUTOML_NL_MODEL_ID = "TCN3472481026502981088"
diff --git a/documentai/snippets/process_document_form_sample_test.py b/documentai/snippets/process_document_form_sample_test.py
index da76d6d0c221..38f722de3960 100644
--- a/documentai/snippets/process_document_form_sample_test.py
+++ b/documentai/snippets/process_document_form_sample_test.py
@@ -17,7 +17,6 @@
 
 from samples.snippets import process_document_form_sample
 
-
 location = "us"
 project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
 processor_id = "90484cfdedb024f6"
diff --git a/documentai/snippets/process_document_quality_sample_test.py b/documentai/snippets/process_document_quality_sample_test.py
index b025756eeeb9..a0dc52cb5cff 100644
--- a/documentai/snippets/process_document_quality_sample_test.py
+++ b/documentai/snippets/process_document_quality_sample_test.py
@@ -17,7 +17,6 @@
 
 from samples.snippets import process_document_quality_sample
 
-
 location = "us"
 project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
 processor_id = "7fcb597c523721b3"
diff --git a/documentai/snippets/process_document_sample_test.py b/documentai/snippets/process_document_sample_test.py
index 8fe188d8da8f..48dce8bbe183 100644
--- a/documentai/snippets/process_document_sample_test.py
+++ b/documentai/snippets/process_document_sample_test.py
@@ -17,7 +17,6 @@
 
 from samples.snippets import process_document_sample
 
-
 location = "us"
 project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
 processor_id = "90484cfdedb024f6"
diff --git a/documentai/snippets/process_document_specialized_sample_test.py b/documentai/snippets/process_document_specialized_sample_test.py
index 04a7abec3668..a3156c963313 100644
--- a/documentai/snippets/process_document_specialized_sample_test.py
+++ b/documentai/snippets/process_document_specialized_sample_test.py
@@ -17,7 +17,6 @@
 
 from samples.snippets import process_document_specialized_sample
 
-
 location = "us"
 project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
 processor_id = "feacd98c28866ede"
diff --git a/documentai/snippets/process_document_splitter_sample_test.py b/documentai/snippets/process_document_splitter_sample_test.py
index df0baf26fd82..575edf60ac89 100644
--- a/documentai/snippets/process_document_splitter_sample_test.py
+++ b/documentai/snippets/process_document_splitter_sample_test.py
@@ -17,7 +17,6 @@
 
 from samples.snippets import process_document_splitter_sample
 
-
 location = "us"
 project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
 processor_id = "ed55eeb2b276066f"
diff --git a/documentai/snippets/quickstart_v1beta2_test.py b/documentai/snippets/quickstart_v1beta2_test.py
index 1868788d7cea..8467b53ee28c 100644
--- a/documentai/snippets/quickstart_v1beta2_test.py
+++ b/documentai/snippets/quickstart_v1beta2_test.py
@@ -16,7 +16,6 @@
 
 from samples.snippets import quickstart_v1beta2
 
-
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"
 
diff --git a/documentai/snippets/set_endpoint_v1beta2_test.py b/documentai/snippets/set_endpoint_v1beta2_test.py
index be535a28d29c..b9811155dead 100644
--- a/documentai/snippets/set_endpoint_v1beta2_test.py
+++ b/documentai/snippets/set_endpoint_v1beta2_test.py
@@ -16,7 +16,6 @@
 
 from samples.snippets import set_endpoint_v1beta2
 
-
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"