gr4vy 1.10.12__py3-none-any.whl → 1.10.15__py3-none-any.whl

gr4vy/models/transactionconnectionoptions.py

@@ -347,116 +347,115 @@ class TransactionConnectionOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "account-updater",
-            "adyen-afterpay",
-            "adyen-alipay",
-            "adyen-card",
-            "adyen-cashapp",
-            "adyen-giropay",
-            "adyen-ideal",
-            "adyen-sepa",
-            "adyen-sofort",
-            "adyen-vipps",
-            "affirm-affirm",
-            "braintree-card",
-            "chaseorbital-card",
-            "cybersource-anti-fraud",
-            "cybersource-card",
-            "cybersource-ideal",
-            "cybersource-kcp",
-            "dlocal-nequi",
-            "dlocal-upi",
-            "fiserv-card",
-            "forter-anti-fraud",
-            "gem-gem",
-            "gem-gemds",
-            "givingblock-givingblock",
-            "latitude-latitude",
-            "latitude-latitudeds",
-            "mattilda-tapi",
-            "mattilda-tapifintechs",
-            "monato-spei",
-            "mock-card",
-            "nuvei-card",
-            "nuvei-ideal",
-            "nuvei-pse",
-            "oxxo-oxxo",
-            "paypal-paypal",
-            "paypal-paypalpaylater",
-            "powertranz-card",
-            "stripe-card",
-            "travelhub-card",
-            "trustly-trustly",
-            "wpay-everydaypay",
-            "wpay-payto",
-        ]
-        nullable_fields = [
-            "account-updater",
-            "adyen-afterpay",
-            "adyen-alipay",
-            "adyen-card",
-            "adyen-cashapp",
-            "adyen-giropay",
-            "adyen-ideal",
-            "adyen-sepa",
-            "adyen-sofort",
-            "adyen-vipps",
-            "affirm-affirm",
-            "braintree-card",
-            "chaseorbital-card",
-            "cybersource-anti-fraud",
-            "cybersource-card",
-            "cybersource-ideal",
-            "cybersource-kcp",
-            "dlocal-nequi",
-            "dlocal-upi",
-            "fiserv-card",
-            "forter-anti-fraud",
-            "gem-gem",
-            "gem-gemds",
-            "givingblock-givingblock",
-            "latitude-latitude",
-            "latitude-latitudeds",
-            "mattilda-tapi",
-            "mattilda-tapifintechs",
-            "monato-spei",
-            "mock-card",
-            "nuvei-card",
-            "nuvei-ideal",
-            "nuvei-pse",
-            "oxxo-oxxo",
-            "paypal-paypal",
-            "paypal-paypalpaylater",
-            "powertranz-card",
-            "stripe-card",
-            "travelhub-card",
-            "trustly-trustly",
-            "wpay-everydaypay",
-            "wpay-payto",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "account-updater",
+                "adyen-afterpay",
+                "adyen-alipay",
+                "adyen-card",
+                "adyen-cashapp",
+                "adyen-giropay",
+                "adyen-ideal",
+                "adyen-sepa",
+                "adyen-sofort",
+                "adyen-vipps",
+                "affirm-affirm",
+                "braintree-card",
+                "chaseorbital-card",
+                "cybersource-anti-fraud",
+                "cybersource-card",
+                "cybersource-ideal",
+                "cybersource-kcp",
+                "dlocal-nequi",
+                "dlocal-upi",
+                "fiserv-card",
+                "forter-anti-fraud",
+                "gem-gem",
+                "gem-gemds",
+                "givingblock-givingblock",
+                "latitude-latitude",
+                "latitude-latitudeds",
+                "mattilda-tapi",
+                "mattilda-tapifintechs",
+                "monato-spei",
+                "mock-card",
+                "nuvei-card",
+                "nuvei-ideal",
+                "nuvei-pse",
+                "oxxo-oxxo",
+                "paypal-paypal",
+                "paypal-paypalpaylater",
+                "powertranz-card",
+                "stripe-card",
+                "travelhub-card",
+                "trustly-trustly",
+                "wpay-everydaypay",
+                "wpay-payto",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "account-updater",
+                "adyen-afterpay",
+                "adyen-alipay",
+                "adyen-card",
+                "adyen-cashapp",
+                "adyen-giropay",
+                "adyen-ideal",
+                "adyen-sepa",
+                "adyen-sofort",
+                "adyen-vipps",
+                "affirm-affirm",
+                "braintree-card",
+                "chaseorbital-card",
+                "cybersource-anti-fraud",
+                "cybersource-card",
+                "cybersource-ideal",
+                "cybersource-kcp",
+                "dlocal-nequi",
+                "dlocal-upi",
+                "fiserv-card",
+                "forter-anti-fraud",
+                "gem-gem",
+                "gem-gemds",
+                "givingblock-givingblock",
+                "latitude-latitude",
+                "latitude-latitudeds",
+                "mattilda-tapi",
+                "mattilda-tapifintechs",
+                "monato-spei",
+                "mock-card",
+                "nuvei-card",
+                "nuvei-ideal",
+                "nuvei-pse",
+                "oxxo-oxxo",
+                "paypal-paypal",
+                "paypal-paypalpaylater",
+                "powertranz-card",
+                "stripe-card",
+                "travelhub-card",
+                "trustly-trustly",
+                "wpay-everydaypay",
+                "wpay-payto",
+            ]
+        )
         serialized = handler(self)
