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

gr4vy/models/add_reportop.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 from .reportcreate import ReportCreate, ReportCreateTypedDict
-from gr4vy.types import BaseModel
+from gr4vy.types import BaseModel, UNSET_SENTINEL
 from gr4vy.utils import FieldMetadata, HeaderMetadata, RequestMetadata
 import pydantic
+from pydantic import model_serializer
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
@@ -22,6 +23,22 @@ class AddReportGlobals(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 AddReportRequestTypedDict(TypedDict):
     report_create: ReportCreateTypedDict
@@ -41,3 +58,19 @@ class AddReportRequest(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/address.py

@@ -57,50 +57,49 @@ class Address(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "city",
-            "country",
-            "postal_code",
-            "state",
-            "state_code",
-            "house_number_or_name",
-            "line1",
-            "line2",
-            "organization",
-        ]
-        nullable_fields = [
-            "city",
-            "country",
-            "postal_code",
-            "state",
-            "state_code",
-            "house_number_or_name",
-            "line1",
-            "line2",
-            "organization",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "city",
+                "country",
+                "postal_code",
+                "state",
+                "state_code",
+                "house_number_or_name",
+                "line1",
+                "line2",
+                "organization",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "city",
+                "country",
+                "postal_code",
+                "state",
+                "state_code",
+                "house_number_or_name",
+                "line1",
+                "line2",
+                "organization",
+            ]
+        )
         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/adyencardoptions.py

@@ -55,44 +55,43 @@ class AdyenCardOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "autoRescue",
-            "maxDaysToRescue",
-            "additionalData",
-            "autoRescueScenario",
-            "window_origin",
-            "splits",
-        ]
-        nullable_fields = [
-            "autoRescue",
-            "maxDaysToRescue",
-            "additionalData",
-            "autoRescueScenario",
-            "window_origin",
-            "splits",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "autoRescue",
+                "maxDaysToRescue",
+                "additionalData",
+                "autoRescueScenario",
+                "window_origin",
+                "splits",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "autoRescue",
+                "maxDaysToRescue",
+                "additionalData",
+                "autoRescueScenario",
+                "window_origin",
+                "splits",
+            ]
+        )
         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/adyenoptions.py

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

@@ -51,42 +51,41 @@ class AdyenSepaOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "autoRescue",
-            "maxDaysToRescue",
-            "additionalData",
-            "autoRescueSepaScenario",
-            "ownerName",
-        ]
-        nullable_fields = [
-            "autoRescue",
-            "maxDaysToRescue",
-            "additionalData",
-            "autoRescueSepaScenario",
-            "ownerName",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "autoRescue",
+                "maxDaysToRescue",
+                "additionalData",
+                "autoRescueSepaScenario",
+                "ownerName",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "autoRescue",
+                "maxDaysToRescue",
+                "additionalData",
+                "autoRescueSepaScenario",
+                "ownerName",
+            ]
+        )
         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/adyensplitsoptions.py

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

@@ -47,46 +47,45 @@ class AffirmItineraryOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "type",
-            "sku",
-            "display_name",
-            "venue",
-            "location",
-            "date_start",
-            "management",
-        ]
-        nullable_fields = [
-            "type",
-            "sku",
-            "display_name",
-            "venue",
-            "location",
-            "date_start",
-            "management",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "type",
+                "sku",
+                "display_name",
+                "venue",
+                "location",
+                "date_start",
+                "management",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "type",
+                "sku",
+                "display_name",
+                "venue",
+                "location",
+                "date_start",
+                "management",
+            ]
+        )
         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/affirmoptions.py

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

@@ -131,70 +131,69 @@ class Airline(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "booking_code",
-            "is_cardholder_traveling",
-            "issued_address",
-            "issued_at",
-            "issuing_carrier_code",
-            "issuing_carrier_name",
-            "issuing_iata_designator",
-            "issuing_icao_code",
-            "legs",
-            "passenger_name_record",
-            "passengers",
-            "reservation_system",
-            "restricted_ticket",
-            "ticket_delivery_method",
-            "ticket_number",
-            "travel_agency_code",
-            "travel_agency_invoice_number",
-            "travel_agency_name",
-            "travel_agency_plan_name",
-        ]
-        nullable_fields = [
-            "booking_code",
-            "is_cardholder_traveling",
-            "issued_address",
-            "issued_at",
-            "issuing_carrier_code",
-            "issuing_carrier_name",
-            "issuing_iata_designator",
-            "issuing_icao_code",
-            "legs",
-            "passenger_name_record",
-            "passengers",
-            "reservation_system",
-            "restricted_ticket",
-            "ticket_delivery_method",
-            "ticket_number",
-            "travel_agency_code",
-            "travel_agency_invoice_number",
-            "travel_agency_name",
-            "travel_agency_plan_name",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "booking_code",
+                "is_cardholder_traveling",
+                "issued_address",
+                "issued_at",
+                "issuing_carrier_code",
+                "issuing_carrier_name",
+                "issuing_iata_designator",
+                "issuing_icao_code",
+                "legs",
+                "passenger_name_record",
+                "passengers",
+                "reservation_system",
+                "restricted_ticket",
+                "ticket_delivery_method",
+                "ticket_number",
+                "travel_agency_code",
+                "travel_agency_invoice_number",
+                "travel_agency_name",
+                "travel_agency_plan_name",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "booking_code",
+                "is_cardholder_traveling",
+                "issued_address",
+                "issued_at",
+                "issuing_carrier_code",
+                "issuing_carrier_name",
+                "issuing_iata_designator",
+                "issuing_icao_code",
+                "legs",
+                "passenger_name_record",
+                "passengers",
+                "reservation_system",
+                "restricted_ticket",
+                "ticket_delivery_method",
+                "ticket_number",
+                "travel_agency_code",
+                "travel_agency_invoice_number",
+                "travel_agency_name",
+                "travel_agency_plan_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