Skip to content

Fix mypy errors #42192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# --------------------------------------------------------------------------

# pylint: disable=docstring-keyword-should-match-keyword-only
from typing import List, Optional, Union, Any
from typing import List, Optional, Union, Any, cast, Dict
import uuid

from azure.core.credentials import TokenCredential, AzureKeyCredential
Expand Down Expand Up @@ -96,7 +96,7 @@ def from_connection_string(cls, conn_str: str, **kwargs: Any) -> "PhoneNumbersCl
"""
endpoint, access_key = parse_connection_str(conn_str)

return cls(endpoint, access_key, **kwargs)
return cls(endpoint, AzureKeyCredential(access_key), **kwargs)

@distributed_trace
def begin_purchase_phone_numbers(
Expand Down Expand Up @@ -240,7 +240,9 @@ def begin_update_phone_number_capabilities(
)

result_properties = poller.result().additional_properties
if "status" in result_properties and result_properties["status"].lower() == "failed":
if (result_properties is not None and
"status" in result_properties and
result_properties["status"].lower() == "failed"):
raise HttpResponseError(
message=result_properties["error"]["message"])

Expand Down Expand Up @@ -271,7 +273,8 @@ def list_purchased_phone_numbers(self, **kwargs: Any) -> ItemPaged[PurchasedPhon
:returns: An iterator of purchased phone numbers.
:rtype: ~azure.core.paging.ItemPaged[~azure.communication.phonenumbers.PurchasedPhoneNumber]
"""
return self._phone_number_client.phone_numbers.list_phone_numbers(**kwargs)
return cast(ItemPaged[PurchasedPhoneNumber],
self._phone_number_client.phone_numbers.list_phone_numbers(**kwargs))

