dub 0.28.0__tar.gz → 0.29.0__tar.gz

{dub-0.28.0 → dub-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dub
-Version: 0.28.0
+Version: 0.29.0
 Summary: Python Client SDK Generated by Speakeasy
 Author: Speakeasy
 Requires-Python: >=3.9.2

{dub-0.28.0 → dub-0.29.0}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "dub"
-version = "0.28.0"
+version = "0.29.0"
 description = "Python Client SDK Generated by Speakeasy"
 authors = [{ name = "Speakeasy" },]
 readme = "README-PYPI.md"
@@ -36,6 +36,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.pytest.ini_options]
 asyncio_default_fixture_loop_scope = "function"
+asyncio_mode = "auto"
 pythonpath = ["src"]
 
 [tool.mypy]

{dub-0.28.0 → dub-0.29.0}/src/dub/_version.py

@@ -3,10 +3,10 @@
 import importlib.metadata
 
 __title__: str = "dub"
-__version__: str = "0.28.0"
+__version__: str = "0.29.0"
 __openapi_doc_version__: str = "0.0.1"
-__gen_version__: str = "2.684.0"
-__user_agent__: str = "speakeasy-sdk/python 0.28.0 2.684.0 0.0.1 dub"
+__gen_version__: str = "2.698.0"
+__user_agent__: str = "speakeasy-sdk/python 0.29.0 2.698.0 0.0.1 dub"
 
 try:
     if __package__ is not None:

{dub-0.28.0 → dub-0.29.0}/src/dub/basesdk.py

@@ -12,9 +12,19 @@ from urllib.parse import parse_qs, urlparse
 
 class BaseSDK:
     sdk_configuration: SDKConfiguration
+    parent_ref: Optional[object] = None
+    """
+    Reference to the root SDK instance, if any. This will prevent it from
+    being garbage collected while there are active streams.
+    """
 
-    def __init__(self, sdk_config: SDKConfiguration) -> None:
+    def __init__(
+        self,
+        sdk_config: SDKConfiguration,
+        parent_ref: Optional[object] = None,
+    ) -> None:
         self.sdk_configuration = sdk_config
+        self.parent_ref = parent_ref
 
     def _get_url(self, base_url, url_variables):
         sdk_url, sdk_variables = self.sdk_configuration.get_server_details()

{dub-0.28.0 → dub-0.29.0}/src/dub/models/components/__init__.py

@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING
 from importlib import import_module
 import builtins
+import sys
 
 if TYPE_CHECKING:
     from .analyticsbrowsers import AnalyticsBrowsers, AnalyticsBrowsersTypedDict
@@ -557,6 +558,18 @@ _dynamic_imports: dict[str, str] = {
 }
 
 
+def dynamic_import(modname, retries=3):
+    for attempt in range(retries):
+        try:
+            return import_module(modname, __package__)
+        except KeyError:
+            # Clear any half-initialized module and retry
+            sys.modules.pop(modname, None)
+            if attempt == retries - 1:
+                break
+    raise KeyError(f"Failed to import module '{modname}' after {retries} attempts")
+
+
 def __getattr__(attr_name: str) -> object:
     module_name = _dynamic_imports.get(attr_name)
     if module_name is None:
@@ -565,7 +578,7 @@ def __getattr__(attr_name: str) -> object:
         )
 
     try:
-        module = import_module(module_name, __package__)
+        module = dynamic_import(module_name)
         result = getattr(module, attr_name)
         return result
     except ImportError as e:

{dub-0.28.0 → dub-0.29.0}/src/dub/models/components/commissioncreatedevent.py

@@ -43,6 +43,12 @@ class PartnerTypedDict(TypedDict):
     r"""The date when the partner enabled payouts."""
     country: Nullable[str]
     r"""The partner's country (required for tax purposes)."""
+    total_clicks: float
+    total_leads: float
+    total_conversions: float
+    total_sales: float
+    total_sale_amount: float
+    total_commissions: float
 
 
 class Partner(BaseModel):
@@ -66,6 +72,18 @@ class Partner(BaseModel):
     country: Nullable[str]
     r"""The partner's country (required for tax purposes)."""
 
+    total_clicks: Annotated[float, pydantic.Field(alias="totalClicks")]
+
+    total_leads: Annotated[float, pydantic.Field(alias="totalLeads")]
+
+    total_conversions: Annotated[float, pydantic.Field(alias="totalConversions")]
+
+    total_sales: Annotated[float, pydantic.Field(alias="totalSales")]
+
+    total_sale_amount: Annotated[float, pydantic.Field(alias="totalSaleAmount")]
+
+    total_commissions: Annotated[float, pydantic.Field(alias="totalCommissions")]
+
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
         optional_fields = []

