dub 0.34.1__py3-none-any.whl → 0.35.0__py3-none-any.whl

dub/models/components/linkschema.py

@@ -305,75 +305,74 @@ class LinkSchema(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "trackConversion",
-            "archived",
-            "proxy",
-            "rewrite",
-            "doIndex",
-            "publicStats",
-            "testVariants",
-            "testStartedAt",
-            "testCompletedAt",
-            "clicks",
-            "leads",
-            "conversions",
-            "sales",
-            "saleAmount",
-        ]
-        nullable_fields = [
-            "externalId",
-            "tenantId",
-            "programId",
-            "partnerId",
-            "expiresAt",
-            "expiredUrl",
-            "disabledAt",
-            "password",
-            "title",
-            "description",
-            "image",
-            "video",
-            "ios",
-            "android",
-            "geo",
-            "tags",
-            "folderId",
-            "comments",
-            "utm_source",
-            "utm_medium",
-            "utm_campaign",
-            "utm_term",
-            "utm_content",
-            "testVariants",
-            "testStartedAt",
-            "testCompletedAt",
-            "userId",
-            "lastClicked",
-            "tagId",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "trackConversion",
+                "archived",
+                "proxy",
+                "rewrite",
+                "doIndex",
+                "publicStats",
+                "testVariants",
+                "testStartedAt",
+                "testCompletedAt",
+                "clicks",
+                "leads",
+                "conversions",
+                "sales",
+                "saleAmount",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "externalId",
+                "tenantId",
+                "programId",
+                "partnerId",
+                "expiresAt",
+                "expiredUrl",
+                "disabledAt",
+                "password",
+                "title",
+                "description",
+                "image",
+                "video",
+                "ios",
+                "android",
+                "geo",
+                "tags",
+                "folderId",
+                "comments",
+                "utm_source",
+                "utm_medium",
+                "utm_campaign",
+                "utm_term",
+                "utm_content",
+                "testVariants",
+                "testStartedAt",
+                "testCompletedAt",
+                "userId",
+                "lastClicked",
+                "tagId",
+            ]
+        )
         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

dub/models/components/linkwebhookevent.py

@@ -283,63 +283,55 @@ class Data(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "testVariants",
-            "clicks",
-            "leads",
-            "conversions",
-            "sales",
-            "saleAmount",
-        ]
-        nullable_fields = [
-            "externalId",
-            "tenantId",
-            "programId",
-            "partnerId",
-            "expiredUrl",
-            "password",
-            "title",
-            "description",
-            "image",
-            "video",
-            "ios",
-            "android",
-            "geo",
-            "tags",
-            "folderId",
-            "comments",
-            "utm_source",
-            "utm_medium",
-            "utm_campaign",
-            "utm_term",
-            "utm_content",
-            "testVariants",
-            "userId",
-            "tagId",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["testVariants", "clicks", "leads", "conversions", "sales", "saleAmount"]
+        )
+        nullable_fields = set(
+            [
+                "externalId",
+                "tenantId",
+                "programId",
+                "partnerId",
+                "expiredUrl",
+                "password",
+                "title",
+                "description",
+                "image",
+                "video",
+                "ios",
+                "android",
+                "geo",
+                "tags",
+                "folderId",
+                "comments",
+                "utm_source",
+                "utm_medium",
+                "utm_campaign",
+                "utm_term",
+                "utm_content",
+                "testVariants",
+                "userId",
+                "tagId",
+            ]
+        )
         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
 

dub/models/components/partneranalyticscount.py

@@ -1,8 +1,9 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from dub.types import BaseModel
+from dub.types import BaseModel, UNSET_SENTINEL
 import pydantic
+from pydantic import model_serializer
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
@@ -33,3 +34,19 @@ class PartnerAnalyticsCount(BaseModel):
     r"""The total amount of sales, in cents"""
 
     earnings: Optional[float] = 0
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["clicks", "leads", "sales", "saleAmount", "earnings"])
+        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

dub/models/components/partneranalyticstimeseries.py

@@ -1,8 +1,9 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from dub.types import BaseModel
+from dub.types import BaseModel, UNSET_SENTINEL
 import pydantic
+from pydantic import model_serializer
 from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
@@ -38,3 +39,19 @@ class PartnerAnalyticsTimeseries(BaseModel):
     r"""The total amount of sales in the interval, in cents"""
 
     earnings: Optional[float] = 0
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = set(["clicks", "leads", "sales", "saleAmount", "earnings"])
+        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

dub/models/components/partneranalyticstoplinks.py

@@ -87,38 +87,27 @@ class PartnerAnalyticsTopLinks(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "comments",
-            "title",
-            "clicks",
-            "leads",
-            "sales",
-            "saleAmount",
-            "earnings",
-        ]
-        nullable_fields = ["comments", "title"]
-        null_default_fields = []
-
+        optional_fields = set(
+            ["comments", "title", "clicks", "leads", "sales", "saleAmount", "earnings"]
+        )
+        nullable_fields = set(["comments", "title"])
         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

dub/models/components/partnerapplicationsubmittedevent.py

@@ -107,53 +107,52 @@ class PartnerApplicationSubmittedEventPartner(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "description",
-            "groupId",
-            "website",
-            "youtube",
-            "twitter",
-            "linkedin",
-            "instagram",
-            "tiktok",
-        ]
-        nullable_fields = [
-            "companyName",
-            "email",
-            "image",
-            "description",
-            "country",
-            "groupId",
-            "website",
-            "youtube",
-            "twitter",
-            "linkedin",
-            "instagram",
-            "tiktok",
-        ]
-        null_default_fields = []
-
+        optional_fields = set(
+            [
+                "description",
+                "groupId",
+                "website",
+                "youtube",
+                "twitter",
+                "linkedin",
+                "instagram",
+                "tiktok",
+            ]
+        )
+        nullable_fields = set(
+            [
+                "companyName",
+                "email",
+                "image",
+                "description",
+                "country",
+                "groupId",
+                "website",
+                "youtube",
+                "twitter",
+                "linkedin",
+                "instagram",
+                "tiktok",
+            ]
+        )
         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
 
@@ -170,30 +169,14 @@ class ApplicationFormData(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = []
-        nullable_fields = ["value"]
-        null_default_fields = []
-
         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)
-            ):
+            if val != UNSET_SENTINEL:
                 m[k] = val
 
         return m
@@ -219,30 +202,14 @@ class PartnerApplicationSubmittedEventData(BaseModel):
 
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = []
-        nullable_fields = ["applicationFormData"]
-        null_default_fields = []
-
         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)
-            ):
+            if val != UNSET_SENTINEL:
                 m[k] = val
 
         return m