dub 0.32.0__py3-none-any.whl → 0.34.0__py3-none-any.whl

dub/utils/retries.py

@@ -3,7 +3,9 @@
 import asyncio
 import random
 import time
-from typing import List
+from datetime import datetime
+from email.utils import parsedate_to_datetime
+from typing import List, Optional
 
 import httpx
 
@@ -51,9 +53,11 @@ class Retries:
 
 class TemporaryError(Exception):
     response: httpx.Response
+    retry_after: Optional[int]
 
     def __init__(self, response: httpx.Response):
         self.response = response
+        self.retry_after = _parse_retry_after_header(response)
 
 
 class PermanentError(Exception):
@@ -63,6 +67,62 @@ class PermanentError(Exception):
         self.inner = inner
 
 
+def _parse_retry_after_header(response: httpx.Response) -> Optional[int]:
+    """Parse Retry-After header from response.
+
+    Returns:
+        Retry interval in milliseconds, or None if header is missing or invalid.
+    """
+    retry_after_header = response.headers.get("retry-after")
+    if not retry_after_header:
+        return None
+
+    try:
+        seconds = float(retry_after_header)
+        return round(seconds * 1000)
+    except ValueError:
+        pass
+
+    try:
+        retry_date = parsedate_to_datetime(retry_after_header)
+        delta = (retry_date - datetime.now(retry_date.tzinfo)).total_seconds()
+        return round(max(0, delta) * 1000)
+    except (ValueError, TypeError):
+        pass
+
+    return None
+
+
+def _get_sleep_interval(
+    exception: Exception,
+    initial_interval: int,
+    max_interval: int,
+    exponent: float,
+    retries: int,
+) -> float:
+    """Get sleep interval for retry with exponential backoff.
+
+    Args:
+        exception: The exception that triggered the retry.
+        initial_interval: Initial retry interval in milliseconds.
+        max_interval: Maximum retry interval in milliseconds.
+        exponent: Base for exponential backoff calculation.
+        retries: Current retry attempt count.
+
+    Returns:
+        Sleep interval in seconds.
+    """
+    if (
+        isinstance(exception, TemporaryError)
+        and exception.retry_after is not None
+        and exception.retry_after > 0
+    ):
+        return exception.retry_after / 1000
+
+    sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
+    return min(sleep, max_interval / 1000)
+
+
 def retry(func, retries: Retries):
     if retries.config.strategy == "backoff":
 
