32851: Fix mypy errors for azure-maps-render (#34987)

* 32851: Fix mypy errors for azure-maps-render

* 32851: Enable type check for azure-maps-render

* 32851: Revert changes for eventgrid

* Use os.getenv default value to avoid unset env vars

* 32851: Use generated model instead of the custom one

* Update sdk/maps/azure-maps-render/samples/async_samples/sample_authentication_async.py

* 32851: Update assets.json for each package to point to the latest recordings

* 32851: Fix pylint errors for azure-maps-search

* 32851: Revert changes in assets.json for each package

* 32851: Ignore mypy errors in azure-maps-search and azure-maps-route packages

Author: Lakicar95

sdk/maps/azure-maps-geolocation/samples/async_samples/sample_authentication_async.py

@@ -31,7 +31,7 @@ async def authentication_maps_service_client_with_subscription_key_credential_as
     from azure.core.credentials import AzureKeyCredential
     from azure.maps.geolocation.aio import MapsGeolocationClient
 
-    subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY") or "your subscription key"
+    subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY", "your subscription key")
 
     maps_geolocation_client = MapsGeolocationClient(credential=AzureKeyCredential(subscription_key))
     # [END create_maps_geolocation_service_client_with_key_async]

sdk/maps/azure-maps-geolocation/samples/async_samples/sample_get_country_code_async.py

@@ -19,7 +19,7 @@
 import asyncio
 import os
 
-subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY") or "your subscription key"
+subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY", "your subscription key")
 
 async def get_country_code_async():
     # [START get_country_code_async]

sdk/maps/azure-maps-geolocation/samples/sample_authentication.py

@@ -29,7 +29,7 @@ def authentication_maps_service_client_with_subscription_key_credential():
     from azure.core.credentials import AzureKeyCredential
     from azure.maps.geolocation import MapsGeolocationClient
 
-    subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY") or "your subscription key"
+    subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY", "your subscription key")
 
     maps_geolocation_client = MapsGeolocationClient(credential=AzureKeyCredential(subscription_key))
     # [END create_maps_geolocation_service_client_with_key]

sdk/maps/azure-maps-geolocation/samples/sample_get_country_code.py

@@ -19,7 +19,7 @@
 
 import os
 
-subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY") or "your subscription key"
+subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY", "your subscription key")
 
 def get_country_code():
     # [START get_country_code]

sdk/maps/azure-maps-render/azure/maps/render/_render_client.py

@@ -10,12 +10,12 @@
 from azure.core.credentials import AzureKeyCredential, TokenCredential
 from azure.core.polling import LROPoller
 from ._base_client import MapsRenderClientBase
+from ._generated.models import Copyright
 
 from .models import (
     LatLon,
     BoundingBox,
     TilesetID,
-    Copyright,
     MapTileset,
     CopyrightCaption,
     RasterTileFormat,
@@ -212,7 +212,7 @@ def get_map_attribution(
                 :dedent: 4
                 :caption: Return map copyright attribution information for a section of a tileset.
         """
-        bounds=[
+        bounds_list = [
             bounds.south,
             bounds.west,
             bounds.north,
@@ -222,7 +222,7 @@ def get_map_attribution(
         return self._render_client.get_map_attribution(
             tileset_id=tileset_id,
             zoom=zoom,
-            bounds=bounds,
+            bounds=bounds_list,
             **kwargs
         )
 
@@ -442,8 +442,8 @@ def get_copyright_from_bounding_box(
         _include_text=kwargs.pop("include_text", True)
 
         return self._render_client.get_copyright_from_bounding_box(
-            south_west=(bounding_box.south,bounding_box.west),
-            north_east=(bounding_box.north,bounding_box.east),
+            south_west=[bounding_box.south,bounding_box.west],
+            north_east=[bounding_box.north,bounding_box.east],
             include_text= "yes" if _include_text else "no",
             **kwargs
         )

sdk/maps/azure-maps-render/azure/maps/render/aio/_render_client_async.py

@@ -12,12 +12,12 @@
 from azure.core.credentials_async import AsyncTokenCredential
 
 from ._base_client_async import AsyncMapsRenderClientBase
+from .._generated.models import Copyright
 
 from ..models import (
     LatLon,
     BoundingBox,
     TilesetID,
-    Copyright,
     MapTileset,
     MapAttribution,
     CopyrightCaption,
@@ -216,7 +216,7 @@ async def get_map_attribution(
                 :dedent: 4
                 :caption: Return map copyright attribution information for a section of a tileset.
         """
-        bounds=[
+        bounds_list = [
             bounds.south,
             bounds.west,
             bounds.north,
@@ -226,7 +226,7 @@ async def get_map_attribution(
         async_result = await self._render_client.get_map_attribution(
             tileset_id=tileset_id,
             zoom=zoom,
-            bounds=bounds,
+            bounds=bounds_list,
             **kwargs
         )
         return async_result
@@ -443,13 +443,15 @@ async def get_copyright_from_bounding_box(
         """
         _include_text=kwargs.pop("include_text", True)
 
-        return await self._render_client.get_copyright_from_bounding_box(
+        result = await self._render_client.get_copyright_from_bounding_box(
             include_text= "yes" if _include_text else "no",
-            south_west=(bounding_box.south,bounding_box.west),
-            north_east=(bounding_box.north,bounding_box.east),
+            south_west=[bounding_box.south,bounding_box.west],
+            north_east=[bounding_box.north,bounding_box.east],
             **kwargs
         )
 
+        return result
+
     @distributed_trace_async
     async def get_copyright_for_tile(
         self,
@@ -494,14 +496,16 @@ async def get_copyright_for_tile(
 
         _include_text=kwargs.pop("include_text", True)
 
-        return await self._render_client.get_copyright_for_tile(
+        result = await self._render_client.get_copyright_for_tile(
             z=z,
             x=x,
             y=y,
             include_text= "yes" if _include_text else "no",
             **kwargs
         )
 
+        return result
+
     @distributed_trace_async
     async def get_copyright_for_world(
         self,
@@ -532,7 +536,9 @@ async def get_copyright_for_world(
         """
         _include_text=kwargs.pop("include_text", True)
 
-        return await self._render_client.get_copyright_for_world(
+        result = await self._render_client.get_copyright_for_world(
             include_text= "yes" if _include_text else "no",
             **kwargs
         )
+
+        return result

sdk/maps/azure-maps-render/azure/maps/render/models/_models.py

@@ -4,7 +4,7 @@
 # ------------------------------------
 
 # pylint: disable=unused-import,ungrouped-imports,super-init-not-called, C0302, C0203
-from typing import NamedTuple, Any
+from typing import NamedTuple, Any, Optional
 from .._generated.models import (
     MapAttribution,
     Copyright as GenCopyright,
@@ -168,23 +168,23 @@ class ImagePathStyle(object):
 
     :keyword path_positions:
         The list of point coordinate on the path.
-    :paramtype path_positions: LatLon
+    :paramtype path_positions: Optional[LatLon]
     :keyword line_color:
         Line color of the path, including line opacity information.
-    :paramtype line_color: str
+    :paramtype line_color: Optional[str]
     :keyword fill_color:
         Fill color of the path, including line opacity information.
-    :paramtype fill_color: str
+    :paramtype fill_color: Optional[str]
     :keyword line_width_in_pixels:
         Line width of the path in pixels.
     :paramtype line_width_in_pixels: int
     :keyword circle_radius_in_meters:
         Circle radius in meters.
     :paramtype circle_radius_in_meters: int
     """
-    path_positions: LatLon = None
-    line_color: str = None
-    fill_color: str = None
+    path_positions: Optional[LatLon] = None
+    line_color: Optional[str] = None
+    fill_color: Optional[str] = None
     line_width_in_pixels: int = 0
     circle_radius_in_meters: int = 0
 
@@ -193,29 +193,29 @@ class ImagePushpinStyle(object):
 
     :keyword pushpin_positions:
         The list of Pushpin coordinate on the map.
-    :paramtype path_positions: LatLon
+    :paramtype path_positions: Optional[LatLon]
     :keyword pushpin_anchor_shift_in_pixels:
         To override the anchor location of the pin image,
         user can designate how to shift or move the anchor location by pixels
     :paramtype pushpin_anchor_shift_in_pixels: int
     :keyword pushpin_color:
         Pushpin color including opacity information.
-    :paramtype pushpin_color: str
+    :paramtype pushpin_color: Optional[str]
     :keyword pushpin_scale_ratio:
         Pushpin scale ratio. Value should greater than zero. A value of 1 is the standard scale.
         Values larger than 1 will make the pins larger, and values smaller than 1 will make them smaller.
     :paramtype pushpin_scale_ratio: float
     :keyword custom_pushpin_image_uri:
         Custom pushpin image, can only be 'ref="Uri"' format.
-    :paramtype custom_pushpin_image_uri: str
+    :paramtype custom_pushpin_image_uri: Optional[str]
     :keyword label_anchor_shift_in_pixels:
         The anchor location of label for built-in pushpins is at the top center of custom pushpins.
         To override the anchor location of the pin image,
         user can designate how to shift or move the anchor location by pixels
-    :paramtype label_anchor_shift_in_pixels: LatLon
+    :paramtype label_anchor_shift_in_pixels: Optional[LatLon]
     :keyword label_color:
         Label color information. Opacity value other than 1 be ignored.
-    :paramtype label_color: str
+    :paramtype label_color: Optional[str]
     :keyword label_scale_ratio:
         Label scale ratio. Should greater than 0. A value of 1 is the standard scale.
         Values larger than 1 will make the label larger.
@@ -226,12 +226,12 @@ class ImagePushpinStyle(object):
         Value can be -360 to 360.
     :paramtype rotation_in_degrees: int
     """
-    pushpin_positions: LatLon = None
+    pushpin_positions: Optional[LatLon] = None
     pushpin_anchor_shift_in_pixels: int = 0
-    pushpin_color: str = None
+    pushpin_color: Optional[str] = None
     pushpin_scale_ratio: float = 0.0
-    custom_pushpin_image_uri: str = None
-    label_anchor_shift_in_pixels: LatLon = None
-    label_color: str = None
+    custom_pushpin_image_uri: Optional[str] = None
+    label_anchor_shift_in_pixels: Optional[LatLon] = None
+    label_color: Optional[str] = None
     label_scale_ratio: float = 0.0
     rotation_in_degrees: int = 0

sdk/maps/azure-maps-render/pyproject.toml

@@ -1,6 +1,5 @@
 [tool.azure-sdk-build]
 pyright = false
-type_check_samples = false
 verifytypes = false
 ci_enabled = false
 strict_sphinx = true

sdk/maps/azure-maps-render/samples/async_samples/sample_authentication_async.py

@@ -31,7 +31,7 @@ async def authentication_maps_service_client_with_subscription_key_credential_as
     from azure.core.credentials import AzureKeyCredential
     from azure.maps.render.aio import MapsRenderClient
 
-    subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY")
+    subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY", "your subscription key")
 
     maps_render_client = MapsRenderClient(credential=AzureKeyCredential(subscription_key))
     # [END create_maps_render_service_client_with_key_async]
@@ -51,7 +51,7 @@ async def authentication_maps_service_client_with_aad_credential_async():
     from azure.maps.render.aio import MapsRenderClient
 
     credential = DefaultAzureCredential()
-    maps_client_id = os.getenv("AZURE_MAPS_CLIENT_ID")
+    maps_client_id = os.getenv("AZURE_MAPS_CLIENT_ID", "your client id")
 
     maps_render_client = MapsRenderClient(client_id=maps_client_id, credential=credential)
     # [END create_maps_render_service_client_with_aad_async]

sdk/maps/azure-maps-render/samples/async_samples/sample_get_copyright_caption_async.py

@@ -21,7 +21,7 @@
 import asyncio
 import os
 
-subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY")
+subscription_key = os.getenv("AZURE_SUBSCRIPTION_KEY", "your subscription key")
 
 async def get_copyright_caption_async():
     # [START get_copyright_caption_async]