{dub-0.28.0 → dub-0.29.0}/src/dub/models/components/saleevent.py

@@ -28,29 +28,29 @@ class PaymentProcessor(str, Enum):
 class SaleTypedDict(TypedDict):
     amount: int
     r"""The amount of the sale in cents (for all two-decimal currencies). If the sale is in a zero-decimal currency, pass the full integer value (e.g. `1437` JPY). Learn more: https://d.to/currency"""
-    payment_processor: PaymentProcessor
-    r"""The payment processor via which the sale was made."""
     invoice_id: NotRequired[Nullable[str]]
     r"""The invoice ID of the sale. Can be used as a idempotency key – only one sale event can be recorded for a given invoice ID."""
+    payment_processor: NotRequired[PaymentProcessor]
+    r"""The payment processor via which the sale was made."""
 
 
 class Sale(BaseModel):
     amount: int
     r"""The amount of the sale in cents (for all two-decimal currencies). If the sale is in a zero-decimal currency, pass the full integer value (e.g. `1437` JPY). Learn more: https://d.to/currency"""
 
-    payment_processor: Annotated[
-        PaymentProcessor, pydantic.Field(alias="paymentProcessor")
-    ]
-    r"""The payment processor via which the sale was made."""
-
     invoice_id: Annotated[OptionalNullable[str], pydantic.Field(alias="invoiceId")] = (
         None
     )
     r"""The invoice ID of the sale. Can be used as a idempotency key – only one sale event can be recorded for a given invoice ID."""
 
+    payment_processor: Annotated[
+        Optional[PaymentProcessor], pydantic.Field(alias="paymentProcessor")
+    ] = PaymentProcessor.CUSTOM
+    r"""The payment processor via which the sale was made."""
+
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["invoiceId"]
+        optional_fields = ["invoiceId", "paymentProcessor"]
         nullable_fields = ["invoiceId"]
         null_default_fields = ["invoiceId"]
 

{dub-0.28.0 → dub-0.29.0}/src/dub/models/errors/__init__.py

@@ -1,8 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
+from .duberror import DubError
 from typing import TYPE_CHECKING
 from importlib import import_module
 import builtins
+import sys
 
 if TYPE_CHECKING:
     from .badrequest import BadRequest, BadRequestData, Code, Error, ErrorTypedDict
@@ -13,7 +15,6 @@ if TYPE_CHECKING:
         ConflictError,
         ConflictErrorTypedDict,
     )
