payi 0.1.0a88__py3-none-any.whl → 0.1.0a90__py3-none-any.whl

payi/__init__.py

@@ -26,7 +26,7 @@ from ._exceptions import (
     UnprocessableEntityError,
     APIResponseValidationError,
 )
-from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
+from ._base_client import DefaultHttpxClient, DefaultAioHttpClient, DefaultAsyncHttpxClient
 from ._utils._logs import setup_logging as _setup_logging
 
 __all__ = [
@@ -68,6 +68,7 @@ __all__ = [
     "DEFAULT_CONNECTION_LIMITS",
     "DefaultHttpxClient",
     "DefaultAsyncHttpxClient",
+    "DefaultAioHttpClient",
 ]
 
 if not _t.TYPE_CHECKING:

payi/_base_client.py

@@ -1071,7 +1071,14 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, APIResponse):
                 raise TypeError(f"API Response types must subclass {APIResponse}; Received {origin}")
 
@@ -1282,6 +1289,24 @@ class _DefaultAsyncHttpxClient(httpx.AsyncClient):
         super().__init__(**kwargs)
 
 
+try:
+    import httpx_aiohttp
+except ImportError:
+
+    class _DefaultAioHttpClient(httpx.AsyncClient):
+        def __init__(self, **_kwargs: Any) -> None:
+            raise RuntimeError("To use the aiohttp client you must have installed the package with the `aiohttp` extra")
+else:
+
+    class _DefaultAioHttpClient(httpx_aiohttp.HttpxAiohttpClient):  # type: ignore
+        def __init__(self, **kwargs: Any) -> None:
+            kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
+            kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
+            kwargs.setdefault("follow_redirects", True)
+
+            super().__init__(**kwargs)
+
+
 if TYPE_CHECKING:
     DefaultAsyncHttpxClient = httpx.AsyncClient
     """An alias to `httpx.AsyncClient` that provides the same defaults that this SDK
@@ -1290,8 +1315,12 @@ if TYPE_CHECKING:
     This is useful because overriding the `http_client` with your own instance of
     `httpx.AsyncClient` will result in httpx's defaults being used, not ours.
     """
+
+    DefaultAioHttpClient = httpx.AsyncClient
+    """An alias to `httpx.AsyncClient` that changes the default HTTP transport to `aiohttp`."""
 else:
     DefaultAsyncHttpxClient = _DefaultAsyncHttpxClient
+    DefaultAioHttpClient = _DefaultAioHttpClient
 
 
 class AsyncHttpxClientWrapper(DefaultAsyncHttpxClient):
@@ -1574,7 +1603,14 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, AsyncAPIResponse):
                 raise TypeError(f"API Response types must subclass {AsyncAPIResponse}; Received {origin}")
 

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.88"  # x-release-please-version
+__version__ = "0.1.0-alpha.90"  # x-release-please-version

payi/lib/instrument.py

@@ -138,6 +138,7 @@ class PayiInstrumentConfig(TypedDict, total=False):
     use_case_id: Optional[str]
     use_case_version: Optional[int]
     user_id: Optional[str]
+    request_tags: Optional["list[str]"]
 
 class _Context(TypedDict, total=False):
     proxy: Optional[bool]
@@ -246,8 +247,17 @@ class _PayiInstrumentor:
                     self._logger.error(f"Error creating default use case definition based on file name {caller_filename}: {e}")
 
             self.__enter__()
+
             # _init_current_context will update the currrent context stack location
-            self._init_current_context(**global_config) # type: ignore
+            context: _Context = {}
+            # Copy allowed keys from global_config into context
+            # Dynamically use keys from _Context TypedDict
+            context_keys = list(_Context.__annotations__.keys()) if hasattr(_Context, '__annotations__') else []
+            for key in context_keys:
+                if key in global_config:
+                    context[key] = global_config[key] # type: ignore
+
+            self._init_current_context(**context) 
 
     def _instrument_all(self) -> None:
         self._instrument_openai()
@@ -567,10 +577,22 @@ class _PayiInstrumentor:
         else:
             context["user_id"] = user_id
 
+        parent_request_tags = parent_context.get("request_tags", None)
+        if request_tags is not None:
+            if len(request_tags) == 0:
+                context["request_tags"] = None
+            else:
+                if parent_request_tags:
+                    # union of new and parent lists if the parent context contains request tags
+                    context["request_tags"] = list(set(request_tags) | set(parent_request_tags))
+                else:
+                    context["request_tags"] = request_tags
+        elif parent_request_tags:
+            # use the parent request_tags if it exists
+            context["request_tags"] = parent_request_tags
+
         if use_case_step and (context["use_case_name"] or context["use_case_id"]):
             context["use_case_step"] = use_case_step
-        if request_tags:
-            context["request_tags"] = request_tags
         if price_as_category:
             context["price_as_category"] = price_as_category
         if price_as_resource:
@@ -587,6 +609,7 @@ class _PayiInstrumentor:
         use_case_id: Optional[str],
         use_case_version: Optional[int],        
         user_id: Optional[str],