-
         m = {}
 
         for n, f in type(self).model_fields.items():
             k = f.alias or n
             val = serialized.get(k)
-            serialized.pop(k, None)
-
-            optional_nullable = k in optional_fields and k in nullable_fields
-            is_set = (
-                self.__pydantic_fields_set__.intersection({n})
-                or k in null_default_fields
-            )  # pylint: disable=no-member
-
-            if val is not None and val != UNSET_SENTINEL:
-                m[k] = val
-            elif val != UNSET_SENTINEL and (
-                not k in optional_fields or (optional_nullable and is_set)
-            ):
-                m[k] = val
+            is_nullable_and_explicitly_set = (
+                k in nullable_fields
+                and (self.__pydantic_fields_set__.intersection({n}))  # pylint: disable=no-member
+            )
+
+            if val != UNSET_SENTINEL:
+                if (
+                    val is not None
+                    or k not in optional_fields
+                    or is_nullable_and_explicitly_set
+                ):
+                    m[k] = val
 
         return m

gr4vy/models/transactioncreate.py

@@ -383,100 +383,99 @@ class TransactionCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "country",
-            "payment_method",
-            "buyer",
-            "buyer_id",
-            "buyer_external_identifier",
-            "gift_cards",
-            "external_identifier",
-            "intent",
-            "store",
-            "three_d_secure_data",
-            "three_d_secure",
-            "metadata",
-            "is_subsequent_payment",
-            "merchant_initiated",
-            "payment_source",
-            "airline",
-            "cart_items",
-            "statement_descriptor",
-            "previous_scheme_transaction_id",
-            "browser_info",
-            "shipping_details_id",
-            "connection_options",
-            "async_capture",
-            "anti_fraud_fingerprint",
-            "payment_service_id",
-            "account_funding_transaction",
-            "allow_partial_authorization",
-            "recipient",
-            "installment_count",
-            "tax_amount",
-            "merchant_tax_id",
-            "purchase_order_number",
-            "customer_reference_number",
-            "amount_includes_tax",
-            "supplier_order_number",
-            "duty_amount",
-            "shipping_amount",
-            "integration_client",
-        ]
-        nullable_fields = [
-            "country",
-            "payment_method",
-            "buyer",
-            "buyer_id",
-            "buyer_external_identifier",
-            "gift_cards",
-            "external_identifier",
-            "three_d_secure_data",
-            "three_d_secure",
-            "metadata",
-            "airline",
-            "cart_items",
-            "statement_descriptor",
-            "previous_scheme_transaction_id",
-            "browser_info",
-            "shipping_details_id",
-            "connection_options",
-            "anti_fraud_fingerprint",
-            "payment_service_id",
-            "recipient",
-            "installment_count",
-            "tax_amount",
-            "merchant_tax_id",
-            "purchase_order_number",
-            "customer_reference_number",
-            "amount_includes_tax",
-            "supplier_order_number",
-            "duty_amount",
-            "shipping_amount",
-            "integration_client",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "country",
+                "payment_method",
+                "buyer",
+                "buyer_id",
+                "buyer_external_identifier",
+                "gift_cards",
+                "external_identifier",
+                "intent",
+                "store",
+                "three_d_secure_data",
+                "three_d_secure",
+                "metadata",
+                "is_subsequent_payment",
+                "merchant_initiated",
+                "payment_source",
+                "airline",
+                "cart_items",
+                "statement_descriptor",
+                "previous_scheme_transaction_id",
+                "browser_info",
+                "shipping_details_id",
+                "connection_options",
+                "async_capture",
+                "anti_fraud_fingerprint",
+                "payment_service_id",
+                "account_funding_transaction",
+                "allow_partial_authorization",
+                "recipient",
+                "installment_count",
+                "tax_amount",
+                "merchant_tax_id",
+                "purchase_order_number",
+                "customer_reference_number",
+                "amount_includes_tax",
+                "supplier_order_number",
+                "duty_amount",
+                "shipping_amount",
+                "integration_client",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "country",
+                "payment_method",
+                "buyer",
+                "buyer_id",
+                "buyer_external_identifier",
+                "gift_cards",
+                "external_identifier",
+                "three_d_secure_data",
+                "three_d_secure",
+                "metadata",
+                "airline",
+                "cart_items",
+                "statement_descriptor",
+                "previous_scheme_transaction_id",
+                "browser_info",
+                "shipping_details_id",
+                "connection_options",
+                "anti_fraud_fingerprint",
+                "payment_service_id",
+                "recipient",
+                "installment_count",
+                "tax_amount",
+                "merchant_tax_id",
+                "purchase_order_number",
+                "customer_reference_number",
+                "amount_includes_tax",
+                "supplier_order_number",
+                "duty_amount",
+                "shipping_amount",
+                "integration_client",
+            ]
+        )
         serialized = handler(self)
