payi 0.1.0a26__py3-none-any.whl → 0.1.0a28__py3-none-any.whl

payi/_base_client.py

@@ -143,6 +143,12 @@ class PageInfo:
         self.url = url
         self.params = params
 
+    @override
+    def __repr__(self) -> str:
+        if self.url:
+            return f"{self.__class__.__name__}(url={self.url})"
+        return f"{self.__class__.__name__}(params={self.params})"
+
 
 class BasePage(GenericModel, Generic[_T]):
     """
@@ -689,7 +695,8 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
         if retry_after is not None and 0 < retry_after <= 60:
             return retry_after
 
-        nb_retries = max_retries - remaining_retries
+        # Also cap retry count to 1000 to avoid any potential overflows with `pow`
+        nb_retries = min(max_retries - remaining_retries, 1000)
 
         # Apply exponential backoff, but not more than the max.
         sleep_seconds = min(INITIAL_RETRY_DELAY * pow(2.0, nb_retries), MAX_RETRY_DELAY)
@@ -1568,7 +1575,7 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
         except Exception as err:
             log.debug("Encountered Exception", exc_info=True)
 
-            if retries_taken > 0:
+            if remaining_retries > 0:
                 return await self._retry_request(
                     input_options,
                     cast_to,

payi/_client.py

@@ -51,6 +51,8 @@ class Payi(SyncAPIClient):
     categories: resources.CategoriesResource
     experiences: resources.ExperiencesResource
     csat: resources.CsatResource
+    billing_models: resources.BillingModelsResource
+    price_modifiers: resources.PriceModifiersResource
     with_raw_response: PayiWithRawResponse
     with_streaming_response: PayiWithStreamedResponse
 
@@ -113,6 +115,8 @@ class Payi(SyncAPIClient):
         self.categories = resources.CategoriesResource(self)
         self.experiences = resources.ExperiencesResource(self)
         self.csat = resources.CsatResource(self)
+        self.billing_models = resources.BillingModelsResource(self)
+        self.price_modifiers = resources.PriceModifiersResource(self)
         self.with_raw_response = PayiWithRawResponse(self)
         self.with_streaming_response = PayiWithStreamedResponse(self)
 
@@ -227,6 +231,8 @@ class AsyncPayi(AsyncAPIClient):
     categories: resources.AsyncCategoriesResource
     experiences: resources.AsyncExperiencesResource
     csat: resources.AsyncCsatResource
+    billing_models: resources.AsyncBillingModelsResource
+    price_modifiers: resources.AsyncPriceModifiersResource
     with_raw_response: AsyncPayiWithRawResponse
     with_streaming_response: AsyncPayiWithStreamedResponse
 
@@ -289,6 +295,8 @@ class AsyncPayi(AsyncAPIClient):
         self.categories = resources.AsyncCategoriesResource(self)
         self.experiences = resources.AsyncExperiencesResource(self)
         self.csat = resources.AsyncCsatResource(self)
+        self.billing_models = resources.AsyncBillingModelsResource(self)
+        self.price_modifiers = resources.AsyncPriceModifiersResource(self)
         self.with_raw_response = AsyncPayiWithRawResponse(self)
         self.with_streaming_response = AsyncPayiWithStreamedResponse(self)
 
@@ -404,6 +412,8 @@ class PayiWithRawResponse:
         self.categories = resources.CategoriesResourceWithRawResponse(client.categories)
         self.experiences = resources.ExperiencesResourceWithRawResponse(client.experiences)
         self.csat = resources.CsatResourceWithRawResponse(client.csat)
+        self.billing_models = resources.BillingModelsResourceWithRawResponse(client.billing_models)
+        self.price_modifiers = resources.PriceModifiersResourceWithRawResponse(client.price_modifiers)
 
 
 class AsyncPayiWithRawResponse:
@@ -413,6 +423,8 @@ class AsyncPayiWithRawResponse:
         self.categories = resources.AsyncCategoriesResourceWithRawResponse(client.categories)
         self.experiences = resources.AsyncExperiencesResourceWithRawResponse(client.experiences)
         self.csat = resources.AsyncCsatResourceWithRawResponse(client.csat)
+        self.billing_models = resources.AsyncBillingModelsResourceWithRawResponse(client.billing_models)
+        self.price_modifiers = resources.AsyncPriceModifiersResourceWithRawResponse(client.price_modifiers)
 
 
 class PayiWithStreamedResponse:
@@ -422,6 +434,8 @@ class PayiWithStreamedResponse:
         self.categories = resources.CategoriesResourceWithStreamingResponse(client.categories)
         self.experiences = resources.ExperiencesResourceWithStreamingResponse(client.experiences)
         self.csat = resources.CsatResourceWithStreamingResponse(client.csat)
+        self.billing_models = resources.BillingModelsResourceWithStreamingResponse(client.billing_models)
+        self.price_modifiers = resources.PriceModifiersResourceWithStreamingResponse(client.price_modifiers)
 
 
 class AsyncPayiWithStreamedResponse:
@@ -431,6 +445,8 @@ class AsyncPayiWithStreamedResponse:
         self.categories = resources.AsyncCategoriesResourceWithStreamingResponse(client.categories)
         self.experiences = resources.AsyncExperiencesResourceWithStreamingResponse(client.experiences)
         self.csat = resources.AsyncCsatResourceWithStreamingResponse(client.csat)
+        self.billing_models = resources.AsyncBillingModelsResourceWithStreamingResponse(client.billing_models)
+        self.price_modifiers = resources.AsyncPriceModifiersResourceWithStreamingResponse(client.price_modifiers)
 
 
 Client = Payi

payi/_compat.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Union, Generic, TypeVar, Callable, cast, overload
 from datetime import date, datetime
-from typing_extensions import Self
+from typing_extensions import Self, Literal
 
 import pydantic
 from pydantic.fields import FieldInfo
@@ -133,13 +133,15 @@ def model_json(model: pydantic.BaseModel, *, indent: int | None = None) -> str:
 def model_dump(
     model: pydantic.BaseModel,
     *,
-    exclude: IncEx = None,
+    exclude: IncEx | None = None,
     exclude_unset: bool = False,
     exclude_defaults: bool = False,
     warnings: bool = True,
+    mode: Literal["json", "python"] = "python",
 ) -> dict[str, Any]:
-    if PYDANTIC_V2:
+    if PYDANTIC_V2 or hasattr(model, "model_dump"):
         return model.model_dump(
+            mode=mode,
             exclude=exclude,
             exclude_unset=exclude_unset,
             exclude_defaults=exclude_defaults,

payi/_models.py

@@ -37,6 +37,7 @@ from ._utils import (
     PropertyInfo,
     is_list,
     is_given,
+    json_safe,
     lru_cache,
     is_mapping,
     parse_date,
@@ -176,7 +177,7 @@ class BaseModel(pydantic.BaseModel):
     # Based on https://github.com/samuelcolvin/pydantic/issues/1168#issuecomment-817742836.
     @classmethod
     @override
-    def construct(
+    def construct(  # pyright: ignore[reportIncompatibleMethodOverride]
         cls: Type[ModelT],
         _fields_set: set[str] | None = None,
         **values: object,
@@ -248,8 +249,8 @@ class BaseModel(pydantic.BaseModel):
             self,
             *,
             mode: Literal["json", "python"] | str = "python",
-            include: IncEx = None,
-            exclude: IncEx = None,
+            include: IncEx | None = None,
+            exclude: IncEx | None = None,
             by_alias: bool = False,
             exclude_unset: bool = False,
             exclude_defaults: bool = False,
@@ -279,8 +280,8 @@ class BaseModel(pydantic.BaseModel):
             Returns:
                 A dictionary representation of the model.
             """
