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

gr4vy/models/merchantaccountupdate.py

@@ -104,66 +104,65 @@ class MerchantAccountUpdate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "account_updater_enabled",
-            "account_updater_request_encryption_key",
-            "account_updater_request_encryption_key_id",
-            "account_updater_response_decryption_key",
-            "account_updater_response_decryption_key_id",
-            "over_capture_amount",
-            "over_capture_percentage",
-            "loon_client_key",
-            "loon_secret_key",
-            "loon_accepted_schemes",
-            "visa_network_tokens_requestor_id",
-            "visa_network_tokens_app_id",
-            "amex_network_tokens_requestor_id",
-            "amex_network_tokens_app_id",
-            "mastercard_network_tokens_requestor_id",
-            "mastercard_network_tokens_app_id",
-            "async_network_tokens_enabled",
-            "display_name",
-        ]
-        nullable_fields = [
-            "account_updater_request_encryption_key",
-            "account_updater_request_encryption_key_id",
-            "account_updater_response_decryption_key",
-            "account_updater_response_decryption_key_id",
-            "over_capture_amount",
-            "over_capture_percentage",
-            "loon_client_key",
-            "loon_secret_key",
-            "loon_accepted_schemes",
-            "visa_network_tokens_requestor_id",
-            "visa_network_tokens_app_id",
-            "amex_network_tokens_requestor_id",
-            "amex_network_tokens_app_id",
-            "mastercard_network_tokens_requestor_id",
-            "mastercard_network_tokens_app_id",
-            "display_name",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "account_updater_enabled",
+                "account_updater_request_encryption_key",
+                "account_updater_request_encryption_key_id",
+                "account_updater_response_decryption_key",
+                "account_updater_response_decryption_key_id",
+                "over_capture_amount",
+                "over_capture_percentage",
+                "loon_client_key",
+                "loon_secret_key",
+                "loon_accepted_schemes",
+                "visa_network_tokens_requestor_id",
+                "visa_network_tokens_app_id",
+                "amex_network_tokens_requestor_id",
+                "amex_network_tokens_app_id",
+                "mastercard_network_tokens_requestor_id",
+                "mastercard_network_tokens_app_id",
+                "async_network_tokens_enabled",
+                "display_name",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "account_updater_request_encryption_key",
+                "account_updater_request_encryption_key_id",
+                "account_updater_response_decryption_key",
+                "account_updater_response_decryption_key_id",
+                "over_capture_amount",
+                "over_capture_percentage",
+                "loon_client_key",
+                "loon_secret_key",
+                "loon_accepted_schemes",
+                "visa_network_tokens_requestor_id",
+                "visa_network_tokens_app_id",
+                "amex_network_tokens_requestor_id",
+                "amex_network_tokens_app_id",
+                "mastercard_network_tokens_requestor_id",
+                "mastercard_network_tokens_app_id",
+                "display_name",
+            ]
+        )
         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/method.py

@@ -70,6 +70,7 @@ Method = Union[
         "oney_3x",
         "oney_4x",
         "oney_6x",
+        "onlinebankingcz",
         "ovo",
         "oxxo",
         "p24",

gr4vy/models/mockcardmerchantadvicecodeoptions.py

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

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

@@ -3,9 +3,10 @@
 from __future__ import annotations
 from .networktokenstatus import NetworkTokenStatus
 from datetime import datetime
-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
@@ -58,3 +59,19 @@ class NetworkToken(BaseModel):
         pydantic.Field(alias="type"),
     ] = "network-token"
     r"""Always `network-token`."""
+
+    @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/networktokencreate.py

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

@@ -88,46 +88,45 @@ class NetworkTokenPaymentMethodCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "cryptogram",
-            "redirect_url",
-            "card_source",
-            "card_scheme",
-            "card_suffix",
-            "cardholder_name",
-            "eci",
-        ]
-        nullable_fields = [
-            "cryptogram",
-            "redirect_url",
-            "card_source",
-            "card_scheme",
-            "card_suffix",
-            "cardholder_name",
-            "eci",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "cryptogram",
+                "redirect_url",
+                "card_source",
+                "card_scheme",
+                "card_suffix",
+                "cardholder_name",
+                "eci",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "cryptogram",
+                "redirect_url",
+                "card_source",
+                "card_scheme",
+                "card_suffix",
+                "cardholder_name",
+                "eci",
+            ]
+        )
         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/nuveiairlinedataoptions.py

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

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

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

@@ -41,30 +41,25 @@ class NuveiPSEOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["userType", "userFisNumber", "fiscalNumber", "bankCode"]
-        nullable_fields = ["userType", "userFisNumber", "fiscalNumber", "bankCode"]
-        null_default_fields = []
-
+        optional_fields = set(["userType", "userFisNumber", "fiscalNumber", "bankCode"])
+        nullable_fields = set(["userType", "userFisNumber", "fiscalNumber", "bankCode"])
         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/oxxooptions.py

@@ -22,30 +22,25 @@ class OxxoOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["payment_method_expires_at", "approval_url"]
-        nullable_fields = ["payment_method_expires_at", "approval_url"]
-        null_default_fields = []
-
+        optional_fields = set(["payment_method_expires_at", "approval_url"])
+        nullable_fields = set(["payment_method_expires_at", "approval_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