DEVEXP-928: Match generated code (#81)

Author: matsk-sinch

sinch/domains/numbers/api/v1/active_numbers_apis.py

@@ -1,5 +1,4 @@
-from typing import Optional
-from pydantic import StrictStr, StrictInt, conlist
+from typing import Optional, List
 from sinch.core.pagination import TokenBasedPaginator, Paginator
 from sinch.domains.numbers.api.v1.base import BaseNumbers
 from sinch.domains.numbers.api.v1.internal import (
@@ -12,7 +11,7 @@
     ListActiveNumbersRequest, NumberRequest, UpdateNumberConfigurationRequest
 )
 from sinch.domains.numbers.models.v1.types import (
-    CapabilityTypeValues, NumberSearchPatternTypeValues, NumberTypeValues, OrderByValues,
+    CapabilityType, NumberSearchPatternType, NumberType, OrderBy,
     SmsConfigurationDict, VoiceConfigurationDict
 )
 
@@ -21,14 +20,14 @@ class ActiveNumbers(BaseNumbers):
 
     def list(
         self,
-        region_code: StrictStr,
-        number_type: NumberTypeValues,
-        number_pattern: Optional[StrictStr] = None,
-        number_search_pattern: Optional[NumberSearchPatternTypeValues] = None,
-        capabilities: Optional[conlist(CapabilityTypeValues)] = None,
-        page_size: Optional[StrictInt] = None,
-        page_token: Optional[StrictStr] = None,
-        order_by: Optional[OrderByValues] = None,
+        region_code: str,
+        number_type: NumberType,
+        number_pattern: Optional[str] = None,
+        number_search_pattern: Optional[NumberSearchPatternType] = None,
+        capabilities: Optional[List[CapabilityType]] = None,
+        page_size: Optional[int] = None,
+        page_token: Optional[str] = None,
+        order_by: Optional[OrderBy] = None,
         **kwargs
     ) -> Paginator[ActiveNumber]:
         return TokenBasedPaginator(
@@ -51,11 +50,11 @@ def list(
 
     def update(
         self,
-        phone_number: StrictStr,
-        display_name: Optional[StrictStr] = None,
+        phone_number: str,
+        display_name: Optional[str] = None,
         sms_configuration: Optional[SmsConfigurationDict] = None,
         voice_configuration: Optional[VoiceConfigurationDict] = None,
-        callback_url: Optional[StrictStr] = None,
+        callback_url: Optional[str] = None,
         **kwargs
     ) -> ActiveNumber:
         request_data = UpdateNumberConfigurationRequest(
@@ -70,7 +69,7 @@ def update(
 
     def get(
         self,
-        phone_number: StrictStr,
+        phone_number: str,
         **kwargs
     ) -> ActiveNumber:
         request_data = NumberRequest(
@@ -81,7 +80,7 @@ def get(
 
     def release(
             self,
-            phone_number: StrictStr,
+            phone_number: str,
             **kwargs
     ) -> ActiveNumber:
         request_data = NumberRequest(

sinch/domains/numbers/api/v1/available_numbers_apis.py

@@ -1,5 +1,4 @@
-from typing import Optional
-from pydantic import StrictInt, StrictStr, conlist
+from typing import Optional, List
 
 from sinch.core.pagination import Paginator, TokenBasedPaginator
 from sinch.domains.numbers.models.v1.response import (
@@ -13,25 +12,25 @@
     ListAvailableNumbersRequest, NumberRequest, RentAnyNumberRequest, RentNumberRequest
 )
 from sinch.domains.numbers.models.v1.types import (
-    CapabilityTypeValues, NumberPatternDict, NumberSearchPatternTypeValues,
-    NumberTypeValues, SmsConfigurationDict, VoiceConfigurationDict
+    CapabilityType, NumberPatternDict, NumberSearchPatternType,
+    NumberType, SmsConfigurationDict, VoiceConfigurationDict
 )
 
 
 class AvailableNumbers(BaseNumbers):
 
-    def check_availability(self, phone_number: StrictStr, **kwargs) -> AvailableNumber:
+    def check_availability(self, phone_number: str, **kwargs) -> AvailableNumber:
         request_data = NumberRequest(phone_number=phone_number, **kwargs)
         return self._request(SearchForNumberEndpoint, request_data)
 
     def search_for_available_numbers(
         self,
-        region_code: StrictStr,
-        number_type: NumberTypeValues,
-        number_pattern: Optional[StrictStr] = None,
-        number_search_pattern: Optional[NumberSearchPatternTypeValues] = None,
-        capabilities: Optional[conlist(CapabilityTypeValues)] = None,
-        page_size: Optional[StrictInt] = None,
+        region_code: str,
+        number_type: NumberType,
+        number_pattern: Optional[str] = None,
+        number_search_pattern: Optional[NumberSearchPatternType] = None,
+        capabilities: Optional[List[CapabilityType]] = None,
+        page_size: Optional[int] = None,
         **kwargs
     ) -> Paginator[AvailableNumber]:
         return TokenBasedPaginator(
@@ -52,10 +51,10 @@ def search_for_available_numbers(
 
     def rent(
         self,
-        phone_number: StrictStr,
+        phone_number: str,
         sms_configuration: Optional[SmsConfigurationDict] = None,
         voice_configuration: Optional[VoiceConfigurationDict] = None,
-        callback_url: Optional[StrictStr] = None,
+        callback_url: Optional[str] = None,
         **kwargs
     ) -> ActiveNumber:
         request_data = RentNumberRequest(
@@ -69,18 +68,18 @@ def rent(
 
     def rent_any(
         self,
-        region_code: StrictStr,
-        type_: NumberTypeValues,
+        region_code: str,
+        number_type: NumberType,
         number_pattern: Optional[NumberPatternDict] = None,
-        capabilities: Optional[conlist(CapabilityTypeValues)] = None,
+        capabilities: Optional[List[CapabilityType]] = None,
         sms_configuration: Optional[SmsConfigurationDict] = None,
         voice_configuration: Optional[VoiceConfigurationDict] = None,
-        callback_url: Optional[StrictStr] = None,
+        callback_url: Optional[str] = None,
         **kwargs
     ) -> ActiveNumber:
         request_data = RentAnyNumberRequest(
             region_code=region_code,
-            type_=type_,
+            number_type=number_type,
             number_pattern=number_pattern,
             capabilities=capabilities,
             sms_configuration=sms_configuration,

sinch/domains/numbers/api/v1/available_regions_apis.py

@@ -1,5 +1,4 @@
-from typing import Optional
-from pydantic import conlist
+from typing import Optional, List
 from sinch.core.pagination import TokenBasedPaginator, Paginator
 from sinch.domains.numbers.api.v1.internal import ListAvailableRegionsEndpoint
 from sinch.domains.numbers.models.v1.internal import ListAvailableRegionsRequest
@@ -13,7 +12,7 @@ def __init__(self, sinch):
 
     def list(
         self,
-        types: Optional[conlist(NumberType)] = None,
+        types: Optional[List[NumberType]] = None,
         **kwargs
     ) -> Paginator[AvailableRegion]:
         """
@@ -22,7 +21,7 @@ def list(
         See which regions apply to your virtual number.
 
         :param types: List of number types to filter the regions.
-        :type types: Optional[conlist(NumberType)]
+        :type types: Optional[List[NumberType]]
 
         :param kwargs: Additional parameters for the request.
         :type kwargs: Optional[dict]

sinch/domains/numbers/api/v1/base/__init__.py

@@ -1,3 +1,3 @@
-from sinch.domains.numbers.api.v1.base.base_numbers import BaseNumbers as BaseNumbers
+from sinch.domains.numbers.api.v1.base.base_numbers import BaseNumbers
 
 __all__ = ['BaseNumbers']

sinch/domains/numbers/api/v1/callback_configuration_apis.py

@@ -31,7 +31,7 @@ def get(
 
     def update(
         self,
-        hmac_secret,
+        hmac_secret: str,
         **kwargs
     ) -> CallbackConfigurationResponse:
         """

sinch/domains/numbers/models/v1/internal/list_active_numbers_request.py

@@ -2,22 +2,21 @@
 from pydantic import Field, StrictInt, StrictStr, field_validator, conlist
 from sinch.domains.numbers.models.v1.internal.base import BaseModelConfigurationRequest
 from sinch.domains.numbers.models.v1.types import (
-    CapabilityType, OrderByValues, NumberSearchPatternTypeValues, NumberTypeValues,
-
+    CapabilityType, OrderBy, NumberSearchPatternType, NumberType
 )
 
 
 class ListActiveNumbersRequest(BaseModelConfigurationRequest):
     region_code: StrictStr = Field(alias="regionCode")
-    number_type: NumberTypeValues = Field(alias="type")
+    number_type: NumberType = Field(alias="type")
     page_size: Optional[StrictInt] = Field(default=None, alias="pageSize")
     capabilities: Optional[conlist(CapabilityType)] = Field(default=None)
-    number_search_pattern: Optional[NumberSearchPatternTypeValues] = (
+    number_search_pattern: Optional[NumberSearchPatternType] = (
         Field(default=None, alias="numberPattern.searchPattern")
     )
     number_pattern: Optional[StrictStr] = Field(default=None, alias="numberPattern.pattern")
     page_token: Optional[StrictStr] = Field(default=None, alias="pageToken")
-    order_by: Optional[OrderByValues] = Field(default=None, alias="orderBy")
+    order_by: Optional[OrderBy] = Field(default=None, alias="orderBy")
 
     @field_validator("order_by", mode="before")
     @classmethod

sinch/domains/numbers/models/v1/internal/list_available_numbers_request.py

@@ -1,14 +1,14 @@
 from typing import Optional
 from pydantic import Field, StrictInt, StrictStr, conlist
 from sinch.domains.numbers.models.v1.internal.base import BaseModelConfigurationRequest
-from sinch.domains.numbers.models.v1.types import CapabilityTypeValues, NumberSearchPatternTypeValues, NumberType
+from sinch.domains.numbers.models.v1.types import CapabilityType, NumberSearchPatternType, NumberType
 
 
 class ListAvailableNumbersRequest(BaseModelConfigurationRequest):
     region_code: StrictStr = Field(alias="regionCode")
     number_type: NumberType = Field(alias="type")
     page_size: Optional[StrictInt] = Field(default=None, alias="size")
-    capabilities: Optional[conlist(CapabilityTypeValues)] = Field(default=None)
-    number_search_pattern: Optional[NumberSearchPatternTypeValues] = (
+    capabilities: Optional[conlist(CapabilityType)] = Field(default=None)
+    number_search_pattern: Optional[NumberSearchPatternType] = (
         Field(default=None, alias="numberPattern.searchPattern"))
     number_pattern: Optional[StrictStr] = Field(default=None, alias="numberPattern.pattern")

sinch/domains/numbers/models/v1/internal/list_available_regions_request.py

@@ -1,8 +1,8 @@
 from typing import Optional
 from pydantic import Field, conlist
 from sinch.domains.numbers.models.v1.internal.base import BaseModelConfigurationRequest
-from sinch.domains.numbers.models.v1.types import NumberTypeValues
+from sinch.domains.numbers.models.v1.types import NumberType
 
 
 class ListAvailableRegionsRequest(BaseModelConfigurationRequest):
-    types: Optional[conlist(NumberTypeValues)] = Field(default=None)
+    types: Optional[conlist(NumberType)] = Field(default=None)

sinch/domains/numbers/models/v1/internal/rent_any_number_request.py

@@ -7,7 +7,7 @@
 
 class RentAnyNumberRequest(BaseModelConfigurationRequest):
     region_code: StrictStr = Field(alias="regionCode")
-    type_: NumberType = Field(alias="type")
+    number_type: NumberType = Field(alias="type")
     number_pattern: Optional[Dict[str, Any]] = Field(default=None, alias="numberPattern")
     capabilities: Optional[conlist(CapabilityType)] = Field(default=None)
     sms_configuration: Optional[Dict[str, Any]] = Field(default=None, alias="smsConfiguration")

sinch/domains/numbers/models/v1/types/__init__.py

@@ -1,19 +1,13 @@
-from sinch.domains.numbers.models.v1.types.capability_type import (
-    CapabilityType, CapabilityTypeValues
-)
-from sinch.domains.numbers.models.v1.types.number_search_pattern_type import (
-     NumberSearchPatternType, NumberSearchPatternTypeValues
-)
+from sinch.domains.numbers.models.v1.types.capability_type import CapabilityType
+from sinch.domains.numbers.models.v1.types.number_search_pattern_type import NumberSearchPatternType
 from sinch.domains.numbers.models.v1.types.number_pattern_dict import NumberPatternDict
-from sinch.domains.numbers.models.v1.types.number_type import NumberType, NumberTypeValues
-from sinch.domains.numbers.models.v1.types.order_by_values import OrderByValues
+from sinch.domains.numbers.models.v1.types.number_type import NumberType
+from sinch.domains.numbers.models.v1.types.order_by import OrderBy
 from sinch.domains.numbers.models.v1.types.scheduled_voice_provisioning import ScheduledVoiceProvisioning
 from sinch.domains.numbers.models.v1.types.sms_configuration_dict import SmsConfigurationDict
-from sinch.domains.numbers.models.v1.types.sms_error_code import SmsErrorCode, SmsErrorCodeValues
+from sinch.domains.numbers.models.v1.types.sms_error_code import SmsErrorCode
 from sinch.domains.numbers.models.v1.types.status_scheduled_provisioning import StatusScheduledProvisioning
-from sinch.domains.numbers.models.v1.types.voice_application_type import (
-    VoiceApplicationType, VoiceApplicationTypeValues
-)
+from sinch.domains.numbers.models.v1.types.voice_application_type import VoiceApplicationType
 from sinch.domains.numbers.models.v1.types.voice_configuration import VoiceConfiguration
 from sinch.domains.numbers.models.v1.types.voice_configuration_dict import VoiceConfigurationDict
 from sinch.domains.numbers.models.v1.types.voice_configuration_est_dict import VoiceConfigurationESTDict
@@ -23,20 +17,15 @@
 
 __all__ = [
     "CapabilityType",
-    "CapabilityTypeValues",
     "NumberPatternDict",
     "NumberSearchPatternType",
-    "NumberSearchPatternTypeValues",
     "NumberType",
-    "NumberTypeValues",
-    "OrderByValues",
+    "OrderBy",
     "ScheduledVoiceProvisioning",
     "SmsConfigurationDict",
     "SmsErrorCode",
-    "SmsErrorCodeValues",
     "StatusScheduledProvisioning",
     "VoiceApplicationType",
-    "VoiceApplicationTypeValues",
     "VoiceConfiguration",
     "VoiceConfigurationCustomDict",
     "VoiceConfigurationESTDict",