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

gr4vy/models/guestbuyer.py

@@ -39,42 +39,41 @@ class GuestBuyer(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "display_name",
-            "external_identifier",
-            "billing_details",
-            "account_number",
-            "shipping_details",
-        ]
-        nullable_fields = [
-            "display_name",
-            "external_identifier",
-            "billing_details",
-            "account_number",
-            "shipping_details",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "display_name",
+                "external_identifier",
+                "billing_details",
+                "account_number",
+                "shipping_details",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "display_name",
+                "external_identifier",
+                "billing_details",
+                "account_number",
+                "shipping_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/internal/globals.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
 import pydantic
+from pydantic import model_serializer
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
@@ -20,3 +21,19 @@ class Globals(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/latitudeoptions.py

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

@@ -25,6 +25,22 @@ class ListAllReportExecutionsGlobals(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 ListAllReportExecutionsRequestTypedDict(TypedDict):
     cursor: NotRequired[Nullable[str]]
@@ -97,47 +113,46 @@ class ListAllReportExecutionsRequest(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "cursor",
-            "limit",
-            "report_name",
-            "created_at_lte",
-            "created_at_gte",
-            "status",
-            "creator_id",
-            "merchant_account_id",
-        ]
-        nullable_fields = [
-            "cursor",
-            "report_name",
-            "created_at_lte",
-            "created_at_gte",
-            "status",
-            "creator_id",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "cursor",
+                "limit",
+                "report_name",
+                "created_at_lte",
+                "created_at_gte",
+                "status",
+                "creator_id",
+                "merchant_account_id",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "cursor",
+                "report_name",
+                "created_at_lte",
+                "created_at_gte",
+                "status",
+                "creator_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
 

gr4vy/models/list_audit_logsop.py

@@ -24,6 +24,22 @@ class ListAuditLogsGlobals(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 ListAuditLogsRequestTypedDict(TypedDict):
     cursor: NotRequired[Nullable[str]]
@@ -80,38 +96,35 @@ class ListAuditLogsRequest(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "cursor",
-            "limit",
-            "action",
-            "user_id",
-            "resource_type",
-            "merchant_account_id",
-        ]
-        nullable_fields = ["cursor", "action", "user_id", "resource_type"]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "cursor",
+                "limit",
+                "action",
+                "user_id",
+                "resource_type",
+                "merchant_account_id",
+            ]
+        )
+        nullable_fields = set(["cursor", "action", "user_id", "resource_type"])
         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/list_buyer_gift_cardsop.py

@@ -22,6 +22,22 @@ class ListBuyerGiftCardsGlobals(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 ListBuyerGiftCardsRequestTypedDict(TypedDict):
     buyer_external_identifier: NotRequired[Nullable[str]]
@@ -50,34 +66,27 @@ class ListBuyerGiftCardsRequest(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "buyer_external_identifier",
-            "buyer_id",
-            "merchant_account_id",
-        ]
-        nullable_fields = ["buyer_external_identifier", "buyer_id"]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["buyer_external_identifier", "buyer_id", "merchant_account_id"]
+        )
+        nullable_fields = set(["buyer_external_identifier", "buyer_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

gr4vy/models/list_buyer_payment_methodsop.py

@@ -35,6 +35,22 @@ class ListBuyerPaymentMethodsGlobals(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
+
 
 OrderBy = Union[
     Literal[
@@ -113,44 +129,37 @@ class ListBuyerPaymentMethodsRequest(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "buyer_id",
-            "buyer_external_identifier",
-            "sort_by",
-            "order_by",
-            "country",
-            "currency",
-            "merchant_account_id",
-        ]
-        nullable_fields = [
-            "buyer_id",
-            "buyer_external_identifier",
-            "sort_by",
-            "country",
-            "currency",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "buyer_id",
+                "buyer_external_identifier",
+                "sort_by",
+                "order_by",
+                "country",
+                "currency",
+                "merchant_account_id",
+            ]
+        )
+        nullable_fields = set(
+            ["buyer_id", "buyer_external_identifier", "sort_by", "country", "currency"]
+        )
         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/list_buyer_shipping_detailsop.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 ListBuyerShippingDetailsGlobals(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 ListBuyerShippingDetailsRequestTypedDict(TypedDict):
     buyer_id: str
@@ -41,3 +58,19 @@ class ListBuyerShippingDetailsRequest(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/list_buyersop.py

@@ -23,6 +23,22 @@ class ListBuyersGlobals(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 ListBuyersRequestTypedDict(TypedDict):
     cursor: NotRequired[Nullable[str]]
@@ -71,37 +87,28 @@ class ListBuyersRequest(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "cursor",
-            "limit",
-            "search",
-            "external_identifier",
-            "merchant_account_id",
-        ]
-        nullable_fields = ["cursor", "search", "external_identifier"]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["cursor", "limit", "search", "external_identifier", "merchant_account_id"]
+        )
+        nullable_fields = set(["cursor", "search", "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