Re-generate Image Analysis SDK with: tox run -e generate -c ..\..\..\eng\tox\tox.ini --root . (#33772)

* After running tox run -e generate -c ..\..\..\eng\tox\tox.ini --root .

* Run again, this time with added pyproject.toml

* Pick up new TypeSpec change, with prop name `list` instead of `values`

* Update samples & test to use 'list' prop name instead of 'values'

* No need to suppress mypy `attr-defined` error. Update README.md code snippets

* Use uniform style in sample code

* Hand fix emitter bug (GitHub issue filed). Remove mypy.ini (no longer needed). Fix code style I don't like

* Fix pylint issues

Author: dargilco

sdk/vision/azure-ai-vision-imageanalysis/README.md

@@ -53,7 +53,7 @@ from azure.ai.vision.imageanalysis import ImageAnalysisClient
 from azure.ai.vision.imageanalysis.models import VisualFeatures
 from azure.core.credentials import AzureKeyCredential
 
-# Set the values of your computer vision endpoint and computer vision key 
+# Set the values of your computer vision endpoint and computer vision key
 # as environment variables:
 try:
     endpoint = os.environ["VISION_ENDPOINT"]
@@ -65,8 +65,8 @@ except KeyError:
 
 # Create an Image Analysis client for synchronous operations
 client = ImageAnalysisClient(
-    endpoint = endpoint,
-    credential = AzureKeyCredential(key)
+    endpoint=endpoint,
+    credential=AzureKeyCredential(key)
 )
 ```
 
@@ -135,14 +135,14 @@ Notes:
 
 ```python
 # Load image to analyze into a 'bytes' object
-with open("sample.jpg", 'rb') as f:
+with open("sample.jpg", "rb") as f:
     image_data = f.read()
 
 # Get a caption for the image. This will be a synchronously (blocking) call.
 result = client.analyze(
-    image_data = image_data,
-    visual_features = [ VisualFeatures.CAPTION ],
-    gender_neutral_caption = True # Optional (default is False)
+    image_data=image_data,
+    visual_features=[VisualFeatures.CAPTION],
+    gender_neutral_caption=True,  # Optional (default is False)
 )
 
 # Print caption results to the console
@@ -165,9 +165,9 @@ This example is similar to the above, expect it calls the `analyze` method and p
 ```python
 # Get a caption for the image. This will be a synchronously (blocking) call.
 result = client.analyze(
-    image_url = "https://aka.ms/azsdk/image-analysis/sample.jpg",
-    visual_features = [ VisualFeatures.CAPTION ],
-    gender_neutral_caption = True # Optional (default is False)
+    image_url="https://aka.ms/azsdk/image-analysis/sample.jpg",
+    visual_features=[VisualFeatures.CAPTION],
+    gender_neutral_caption=True,  # Optional (default is False)
 )
 
 # Print caption results to the console
@@ -187,13 +187,13 @@ This example demonstrates how to extract printed or hand-written text for the im
 
 ```python
 # Load image to analyze into a 'bytes' object
-with open("sample.jpg", 'rb') as f:
+with open("sample.jpg", "rb") as f:
     image_data = f.read()
 
 # Extract text (OCR) from an image stream. This will be a synchronously (blocking) call.
 result = client.analyze(
-    image_data = image_data,
-    visual_features = [ VisualFeatures.READ ]
+    image_data=image_data,
+    visual_features=[VisualFeatures.READ]
 )
 
 # Print text (OCR) analysis results to the console
@@ -221,8 +221,8 @@ This example is similar to the above, expect it calls the `analyze` method and p
 ```python
 # Extract text (OCR) from an image stream. This will be a synchronously (blocking) call.
 result = client.analyze(
-    image_url = "https://aka.ms/azsdk/image-analysis/sample.jpg",
-    visual_features = [ VisualFeatures.READ ]
+    image_url="https://aka.ms/azsdk/image-analysis/sample.jpg",
+    visual_features=[VisualFeatures.READ]
 )
 
 # Print text (OCR) analysis results to the console
@@ -277,21 +277,21 @@ The client uses the standard [Python logging library](https://docs.python.org/3/
 import sys
 import logging
 
-# Acquire the logger for this client library. Use 'azure' to affect both 
+# Acquire the logger for this client library. Use 'azure' to affect both
 # 'azure.core` and `azure.ai.vision.imageanalysis' libraries.
-logger = logging.getLogger('azure')
+logger = logging.getLogger("azure")
 
 # Set the desired logging level. logging.INFO or logging.DEBUG are good options.
 logger.setLevel(logging.INFO)
 
 # Direct logging output to stdout (the default):
-handler = logging.StreamHandler(stream = sys.stdout)
+handler = logging.StreamHandler(stream=sys.stdout)
 # Or direct logging output to a file:
 # handler = logging.FileHandler(filename = 'sample.log')
 logger.addHandler(handler)
 
 # Optional: change the default logging format. Here we add a timestamp.
-formatter = logging.Formatter('%(asctime)s:%(levelname)s:%(name)s:%(message)s')
+formatter = logging.Formatter("%(asctime)s:%(levelname)s:%(name)s:%(message)s")
 handler.setFormatter(formatter)
 ```
 
@@ -304,9 +304,9 @@ By default logs redact the values of URL query strings, the values of some HTTP
 ```python
 # Create an Image Analysis client with none redacted log
 client = ImageAnalysisClient(
-    endpoint = endpoint,
-    credential = AzureKeyCredential(key),
-    logging_enable = True
+    endpoint=endpoint,
+    credential=AzureKeyCredential(key),
+    logging_enable=True
 )
 ```
 

sdk/vision/azure-ai-vision-imageanalysis/azure/ai/vision/imageanalysis/__init__.py

@@ -6,21 +6,17 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._client import ImageAnalysisClient
+from ._patch import ImageAnalysisClient
 from ._version import VERSION
 
 __version__ = VERSION
 
-try:
-    from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
-except ImportError:
-    _patch_all = []
+
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "ImageAnalysisClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+
 
 _patch_sdk()

sdk/vision/azure-ai-vision-imageanalysis/azure/ai/vision/imageanalysis/_operations/_operations.py

@@ -147,8 +147,7 @@ def _analyze_from_buffer(
         :paramtype visual_features: list[str or ~azure.ai.vision.imageanalysis.models.VisualFeatures]
         :keyword language: The desired language for result generation (a two-letter language code).
          If this option is not specified, the default value 'en' is used (English).
-         See https://aka.ms/cv-languages for a list of supported languages.
-         At the moment, only tags can be generated in non-English languages. Default value is None.
+         See https://aka.ms/cv-languages for a list of supported languages. Default value is None.
         :paramtype language: str
         :keyword gender_neutral_caption: Boolean flag for enabling gender-neutral captioning for
          Caption and Dense Captions features.
@@ -468,8 +467,7 @@ def _analyze_from_url(
         :paramtype visual_features: list[str or ~azure.ai.vision.imageanalysis.models.VisualFeatures]
         :keyword language: The desired language for result generation (a two-letter language code).
          If this option is not specified, the default value 'en' is used (English).
-         See https://aka.ms/cv-languages for a list of supported languages.
-         At the moment, only tags can be generated in non-English languages. Default value is None.
+         See https://aka.ms/cv-languages for a list of supported languages. Default value is None.
         :paramtype language: str
         :keyword gender_neutral_caption: Boolean flag for enabling gender-neutral captioning for
          Caption and Dense Captions features.

sdk/vision/azure-ai-vision-imageanalysis/azure/ai/vision/imageanalysis/_operations/_patch.py

@@ -5,7 +5,8 @@
 # --------------------------------------------------------------------------
 from typing import List
 
-__all__: List[str] = [] # Add all objects you want publicly available to users at this package level
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
 
 def patch_sdk():
     """Do not remove from this file.

sdk/vision/azure-ai-vision-imageanalysis/azure/ai/vision/imageanalysis/_patch.py

@@ -21,6 +21,7 @@
 from ._operations._operations import ImageAnalysisClientOperationsMixin
 from ._client import ImageAnalysisClient as ImageAnalysisClientGenerated
 
+
 class ImageAnalysisClient(ImageAnalysisClientGenerated):
     """ImageAnalysisClient.
 
@@ -115,29 +116,32 @@ def analyze(
         visual_features_impl: List[Union[str, _models.VisualFeatures]] = list(visual_features)
 
         if image_url is not None:
-            return ImageAnalysisClientOperationsMixin._analyze_from_url( # pylint: disable=protected-access
+            return ImageAnalysisClientOperationsMixin._analyze_from_url(  # pylint: disable=protected-access
                 self,
-                image_content = _models._models.ImageUrl(url = image_url), # pylint: disable=protected-access
-                visual_features = visual_features_impl,
-                language = language,
-                gender_neutral_caption = gender_neutral_caption,
-                smart_crops_aspect_ratios = smart_crops_aspect_ratios,
-                model_version = model_version,
-                **kwargs)
+                image_content=_models._models.ImageUrl(url=image_url),  # pylint: disable=protected-access
+                visual_features=visual_features_impl,
+                language=language,
+                gender_neutral_caption=gender_neutral_caption,
+                smart_crops_aspect_ratios=smart_crops_aspect_ratios,
+                model_version=model_version,
+                **kwargs
+            )
 
         if image_data is not None:
-            return ImageAnalysisClientOperationsMixin._analyze_from_buffer( # pylint: disable=protected-access
+            return ImageAnalysisClientOperationsMixin._analyze_from_buffer(  # pylint: disable=protected-access
                 self,
-                image_content = image_data,
-                visual_features = visual_features_impl,
-                language = language,
-                gender_neutral_caption = gender_neutral_caption,
-                smart_crops_aspect_ratios = smart_crops_aspect_ratios,
-                model_version = model_version,
-                **kwargs)
+                image_content=image_data,
+                visual_features=visual_features_impl,
+                language=language,
+                gender_neutral_caption=gender_neutral_caption,
+                smart_crops_aspect_ratios=smart_crops_aspect_ratios,
+                model_version=model_version,
+                **kwargs
+            )
 
         raise ValueError("Either image_data or image_url must be specified.")
 
+
 __all__: List[str] = [
     "ImageAnalysisClient"
 ]  # Add all objects you want publicly available to users at this package level

sdk/vision/azure-ai-vision-imageanalysis/azure/ai/vision/imageanalysis/aio/__init__.py

@@ -6,18 +6,14 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._client import ImageAnalysisClient
+from ._patch import ImageAnalysisClient
+
 
-try:
-    from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
-except ImportError:
-    _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "ImageAnalysisClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+
 
 _patch_sdk()

sdk/vision/azure-ai-vision-imageanalysis/azure/ai/vision/imageanalysis/aio/_operations/_patch.py

@@ -5,7 +5,8 @@
 # --------------------------------------------------------------------------
 from typing import List
 
-__all__: List[str] = [] # Add all objects you want publicly available to users at this package level
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
 
 def patch_sdk():
     """Do not remove from this file.

sdk/vision/azure-ai-vision-imageanalysis/azure/ai/vision/imageanalysis/aio/_patch.py

@@ -21,6 +21,7 @@
 from ._operations._operations import ImageAnalysisClientOperationsMixin
 from ._client import ImageAnalysisClient as ImageAnalysisClientGenerated
 
+
 class ImageAnalysisClient(ImageAnalysisClientGenerated):
     """ImageAnalysisClient.
 
@@ -115,29 +116,32 @@ async def analyze(
         visual_features_impl: List[Union[str, _models.VisualFeatures]] = list(visual_features)
 
         if image_url is not None:
-            return await ImageAnalysisClientOperationsMixin._analyze_from_url( # pylint: disable=protected-access
+            return await ImageAnalysisClientOperationsMixin._analyze_from_url(  # pylint: disable=protected-access
                 self,
-                image_content = _models._models.ImageUrl(url = image_url), # pylint: disable=protected-access
-                visual_features = visual_features_impl,
-                language = language,
-                gender_neutral_caption = gender_neutral_caption,
-                smart_crops_aspect_ratios = smart_crops_aspect_ratios,
-                model_version = model_version,
-                **kwargs)
+                image_content=_models._models.ImageUrl(url=image_url),  # pylint: disable=protected-access
+                visual_features=visual_features_impl,
+                language=language,
+                gender_neutral_caption=gender_neutral_caption,
+                smart_crops_aspect_ratios=smart_crops_aspect_ratios,
+                model_version=model_version,
+                **kwargs
+            )
 
         if image_data is not None:
-            return await ImageAnalysisClientOperationsMixin._analyze_from_buffer( # pylint: disable=protected-access
+            return await ImageAnalysisClientOperationsMixin._analyze_from_buffer(  # pylint: disable=protected-access
                 self,
-                image_content = image_data,
-                visual_features = visual_features_impl,
-                language = language,
-                gender_neutral_caption = gender_neutral_caption,
-                smart_crops_aspect_ratios = smart_crops_aspect_ratios,
-                model_version = model_version,
-                **kwargs)
+                image_content=image_data,
+                visual_features=visual_features_impl,
+                language=language,
+                gender_neutral_caption=gender_neutral_caption,
+                smart_crops_aspect_ratios=smart_crops_aspect_ratios,
+                model_version=model_version,
+                **kwargs
+            )
 
         raise ValueError("Either image_data or image_url must be specified.")
 
+
 __all__: List[str] = [
     "ImageAnalysisClient"
 ]  # Add all objects you want publicly available to users at this package level