-    from .duberror import DubError
     from .forbidden import (
         Forbidden,
         ForbiddenCode,
@@ -130,7 +131,6 @@ _dynamic_imports: dict[str, str] = {
     "ConflictData": ".conflict",
     "ConflictError": ".conflict",
     "ConflictErrorTypedDict": ".conflict",
-    "DubError": ".duberror",
     "Forbidden": ".forbidden",
     "ForbiddenCode": ".forbidden",
     "ForbiddenData": ".forbidden",
@@ -172,6 +172,18 @@ _dynamic_imports: dict[str, str] = {
 }
 
 
+def dynamic_import(modname, retries=3):
+    for attempt in range(retries):
+        try:
+            return import_module(modname, __package__)
+        except KeyError:
+            # Clear any half-initialized module and retry
+            sys.modules.pop(modname, None)
+            if attempt == retries - 1:
+                break
+    raise KeyError(f"Failed to import module '{modname}' after {retries} attempts")
+
+
 def __getattr__(attr_name: str) -> object:
     module_name = _dynamic_imports.get(attr_name)
     if module_name is None:
@@ -180,7 +192,7 @@ def __getattr__(attr_name: str) -> object:
         )
 
     try:
-        module = import_module(module_name, __package__)
+        module = dynamic_import(module_name)
         result = getattr(module, attr_name)
         return result
     except ImportError as e:

{dub-0.28.0 → dub-0.29.0}/src/dub/models/operations/__init__.py

@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING
 from importlib import import_module
 import builtins
+import sys
 
 if TYPE_CHECKING:
     from .bulkcreatelinks import (
@@ -1094,6 +1095,18 @@ _dynamic_imports: dict[str, str] = {
 }
 
 
+def dynamic_import(modname, retries=3):
+    for attempt in range(retries):
+        try:
+            return import_module(modname, __package__)
+        except KeyError:
+            # Clear any half-initialized module and retry
+            sys.modules.pop(modname, None)
+            if attempt == retries - 1:
+                break
+    raise KeyError(f"Failed to import module '{modname}' after {retries} attempts")
+
+
 def __getattr__(attr_name: str) -> object:
     module_name = _dynamic_imports.get(attr_name)
     if module_name is None:
@@ -1102,7 +1115,7 @@ def __getattr__(attr_name: str) -> object:
         )
 
     try:
-        module = import_module(module_name, __package__)
+        module = dynamic_import(module_name)
         result = getattr(module, attr_name)
         return result
     except ImportError as e:

{dub-0.28.0 → dub-0.29.0}/src/dub/models/operations/tracklead.py

@@ -10,15 +10,16 @@ from typing_extensions import Annotated, NotRequired, TypedDict
 
 
 class Mode(str, Enum):
-    r"""The mode to use for tracking the lead event. `async` will not block the request; `wait` will block the request until the lead event is fully recorded in Dub."""
+    r"""The mode to use for tracking the lead event. `async` will not block the request; `wait` will block the request until the lead event is fully recorded in Dub; `deferred` will defer the lead event creation to a subsequent request."""
 
     ASYNC = "async"
     WAIT = "wait"
+    DEFERRED = "deferred"
 
 
 class TrackLeadRequestBodyTypedDict(TypedDict):
     click_id: str
-    r"""The unique ID of the click that the lead conversion event is attributed to. You can read this value from `dub_id` cookie."""
+    r"""The unique ID of the click that the lead conversion event is attributed to. You can read this value from `dub_id` cookie. If an empty string is provided, Dub will try to find an existing customer with the provided `customerExternalId` and use the `clickId` from the customer if found."""
     event_name: str
     r"""The name of the lead event to track. Can also be used as a unique identifier to associate a given lead event for a customer for a subsequent sale event (via the `leadEventName` prop in `/track/sale`)."""
     customer_external_id: str
@@ -29,17 +30,17 @@ class TrackLeadRequestBodyTypedDict(TypedDict):
     r"""The email address of the customer."""
     customer_avatar: NotRequired[Nullable[str]]
     r"""The avatar URL of the customer."""
+    mode: NotRequired[Mode]
+    r"""The mode to use for tracking the lead event. `async` will not block the request; `wait` will block the request until the lead event is fully recorded in Dub; `deferred` will defer the lead event creation to a subsequent request."""
     event_quantity: NotRequired[Nullable[float]]
     r"""The numerical value associated with this lead event (e.g., number of provisioned seats in a free trial). If defined as N, the lead event will be tracked N times."""
-    mode: NotRequired[Mode]
-    r"""The mode to use for tracking the lead event. `async` will not block the request; `wait` will block the request until the lead event is fully recorded in Dub."""
     metadata: NotRequired[Nullable[Dict[str, Any]]]
     r"""Additional metadata to be stored with the lead event. Max 10,000 characters."""
 
 
 class TrackLeadRequestBody(BaseModel):
     click_id: Annotated[str, pydantic.Field(alias="clickId")]
-    r"""The unique ID of the click that the lead conversion event is attributed to. You can read this value from `dub_id` cookie."""
+    r"""The unique ID of the click that the lead conversion event is attributed to. You can read this value from `dub_id` cookie. If an empty string is provided, Dub will try to find an existing customer with the provided `customerExternalId` and use the `clickId` from the customer if found."""
 
     event_name: Annotated[str, pydantic.Field(alias="eventName")]
     r"""The name of the lead event to track. Can also be used as a unique identifier to associate a given lead event for a customer for a subsequent sale event (via the `leadEventName` prop in `/track/sale`)."""
@@ -62,14 +63,14 @@ class TrackLeadRequestBody(BaseModel):
     ] = None
     r"""The avatar URL of the customer."""
 
+    mode: Optional[Mode] = Mode.ASYNC
+    r"""The mode to use for tracking the lead event. `async` will not block the request; `wait` will block the request until the lead event is fully recorded in Dub; `deferred` will defer the lead event creation to a subsequent request."""
+
     event_quantity: Annotated[
         OptionalNullable[float], pydantic.Field(alias="eventQuantity")
     ] = UNSET
     r"""The numerical value associated with this lead event (e.g., number of provisioned seats in a free trial). If defined as N, the lead event will be tracked N times."""
 
-    mode: Optional[Mode] = Mode.ASYNC
-    r"""The mode to use for tracking the lead event. `async` will not block the request; `wait` will block the request until the lead event is fully recorded in Dub."""
-
     metadata: OptionalNullable[Dict[str, Any]] = UNSET
     r"""Additional metadata to be stored with the lead event. Max 10,000 characters."""
 