@@ -183,8 +243,10 @@ def retry_with_backoff(
                     return exception.response
 
                 raise
-            sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
-            sleep = min(sleep, max_interval / 1000)
+
+            sleep = _get_sleep_interval(
+                exception, initial_interval, max_interval, exponent, retries
+            )
             time.sleep(sleep)
             retries += 1
 
@@ -211,7 +273,9 @@ async def retry_with_backoff_async(
                     return exception.response
 
                 raise
-            sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
-            sleep = min(sleep, max_interval / 1000)
+
+            sleep = _get_sleep_interval(
+                exception, initial_interval, max_interval, exponent, retries
+            )
             await asyncio.sleep(sleep)
             retries += 1

dub/utils/serializers.py

@@ -102,26 +102,6 @@ def validate_int(b):
     return int(b)
 
 
-def validate_open_enum(is_int: bool):
-    def validate(e):
-        if e is None:
-            return None
-
-        if isinstance(e, Unset):
-            return e
-
-        if is_int:
-            if not isinstance(e, int):
-                raise ValueError("Expected int")
-        else:
-            if not isinstance(e, str):
-                raise ValueError("Expected string")
-
-        return e
-
-    return validate
-
-
 def validate_const(v):
     def validate(c):
         # Optional[T] is a Union[T, None]

dub/utils/unmarshal_json_response.py

@@ -1,12 +1,26 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from typing import Any, Optional
+from typing import Any, Optional, Type, TypeVar, overload
 
 import httpx
 
 from .serializers import unmarshal_json
 from dub.models import errors
 
+T = TypeVar("T")
+
+
+@overload
+def unmarshal_json_response(
+    typ: Type[T], http_res: httpx.Response, body: Optional[str] = None
+) -> T: ...
+
+
+@overload
+def unmarshal_json_response(
+    typ: Any, http_res: httpx.Response, body: Optional[str] = None
+) -> Any: ...
+
 
 def unmarshal_json_response(
     typ: Any, http_res: httpx.Response, body: Optional[str] = None

dub/workspaces.py

@@ -20,7 +20,7 @@ class Workspaces(BaseSDK):
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> Optional[components.WorkspaceSchema]:
+    ) -> components.WorkspaceSchema:
         r"""Retrieve a workspace
 
         Retrieve a workspace for the authenticated user.
@@ -58,6 +58,7 @@ class Workspaces(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -96,9 +97,7 @@ class Workspaces(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return unmarshal_json_response(
-                Optional[components.WorkspaceSchema], http_res
-            )
+            return unmarshal_json_response(components.WorkspaceSchema, http_res)
         if utils.match_response(http_res, "400", "application/json"):
             response_data = unmarshal_json_response(errors.BadRequestData, http_res)
             raise errors.BadRequest(response_data, http_res)
@@ -151,7 +150,7 @@ class Workspaces(BaseSDK):
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> Optional[components.WorkspaceSchema]:
+    ) -> components.WorkspaceSchema:
         r"""Retrieve a workspace
 
         Retrieve a workspace for the authenticated user.
@@ -189,6 +188,7 @@ class Workspaces(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -227,9 +227,7 @@ class Workspaces(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return unmarshal_json_response(
-                Optional[components.WorkspaceSchema], http_res
-            )
+            return unmarshal_json_response(components.WorkspaceSchema, http_res)
         if utils.match_response(http_res, "400", "application/json"):
             response_data = unmarshal_json_response(errors.BadRequestData, http_res)
             raise errors.BadRequest(response_data, http_res)
@@ -286,7 +284,7 @@ class Workspaces(BaseSDK):
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> Optional[components.WorkspaceSchema]:
+    ) -> components.WorkspaceSchema:
         r"""Update a workspace
 
         Update a workspace by ID or slug.
@@ -335,6 +333,7 @@ class Workspaces(BaseSDK):
                 "json",
                 Optional[operations.UpdateWorkspaceRequestBody],
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -373,9 +372,7 @@ class Workspaces(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return unmarshal_json_response(
-                Optional[components.WorkspaceSchema], http_res
-            )
+            return unmarshal_json_response(components.WorkspaceSchema, http_res)
         if utils.match_response(http_res, "400", "application/json"):
             response_data = unmarshal_json_response(errors.BadRequestData, http_res)
             raise errors.BadRequest(response_data, http_res)
@@ -432,7 +429,7 @@ class Workspaces(BaseSDK):
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> Optional[components.WorkspaceSchema]:
+    ) -> components.WorkspaceSchema:
         r"""Update a workspace
 
         Update a workspace by ID or slug.
@@ -481,6 +478,7 @@ class Workspaces(BaseSDK):
                 "json",
                 Optional[operations.UpdateWorkspaceRequestBody],
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -519,9 +517,7 @@ class Workspaces(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return unmarshal_json_response(
-                Optional[components.WorkspaceSchema], http_res
-            )
+            return unmarshal_json_response(components.WorkspaceSchema, http_res)
         if utils.match_response(http_res, "400", "application/json"):
             response_data = unmarshal_json_response(errors.BadRequestData, http_res)
             raise errors.BadRequest(response_data, http_res)

{dub-0.32.0.dist-info → dub-0.34.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dub
-Version: 0.32.0
+Version: 0.34.0
 Summary: Python Client SDK Generated by Speakeasy
 License-File: LICENSE
 Author: Speakeasy
@@ -155,8 +155,6 @@ with Dub(
         ],
     })
 
-    assert res is not None
-
     # Handle response
     print(res)
 ```
@@ -194,8 +192,6 @@ async def main():
             ],
         })
 
-        assert res is not None
-
         # Handle response
         print(res)
 
@@ -231,8 +227,6 @@ with Dub(
         ],
     })
 
-    assert res is not None
-
     # Handle response
     print(res)
 ```
@@ -270,8 +264,6 @@ async def main():
             ],
         })
 