@distributed_trace
def list_available_countries(self, **kwargs: Any) -> ItemPaged[PhoneNumberCountry]:
Expand All @@ -287,9 +290,10 @@ def list_available_countries(self, **kwargs: Any) -> ItemPaged[PhoneNumberCountr
~azure.core.paging.ItemPaged[~azure.communication.phonenumbers.PhoneNumberCountry]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_available_countries(
accept_language=self._accepted_language, **kwargs
)
return cast(ItemPaged[PhoneNumberCountry],
self._phone_number_client.phone_numbers.list_available_countries(
accept_language=self._accepted_language, **kwargs
))

@distributed_trace
def list_available_localities(self, country_code: str, **kwargs: Any) -> ItemPaged[PhoneNumberLocality]:
Expand All @@ -310,13 +314,14 @@ def list_available_localities(self, country_code: str, **kwargs: Any) -> ItemPag
~azure.core.paging.ItemPaged[~azure.communication.phonenumbers.PhoneNumberLocality]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_available_localities(
country_code,
administrative_division=kwargs.pop(
"administrative_division", None),
accept_language=self._accepted_language,
**kwargs
)
return cast(ItemPaged[PhoneNumberLocality],
self._phone_number_client.phone_numbers.list_available_localities(
country_code,
administrative_division=kwargs.pop(
"administrative_division", None),
accept_language=self._accepted_language,
**kwargs
))

@distributed_trace
def list_available_offerings(self, country_code: str, **kwargs: Any) -> ItemPaged[PhoneNumberOffering]:
Expand All @@ -340,12 +345,13 @@ def list_available_offerings(self, country_code: str, **kwargs: Any) -> ItemPage
~azure.core.paging.ItemPaged[~azure.communication.phonenumbers.PhoneNumberOffering]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_offerings(
country_code,
phone_number_type=kwargs.pop("phone_number_type", None),
assignment_type=kwargs.pop("assignment_type", None),
**kwargs
)
return cast(ItemPaged[PhoneNumberOffering],
self._phone_number_client.phone_numbers.list_offerings(
country_code,
phone_number_type=kwargs.pop("phone_number_type", None),
assignment_type=kwargs.pop("assignment_type", None),
**kwargs
))

@distributed_trace
def list_available_area_codes(
Expand Down Expand Up @@ -374,15 +380,16 @@ def list_available_area_codes(
:rtype: ~azure.core.paging.ItemPaged[~azure.communication.phonenumbers.PhoneNumberAreaCode]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_area_codes(
country_code,
phone_number_type=phone_number_type,
assignment_type=kwargs.pop("assignment_type", None),
locality=kwargs.pop("locality", None),
administrative_division=kwargs.pop(
"administrative_division", None),
**kwargs
)
return cast(ItemPaged[PhoneNumberAreaCode],
self._phone_number_client.phone_numbers.list_area_codes(
country_code,
phone_number_type=phone_number_type,
assignment_type=kwargs.pop("assignment_type", None),
locality=kwargs.pop("locality", None),
administrative_division=kwargs.pop(
"administrative_division", None),
**kwargs
))

@distributed_trace
def search_operator_information(
Expand Down Expand Up @@ -443,9 +450,10 @@ def list_reservations(
# This allows mapping the generated model to the public model.
# Internally, the generated client will create an instance of this iterator with each fetched page.

return self._phone_number_client.phone_numbers.list_reservations(
max_page_size=max_page_size,
**kwargs)
return cast(ItemPaged[PhoneNumbersReservation],
self._phone_number_client.phone_numbers.list_reservations(
max_page_size=max_page_size,
**kwargs))

@distributed_trace
def create_or_update_reservation(
Expand Down Expand Up @@ -481,15 +489,18 @@ def create_or_update_reservation(
except ValueError as exc:
raise ValueError("reservation_id must be in valid UUID format") from exc

phone_numbers = {}
phone_numbers: Dict[str, Optional[AvailablePhoneNumber]] = {}
if numbers_to_add:
for number in numbers_to_add:
phone_numbers[number.id] = number
if number.id is not None:
phone_numbers[number.id] = number
if numbers_to_remove:
for number in numbers_to_remove:
phone_numbers[number] = None
for number_id in numbers_to_remove:
phone_numbers[number_id] = None

reservation = PhoneNumbersReservation(phone_numbers=phone_numbers)
# Cast to satisfy type checker - merge-patch operations allow None values
reservation = PhoneNumbersReservation(
phone_numbers=cast(Optional[Dict[str, AvailablePhoneNumber]], phone_numbers))

return self._phone_number_client.phone_numbers.create_or_update_reservation(
reservation_id, reservation, **kwargs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# --------------------------------------------------------------------------

# pylint: disable=docstring-keyword-should-match-keyword-only
from typing import List, Optional, Union, Any
from typing import List, Optional, Union, Any, cast, Dict
import uuid

from azure.core.credentials_async import AsyncTokenCredential
Expand Down Expand Up @@ -99,7 +99,7 @@ def from_connection_string(cls, conn_str: str, **kwargs: Any) -> "PhoneNumbersCl
"""
endpoint, access_key = parse_connection_str(conn_str)

return cls(endpoint, access_key, **kwargs)
return cls(endpoint, AzureKeyCredential(access_key), **kwargs)

@distributed_trace_async
async def begin_purchase_phone_numbers(
Expand Down Expand Up @@ -268,7 +268,10 @@ def list_purchased_phone_numbers(self, **kwargs: Any) -> AsyncItemPaged[Purchase
~azure.core.async_paging.AsyncItemPaged[~azure.communication.phonenumbers.PurchasedPhoneNumber]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_phone_numbers(**kwargs)
return cast(
AsyncItemPaged[PurchasedPhoneNumber],
self._phone_number_client.phone_numbers.list_phone_numbers(**kwargs)
)

@distributed_trace
def list_available_countries(self, **kwargs: Any) -> AsyncItemPaged[PhoneNumberCountry]:
Expand All @@ -284,8 +287,11 @@ def list_available_countries(self, **kwargs: Any) -> AsyncItemPaged[PhoneNumberC
~azure.core.async_paging.AsyncItemPaged[~azure.communication.phonenumbers.PhoneNumberCountry]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_available_countries(
accept_language=self._accepted_language, **kwargs
return cast(
AsyncItemPaged[PhoneNumberCountry],
self._phone_number_client.phone_numbers.list_available_countries(
accept_language=self._accepted_language, **kwargs
)
)

@distributed_trace
Expand All @@ -307,12 +313,15 @@ def list_available_localities(self, country_code: str, **kwargs: Any) -> AsyncIt
~azure.core.async_paging.AsyncItemPaged[~azure.communication.phonenumbers.PhoneNumberLocality]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_available_localities(
country_code,
administrative_division=kwargs.pop(
"administrative_division", None),
accept_language=self._accepted_language,
**kwargs
return cast(
AsyncItemPaged[PhoneNumberLocality],
self._phone_number_client.phone_numbers.list_available_localities(
country_code,
administrative_division=kwargs.pop(
"administrative_division", None),
accept_language=self._accepted_language,
**kwargs
)
)

@distributed_trace
Expand All @@ -337,12 +346,12 @@ def list_available_offerings(self, country_code: str, **kwargs: Any) -> AsyncIte
~azure.core.async_paging.AsyncItemPaged[~azure.communication.phonenumbers.PhoneNumberOffering]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_offerings(
return cast(AsyncItemPaged[PhoneNumberOffering], self._phone_number_client.phone_numbers.list_offerings(
country_code,
phone_number_type=kwargs.pop("phone_number_type", None),
assignment_type=kwargs.pop("assignment_type", None),
**kwargs
)
))

@distributed_trace
def list_available_area_codes(
Expand Down Expand Up @@ -371,15 +380,15 @@ def list_available_area_codes(
:rtype: ~azure.core.paging.ItemPaged[~azure.communication.phonenumbers.PhoneNumberAreaCode]
:raises ~azure.core.exceptions.HttpResponseError:
"""
return self._phone_number_client.phone_numbers.list_area_codes(
return cast(AsyncItemPaged[PhoneNumberAreaCode], self._phone_number_client.phone_numbers.list_area_codes(
country_code,
phone_number_type=phone_number_type,
assignment_type=kwargs.pop("assignment_type", None),
locality=kwargs.pop("locality", None),
administrative_division=kwargs.pop(
"administrative_division", None),
**kwargs
)
))

@distributed_trace_async
async def search_operator_information(
Expand Down Expand Up @@ -451,9 +460,9 @@ def list_reservations(
~azure.core.async_paging.AsyncItemPaged[~azure.communication.phonenumbers.PhoneNumbersReservation]
"""

return self._phone_number_client.phone_numbers.list_reservations(
return cast(AsyncItemPaged[PhoneNumbersReservation], self._phone_number_client.phone_numbers.list_reservations(
max_page_size=max_page_size,
**kwargs)
**kwargs))

@distributed_trace_async
async def create_or_update_reservation(
Expand Down Expand Up @@ -489,15 +498,18 @@ async def create_or_update_reservation(
except ValueError as exc:
raise ValueError("reservation_id must be in valid UUID format") from exc

phone_numbers = {}
phone_numbers: Dict[str, Optional[AvailablePhoneNumber]] = {}
if numbers_to_add:
for number in numbers_to_add:
phone_numbers[number.id] = number
if number.id is not None:
phone_numbers[number.id] = number
if numbers_to_remove:
for number in numbers_to_remove:
phone_numbers[number] = None
for number_id in numbers_to_remove:
phone_numbers[number_id] = None

reservation = PhoneNumbersReservation(phone_numbers=phone_numbers)
# Cast to satisfy type checker - merge-patch operations allow None values
reservation = PhoneNumbersReservation(
phone_numbers=cast(Optional[Dict[str, AvailablePhoneNumber]], phone_numbers))

return await self._phone_number_client.phone_numbers.create_or_update_reservation(
reservation_id, reservation, **kwargs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@

# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md

__all__: list[str] = []

def patch_sdk():
pass
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
# --------------------------------------------------------------------------


__all__: list[str] = []


# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
Expand Down
Loading