@@ -79,8 +80,8 @@ class TrackLeadRequestBody(BaseModel):
             "customerName",
             "customerEmail",
             "customerAvatar",
-            "eventQuantity",
             "mode",
+            "eventQuantity",
             "metadata",
         ]
         nullable_fields = [

{dub-0.28.0 → dub-0.29.0}/src/dub/models/operations/tracksale.py

@@ -25,12 +25,12 @@ class TrackSaleRequestBodyTypedDict(TypedDict):
     r"""The unique ID of the customer in your system. Will be used to identify and attribute all future events to this customer."""
     amount: int
     r"""The amount of the sale in cents (for all two-decimal currencies). If the sale is in a zero-decimal currency, pass the full integer value (e.g. `1437` JPY). Learn more: https://d.to/currency"""
-    payment_processor: PaymentProcessor
-    r"""The payment processor via which the sale was made."""
     currency: NotRequired[str]
     r"""The currency of the sale. Accepts ISO 4217 currency codes. Sales will be automatically converted and stored as USD at the latest exchange rates. Learn more: https://d.to/currency"""
     event_name: NotRequired[str]
     r"""The name of the sale event. Recommended format: `Invoice paid` or `Subscription created`."""
+    payment_processor: NotRequired[PaymentProcessor]
+    r"""The payment processor via which the sale was made."""
     invoice_id: NotRequired[Nullable[str]]
     r"""The invoice ID of the sale. Can be used as a idempotency key – only one sale event can be recorded for a given invoice ID."""
     lead_event_name: NotRequired[Nullable[str]]
@@ -46,17 +46,17 @@ class TrackSaleRequestBody(BaseModel):
     amount: int
     r"""The amount of the sale in cents (for all two-decimal currencies). If the sale is in a zero-decimal currency, pass the full integer value (e.g. `1437` JPY). Learn more: https://d.to/currency"""
 
-    payment_processor: Annotated[
-        PaymentProcessor, pydantic.Field(alias="paymentProcessor")
-    ]
-    r"""The payment processor via which the sale was made."""
-
     currency: Optional[str] = "usd"
     r"""The currency of the sale. Accepts ISO 4217 currency codes. Sales will be automatically converted and stored as USD at the latest exchange rates. Learn more: https://d.to/currency"""
 
     event_name: Annotated[Optional[str], pydantic.Field(alias="eventName")] = "Purchase"
     r"""The name of the sale event. Recommended format: `Invoice paid` or `Subscription created`."""
 
+    payment_processor: Annotated[
+        Optional[PaymentProcessor], pydantic.Field(alias="paymentProcessor")
+    ] = PaymentProcessor.CUSTOM
+    r"""The payment processor via which the sale was made."""
+
     invoice_id: Annotated[OptionalNullable[str], pydantic.Field(alias="invoiceId")] = (
         None
     )
@@ -75,6 +75,7 @@ class TrackSaleRequestBody(BaseModel):
         optional_fields = [
             "currency",
             "eventName",
+            "paymentProcessor",
             "invoiceId",
             "leadEventName",
             "metadata",

{dub-0.28.0 → dub-0.29.0}/src/dub/models/operations/updateworkspace.py

@@ -5,7 +5,7 @@ from dub.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTIN
 from dub.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 import pydantic
 from pydantic import model_serializer
-from typing import List, Optional
+from typing import Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -14,7 +14,6 @@ class UpdateWorkspaceRequestBodyTypedDict(TypedDict):
     slug: NotRequired[str]
     logo: NotRequired[Nullable[str]]
     conversion_enabled: NotRequired[bool]
-    allowed_hostnames: NotRequired[List[str]]
 
 
 class UpdateWorkspaceRequestBody(BaseModel):
@@ -28,19 +27,9 @@ class UpdateWorkspaceRequestBody(BaseModel):
         Optional[bool], pydantic.Field(alias="conversionEnabled")
     ] = None
 
-    allowed_hostnames: Annotated[
-        Optional[List[str]], pydantic.Field(alias="allowedHostnames")
-    ] = None
-
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = [
-            "name",
-            "slug",
-            "logo",
-            "conversionEnabled",
-            "allowedHostnames",
-        ]
+        optional_fields = ["name", "slug", "logo", "conversionEnabled"]
         nullable_fields = ["logo"]
         null_default_fields = []
 

{dub-0.28.0 → dub-0.29.0}/src/dub/sdk.py

@@ -11,6 +11,7 @@ from dub.models import components
 from dub.types import OptionalNullable, UNSET
 import httpx
 import importlib
+import sys
 from typing import Any, Callable, Dict, Optional, TYPE_CHECKING, Union, cast
 import weakref
 
@@ -131,6 +132,7 @@ class Dub(BaseSDK):
                 timeout_ms=timeout_ms,
                 debug_logger=debug_logger,
             ),
