payi 0.1.0a89__py3-none-any.whl → 0.1.0a91__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.89"  # x-release-please-version
+__version__ = "0.1.0-alpha.91"  # x-release-please-version

payi/lib/AnthropicInstrumentor.py

@@ -173,10 +173,15 @@ class _AnthropicProviderRequest(_ProviderRequest):
 
         messages = kwargs.get("messages")
         if messages:
+
             anthropic_has_image_and_get_texts(self, messages)
 
         return True
 
+    @override
+    def remove_inline_data(self, prompt: 'dict[str, Any]') -> bool:
+        return anthropic_remove_inline_data(prompt)
+
     @override
     def process_exception(self, exception: Exception, kwargs: Any, ) -> bool:
         try:
@@ -352,4 +357,30 @@ def has_image_and_get_texts(encoding: tiktoken.Encoding, content: Union[str, 'li
         token_count = sum(len(encoding.encode(item.get("text", ""))) for item in content if item.get("type") == "text")
         return has_image, token_count
     
-    return False, 0
+    return False, 0
+
+def anthropic_remove_inline_data(prompt: 'dict[str, Any]') -> bool:# noqa: ARG002
+    messages = prompt.get("messages", [])
+    if not messages:
+        return False
+
+    modified = False
+    for message in messages:
+        content = message.get('content', Any)
+        if not content or not isinstance(content, list):
+            continue
+
+        for item in content: # type: ignore
+            if not isinstance(item, dict):
+                continue
+            # item: dict[str, Any]
+            type = item.get("type", "") # type: ignore
+            if type != "image":
+                continue
+
+            source = item.get("source", {}) # type: ignore
+            if source.get("type", "") == "base64": # type: ignore
+                source["data"] = _PayiInstrumentor._not_instrumented
+                modified = True
+
+    return modified

payi/lib/BedrockInstrumentor.py

@@ -356,6 +356,24 @@ class _BedrockInvokeProviderRequest(_BedrockProviderRequest):
 
         return response
 
+    @override
+    def remove_inline_data(self, prompt: 'dict[str, Any]') -> bool:# noqa: ARG002
+        if not self._is_anthropic:
+            return False
+
+        from .AnthropicInstrumentor import anthropic_remove_inline_data
+        body = prompt.get("body", "")
+        if not body:
+            return False
+        
+        body_json = json.loads(body)
+        
+        if anthropic_remove_inline_data(body_json):
+            prompt["body"] = json.dumps(body_json)
+            return True
+
+        return False
+
 class _BedrockConverseProviderRequest(_BedrockProviderRequest):
     @override
     def process_synchronous_response(

payi/lib/OpenAIInstrumentor.py

@@ -301,9 +301,9 @@ class _OpenAiProviderRequest(_ProviderRequest):
         units["text"] = Units(input=input, output=output)
 
     @staticmethod
-    def has_image_and_get_texts(encoding: tiktoken.Encoding, content: Union[str, 'list[Any]'], image_type: str = "image_url", text_type:str = "text") -> 'tuple[bool, int]':
+    def has_image_and_get_texts(encoding: tiktoken.Encoding, content: Union[str, 'list[Any]'], image_type: str, text_type: str) -> 'tuple[bool, int]':
         if isinstance(content, list): # type: ignore
-            has_image = any(item.get("type") == image_type for item in content)
+            has_image = any(item.get("type", "") == image_type for item in content)
             if has_image is False:
                 return has_image, 0
             
@@ -311,6 +311,28 @@ class _OpenAiProviderRequest(_ProviderRequest):
             return has_image, token_count
         return False, 0
 
+    @staticmethod
+    def post_process_request_prompt(content: Union[str, 'list[Any]'], image_type: str, url_subkey: bool) -> bool:
+        modified = False
+        if isinstance(content, list): # type: ignore
+            for item in content:
+                type = item.get("type", "")
+                if type != image_type:
+                    continue
+
+                if url_subkey:
+                    url = item.get("image_url", {}).get("url", "")
+                    if url.startswith("data:"):
+                        item["image_url"]["url"] = _PayiInstrumentor._not_instrumented
+                        modified = True
+                else:
+                    url = item.get("image_url", "")
+                    if url.startswith("data:"):
+                        item["image_url"] = _PayiInstrumentor._not_instrumented
+                        modified = True
+
+        return modified
+
 class _OpenAiEmbeddingsProviderRequest(_OpenAiProviderRequest):
     def __init__(self, instrumentor: _PayiInstrumentor):
         super().__init__(
@@ -397,7 +419,7 @@ class _OpenAiChatProviderRequest(_OpenAiProviderRequest):
             
             if enc:
                 for message in messages:
-                    msg_has_image, msg_prompt_tokens = self.has_image_and_get_texts(enc, message.get('content', ''))
+                    msg_has_image, msg_prompt_tokens = self.has_image_and_get_texts(enc, message.get('content', ''), image_type="image_url", text_type="text")
                     if msg_has_image:
                         has_image = True
                         estimated_token_count += msg_prompt_tokens
@@ -418,6 +440,13 @@ class _OpenAiChatProviderRequest(_OpenAiProviderRequest):
                     self._include_usage_added = True
         return True
 
+    @override
+    def remove_inline_data(self, prompt: 'dict[str, Any]') -> bool:
+        messages = prompt.get("messages", None)
+        if not messages:
+            return False
+        return self.post_process_request_prompt(messages, image_type="image_url", url_subkey=True)
+
     @override
     def process_synchronous_response(
         self,
@@ -531,6 +560,21 @@ class _OpenAiResponsesProviderRequest(_OpenAiProviderRequest):
 
         return True
 
+    @override
+    def remove_inline_data(self, prompt: 'dict[str, Any]') -> bool:
+        modified = False
+        input = prompt.get("input", [])
+        for item in input:
+            if not isinstance(item, dict):
+                continue
+
+            for key, value in item.items(): # type: ignore
+                if key == "content":
+                    if isinstance(value, list):
+                        modified = self.post_process_request_prompt(value, image_type="input_image", url_subkey=False) | modified # type: ignore
+
+        return modified
+
     @override
     def process_synchronous_response(
         self,

payi/lib/VertexRequest.py

@@ -1,6 +1,7 @@
 import json
 import math
 from typing import Any, Optional
+from typing_extensions import override
 
 from payi.lib.helpers import PayiCategories
 from payi.types.ingest_units_params import Units
@@ -62,7 +63,22 @@ class _VertexRequest(_ProviderRequest): # type: ignore
             ingest = True
 
         return _ChunkResult(send_chunk_to_caller=True, ingest=ingest)
-    
+
+    @override
+    def remove_inline_data(self, prompt: 'dict[str, Any]') -> bool:
+        modified = False
+
+        parts: list[dict[str, Any]] = prompt["contents"].get("parts", []) 
+        for part in parts:
+            inline_data = part.get("inline_data", {})
+            if not isinstance(inline_data, dict):
+                continue
+            if "data" in inline_data:
+                inline_data["data"] = _PayiInstrumentor._not_instrumented
+                modified = True
+
+        return modified
+
     def process_response_part_for_function_call(self, part: 'dict[str, Any]') -> None:
         function = part.get("function_call", {})
         if not function:

payi/lib/instrument.py

@@ -67,6 +67,9 @@ class _ProviderRequest:
     def process_initial_stream_response(self, response: Any) -> None:
         pass
 
+    def remove_inline_data(self, prompt: 'dict[str, Any]') -> bool:# noqa: ARG002
+        return False
+
     @property
     def is_aws_client(self) -> bool:
         return self._is_aws_client if self._is_aws_client is not None else False
@@ -133,6 +136,7 @@ class _ProviderRequest:
 class PayiInstrumentConfig(TypedDict, total=False):
     proxy: bool
     global_instrumentation: bool
+    instrument_inline_data: bool
     limit_ids: Optional["list[str]"]
     use_case_name: Optional[str]
     use_case_id: Optional[str]
@@ -183,6 +187,8 @@ class _TrackContext:
             _instrumentor.__exit__(exc_type, exc_val, exc_tb)
 
 class _PayiInstrumentor:
+    _not_instrumented: str = "<not_instrumented>"
+
     def __init__(
         self,
         payi: Optional[Payi],
@@ -219,6 +225,8 @@ class _PayiInstrumentor:
         # default is instrument and ingest metrics
         self._proxy_default: bool = global_config.get("proxy", False)
 
+        self._instrument_inline_data: bool = global_config.get("instrument_inline_data", False)
+
         global_instrumentation = global_config.pop("global_instrumentation", True)
 
         if instruments is None or "*" in instruments:
@@ -345,6 +353,18 @@ class _PayiInstrumentor:
             # convert the function call builder to a list of function calls
             ingest_units["provider_response_function_calls"] = list(request._function_call_builder.values())
 
+        request_json = ingest_units.get('provider_request_json', "")
+        if request_json and self._instrument_inline_data is False:
+            try:
+                prompt_dict = json.loads(request_json)
+                if request.remove_inline_data(prompt_dict):
+                    self._logger.debug(f"Removed inline data from provider_request_json")
+                    # store the modified dict back as JSON string
+                    ingest_units['provider_request_json'] = json.dumps(prompt_dict)
+
+            except Exception as e:
+                self._logger.error(f"Error serializing provider_request_json: {e}")
+
         if int(ingest_units.get("http_status_code") or 0) < 400:
             units = ingest_units.get("units", {})
             if not units or all(unit.get("input", 0) == 0 and unit.get("output", 0) == 0 for unit in units.values()):

{payi-0.1.0a89.dist-info → payi-0.1.0a91.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: payi
-Version: 0.1.0a89
+Version: 0.1.0a91
 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.0a89.dist-info → payi-0.1.0a91.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=GTJ8Nh5qU2OJwemicx-uYEo7CsIqWAVGkyXHqGAuizc,165
+payi/_version.py,sha256=wnUMU4k-h1Eu3R8s5wrOCNikJ4l9uxlc072i7sOabGE,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
@@ -25,15 +25,15 @@ payi/_utils/_transform.py,sha256=n7kskEWz6o__aoNvhFoGVyDoalNe6mJwp-g7BWkdj88,156
 payi/_utils/_typing.py,sha256=D0DbbNu8GnYQTSICnTSHDGsYXj8TcAKyhejb0XcnjtY,4602
 payi/_utils/_utils.py,sha256=ts4CiiuNpFiGB6YMdkQRh2SZvYvsl7mAF-JWHCcLDf4,12312
 payi/lib/.keep,sha256=wuNrz-5SXo3jJaJOJgz4vFHM41YH_g20F5cRQo0vLes,224
-payi/lib/AnthropicInstrumentor.py,sha256=rpp1MUP2bvCNvVPAHn1xrzvupuIWR0pm4P8t1dR_m70,13103
-payi/lib/BedrockInstrumentor.py,sha256=Q-QggkVWOQPI84O4I30zirIIKJcU4Qj9YhflGznK8cE,17070
+payi/lib/AnthropicInstrumentor.py,sha256=RPboYEubUg396a9irmy7dndXrtq0qy1DD81trJLIIBc,14090
+payi/lib/BedrockInstrumentor.py,sha256=Vx0DUjdYzHWAuYsmK28z9Bxz-mj7UouEESsCN3B9Jn4,17588
 payi/lib/GoogleGenAiInstrumentor.py,sha256=DLbmlwmyOwooe7FuBkEAO_Z3xjPKpvQyO4VwLBeZnn4,8477
-payi/lib/OpenAIInstrumentor.py,sha256=Eiy6dGEuHKjPannndbt1E1dVF0FkDvtJy6tIZoYHY2A,20822
+payi/lib/OpenAIInstrumentor.py,sha256=6HENrdN6kLMUwC00wNSdeGeK4fUDBWo2dCbVC9koi0c,22581
 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/VertexRequest.py,sha256=NNH6S86nCHaU54Rb1rxai-b3UiJvatmzKkDKBmqMeKY,10530
 payi/lib/helpers.py,sha256=FPzNSSHGf9bgD6CanB7yVx_U8t4lm2c0jlZKrsziYlc,4242
-payi/lib/instrument.py,sha256=FB0X4y7Fc5q9gtOxkX4FomNiCLP7e7SOioDztX16lEk,62040
+payi/lib/instrument.py,sha256=CiUtYwpTeoFbm7EEBXSbfaE5ZJKNuu7-ZfrXMi3hINM,62954
 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.0a89.dist-info/METADATA,sha256=5O69xC5pNrymPWBi0WgiUyKoCTS4Jc1eSOV-NktrwRE,15180
-payi-0.1.0a89.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-payi-0.1.0a89.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a89.dist-info/RECORD,,
+payi-0.1.0a91.dist-info/METADATA,sha256=kiUf1xwcAkJHwPMPZfNsjuuOuA5nZUNZv1xaiHnHAh0,16333
+payi-0.1.0a91.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+payi-0.1.0a91.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a91.dist-info/RECORD,,