+        request_tags: Optional["list[str]"] = None,
         *args: Any,
         **kwargs: Any,
     ) -> Any:
@@ -597,7 +620,8 @@ class _PayiInstrumentor:
                 use_case_name=use_case_name,
                 use_case_id=use_case_id,
                 use_case_version=use_case_version,
-                user_id=user_id)
+                user_id=user_id,
+                request_tags=request_tags)
             return await func(*args, **kwargs)
 
     def _call_func(
@@ -609,6 +633,7 @@ class _PayiInstrumentor:
         use_case_id: Optional[str],
         use_case_version: Optional[int],        
         user_id: Optional[str],
+        request_tags: Optional["list[str]"] = None,
         *args: Any,
         **kwargs: Any,
     ) -> Any:
@@ -619,7 +644,8 @@ class _PayiInstrumentor:
                 use_case_name=use_case_name,
                 use_case_id=use_case_id,
                 use_case_version=use_case_version,
-                user_id=user_id)
+                user_id=user_id,
+                request_tags=request_tags)
             return func(*args, **kwargs)
 
     def __enter__(self) -> Any:
@@ -1475,6 +1501,7 @@ def track(
     use_case_id: Optional[str] = None,
     use_case_version: Optional[int] = None,
     user_id: Optional[str] = None,
+    request_tags: Optional["list[str]"] = None,
     proxy: Optional[bool] = None,
 ) -> Any:
 
@@ -1496,6 +1523,7 @@ def track(
                     use_case_id,
                     use_case_version,
                     user_id,
+                    request_tags,
                     *args,
                     **kwargs,
                 )
@@ -1516,6 +1544,7 @@ def track(
                     use_case_id,
                     use_case_version,
                     user_id,
+                    request_tags,
                     *args,
                     **kwargs,
                 )