+            parent_ref=self,
         )
 
         hooks = SDKHooks()
@@ -155,13 +157,24 @@ class Dub(BaseSDK):
             self.sdk_configuration.async_client_supplied,
         )
 
+    def dynamic_import(self, modname, retries=3):
+        for attempt in range(retries):
+            try:
+                return importlib.import_module(modname)
+            except KeyError:
+                # Clear any half-initialized module and retry
+                sys.modules.pop(modname, None)
+                if attempt == retries - 1:
+                    break
+        raise KeyError(f"Failed to import module '{modname}' after {retries} attempts")
+
     def __getattr__(self, name: str):
         if name in self._sub_sdk_map:
             module_path, class_name = self._sub_sdk_map[name]
             try:
-                module = importlib.import_module(module_path)
+                module = self.dynamic_import(module_path)
                 klass = getattr(module, class_name)
-                instance = klass(self.sdk_configuration)
+                instance = klass(self.sdk_configuration, parent_ref=self)
                 setattr(self, name, instance)
                 return instance
             except ImportError as e:

{dub-0.28.0 → dub-0.29.0}/src/dub/utils/__init__.py

@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING
 from importlib import import_module
 import builtins
+import sys
 
 if TYPE_CHECKING:
     from .annotations import get_discriminator
@@ -159,6 +160,18 @@ _dynamic_imports: dict[str, str] = {
 }
 
 
+def dynamic_import(modname, retries=3):
+    for attempt in range(retries):
+        try:
+            return import_module(modname, __package__)
+        except KeyError:
+            # Clear any half-initialized module and retry
+            sys.modules.pop(modname, None)
+            if attempt == retries - 1:
+                break
+    raise KeyError(f"Failed to import module '{modname}' after {retries} attempts")
+
+
 def __getattr__(attr_name: str) -> object:
     module_name = _dynamic_imports.get(attr_name)
     if module_name is None:
@@ -167,9 +180,8 @@ def __getattr__(attr_name: str) -> object:
         )
 
     try:
-        module = import_module(module_name, __package__)
-        result = getattr(module, attr_name)
-        return result
+        module = dynamic_import(module_name)
+        return getattr(module, attr_name)
     except ImportError as e:
         raise ImportError(
             f"Failed to import {attr_name} from {module_name}: {e}"

{dub-0.28.0 → dub-0.29.0}/src/dub/utils/eventstreaming.py

@@ -17,6 +17,9 @@ T = TypeVar("T")
 
 
 class EventStream(Generic[T]):
+    # Holds a reference to the SDK client to avoid it being garbage collected
+    # and cause termination of the underlying httpx client.
+    client_ref: Optional[object]
     response: httpx.Response
     generator: Generator[T, None, None]
 
@@ -25,9 +28,11 @@ class EventStream(Generic[T]):
         response: httpx.Response,
         decoder: Callable[[str], T],
         sentinel: Optional[str] = None,
+        client_ref: Optional[object] = None,
     ):
         self.response = response
         self.generator = stream_events(response, decoder, sentinel)
+        self.client_ref = client_ref
 
     def __iter__(self):
         return self
@@ -43,6 +48,9 @@ class EventStream(Generic[T]):
 
 
 class EventStreamAsync(Generic[T]):
+    # Holds a reference to the SDK client to avoid it being garbage collected
+    # and cause termination of the underlying httpx client.
+    client_ref: Optional[object]
     response: httpx.Response
     generator: AsyncGenerator[T, None]
 
@@ -51,9 +59,11 @@ class EventStreamAsync(Generic[T]):
         response: httpx.Response,
         decoder: Callable[[str], T],
         sentinel: Optional[str] = None,
+        client_ref: Optional[object] = None,
     ):
         self.response = response
         self.generator = stream_events_async(response, decoder, sentinel)
+        self.client_ref = client_ref
 
     def __aiter__(self):
         return self

{dub-0.28.0 → dub-0.29.0}/src/dub/models/components/domainschema.py

@@ -167,9 +167,9 @@ class DomainSchema(BaseModel):
             "placeholder",
             "expiredUrl",
             "notFoundUrl",
+            "logo",
             "assetLinks",
             "appleAppSiteAssociation",
-            "logo",
             "registeredDomain",
         ]
         null_default_fields = ["assetLinks", "appleAppSiteAssociation"]