-            if mode != "python":
-                raise ValueError("mode is only supported in Pydantic v2")
+            if mode not in {"json", "python"}:
+                raise ValueError("mode must be either 'json' or 'python'")
             if round_trip != False:
                 raise ValueError("round_trip is only supported in Pydantic v2")
             if warnings != True:
@@ -289,7 +290,7 @@ class BaseModel(pydantic.BaseModel):
                 raise ValueError("context is only supported in Pydantic v2")
             if serialize_as_any != False:
                 raise ValueError("serialize_as_any is only supported in Pydantic v2")
-            return super().dict(  # pyright: ignore[reportDeprecated]
+            dumped = super().dict(  # pyright: ignore[reportDeprecated]
                 include=include,
                 exclude=exclude,
                 by_alias=by_alias,
@@ -298,13 +299,15 @@ class BaseModel(pydantic.BaseModel):
                 exclude_none=exclude_none,
             )
 
+            return cast(dict[str, Any], json_safe(dumped)) if mode == "json" else dumped
+
         @override
         def model_dump_json(
             self,
             *,
             indent: int | None = None,
-            include: IncEx = None,
-            exclude: IncEx = None,
+            include: IncEx | None = None,
+            exclude: IncEx | None = None,
             by_alias: bool = False,
             exclude_unset: bool = False,
             exclude_defaults: bool = False,

payi/_response.py

@@ -192,6 +192,9 @@ class BaseAPIResponse(Generic[R]):
         if cast_to == float:
             return cast(R, float(response.text))
 
+        if cast_to == bool:
+            return cast(R, response.text.lower() == "true")
+
         origin = get_origin(cast_to) or cast_to
 
         if origin == APIResponse:

payi/_types.py

@@ -16,7 +16,7 @@ from typing import (
     Optional,
     Sequence,
 )
-from typing_extensions import Literal, Protocol, TypeAlias, TypedDict, override, runtime_checkable
+from typing_extensions import Set, Literal, Protocol, TypeAlias, TypedDict, override, runtime_checkable
 
 import httpx
 import pydantic
@@ -193,7 +193,9 @@ StrBytesIntFloat = Union[str, bytes, int, float]
 
 # Note: copied from Pydantic
 # https://github.com/pydantic/pydantic/blob/32ea570bf96e84234d2992e1ddf40ab8a565925a/pydantic/main.py#L49
-IncEx: TypeAlias = "set[int] | set[str] | dict[int, Any] | dict[str, Any] | None"
+IncEx: TypeAlias = Union[
+    Set[int], Set[str], Mapping[int, Union["IncEx", Literal[True]]], Mapping[str, Union["IncEx", Literal[True]]]
+]
 
 PostParser = Callable[[Any], Any]
 

payi/_utils/__init__.py

@@ -6,6 +6,7 @@ from ._utils import (
     is_list as is_list,
     is_given as is_given,
     is_tuple as is_tuple,
+    json_safe as json_safe,
     lru_cache as lru_cache,
     is_mapping as is_mapping,
     is_tuple_t as is_tuple_t,

payi/_utils/_transform.py

@@ -173,6 +173,11 @@ def _transform_recursive(
         # Iterable[T]
         or (is_iterable_type(stripped_type) and is_iterable(data) and not isinstance(data, str))
     ):
+        # dicts are technically iterable, but it is an iterable on the keys of the dict and is not usually
+        # intended as an iterable, so we don't transform it.
+        if isinstance(data, dict):
+            return cast(object, data)
+
         inner_type = extract_type_arg(stripped_type, 0)
         return [_transform_recursive(d, annotation=annotation, inner_type=inner_type) for d in data]
 
@@ -186,7 +191,7 @@ def _transform_recursive(
         return data
 
     if isinstance(data, pydantic.BaseModel):
-        return model_dump(data, exclude_unset=True)
+        return model_dump(data, exclude_unset=True, mode="json")
 
     annotated_type = _get_annotated_type(annotation)
     if annotated_type is None:
@@ -311,6 +316,11 @@ async def _async_transform_recursive(
         # Iterable[T]
         or (is_iterable_type(stripped_type) and is_iterable(data) and not isinstance(data, str))
     ):
+        # dicts are technically iterable, but it is an iterable on the keys of the dict and is not usually
+        # intended as an iterable, so we don't transform it.
+        if isinstance(data, dict):
+            return cast(object, data)
+
         inner_type = extract_type_arg(stripped_type, 0)
         return [await _async_transform_recursive(d, annotation=annotation, inner_type=inner_type) for d in data]
 
@@ -324,7 +334,7 @@ async def _async_transform_recursive(
         return data
 
     if isinstance(data, pydantic.BaseModel):
-        return model_dump(data, exclude_unset=True)
+        return model_dump(data, exclude_unset=True, mode="json")
 
     annotated_type = _get_annotated_type(annotation)
     if annotated_type is None:

payi/_utils/_utils.py

@@ -16,6 +16,7 @@ from typing import (
     overload,
 )
 from pathlib import Path
+from datetime import date, datetime
 from typing_extensions import TypeGuard
 
 import sniffio
@@ -395,3 +396,19 @@ def lru_cache(*, maxsize: int | None = 128) -> Callable[[CallableT], CallableT]:
         maxsize=maxsize,
     )
     return cast(Any, wrapper)  # type: ignore[no-any-return]
+
+
+def json_safe(data: object) -> object:
+    """Translates a mapping / sequence recursively in the same fashion
+    as `pydantic` v2's `model_dump(mode="json")`.
+    """
+    if is_mapping(data):
+        return {json_safe(key): json_safe(value) for key, value in data.items()}
+
+    if is_iterable(data) and not isinstance(data, (str, bytes, bytearray)):
+        return [json_safe(item) for item in data]
+
+    if isinstance(data, (datetime, date)):
+        return data.isoformat()
+
+    return data

payi/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "payi"
-__version__ = "0.1.0-alpha.26"  # x-release-please-version
+__version__ = "0.1.0-alpha.28"  # x-release-please-version

payi/resources/__init__.py

@@ -40,6 +40,22 @@ from .experiences import (
     ExperiencesResourceWithStreamingResponse,
     AsyncExperiencesResourceWithStreamingResponse,
 )
+from .billing_models import (
+    BillingModelsResource,
+    AsyncBillingModelsResource,
+    BillingModelsResourceWithRawResponse,
+    AsyncBillingModelsResourceWithRawResponse,
+    BillingModelsResourceWithStreamingResponse,
+    AsyncBillingModelsResourceWithStreamingResponse,
+)
+from .price_modifiers import (
+    PriceModifiersResource,
+    AsyncPriceModifiersResource,
+    PriceModifiersResourceWithRawResponse,
+    AsyncPriceModifiersResourceWithRawResponse,
+    PriceModifiersResourceWithStreamingResponse,
+    AsyncPriceModifiersResourceWithStreamingResponse,
+)
 
 __all__ = [
     "BudgetsResource",
@@ -72,4 +88,16 @@ __all__ = [
     "AsyncCsatResourceWithRawResponse",
     "CsatResourceWithStreamingResponse",
     "AsyncCsatResourceWithStreamingResponse",
+    "BillingModelsResource",
+    "AsyncBillingModelsResource",
+    "BillingModelsResourceWithRawResponse",
+    "AsyncBillingModelsResourceWithRawResponse",
+    "BillingModelsResourceWithStreamingResponse",
+    "AsyncBillingModelsResourceWithStreamingResponse",
+    "PriceModifiersResource",
+    "AsyncPriceModifiersResource",
+    "PriceModifiersResourceWithRawResponse",
+    "AsyncPriceModifiersResourceWithRawResponse",
+    "PriceModifiersResourceWithStreamingResponse",
+    "AsyncPriceModifiersResourceWithStreamingResponse",
 ]