{payi-0.1.0a88.dist-info → payi-0.1.0a90.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: payi
-Version: 0.1.0a88
+Version: 0.1.0a90
 Summary: The official Python library for the payi API
 Project-URL: Homepage, https://github.com/Pay-i/pay-i-python
 Project-URL: Repository, https://github.com/Pay-i/pay-i-python
@@ -30,11 +30,14 @@ Requires-Dist: sniffio
 Requires-Dist: tiktoken>=0.8.0
 Requires-Dist: typing-extensions<5,>=4.10
 Requires-Dist: wrapt>=1.17.2
+Provides-Extra: aiohttp
+Requires-Dist: aiohttp; extra == 'aiohttp'
+Requires-Dist: httpx-aiohttp>=0.1.6; extra == 'aiohttp'
 Description-Content-Type: text/markdown
 
 # Payi Python API library
 
-[![PyPI version](https://img.shields.io/pypi/v/payi.svg)](https://pypi.org/project/payi/)
+[![PyPI version](https://github.com/Pay-i/pay-i-python/tree/main/<https://img.shields.io/pypi/v/payi.svg?label=pypi%20(stable)>)](https://pypi.org/project/payi/)
 
 The Payi Python library provides convenient access to the Payi REST API from any Python 3.8+
 application. The library includes type definitions for all request params and response fields,
@@ -104,6 +107,41 @@ asyncio.run(main())
 
 Functionality between the synchronous and asynchronous clients is otherwise identical.
 
+### With aiohttp
+
+By default, the async client uses `httpx` for HTTP requests. However, for improved concurrency performance you may also use `aiohttp` as the HTTP backend.
+
+You can enable this by installing `aiohttp`:
+
+```sh
+# install from PyPI
+pip install --pre payi[aiohttp]
+```
+
+Then you can enable it by instantiating the client with `http_client=DefaultAioHttpClient()`:
+
+```python
+import os
+import asyncio
+from payi import DefaultAioHttpClient
+from payi import AsyncPayi
+
+
+async def main() -> None:
+    async with AsyncPayi(
+        api_key=os.environ.get("PAYI_API_KEY"),  # This is the default and can be omitted
+        http_client=DefaultAioHttpClient(),
+    ) as client:
+        use_case_definition = await client.use_cases.definitions.create(
+            description="Sample Use Case Definition Description",
+            name="SampleUseCaseDefinition",
+        )
+        print(use_case_definition.request_id)
+
+
+asyncio.run(main())
+```
+
 ## Using types
 
 Nested request parameters are [TypedDicts](https://docs.python.org/3/library/typing.html#typing.TypedDict). Responses are [Pydantic models](https://docs.pydantic.dev) which also provide helper methods for things like:
@@ -264,7 +302,7 @@ client.with_options(max_retries=5).use_cases.definitions.create(
 ### Timeouts
 
 By default requests time out after 1 minute. You can configure this with a `timeout` option,
-which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/#fine-tuning-the-configuration) object:
+which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/timeouts/#fine-tuning-the-configuration) object:
 
 ```python
 from payi import Payi

{payi-0.1.0a88.dist-info → payi-0.1.0a90.dist-info}/RECORD

@@ -1,5 +1,5 @@
-payi/__init__.py,sha256=4FRZqYbTvadWzWaSOtI2PmlFVjY4Z-jAi-T0DZAqR8c,2510
-payi/_base_client.py,sha256=b8EliKyjMXslDv4v36gTGE_tIg3h9wi8eQmwAJ2xaBg,65090
+payi/__init__.py,sha256=D0Hb0f0CuE6t648U7C0qOOKez56wyNcIndIYcNuamlU,2560
+payi/_base_client.py,sha256=Euo_HnDuz_74WmLbzSJZe5mBIbXNQIixMiOvCSRZFiI,66713
 payi/_client.py,sha256=NoznzJFIQsFjEcPZWGJpHr94mOTMaQBuH-U_WGdjB10,17882
 payi/_compat.py,sha256=VWemUKbj6DDkQ-O4baSpHVLJafotzeXmCQGJugfVTIw,6580
 payi/_constants.py,sha256=S14PFzyN9-I31wiV7SmIlL5Ga0MLHxdvegInGdXH7tM,462
@@ -11,7 +11,7 @@ payi/_resource.py,sha256=j2jIkTr8OIC8sU6-05nxSaCyj4MaFlbZrwlyg4_xJos,1088
 payi/_response.py,sha256=rh9oJAvCKcPwQFm4iqH_iVrmK8bNx--YP_A2a4kN1OU,28776
 payi/_streaming.py,sha256=Z_wIyo206T6Jqh2rolFg2VXZgX24PahLmpURp0-NssU,10092
 payi/_types.py,sha256=7jE5MoQQFVoVxw5vVzvZ2Ao0kcjfNOGsBgyJfLBEnMo,6195
-payi/_version.py,sha256=mmvzpz5jsTtAwZFRR8dHHIZK4kUAk5zC7Amkz0uWBAQ,165
+payi/_version.py,sha256=tXFgPEeKbWMp7R7RIanP0VvZ88LuzOsIwp2Fn20klHs,165
 payi/pagination.py,sha256=k2356QGPOUSjRF2vHpwLBdF6P-2vnQzFfRIJQAHGQ7A,1258
 payi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payi/_utils/__init__.py,sha256=PNZ_QJuzZEgyYXqkO1HVhGkj5IU9bglVUcw7H-Knjzw,2062
@@ -33,7 +33,7 @@ payi/lib/Stopwatch.py,sha256=7OJlxvr2Jyb6Zr1LYCYKczRB7rDVKkIR7gc4YoleNdE,764
 payi/lib/VertexInstrumentor.py,sha256=IdahkOgB6ReBGpdgGCrBHplAFwK3KZ_XaRgFXVTodRU,7136
 payi/lib/VertexRequest.py,sha256=xKBURJHx4_bXMM8AijtRAjH8t-QukRLx6AIwsCw33Y0,9986
 payi/lib/helpers.py,sha256=FPzNSSHGf9bgD6CanB7yVx_U8t4lm2c0jlZKrsziYlc,4242
-payi/lib/instrument.py,sha256=qGTnLEppOsuGU8G0mQRwfoosBIJ_sZP-b1FabCmI5wc,60696
+payi/lib/instrument.py,sha256=FB0X4y7Fc5q9gtOxkX4FomNiCLP7e7SOioDztX16lEk,62040
 payi/resources/__init__.py,sha256=1rtrPLWbNt8oJGOp6nwPumKLJ-ftez0B6qwLFyfcoP4,2972
 payi/resources/ingest.py,sha256=Z4WHv-INZoIlBzFw4o1j_PHykDsNACpkkF42Kik0UMg,23758
 payi/resources/categories/__init__.py,sha256=WeotN_d-0Ri8ohsrNPbve7RyViD9_N0NA9DrV3WYg3w,1701
@@ -145,7 +145,7 @@ payi/types/use_cases/definitions/kpi_retrieve_response.py,sha256=uQXliSvS3k-yDYw
 payi/types/use_cases/definitions/kpi_update_params.py,sha256=jbawdWAdMnsTWVH0qfQGb8W7_TXe3lq4zjSRu44d8p8,373
 payi/types/use_cases/definitions/kpi_update_response.py,sha256=zLyEoT0S8d7XHsnXZYT8tM7yDw0Aze0Mk-_Z6QeMtc8,459
 payi/types/use_cases/definitions/limit_config_create_params.py,sha256=pzQza_16N3z8cFNEKr6gPbFvuGFrwNuGxAYb--Kbo2M,449
-payi-0.1.0a88.dist-info/METADATA,sha256=1Ya6iDmjt5mh2Kfhd9h3sPYTOO0NLKhC_RZ2tuCJatQ,15180
-payi-0.1.0a88.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-payi-0.1.0a88.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a88.dist-info/RECORD,,
+payi-0.1.0a90.dist-info/METADATA,sha256=gyCugCALPCJppx1mvByADB01sZ2mbBFbWJTEynnccjg,16333
+payi-0.1.0a90.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+payi-0.1.0a90.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a90.dist-info/RECORD,,