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

gr4vy/models/digitalwallet.py

@@ -97,44 +97,38 @@ class DigitalWallet(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "type",
-            "merchant_display_name",
-            "merchant_url",
-            "merchant_country_code",
-            "active_certificate_count",
-            "pending_certificate_count",
-            "expired_certificate_count",
-            "fields",
-        ]
-        nullable_fields = [
-            "merchant_display_name",
-            "merchant_url",
-            "merchant_country_code",
-            "fields",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "type",
+                "merchant_display_name",
+                "merchant_url",
+                "merchant_country_code",
+                "active_certificate_count",
+                "pending_certificate_count",
+                "expired_certificate_count",
+                "fields",
+            ]
+        )
+        nullable_fields = set(
+            ["merchant_display_name", "merchant_url", "merchant_country_code", "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/digitalwalletcreate.py

@@ -39,39 +39,34 @@ class DigitalWalletCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "merchant_display_name",
-            "merchant_url",
-            "merchant_country_code",
-            "domain_names",
-        ]
-        nullable_fields = [
-            "merchant_display_name",
-            "merchant_url",
-            "merchant_country_code",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "merchant_display_name",
+                "merchant_url",
+                "merchant_country_code",
+                "domain_names",
+            ]
+        )
+        nullable_fields = set(
+            ["merchant_display_name", "merchant_url", "merchant_country_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/digitalwalletupdate.py

@@ -32,42 +32,41 @@ class DigitalWalletUpdate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "merchant_name",
-            "domain_names",
-            "merchant_display_name",
-            "merchant_url",
-            "merchant_country_code",
-        ]
-        nullable_fields = [
-            "merchant_name",
-            "domain_names",
-            "merchant_display_name",
-            "merchant_url",
-            "merchant_country_code",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "merchant_name",
+                "domain_names",
+                "merchant_display_name",
+                "merchant_url",
+                "merchant_country_code",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "merchant_name",
+                "domain_names",
+                "merchant_display_name",
+                "merchant_url",
+                "merchant_country_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/dlocaloptions.py

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

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

@@ -46,44 +46,29 @@ class DlocalUPIWalletOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "name",
-            "email",
-            "token",
-            "username",
-            "verify",
-            "recurring_info",
-        ]
-        nullable_fields = [
-            "name",
-            "email",
-            "token",
-            "username",
-            "verify",
-            "recurring_info",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["name", "email", "token", "username", "verify", "recurring_info"]
+        )
+        nullable_fields = set(
+            ["name", "email", "token", "username", "verify", "recurring_info"]
+        )
         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/dlocalwalletoptions.py

@@ -37,30 +37,25 @@ class DlocalWalletOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["name", "email", "token", "username", "verify"]
-        nullable_fields = ["name", "email", "token", "username", "verify"]
-        null_default_fields = []
-
+        optional_fields = set(["name", "email", "token", "username", "verify"])
+        nullable_fields = set(["name", "email", "token", "username", "verify"])
         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/expire_payment_linkop.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 ExpirePaymentLinkGlobals(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 ExpirePaymentLinkRequestTypedDict(TypedDict):
     payment_link_id: str
@@ -41,3 +58,19 @@ class ExpirePaymentLinkRequest(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/fiservinstallmentoptions.py

@@ -41,40 +41,39 @@ class FiservInstallmentOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "numberOfInstallments",
-            "installmentsInterest",
-            "installmentDelayMonths",
-            "merchantAdviceCodeSupported",
-        ]
-        nullable_fields = [
-            "numberOfInstallments",
-            "installmentsInterest",
-            "installmentDelayMonths",
-            "merchantAdviceCodeSupported",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "numberOfInstallments",
+                "installmentsInterest",
+                "installmentDelayMonths",
+                "merchantAdviceCodeSupported",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "numberOfInstallments",
+                "installmentsInterest",
+                "installmentDelayMonths",
+                "merchantAdviceCodeSupported",
+            ]
+        )
         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
+            is_nullable_and_explicitly_set = (
+                k in nullable_fields
+                and (self.__pydantic_fields_set__.intersection({n}))  # 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
+            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/fiservoptions.py

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

@@ -63,42 +63,41 @@ class ForterAntiFraudOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "delivery_type",
-            "delivery_method",
-            "is_guest_buyer",
-            "cart_items",
-            "total_discount",
-        ]
-        nullable_fields = [
-            "delivery_type",
-            "delivery_method",
-            "is_guest_buyer",
-            "cart_items",
-            "total_discount",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "delivery_type",
+                "delivery_method",
+                "is_guest_buyer",
+                "cart_items",
+                "total_discount",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "delivery_type",
+                "delivery_method",
+                "is_guest_buyer",
+                "cart_items",
+                "total_discount",
+            ]
+        )
         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