Merge branch 'main' into patch-1

Author: manisha1997

CHANGES.md

@@ -3,6 +3,46 @@ twilio-python Changelog
 
 Here you can see the full list of changes between each twilio-python release.
 
+[2025-05-13] Version 9.6.1
+--------------------------
+**Accounts**
+- Changes to add date_of_consent param in Bulk Consent API
+
+**Api**
+- Change `friendly_name`, `date_created` and `date_updated` properties to type `string`.
+
+**Twiml**
+- Update twiml definition for `<ConversationRelay>` and `<Assistant>`
+
+
+[2025-05-05] Version 9.6.0
+--------------------------
+**Library - Fix**
+- [PR #848](https://github.com/twilio/twilio-python/pull/848): Timezone changes in token_auth_strategy.py. Thanks to [@Pablo2113](https://github.com/Pablo2113)!
+- [PR #853](https://github.com/twilio/twilio-python/pull/853): Fix deprecated/invalid config in `setup.cfg`. Thanks to [@abravalheri](https://github.com/abravalheri)!
+
+**Library - Chore**
+- [PR #858](https://github.com/twilio/twilio-python/pull/858): fix oauth examples. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!
+
+**Library - Docs**
+- [PR #855](https://github.com/twilio/twilio-python/pull/855): update pagination usage in README.md. Thanks to [@manisha1997](https://github.com/manisha1997)!
+
+**Api**
+- Add `response_key` for `Usage Triggers` fetch endpoint.
+
+**Flex**
+- Add Update Interaction API
+- Adding `webhook_ttid` as optional parameter in Interactions API
+
+**Serverless**
+- Add node22 as a valid Build runtime
+- Add node20 as a valid Build runtime
+
+**Video**
+- removed `transcribe_participants_on_connect` and `transcriptions_configuration` from the room resource **(breaking change)**
+- Added `transcribe_participants_on_connect` and `transcriptions_configuration` to the room resource
+
+
 [2025-04-07] Version 9.5.2
 --------------------------
 **Studio**

examples/organization_api.py

@@ -16,12 +16,12 @@ def example():
     """
     Some example usage of using organization resources
     """
-    self.client = Client(
+    client = Client(
         account_sid=ACCOUNT_SID,
         credential_provider=OrgsCredentialProvider(CLIENT_ID, CLIENT_SECRET),
     )
 
-    accounts = self.client.preview_iam.organization(
+    accounts = client.preview_iam.organization(
         organization_sid=ORGS_SID
     ).accounts.stream()
     for record in accounts:

examples/public_oauth.py

@@ -17,12 +17,12 @@ def example():
     """
     Some example usage of message resources.
     """
-    self.client = Client(
+    client = Client(
         account_sid=ACCOUNT_SID,
         credential_provider=ClientCredentialProvider(CLIENT_ID, CLIENT_SECRET),
     )
 
-    msg = self.client.messages.create(
+    msg = client.messages.create(
         to=self.to_number, from_=self.from_number, body="hello world"
     )
 

setup.cfg

@@ -2,7 +2,7 @@
 universal = 1
 
 [metadata]
-description-file = README.md
+long_description = file: README.md
 license = MIT
 
 [flake8]

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name="twilio",
-    version="9.5.2",
+    version="9.6.1",
     description="Twilio API client and TwiML generator",
     author="Twilio",
     help_center="https://www.twilio.com/help/contact",

twilio/__init__.py

@@ -1,2 +1,2 @@
-__version_info__ = ("9", "5", "2")
+__version_info__ = ("9", "6", "1")
 __version__ = ".".join(__version_info__)

twilio/auth_strategy/token_auth_strategy.py

@@ -1,7 +1,7 @@
 import jwt
 import threading
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 from twilio.auth_strategy.auth_type import AuthType
 from twilio.auth_strategy.auth_strategy import AuthStrategy
@@ -43,8 +43,10 @@ def is_token_expired(self, token):
             if exp is None:
                 return True  # No expiration time present, consider it expired
 
-            # Check if the expiration time has passed
-            return datetime.fromtimestamp(exp) < datetime.utcnow()
+            # Check if the expiration time has passed by using time-zone
+            return datetime.fromtimestamp(exp, tz=timezone.utc) < datetime.now(
+                timezone.utc
+            )
 
         except jwt.DecodeError:
             return True  # Token is invalid

twilio/rest/accounts/v1/bulk_consents.py

@@ -57,7 +57,7 @@ def create(self, items: List[object]) -> BulkConsentsInstance:
         """
         Create the BulkConsentsInstance
 
-        :param items: This is a list of objects that describes a contact's opt-in status. Each object contains the following fields: `contact_id`, which must be a string representing phone number in [E.164 format](https://www.twilio.com/docs/glossary/what-e164); `correlation_id`, a unique 32-character UUID used to uniquely map the request item with the response item; `sender_id`, which can be either a valid messaging service SID or a from phone number; `status`, a string representing the consent status. Can be one of [`opt-in`, `opt-out`]; and `source`, a string indicating the medium through which the consent was collected. Can be one of [`website`, `offline`, `opt-in-message`, `opt-out-message`, `others`].
+        :param items: This is a list of objects that describes a contact's opt-in status. Each object contains the following fields: `contact_id`, which must be a string representing phone number in [E.164 format](https://www.twilio.com/docs/glossary/what-e164); `correlation_id`, a unique 32-character UUID used to uniquely map the request item with the response item; `sender_id`, which can be either a valid messaging service SID or a from phone number; `status`, a string representing the consent status. Can be one of [`opt-in`, `opt-out`]; `source`, a string indicating the medium through which the consent was collected. Can be one of [`website`, `offline`, `opt-in-message`, `opt-out-message`, `others`]; `date_of_consent`, an optional datetime string field in ISO-8601 format that captures the exact date and time when the user gave or revoked consent. If not provided, it will be empty.
 
         :returns: The created BulkConsentsInstance
         """
@@ -83,7 +83,7 @@ async def create_async(self, items: List[object]) -> BulkConsentsInstance:
         """
         Asynchronously create the BulkConsentsInstance
 
-        :param items: This is a list of objects that describes a contact's opt-in status. Each object contains the following fields: `contact_id`, which must be a string representing phone number in [E.164 format](https://www.twilio.com/docs/glossary/what-e164); `correlation_id`, a unique 32-character UUID used to uniquely map the request item with the response item; `sender_id`, which can be either a valid messaging service SID or a from phone number; `status`, a string representing the consent status. Can be one of [`opt-in`, `opt-out`]; and `source`, a string indicating the medium through which the consent was collected. Can be one of [`website`, `offline`, `opt-in-message`, `opt-out-message`, `others`].
+        :param items: This is a list of objects that describes a contact's opt-in status. Each object contains the following fields: `contact_id`, which must be a string representing phone number in [E.164 format](https://www.twilio.com/docs/glossary/what-e164); `correlation_id`, a unique 32-character UUID used to uniquely map the request item with the response item; `sender_id`, which can be either a valid messaging service SID or a from phone number; `status`, a string representing the consent status. Can be one of [`opt-in`, `opt-out`]; `source`, a string indicating the medium through which the consent was collected. Can be one of [`website`, `offline`, `opt-in-message`, `opt-out-message`, `others`]; `date_of_consent`, an optional datetime string field in ISO-8601 format that captures the exact date and time when the user gave or revoked consent. If not provided, it will be empty.
 
         :returns: The created BulkConsentsInstance
         """

twilio/rest/api/v2010/account/address/dependent_phone_number.py

@@ -12,9 +12,8 @@
     Do not edit the class manually.
 """
 
-from datetime import datetime
 from typing import Any, Dict, List, Optional, Union, Iterator, AsyncIterator
-from twilio.base import deserialize, values
+from twilio.base import values
 
 from twilio.base.instance_resource import InstanceResource
 from twilio.base.list_resource import ListResource
@@ -51,7 +50,7 @@ class EmergencyStatus(object):
     :ivar sms_method: The HTTP method we use to call `sms_url`. Can be: `GET` or `POST`.
     :ivar sms_url: The URL we call when the phone number receives an incoming SMS message.
     :ivar address_requirements: 
-    :ivar capabilities: The set of Boolean properties that indicates whether a phone number can receive calls or messages.  Capabilities are  `Voice`, `SMS`, and `MMS` and each capability can be: `true` or `false`.
+    :ivar capabilities: 
     :ivar status_callback: The URL we call using the `status_callback_method` to send status information to your application.
     :ivar status_callback_method: The HTTP method we use to call `status_callback`. Can be: `GET` or `POST`.
     :ivar api_version: The API version used to start a new TwiML session.
@@ -83,20 +82,16 @@ def __init__(
         self.voice_caller_id_lookup: Optional[bool] = payload.get(
             "voice_caller_id_lookup"
         )
-        self.date_created: Optional[datetime] = deserialize.rfc2822_datetime(
-            payload.get("date_created")
-        )
-        self.date_updated: Optional[datetime] = deserialize.rfc2822_datetime(
-            payload.get("date_updated")
-        )
+        self.date_created: Optional[str] = payload.get("date_created")
+        self.date_updated: Optional[str] = payload.get("date_updated")
         self.sms_fallback_method: Optional[str] = payload.get("sms_fallback_method")
         self.sms_fallback_url: Optional[str] = payload.get("sms_fallback_url")
         self.sms_method: Optional[str] = payload.get("sms_method")
         self.sms_url: Optional[str] = payload.get("sms_url")
         self.address_requirements: Optional[
             "DependentPhoneNumberInstance.AddressRequirement"
         ] = payload.get("address_requirements")
-        self.capabilities: Optional[Dict[str, object]] = payload.get("capabilities")
+        self.capabilities: Optional[str] = payload.get("capabilities")
         self.status_callback: Optional[str] = payload.get("status_callback")
         self.status_callback_method: Optional[str] = payload.get(
             "status_callback_method"

twilio/rest/api/v2010/account/call/__init__.py

@@ -769,7 +769,7 @@ def create(
         :param status_callback: The URL we should call using the `status_callback_method` to send status information to your application. If no `status_callback_event` is specified, we will send the `completed` status. If an `application_sid` parameter is present, this parameter is ignored. URLs must contain a valid hostname (underscores are not permitted).
         :param status_callback_event: The call progress events that we will send to the `status_callback` URL. Can be: `initiated`, `ringing`, `answered`, and `completed`. If no event is specified, we send the `completed` status. If you want to receive multiple events, specify each one in a separate `status_callback_event` parameter. See the code sample for [monitoring call progress](https://www.twilio.com/docs/voice/api/call-resource?code-sample=code-create-a-call-resource-and-specify-a-statuscallbackevent&code-sdk-version=json). If an `application_sid` is present, this parameter is ignored.
         :param status_callback_method: The HTTP method we should use when calling the `status_callback` URL. Can be: `GET` or `POST` and the default is `POST`. If an `application_sid` parameter is present, this parameter is ignored.
-        :param send_digits: A string of keys to dial after connecting to the number, maximum of 32 digits. Valid digits in the string include: any digit (`0`-`9`), '`#`', '`*`' and '`w`', to insert a half second pause. For example, if you connected to a company phone number and wanted to pause for one second, and then dial extension 1234 followed by the pound key, the value of this parameter would be `ww1234#`. Remember to URL-encode this string, since the '`#`' character has special meaning in a URL. If both `SendDigits` and `MachineDetection` parameters are provided, then `MachineDetection` will be ignored.
+        :param send_digits: The string of keys to dial after connecting to the number, with a maximum length of 32 digits. Valid digits in the string include any digit (`0`-`9`), '`A`', '`B`', '`C`', '`D`', '`#`', and '`*`'. You can also use '`w`' to insert a half-second pause and '`W`' to insert a one-second pause. For example, to pause for one second after connecting and then dial extension 1234 followed by the # key, set this parameter to `W1234#`. Be sure to URL-encode this string because the '`#`' character has special meaning in a URL. If both `SendDigits` and `MachineDetection` parameters are provided, then `MachineDetection` will be ignored.
         :param timeout: The integer number of seconds that we should allow the phone to ring before assuming there is no answer. The default is `60` seconds and the maximum is `600` seconds. For some call flows, we will add a 5-second buffer to the timeout value you provide. For this reason, a timeout value of 10 seconds could result in an actual timeout closer to 15 seconds. You can set this to a short time, such as `15` seconds, to hang up before reaching an answering machine or voicemail.
         :param record: Whether to record the call. Can be `true` to record the phone call, or `false` to not. The default is `false`. The `recording_url` is sent to the `status_callback` URL.
         :param recording_channels: The number of channels in the final recording. Can be: `mono` or `dual`. The default is `mono`. `mono` records both legs of the call in a single channel of the recording file. `dual` records each leg to a separate channel of the recording file. The first channel of a dual-channel recording contains the parent call and the second channel contains the child call.
@@ -906,7 +906,7 @@ async def create_async(
         :param status_callback: The URL we should call using the `status_callback_method` to send status information to your application. If no `status_callback_event` is specified, we will send the `completed` status. If an `application_sid` parameter is present, this parameter is ignored. URLs must contain a valid hostname (underscores are not permitted).
         :param status_callback_event: The call progress events that we will send to the `status_callback` URL. Can be: `initiated`, `ringing`, `answered`, and `completed`. If no event is specified, we send the `completed` status. If you want to receive multiple events, specify each one in a separate `status_callback_event` parameter. See the code sample for [monitoring call progress](https://www.twilio.com/docs/voice/api/call-resource?code-sample=code-create-a-call-resource-and-specify-a-statuscallbackevent&code-sdk-version=json). If an `application_sid` is present, this parameter is ignored.
         :param status_callback_method: The HTTP method we should use when calling the `status_callback` URL. Can be: `GET` or `POST` and the default is `POST`. If an `application_sid` parameter is present, this parameter is ignored.
-        :param send_digits: A string of keys to dial after connecting to the number, maximum of 32 digits. Valid digits in the string include: any digit (`0`-`9`), '`#`', '`*`' and '`w`', to insert a half second pause. For example, if you connected to a company phone number and wanted to pause for one second, and then dial extension 1234 followed by the pound key, the value of this parameter would be `ww1234#`. Remember to URL-encode this string, since the '`#`' character has special meaning in a URL. If both `SendDigits` and `MachineDetection` parameters are provided, then `MachineDetection` will be ignored.
+        :param send_digits: The string of keys to dial after connecting to the number, with a maximum length of 32 digits. Valid digits in the string include any digit (`0`-`9`), '`A`', '`B`', '`C`', '`D`', '`#`', and '`*`'. You can also use '`w`' to insert a half-second pause and '`W`' to insert a one-second pause. For example, to pause for one second after connecting and then dial extension 1234 followed by the # key, set this parameter to `W1234#`. Be sure to URL-encode this string because the '`#`' character has special meaning in a URL. If both `SendDigits` and `MachineDetection` parameters are provided, then `MachineDetection` will be ignored.
         :param timeout: The integer number of seconds that we should allow the phone to ring before assuming there is no answer. The default is `60` seconds and the maximum is `600` seconds. For some call flows, we will add a 5-second buffer to the timeout value you provide. For this reason, a timeout value of 10 seconds could result in an actual timeout closer to 15 seconds. You can set this to a short time, such as `15` seconds, to hang up before reaching an answering machine or voicemail.
         :param record: Whether to record the call. Can be `true` to record the phone call, or `false` to not. The default is `false`. The `recording_url` is sent to the `status_callback` URL.
         :param recording_channels: The number of channels in the final recording. Can be: `mono` or `dual`. The default is `mono`. `mono` records both legs of the call in a single channel of the recording file. `dual` records each leg to a separate channel of the recording file. The first channel of a dual-channel recording contains the parent call and the second channel contains the child call.