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

gr4vy/models/braintreeoptions.py

@@ -34,30 +34,29 @@ class BraintreeOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["discount_amount", "custom_fields", "dynamic_data_fields"]
-        nullable_fields = ["discount_amount", "custom_fields", "dynamic_data_fields"]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["discount_amount", "custom_fields", "dynamic_data_fields"]
+        )
+        nullable_fields = set(
+            ["discount_amount", "custom_fields", "dynamic_data_fields"]
+        )
         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/browserinfo.py

@@ -70,30 +70,25 @@ class BrowserInfo(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["accept_header"]
-        nullable_fields = ["accept_header"]
-        null_default_fields = []
-
+        optional_fields = set(["accept_header"])
+        nullable_fields = set(["accept_header"])
         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/buyer.py

@@ -66,43 +66,42 @@ class Buyer(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "type",
-            "id",
-            "display_name",
-            "external_identifier",
-            "billing_details",
-            "account_number",
-        ]
-        nullable_fields = [
-            "id",
-            "display_name",
-            "external_identifier",
-            "billing_details",
-            "account_number",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "type",
+                "id",
+                "display_name",
+                "external_identifier",
+                "billing_details",
+                "account_number",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "id",
+                "display_name",
+                "external_identifier",
+                "billing_details",
+                "account_number",
+            ]
+        )
         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/buyercreate.py

@@ -37,40 +37,29 @@ class BuyerCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "display_name",
-            "external_identifier",
-            "billing_details",
-            "account_number",
-        ]
-        nullable_fields = [
-            "display_name",
-            "external_identifier",
-            "billing_details",
-            "account_number",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["display_name", "external_identifier", "billing_details", "account_number"]
+        )
+        nullable_fields = set(
+            ["display_name", "external_identifier", "billing_details", "account_number"]
+        )
         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/buyers.py

@@ -34,30 +34,25 @@ class Buyers(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/buyerupdate.py

@@ -37,40 +37,29 @@ class BuyerUpdate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "display_name",
-            "external_identifier",
-            "account_number",
-            "billing_details",
-        ]
-        nullable_fields = [
-            "display_name",
-            "external_identifier",
-            "account_number",
-            "billing_details",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["display_name", "external_identifier", "account_number", "billing_details"]
+        )
+        nullable_fields = set(
+            ["display_name", "external_identifier", "account_number", "billing_details"]
+        )
         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/cancel_transactionop.py

@@ -1,9 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from gr4vy.types import BaseModel
+from gr4vy.types import BaseModel, UNSET_SENTINEL
 from gr4vy.utils import FieldMetadata, HeaderMetadata, PathParamMetadata
 import pydantic
+from pydantic import model_serializer
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
@@ -21,6 +22,22 @@ class CancelTransactionGlobals(BaseModel):
     ] = None
     r"""The ID of the merchant account to use for this request."""
 
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["merchant_account_id"])
+        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
+
 
 class CancelTransactionRequestTypedDict(TypedDict):
     transaction_id: str
@@ -41,3 +58,19 @@ class CancelTransactionRequest(BaseModel):
         FieldMetadata(header=HeaderMetadata(style="simple", explode=False)),
     ] = None
     r"""The ID of the merchant account to use for this request."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["merchant_account_id"])
+        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/capture_transactionop.py

@@ -33,6 +33,22 @@ class CaptureTransactionGlobals(BaseModel):
     ] = None
     r"""The ID of the merchant account to use for this request."""
 
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["merchant_account_id"])
+        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
+
 
 class CaptureTransactionRequestTypedDict(TypedDict):
     transaction_id: str
@@ -70,31 +86,26 @@ class CaptureTransactionRequest(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["prefer", "merchant_account_id"]
-        nullable_fields = ["prefer"]
-        null_default_fields = []
-
+        optional_fields = set(["prefer", "merchant_account_id"])
+        nullable_fields = set(["prefer"])
         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/cardpaymentmethodcreate.py

@@ -59,43 +59,42 @@ class CardPaymentMethodCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "buyer_external_identifier",
-            "buyer_id",
-            "external_identifier",
-            "card_type",
-            "method",
-            "security_code",
-        ]
-        nullable_fields = [
-            "buyer_external_identifier",
-            "buyer_id",
-            "external_identifier",
-            "card_type",
-            "security_code",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "buyer_external_identifier",
+                "buyer_id",
+                "external_identifier",
+                "card_type",
+                "method",
+                "security_code",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "buyer_external_identifier",
+                "buyer_id",
+                "external_identifier",
+                "card_type",
+                "security_code",
+            ]
+        )
         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/cardschemedefinition.py

@@ -1,9 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from gr4vy.types import BaseModel
+from gr4vy.types import BaseModel, UNSET_SENTINEL
 from gr4vy.utils import validate_const
 import pydantic
+from pydantic import model_serializer
 from pydantic.functional_validators import AfterValidator
 from typing import Literal, Optional
 from typing_extensions import Annotated, TypedDict
@@ -38,3 +39,19 @@ class CardSchemeDefinition(BaseModel):
         pydantic.Field(alias="type"),
     ] = "card-scheme-definition"
     r"""Always `card-scheme-definition`."""
+
+    @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/cardwithurlpaymentmethodcreate.py

@@ -68,45 +68,44 @@ class CardWithURLPaymentMethodCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "buyer_external_identifier",
-            "buyer_id",
-            "external_identifier",
-            "card_type",
-            "method",
-            "security_code",
-            "redirect_url",
-        ]
-        nullable_fields = [
-            "buyer_external_identifier",
-            "buyer_id",
-            "external_identifier",
-            "card_type",
-            "security_code",
-            "redirect_url",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "buyer_external_identifier",
+                "buyer_id",
+                "external_identifier",
+                "card_type",
+                "method",
+                "security_code",
+                "redirect_url",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "buyer_external_identifier",
+                "buyer_id",
+                "external_identifier",
+                "card_type",
+                "security_code",
+                "redirect_url",
+            ]
+        )
         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