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

gr4vy/models/airlineleg.py

@@ -145,78 +145,77 @@ class AirlineLeg(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "arrival_airport",
-            "arrival_at",
-            "arrival_city",
-            "arrival_country",
-            "carrier_code",
-            "carrier_name",
-            "iata_designator",
-            "icao_code",
-            "coupon_number",
-            "departure_airport",
-            "departure_at",
-            "departure_city",
-            "departure_country",
-            "departure_tax_amount",
-            "fare_amount",
-            "fare_basis_code",
-            "fee_amount",
-            "flight_class",
-            "flight_number",
-            "route_type",
-            "seat_class",
-            "stop_over",
-            "tax_amount",
-        ]
-        nullable_fields = [
-            "arrival_airport",
-            "arrival_at",
-            "arrival_city",
-            "arrival_country",
-            "carrier_code",
-            "carrier_name",
-            "iata_designator",
-            "icao_code",
-            "coupon_number",
-            "departure_airport",
-            "departure_at",
-            "departure_city",
-            "departure_country",
-            "departure_tax_amount",
-            "fare_amount",
-            "fare_basis_code",
-            "fee_amount",
-            "flight_class",
-            "flight_number",
-            "route_type",
-            "seat_class",
-            "stop_over",
-            "tax_amount",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "arrival_airport",
+                "arrival_at",
+                "arrival_city",
+                "arrival_country",
+                "carrier_code",
+                "carrier_name",
+                "iata_designator",
+                "icao_code",
+                "coupon_number",
+                "departure_airport",
+                "departure_at",
+                "departure_city",
+                "departure_country",
+                "departure_tax_amount",
+                "fare_amount",
+                "fare_basis_code",
+                "fee_amount",
+                "flight_class",
+                "flight_number",
+                "route_type",
+                "seat_class",
+                "stop_over",
+                "tax_amount",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "arrival_airport",
+                "arrival_at",
+                "arrival_city",
+                "arrival_country",
+                "carrier_code",
+                "carrier_name",
+                "iata_designator",
+                "icao_code",
+                "coupon_number",
+                "departure_airport",
+                "departure_at",
+                "departure_city",
+                "departure_country",
+                "departure_tax_amount",
+                "fare_amount",
+                "fare_basis_code",
+                "fee_amount",
+                "flight_class",
+                "flight_number",
+                "route_type",
+                "seat_class",
+                "stop_over",
+                "tax_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/airlinepassenger.py

@@ -85,54 +85,53 @@ class AirlinePassenger(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "age_group",
-            "date_of_birth",
-            "email_address",
-            "first_name",
-            "frequent_flyer_number",
-            "last_name",
-            "passport_number",
-            "phone_number",
-            "ticket_number",
-            "title",
-            "country_code",
-        ]
-        nullable_fields = [
-            "age_group",
-            "date_of_birth",
-            "email_address",
-            "first_name",
-            "frequent_flyer_number",
-            "last_name",
-            "passport_number",
-            "phone_number",
-            "ticket_number",
-            "title",
-            "country_code",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "age_group",
+                "date_of_birth",
+                "email_address",
+                "first_name",
+                "frequent_flyer_number",
+                "last_name",
+                "passport_number",
+                "phone_number",
+                "ticket_number",
+                "title",
+                "country_code",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "age_group",
+                "date_of_birth",
+                "email_address",
+                "first_name",
+                "frequent_flyer_number",
+                "last_name",
+                "passport_number",
+                "phone_number",
+                "ticket_number",
+                "title",
+                "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/applepaypaymentmethodcreate.py

@@ -68,46 +68,45 @@ class ApplePayPaymentMethodCreate(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "buyer_external_identifier",
-            "buyer_id",
-            "cardholder_name",
-            "redirect_url",
-            "card_suffix",
-            "card_scheme",
-            "card_type",
-        ]
-        nullable_fields = [
-            "buyer_external_identifier",
-            "buyer_id",
-            "cardholder_name",
-            "redirect_url",
-            "card_suffix",
-            "card_scheme",
-            "card_type",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "buyer_external_identifier",
+                "buyer_id",
+                "cardholder_name",
+                "redirect_url",
+                "card_suffix",
+                "card_scheme",
+                "card_type",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "buyer_external_identifier",
+                "buyer_id",
+                "cardholder_name",
+                "redirect_url",
+                "card_suffix",
+                "card_scheme",
+                "card_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/auditlogentries.py

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

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

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

@@ -44,44 +44,43 @@ class BillingDetails(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "first_name",
-            "last_name",
-            "email_address",
-            "phone_number",
-            "address",
-            "tax_id",
-        ]
-        nullable_fields = [
-            "first_name",
-            "last_name",
-            "email_address",
-            "phone_number",
-            "address",
-            "tax_id",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "first_name",
+                "last_name",
+                "email_address",
+                "phone_number",
+                "address",
+                "tax_id",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "first_name",
+                "last_name",
+                "email_address",
+                "phone_number",
+                "address",
+                "tax_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/braintreedynamicdatafieldsoptions.py

@@ -44,38 +44,37 @@ class BraintreeDynamicDataFieldsOptions(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "three_ds_auth_status",
-            "purchase_order_number",
-            "vault_payment_method_criteria",
-        ]
-        nullable_fields = [
-            "three_ds_auth_status",
-            "purchase_order_number",
-            "vault_payment_method_criteria",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "three_ds_auth_status",
+                "purchase_order_number",
+                "vault_payment_method_criteria",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "three_ds_auth_status",
+                "purchase_order_number",
+                "vault_payment_method_criteria",
+            ]
+        )
         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