-        assert res is not None
-
         # Handle response
         print(res)
 
@@ -285,24 +277,23 @@ asyncio.run(main())
 <details open>
 <summary>Available methods</summary>
 
-### [analytics](https://github.com/dubinc/dub-python/blob/master/docs/sdks/analytics/README.md)
+### [Analytics](https://github.com/dubinc/dub-python/blob/master/docs/sdks/analytics/README.md)
 
 * [retrieve](https://github.com/dubinc/dub-python/blob/master/docs/sdks/analytics/README.md#retrieve) - Retrieve analytics for a link, a domain, or the authenticated workspace.
 
-### [commissions](https://github.com/dubinc/dub-python/blob/master/docs/sdks/commissions/README.md)
+### [Commissions](https://github.com/dubinc/dub-python/blob/master/docs/sdks/commissions/README.md)
 
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/commissions/README.md#list) - Get commissions for a program.
 * [update](https://github.com/dubinc/dub-python/blob/master/docs/sdks/commissions/README.md#update) - Update a commission.
 
-### [customers](https://github.com/dubinc/dub-python/blob/master/docs/sdks/customers/README.md)
+### [Customers](https://github.com/dubinc/dub-python/blob/master/docs/sdks/customers/README.md)
 
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/customers/README.md#list) - Retrieve a list of customers
-* [~~create~~](https://github.com/dubinc/dub-python/blob/master/docs/sdks/customers/README.md#create) - Create a customer :warning: **Deprecated**
 * [get](https://github.com/dubinc/dub-python/blob/master/docs/sdks/customers/README.md#get) - Retrieve a customer
 * [update](https://github.com/dubinc/dub-python/blob/master/docs/sdks/customers/README.md#update) - Update a customer
 * [delete](https://github.com/dubinc/dub-python/blob/master/docs/sdks/customers/README.md#delete) - Delete a customer
 
-### [domains](https://github.com/dubinc/dub-python/blob/master/docs/sdks/domains/README.md)
+### [Domains](https://github.com/dubinc/dub-python/blob/master/docs/sdks/domains/README.md)
 
 * [create](https://github.com/dubinc/dub-python/blob/master/docs/sdks/domains/README.md#create) - Create a domain
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/domains/README.md#list) - Retrieve a list of domains
@@ -311,22 +302,22 @@ asyncio.run(main())
 * [register](https://github.com/dubinc/dub-python/blob/master/docs/sdks/domains/README.md#register) - Register a domain
 * [check_status](https://github.com/dubinc/dub-python/blob/master/docs/sdks/domains/README.md#check_status) - Check the availability of one or more domains
 
-### [embed_tokens](https://github.com/dubinc/dub-python/blob/master/docs/sdks/embedtokens/README.md)
+### [EmbedTokens](https://github.com/dubinc/dub-python/blob/master/docs/sdks/embedtokens/README.md)
 
 * [referrals](https://github.com/dubinc/dub-python/blob/master/docs/sdks/embedtokens/README.md#referrals) - Create a referrals embed token
 
-### [events](https://github.com/dubinc/dub-python/blob/master/docs/sdks/events/README.md)
+### [Events](https://github.com/dubinc/dub-python/blob/master/docs/sdks/events/README.md)
 
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/events/README.md#list) - Retrieve a list of events
 
-### [folders](https://github.com/dubinc/dub-python/blob/master/docs/sdks/folders/README.md)
+### [Folders](https://github.com/dubinc/dub-python/blob/master/docs/sdks/folders/README.md)
 
 * [create](https://github.com/dubinc/dub-python/blob/master/docs/sdks/folders/README.md#create) - Create a folder
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/folders/README.md#list) - Retrieve a list of folders
 * [update](https://github.com/dubinc/dub-python/blob/master/docs/sdks/folders/README.md#update) - Update a folder
 * [delete](https://github.com/dubinc/dub-python/blob/master/docs/sdks/folders/README.md#delete) - Delete a folder
 
-### [links](https://github.com/dubinc/dub-python/blob/master/docs/sdks/links/README.md)
+### [Links](https://github.com/dubinc/dub-python/blob/master/docs/sdks/links/README.md)
 
 * [create](https://github.com/dubinc/dub-python/blob/master/docs/sdks/links/README.md#create) - Create a link
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/links/README.md#list) - Retrieve a list of links
@@ -339,7 +330,7 @@ asyncio.run(main())
 * [delete_many](https://github.com/dubinc/dub-python/blob/master/docs/sdks/links/README.md#delete_many) - Bulk delete links
 * [upsert](https://github.com/dubinc/dub-python/blob/master/docs/sdks/links/README.md#upsert) - Upsert a link
 
-### [partners](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md)
+### [Partners](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md)
 
 * [create](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md#create) - Create or update a partner
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md#list) - List all partners
@@ -347,24 +338,25 @@ asyncio.run(main())
 * [retrieve_links](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md#retrieve_links) - Retrieve a partner's links.
 * [upsert_link](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md#upsert_link) - Upsert a link for a partner
 * [analytics](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md#analytics) - Retrieve analytics for a partner
+* [ban](https://github.com/dubinc/dub-python/blob/master/docs/sdks/partners/README.md#ban) - Ban a partner
 
-### [qr_codes](https://github.com/dubinc/dub-python/blob/master/docs/sdks/qrcodes/README.md)
+### [QRCodes](https://github.com/dubinc/dub-python/blob/master/docs/sdks/qrcodes/README.md)
 
 * [get](https://github.com/dubinc/dub-python/blob/master/docs/sdks/qrcodes/README.md#get) - Retrieve a QR code
 
-### [tags](https://github.com/dubinc/dub-python/blob/master/docs/sdks/tags/README.md)
+### [Tags](https://github.com/dubinc/dub-python/blob/master/docs/sdks/tags/README.md)
 
 * [create](https://github.com/dubinc/dub-python/blob/master/docs/sdks/tags/README.md#create) - Create a tag
 * [list](https://github.com/dubinc/dub-python/blob/master/docs/sdks/tags/README.md#list) - Retrieve a list of tags
 * [update](https://github.com/dubinc/dub-python/blob/master/docs/sdks/tags/README.md#update) - Update a tag
 * [delete](https://github.com/dubinc/dub-python/blob/master/docs/sdks/tags/README.md#delete) - Delete a tag
 
-### [track](https://github.com/dubinc/dub-python/blob/master/docs/sdks/track/README.md)
+### [Track](https://github.com/dubinc/dub-python/blob/master/docs/sdks/track/README.md)
 
 * [lead](https://github.com/dubinc/dub-python/blob/master/docs/sdks/track/README.md#lead) - Track a lead
 * [sale](https://github.com/dubinc/dub-python/blob/master/docs/sdks/track/README.md#sale) - Track a sale
 
-### [workspaces](https://github.com/dubinc/dub-python/blob/master/docs/sdks/workspaces/README.md)
+### [Workspaces](https://github.com/dubinc/dub-python/blob/master/docs/sdks/workspaces/README.md)
 
 * [get](https://github.com/dubinc/dub-python/blob/master/docs/sdks/workspaces/README.md#get) - Retrieve a workspace
 * [update](https://github.com/dubinc/dub-python/blob/master/docs/sdks/workspaces/README.md#update) - Update a workspace
@@ -416,8 +408,6 @@ with Dub(
             ],
         })
 
-        assert res is not None
-
         # Handle response
         print(res)
 
@@ -497,8 +487,6 @@ with Dub(
         ],
     })
 
-    assert res is not None
-
     # Handle response
     print(res)
 
@@ -624,8 +612,6 @@ with Dub(
         ],
     })
 
-    assert res is not None
-
     # Handle response
     print(res)
 
@@ -666,8 +652,6 @@ with Dub(
     },
         RetryConfig("backoff", BackoffStrategy(1, 50, 1.1, 100), False))
 
-    assert res is not None
-
     # Handle response
     print(res)
 
@@ -702,8 +686,6 @@ with Dub(
         ],
     })
 
-    assert res is not None
-
     # Handle response
     print(res)