-
         m = {}
 
         for n, f in type(self).model_fields.items():
             k = f.alias or n
             val = serialized.get(k)
-            serialized.pop(k, None)
-
-            optional_nullable = k in optional_fields and k in nullable_fields
-            is_set = (
-                self.__pydantic_fields_set__.intersection({n})
-                or k in null_default_fields
-            )  # pylint: disable=no-member
-
-            if val is not None and val != UNSET_SENTINEL:
-                m[k] = val
-            elif val != UNSET_SENTINEL and (
-                not k in optional_fields or (optional_nullable and is_set)
-            ):
-                m[k] = val
+            is_nullable_and_explicitly_set = (
+                k in nullable_fields
+                and (self.__pydantic_fields_set__.intersection({n}))  # pylint: disable=no-member
+            )
+
+            if val != UNSET_SENTINEL:
+                if (
+                    val is not None
+                    or k not in optional_fields
+                    or is_nullable_and_explicitly_set
+                ):
+                    m[k] = val
 
         return m

gr4vy/models/transactionevent.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 from datetime import datetime
-from gr4vy.types import BaseModel, UnrecognizedStr
+from gr4vy.types import BaseModel, UNSET_SENTINEL, UnrecognizedStr
 from gr4vy.utils import validate_const
 import pydantic
+from pydantic import model_serializer
 from pydantic.functional_validators import AfterValidator
 from typing import Any, Dict, Literal, Optional, Union
 from typing_extensions import Annotated, TypedDict
@@ -102,3 +103,19 @@ class TransactionEvent(BaseModel):
         pydantic.Field(alias="type"),
     ] = "transaction-event"
     r"""Always `transaction-event`."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["type"])
+        serialized = handler(self)
+        m = {}
+
+        for n, f in type(self).model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+
+            if val != UNSET_SENTINEL:
+                if val is not None or k not in optional_fields:
+                    m[k] = val
+
+        return m

gr4vy/models/transactionevents.py

@@ -34,30 +34,25 @@ class TransactionEvents(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["limit", "next_cursor", "previous_cursor"]
-        nullable_fields = ["next_cursor", "previous_cursor"]
-        null_default_fields = []
-
+        optional_fields = set(["limit", "next_cursor", "previous_cursor"])
+        nullable_fields = set(["next_cursor", "previous_cursor"])
         serialized = handler(self)
-
         m = {}
 
         for n, f in type(self).model_fields.items():
             k = f.alias or n
             val = serialized.get(k)
-            serialized.pop(k, None)
-
-            optional_nullable = k in optional_fields and k in nullable_fields
-            is_set = (
-                self.__pydantic_fields_set__.intersection({n})
-                or k in null_default_fields
-            )  # pylint: disable=no-member
-
-            if val is not None and val != UNSET_SENTINEL:
-                m[k] = val
-            elif val != UNSET_SENTINEL and (
-                not k in optional_fields or (optional_nullable and is_set)
-            ):
-                m[k] = val
+            is_nullable_and_explicitly_set = (
+                k in nullable_fields
+                and (self.__pydantic_fields_set__.intersection({n}))  # pylint: disable=no-member
+            )
+
+            if val != UNSET_SENTINEL:
+                if (
+                    val is not None
+                    or k not in optional_fields
+                    or is_nullable_and_explicitly_set
+                ):
+                    m[k] = val
 
         return m

gr4vy/models/transactiongiftcard.py

@@ -46,30 +46,25 @@ class TransactionGiftCard(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["type", "id"]
-        nullable_fields = ["id"]
-        null_default_fields = []
-
+        optional_fields = set(["type", "id"])
+        nullable_fields = set(["id"])
         serialized = handler(self)
-
         m = {}
 
         for n, f in type(self).model_fields.items():
             k = f.alias or n
             val = serialized.get(k)
-            serialized.pop(k, None)
-
-            optional_nullable = k in optional_fields and k in nullable_fields
-            is_set = (
-                self.__pydantic_fields_set__.intersection({n})
-                or k in null_default_fields
-            )  # pylint: disable=no-member
-
-            if val is not None and val != UNSET_SENTINEL:
-                m[k] = val
-            elif val != UNSET_SENTINEL and (
-                not k in optional_fields or (optional_nullable and is_set)
-            ):
-                m[k] = val
+            is_nullable_and_explicitly_set = (
+                k in nullable_fields
+                and (self.__pydantic_fields_set__.intersection({n}))  # pylint: disable=no-member
+            )
+
+            if val != UNSET_SENTINEL:
+                if (
+                    val is not None
+                    or k not in optional_fields
+                    or is_nullable_and_explicitly_set
+                ):
+                    m[k] = val
 
         return m