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

gr4vy/models/transactionpaymentmethod.py

@@ -109,61 +109,60 @@ class TransactionPaymentMethod(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "type",
-            "approval_url",
-            "country",
-            "currency",
-            "details",
-            "expiration_date",
-            "fingerprint",
-            "label",
-            "last_replaced_at",
-            "mode",
-            "scheme",
-            "id",
-            "approval_target",
-            "external_identifier",
-            "payment_account_reference",
-        ]
-        nullable_fields = [
-            "approval_url",
-            "country",
-            "currency",
-            "details",
-            "expiration_date",
-            "fingerprint",
-            "label",
-            "last_replaced_at",
-            "mode",
-            "scheme",
-            "id",
-            "approval_target",
-            "external_identifier",
-            "payment_account_reference",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "type",
+                "approval_url",
+                "country",
+                "currency",
+                "details",
+                "expiration_date",
+                "fingerprint",
+                "label",
+                "last_replaced_at",
+                "mode",
+                "scheme",
+                "id",
+                "approval_target",
+                "external_identifier",
+                "payment_account_reference",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "approval_url",
+                "country",
+                "currency",
+                "details",
+                "expiration_date",
+                "fingerprint",
+                "label",
+                "last_replaced_at",
+                "mode",
+                "scheme",
+                "id",
+                "approval_target",
+                "external_identifier",
+                "payment_account_reference",
+            ]
+        )
         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/transactionpaymentservice.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 from .method import Method
-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
@@ -42,3 +43,19 @@ class TransactionPaymentService(BaseModel):
         pydantic.Field(alias="type"),
     ] = "payment-service"
     r"""Always `payment-service`."""
+
+    @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/transactionrefundallcreate.py

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

@@ -37,36 +37,27 @@ class TransactionRefundCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "amount",
-            "target_type",
-            "target_id",
-            "reason",
-            "external_identifier",
-        ]
-        nullable_fields = ["amount", "target_id", "reason", "external_identifier"]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["amount", "target_type", "target_id", "reason", "external_identifier"]
+        )
+        nullable_fields = set(["amount", "target_id", "reason", "external_identifier"])
         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/transactionretriesreportspec.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 Any, Dict, Literal, Optional
 from typing_extensions import Annotated, TypedDict
@@ -28,3 +29,19 @@ class TransactionRetriesReportSpec(BaseModel):
         pydantic.Field(alias="model"),
     ] = "transaction_retries"
     r"""The report model type."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["model"])
+        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/transactionsreportspec.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 Any, Dict, Literal, Optional
 from typing_extensions import Annotated, TypedDict
@@ -28,3 +29,19 @@ class TransactionsReportSpec(BaseModel):
         pydantic.Field(alias="model"),
     ] = "transactions"
     r"""The report model type."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["model"])
+        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/transactionsummaries.py

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

@@ -199,62 +199,61 @@ class TransactionSummary(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "type",
-            "settled_currency",
-            "country",
-            "external_identifier",
-            "payment_method",
-            "method",
-            "instrument_type",
-            "error_code",
-            "payment_service",
-            "pending_review",
-            "buyer",
-            "raw_response_code",
-            "raw_response_description",
-            "shipping_details",
-            "checkout_session_id",
-            "gift_card_service",
-        ]
-        nullable_fields = [
-            "settled_currency",
-            "country",
-            "external_identifier",
-            "payment_method",
-            "method",
-            "instrument_type",
-            "error_code",
-            "payment_service",
-            "buyer",
-            "raw_response_code",
-            "raw_response_description",
-            "shipping_details",
-            "checkout_session_id",
-            "gift_card_service",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "type",
+                "settled_currency",
+                "country",
+                "external_identifier",
+                "payment_method",
+                "method",
+                "instrument_type",
+                "error_code",
+                "payment_service",
+                "pending_review",
+                "buyer",
+                "raw_response_code",
+                "raw_response_description",
+                "shipping_details",
+                "checkout_session_id",
+                "gift_card_service",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "settled_currency",
+                "country",
+                "external_identifier",
+                "payment_method",
+                "method",
+                "instrument_type",
+                "error_code",
+                "payment_service",
+                "buyer",
+                "raw_response_code",
+                "raw_response_description",
+                "shipping_details",
+                "checkout_session_id",
+                "gift_card_service",
+            ]
+        )
         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/transactionthreedsecuresummary.py

@@ -58,44 +58,29 @@ class TransactionThreeDSecureSummary(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "version",
-            "status",
-            "method",
-            "response_data",
-            "error_data",
-            "amount",
-        ]
-        nullable_fields = [
-            "version",
-            "status",
-            "method",
-            "response_data",
-            "error_data",
-            "amount",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["version", "status", "method", "response_data", "error_data", "amount"]
+        )
+        nullable_fields = set(
+            ["version", "status", "method", "response_data", "error_data", "amount"]
+        )
         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/transactionupdate.py

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

@@ -52,30 +52,25 @@ class TransactionVoid(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["type"]
-        nullable_fields = ["code", "raw_response_code", "raw_response_description"]
-        null_default_fields = []
-
+        optional_fields = set(["type"])
+        nullable_fields = set(["code", "raw_response_code", "raw_response_description"])
         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