run nox

Author: ohmayr

packages/google-cloud-vision/google/cloud/vision_v1/__init__.py

@@ -27,8 +27,11 @@
     # this code path once we drop support for Python 3.7
     import importlib_metadata as metadata
 
+from google.cloud.vision_helpers import VisionHelpers
+from google.cloud.vision_helpers.decorators import add_single_feature_methods
 
-from .services.image_annotator import ImageAnnotatorAsyncClient, ImageAnnotatorClient
+from .services.image_annotator import ImageAnnotatorAsyncClient
+from .services.image_annotator import ImageAnnotatorClient as IacImageAnnotatorClient
 from .services.product_search import ProductSearchAsyncClient, ProductSearchClient
 from .types.geometry import BoundingPoly, NormalizedVertex, Position, Vertex
 from .types.image_annotator import (
@@ -204,6 +207,13 @@ def _get_version(dependency_name):
             + "https://devguide.python.org/versions/"
         )
 
+
+@add_single_feature_methods
+class ImageAnnotatorClient(VisionHelpers, IacImageAnnotatorClient):
+    __doc__ = IacImageAnnotatorClient.__doc__
+    Feature = Feature
+
+
 __all__ = (
     "ImageAnnotatorAsyncClient",
     "ProductSearchAsyncClient",

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/client.py

@@ -649,9 +649,11 @@ def __init__(
 
         universe_domain_opt = getattr(self._client_options, "universe_domain", None)
 
-        self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = (
-            ImageAnnotatorClient._read_environment_variables()
-        )
+        (
+            self._use_client_cert,
+            self._use_mtls_endpoint,
+            self._universe_domain_env,
+        ) = ImageAnnotatorClient._read_environment_variables()
         self._client_cert_source = ImageAnnotatorClient._get_client_cert_source(
             self._client_options.client_cert_source, self._use_client_cert
         )

packages/google-cloud-vision/google/cloud/vision_v1/services/product_search/client.py

@@ -694,9 +694,11 @@ def __init__(
 
         universe_domain_opt = getattr(self._client_options, "universe_domain", None)
 
-        self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = (
-            ProductSearchClient._read_environment_variables()
-        )
+        (
+            self._use_client_cert,
+            self._use_mtls_endpoint,
+            self._universe_domain_env,
+        ) = ProductSearchClient._read_environment_variables()
         self._client_cert_source = ProductSearchClient._get_client_cert_source(
             self._client_options.client_cert_source, self._use_client_cert
         )

packages/google-cloud-vision/google/cloud/vision_v1/types/__init__.py

@@ -13,12 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .geometry import (
-    BoundingPoly,
-    NormalizedVertex,
-    Position,
-    Vertex,
-)
+from .geometry import BoundingPoly, NormalizedVertex, Position, Vertex
 from .image_annotator import (
     AnnotateFileRequest,
     AnnotateFileResponse,
@@ -61,10 +56,7 @@
     TextDetectionParams,
     WebDetectionParams,
 )
-from .product_search import (
-    ProductSearchParams,
-    ProductSearchResults,
-)
+from .product_search import ProductSearchParams, ProductSearchResults
 from .product_search_service import (
     AddProductToProductSetRequest,
     BatchOperationMetadata,
@@ -98,17 +90,8 @@
     UpdateProductRequest,
     UpdateProductSetRequest,
 )
-from .text_annotation import (
-    Block,
-    Page,
-    Paragraph,
-    Symbol,
-    TextAnnotation,
-    Word,
-)
-from .web_detection import (
-    WebDetection,
-)
+from .text_annotation import Block, Page, Paragraph, Symbol, TextAnnotation, Word
+from .web_detection import WebDetection
 
 __all__ = (
     "BoundingPoly",

packages/google-cloud-vision/google/cloud/vision_v1p1beta1/__init__.py

@@ -27,8 +27,11 @@
     # this code path once we drop support for Python 3.7
     import importlib_metadata as metadata
 
+from google.cloud.vision_helpers import VisionHelpers
+from google.cloud.vision_helpers.decorators import add_single_feature_methods
 
-from .services.image_annotator import ImageAnnotatorAsyncClient, ImageAnnotatorClient
+from .services.image_annotator import ImageAnnotatorAsyncClient
+from .services.image_annotator import ImageAnnotatorClient as IacImageAnnotatorClient
 from .types.geometry import BoundingPoly, Position, Vertex
 from .types.image_annotator import (
     AnnotateImageRequest,
@@ -152,6 +155,13 @@ def _get_version(dependency_name):
             + "https://devguide.python.org/versions/"
         )
 
+
+@add_single_feature_methods
+class ImageAnnotatorClient(VisionHelpers, IacImageAnnotatorClient):
+    __doc__ = IacImageAnnotatorClient.__doc__
+    Feature = Feature
+
+
 __all__ = (
     "ImageAnnotatorAsyncClient",
     "AnnotateImageRequest",

packages/google-cloud-vision/google/cloud/vision_v1p1beta1/services/image_annotator/client.py

@@ -598,9 +598,11 @@ def __init__(
 
         universe_domain_opt = getattr(self._client_options, "universe_domain", None)
 
-        self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = (
-            ImageAnnotatorClient._read_environment_variables()
-        )
+        (
+            self._use_client_cert,
+            self._use_mtls_endpoint,
+            self._universe_domain_env,
+        ) = ImageAnnotatorClient._read_environment_variables()
         self._client_cert_source = ImageAnnotatorClient._get_client_cert_source(
             self._client_options.client_cert_source, self._use_client_cert
         )

packages/google-cloud-vision/google/cloud/vision_v1p1beta1/types/__init__.py

@@ -13,11 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .geometry import (
-    BoundingPoly,
-    Position,
-    Vertex,
-)
+from .geometry import BoundingPoly, Position, Vertex
 from .image_annotator import (
     AnnotateImageRequest,
     AnnotateImageResponse,
@@ -43,17 +39,8 @@
     TextDetectionParams,
     WebDetectionParams,
 )
-from .text_annotation import (
-    Block,
-    Page,
-    Paragraph,
-    Symbol,
-    TextAnnotation,
-    Word,
-)
-from .web_detection import (
-    WebDetection,
-)
+from .text_annotation import Block, Page, Paragraph, Symbol, TextAnnotation, Word
+from .web_detection import WebDetection
 
 __all__ = (
     "BoundingPoly",

packages/google-cloud-vision/google/cloud/vision_v1p2beta1/__init__.py

@@ -27,8 +27,11 @@
     # this code path once we drop support for Python 3.7
     import importlib_metadata as metadata
 
+from google.cloud.vision_helpers import VisionHelpers
+from google.cloud.vision_helpers.decorators import add_single_feature_methods
 
-from .services.image_annotator import ImageAnnotatorAsyncClient, ImageAnnotatorClient
+from .services.image_annotator import ImageAnnotatorAsyncClient
+from .services.image_annotator import ImageAnnotatorClient as IacImageAnnotatorClient
 from .types.geometry import BoundingPoly, NormalizedVertex, Position, Vertex
 from .types.image_annotator import (
     AnnotateFileResponse,
@@ -163,6 +166,13 @@ def _get_version(dependency_name):
             + "https://devguide.python.org/versions/"
         )
 
+
+@add_single_feature_methods
+class ImageAnnotatorClient(VisionHelpers, IacImageAnnotatorClient):
+    __doc__ = IacImageAnnotatorClient.__doc__
+    Feature = Feature
+
+
 __all__ = (
     "ImageAnnotatorAsyncClient",
     "AnnotateFileResponse",

packages/google-cloud-vision/google/cloud/vision_v1p2beta1/services/image_annotator/client.py

@@ -603,9 +603,11 @@ def __init__(
 
         universe_domain_opt = getattr(self._client_options, "universe_domain", None)
 
-        self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = (
-            ImageAnnotatorClient._read_environment_variables()
-        )
+        (
+            self._use_client_cert,
+            self._use_mtls_endpoint,
+            self._universe_domain_env,
+        ) = ImageAnnotatorClient._read_environment_variables()
         self._client_cert_source = ImageAnnotatorClient._get_client_cert_source(
             self._client_options.client_cert_source, self._use_client_cert
         )

packages/google-cloud-vision/google/cloud/vision_v1p2beta1/types/__init__.py

@@ -13,12 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .geometry import (
-    BoundingPoly,
-    NormalizedVertex,
-    Position,
-    Vertex,
-)
+from .geometry import BoundingPoly, NormalizedVertex, Position, Vertex
 from .image_annotator import (
     AnnotateFileResponse,
     AnnotateImageRequest,
@@ -55,17 +50,8 @@
     TextDetectionParams,
     WebDetectionParams,
 )
-from .text_annotation import (
-    Block,
-    Page,
-    Paragraph,
-    Symbol,
-    TextAnnotation,
-    Word,
-)
-from .web_detection import (
-    WebDetection,
-)
+from .text_annotation import Block, Page, Paragraph, Symbol, TextAnnotation, Word
+from .web_detection import WebDetection
 
 __all__ = (
     "BoundingPoly",