Merge upstream and update generated code for v2042 and

Author: stripe-openapi[bot]

API_VERSION

@@ -1 +1 @@
-0de52cdca31a7c51c6d11187fc88ab23ea3a1c5b
+13e48677b8744cdd8170f92a48ed598952515497

OPENAPI_VERSION

@@ -1 +1 @@
-v2031
+v2042

examples/event_notification_webhook_handler.py

@@ -1,26 +1,24 @@
 """
-event_notification_webhook_handler.py - receive and process thin events like the
-v1.billing.meter.error_report_triggered event.
+event_notification_webhook_handler.py - receive and process event notifications (AKA thin events) like the v1.billing.meter.error_report_triggered and v1.billing.meter.no_meter_found events.
 
 In this example, we:
     - create a StripeClient called client
     - use client.parse_event_notification() to parse the received notification webhook body
     - if its type is "v1.billing.meter.error_report_triggered":
-        - call event_notification.fetch_event() to retrieve the full event object
         - call event_notification.fetch_related_object() to retrieve the Meter that failed
+        - call event_notification.fetch_event() to retrieve the full event object
+        - log info about the failure
+    - if its type is "v1.billing.meter.no_meter_found":
+        - call event_notification.fetch_event() to retrieve the full event object
         - log info about the failure
+    - if the SDK doesn't have types for it, it will be an UnknownEventNotification:
+        - optionally cast it to UnknownEventNotification to get more accurate typing
+        - match on the type property to handle specific unknown event types
 """
 
 import os
 from stripe import StripeClient
-from stripe import Event
-from stripe.v2.core import Event as V2Event, EventNotification
-from stripe.events import (
-    V2CoreEventDestinationPingEventNotification,
-    V1BillingMeterErrorReportTriggeredEvent,
-    UnknownEventNotification,
-    ALL_EVENT_NOTIFICATIONS,
-)
+from stripe.events import UnknownEventNotification
 
 from flask import Flask, request, jsonify
 
@@ -37,22 +35,63 @@ def webhook():
     sig_header = request.headers.get("Stripe-Signature")
 
     try:
-        event_notification = client.parse_event_notification(
+        event_notif = client.parse_event_notification(
             webhook_body, sig_header, webhook_secret
         )
 
-        # Fetch the event data to understand the failure
-        if (
-            event_notification.type
-            == "v1.billing.meter.error_report_triggered"
-        ):
-            meter = event_notification.fetch_related_object()
-            event = event_notification.fetch_event()
+        # type checkers will narrow the type based on the `type` property
+        if event_notif.type == "v1.billing.meter.error_report_triggered":
+            # in this block, event_notification is typed as
+            # a V1BillingMeterErrorReportTriggeredEventNotification
+
+            # there's basic info about the related object in the notification
+            print(f"Meter w/ id {event_notif.related_object.id} had a problem")
+
+            # or you can fetch the full object form the API for more details
+            meter = event_notif.fetch_related_object()
+            print(f"Meter {meter.display_name} ({meter.id}) had a problem")
+
+            # And you can always fetch the full event:
+            event = event_notif.fetch_event()
+            print(f"More info: {event.data.developer_message_summary}")
+
+        elif event_notif.type == "v1.billing.meter.no_meter_found":
+            # in this block, event_notification is typed as
+            # a V1BillingMeterNoMeterFoundEventNotification
+
+            # that class doesn't define `fetch_related_object` because the event
+            # has no related object.
+            # so this line would correctly give a type error:
+            # meter = event_notif.fetch_related_object()
+
+            # but fetching the event always works:
+            event = event_notif.fetch_event()
             print(
-                f"Err! Meter {meter.id} had a problem (more info: {event.data.developer_message_summary})"
+                f"Err! No meter found: {event.data.developer_message_summary}"
             )
-            # Record the failures and alert your team
-            # Add your logic here
+
+        # Events that were introduced after this SDK version release are
+        # represented as `UnknownEventNotification`s.
+        # They're valid, the SDK just doesn't have corresponding classes for them.
+        # You must match on the "type" property instead.
+        elif isinstance(event_notif, UnknownEventNotification):
+            # these lines are optional, but will give you more accurate typing in this block
+            from typing import cast
+
+            event_notif = cast(UnknownEventNotification, event_notif)
+
+            # continue matching on the type property
+            # from this point on, the `related_object` property _may_ be None
+            # (depending on the event type)
+            if event_notif.type == "some.new.event":
+                # if this event type has a related object, you can fetch it
+                obj = event_notif.fetch_related_object()
+                # otherwise, `obj` will just be `None`
+                print(f"Related object: {obj}")
+
+                # you can still fetch the full event, but it will be untyped
+                event = event_notif.fetch_event()
+                print(f"New event: {event.data}")  # type: ignore
 
         return jsonify(success=True), 200
     except Exception as e:

stripe/_charge.py

@@ -1882,7 +1882,10 @@ class Qris(StripeObject):
             pass
 
         class Rechnung(StripeObject):
-            pass
+            payment_portal_url: Optional[str]
+            """
+            Payment portal URL.
+            """
 
         class RevolutPay(StripeObject):
             class Funding(StripeObject):

stripe/_file.py

@@ -63,6 +63,7 @@ class File(CreateableAPIResource["File"], ListableAPIResource["File"]):
         "identity_document_downloadable",
         "issuing_regulatory_reporting",
         "pci_document",
+        "platform_terms_of_service",
         "selfie",
         "sigma_scheduled_query",
         "tax_document_user_upload",

stripe/_payment_attempt_record.py

@@ -1553,7 +1553,10 @@ class Qris(StripeObject):
             pass
 
         class Rechnung(StripeObject):
-            pass
+            payment_portal_url: Optional[str]
+            """
+            Payment portal URL.
+            """
 
         class RevolutPay(StripeObject):
             class Funding(StripeObject):

stripe/_payment_method_configuration.py

@@ -732,6 +732,28 @@ class DisplayPreference(StripeObject):
         display_preference: DisplayPreference
         _inner_class_types = {"display_preference": DisplayPreference}
 
+    class MbWay(StripeObject):
+        class DisplayPreference(StripeObject):
+            overridable: Optional[bool]
+            """
+            For child configs, whether or not the account's preference will be observed. If `false`, the parent configuration's default is used.
+            """
+            preference: Literal["none", "off", "on"]
+            """
+            The account's display preference.
+            """
+            value: Literal["off", "on"]
+            """
+            The effective display preference value.
+            """
+
+        available: bool
+        """
+        Whether this payment method may be offered at checkout. True if `display_preference` is `on` and the payment method's capability is active.
+        """
+        display_preference: DisplayPreference
+        _inner_class_types = {"display_preference": DisplayPreference}
+
     class Mobilepay(StripeObject):
         class DisplayPreference(StripeObject):
             overridable: Optional[bool]
@@ -1355,6 +1377,7 @@ class DisplayPreference(StripeObject):
     """
     Has the value `true` if the object exists in live mode or the value `false` if the object exists in test mode.
     """
+    mb_way: Optional[MbWay]
     mobilepay: Optional[Mobilepay]
     multibanco: Optional[Multibanco]
     name: str
@@ -1562,6 +1585,7 @@ async def retrieve_async(
         "konbini": Konbini,
         "kr_card": KrCard,
         "link": Link,
+        "mb_way": MbWay,
         "mobilepay": Mobilepay,
         "multibanco": Multibanco,
         "naver_pay": NaverPay,

stripe/_payment_record.py

@@ -1566,7 +1566,10 @@ class Qris(StripeObject):
             pass
 
         class Rechnung(StripeObject):
-            pass
+            payment_portal_url: Optional[str]
+            """
+            Payment portal URL.
+            """
 
         class RevolutPay(StripeObject):
             class Funding(StripeObject):

stripe/events/__init__.py

@@ -16,10 +16,6 @@
     V1BillingMeterNoMeterFoundEvent as V1BillingMeterNoMeterFoundEvent,
     V1BillingMeterNoMeterFoundEventNotification as V1BillingMeterNoMeterFoundEventNotification,
 )
-from stripe.events._v2_billing_bill_setting_updated_event import (
-    V2BillingBillSettingUpdatedEvent as V2BillingBillSettingUpdatedEvent,
-    V2BillingBillSettingUpdatedEventNotification as V2BillingBillSettingUpdatedEventNotification,
-)
 from stripe.events._v2_core_account_closed_event import (
     V2CoreAccountClosedEvent as V2CoreAccountClosedEvent,
     V2CoreAccountClosedEventNotification as V2CoreAccountClosedEventNotification,

stripe/events/_event_classes.py

@@ -9,10 +9,6 @@
     V1BillingMeterNoMeterFoundEvent,
     V1BillingMeterNoMeterFoundEventNotification,
 )
-from stripe.events._v2_billing_bill_setting_updated_event import (
-    V2BillingBillSettingUpdatedEvent,
-    V2BillingBillSettingUpdatedEventNotification,
-)
 from stripe.events._v2_core_account_closed_event import (
     V2CoreAccountClosedEvent,
     V2CoreAccountClosedEventNotification,
@@ -262,7 +258,6 @@
 V2_EVENT_CLASS_LOOKUP = {
     V1BillingMeterErrorReportTriggeredEvent.LOOKUP_TYPE: V1BillingMeterErrorReportTriggeredEvent,
     V1BillingMeterNoMeterFoundEvent.LOOKUP_TYPE: V1BillingMeterNoMeterFoundEvent,
-    V2BillingBillSettingUpdatedEvent.LOOKUP_TYPE: V2BillingBillSettingUpdatedEvent,
     V2CoreAccountClosedEvent.LOOKUP_TYPE: V2CoreAccountClosedEvent,
     V2CoreAccountCreatedEvent.LOOKUP_TYPE: V2CoreAccountCreatedEvent,
     V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEvent.LOOKUP_TYPE: V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEvent,
@@ -329,7 +324,6 @@
 V2_EVENT_NOTIFICATION_CLASS_LOOKUP = {
     V1BillingMeterErrorReportTriggeredEventNotification.LOOKUP_TYPE: V1BillingMeterErrorReportTriggeredEventNotification,
     V1BillingMeterNoMeterFoundEventNotification.LOOKUP_TYPE: V1BillingMeterNoMeterFoundEventNotification,
-    V2BillingBillSettingUpdatedEventNotification.LOOKUP_TYPE: V2BillingBillSettingUpdatedEventNotification,
     V2CoreAccountClosedEventNotification.LOOKUP_TYPE: V2CoreAccountClosedEventNotification,
     V2CoreAccountCreatedEventNotification.LOOKUP_TYPE: V2CoreAccountCreatedEventNotification,
     V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEventNotification.LOOKUP_TYPE: V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEventNotification,
@@ -396,7 +390,6 @@
 ALL_EVENT_NOTIFICATIONS = Union[
     V1BillingMeterErrorReportTriggeredEventNotification,
     V1BillingMeterNoMeterFoundEventNotification,
-    V2BillingBillSettingUpdatedEventNotification,
     V2CoreAccountClosedEventNotification,
     V2CoreAccountCreatedEventNotification,
     V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEventNotification,