payi 0.1.0a42__tar.gz → 0.1.0a44__tar.gz

payi-0.1.0a44/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.1.0-alpha.44"
+}

{payi-0.1.0a42 → payi-0.1.0a44}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.1.0-alpha.44 (2025-02-06)
+
+Full Changelog: [v0.1.0-alpha.43...v0.1.0-alpha.44](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.43...v0.1.0-alpha.44)
+
+### Features
+
+* feat(api): azure openai ([#215](https://github.com/Pay-i/pay-i-python/issues/215)) ([55781bc](https://github.com/Pay-i/pay-i-python/commit/55781bc055535677c2b694a20172abfde595c596))
+
+## 0.1.0-alpha.43 (2025-02-06)
+
+Full Changelog: [v0.1.0-alpha.42...v0.1.0-alpha.43](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.42...v0.1.0-alpha.43)
+
+### Features
+
+* **client:** send `X-Stainless-Read-Timeout` header ([#210](https://github.com/Pay-i/pay-i-python/issues/210)) ([fd485f6](https://github.com/Pay-i/pay-i-python/commit/fd485f692182c38d869cfadddc57d1d7c623df8e))
+
 ## 0.1.0-alpha.42 (2025-02-05)
 
 Full Changelog: [v0.1.0-alpha.41...v0.1.0-alpha.42](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.41...v0.1.0-alpha.42)

{payi-0.1.0a42 → payi-0.1.0a44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a42
+Version: 0.1.0a44
 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
@@ -25,6 +25,7 @@ Requires-Python: >=3.8
 Requires-Dist: anyio<5,>=3.5.0
 Requires-Dist: distro<2,>=1.7.0
 Requires-Dist: httpx<1,>=0.23.0
+Requires-Dist: nest-asyncio>=1.6.0
 Requires-Dist: pydantic<3,>=1.9.0
 Requires-Dist: sniffio
 Requires-Dist: tiktoken>=0.8.0

{payi-0.1.0a42 → payi-0.1.0a44}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.42"
+version = "0.1.0-alpha.44"
 description = "The official Python library for the payi API"
 dynamic = ["readme"]
 license = "Apache-2.0"
@@ -16,6 +16,7 @@ dependencies = [
     "sniffio",
     "wrapt>=1.17.2",
     "tiktoken>=0.8.0",
+    "nest-asyncio>=1.6.0",
 ]
 requires-python = ">= 3.8"
 classifiers = [

{payi-0.1.0a42 → payi-0.1.0a44}/requirements-dev.lock

@@ -7,6 +7,7 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -56,6 +57,7 @@ mypy==1.14.1
 mypy-extensions==1.0.0
     # via mypy
 nest-asyncio==1.6.0
+    # via payi
 nodeenv==1.8.0
     # via pyright
 nox==2023.4.22

{payi-0.1.0a42 → payi-0.1.0a44}/requirements.lock

@@ -7,6 +7,7 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -34,6 +35,8 @@ idna==3.4
     # via anyio
     # via httpx
     # via requests
+nest-asyncio==1.6.0
+    # via payi
 pydantic==2.10.3
     # via payi
 pydantic-core==2.27.1

{payi-0.1.0a42 → payi-0.1.0a44}/src/payi/_base_client.py

@@ -418,10 +418,17 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
         if idempotency_header and options.method.lower() != "get" and idempotency_header not in headers:
             headers[idempotency_header] = options.idempotency_key or self._idempotency_key()
 
-        # Don't set the retry count header if it was already set or removed by the caller. We check
+        # Don't set these headers if they were already set or removed by the caller. We check
         # `custom_headers`, which can contain `Omit()`, instead of `headers` to account for the removal case.
-        if "x-stainless-retry-count" not in (header.lower() for header in custom_headers):
+        lower_custom_headers = [header.lower() for header in custom_headers]
+        if "x-stainless-retry-count" not in lower_custom_headers:
             headers["x-stainless-retry-count"] = str(retries_taken)
+        if "x-stainless-read-timeout" not in lower_custom_headers:
+            timeout = self.timeout if isinstance(options.timeout, NotGiven) else options.timeout
+            if isinstance(timeout, Timeout):
+                timeout = timeout.read
+            if timeout is not None:
+                headers["x-stainless-read-timeout"] = str(timeout)
 
         return headers
 

{payi-0.1.0a42 → payi-0.1.0a44}/src/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.42"  # x-release-please-version
+__version__ = "0.1.0-alpha.44"  # x-release-please-version

{payi-0.1.0a42 → payi-0.1.0a44}/src/payi/lib/OpenAIInstrumentor.py

@@ -13,6 +13,12 @@ from .instrument import IsStreaming, PayiInstrumentor
 
 
 class OpenAiInstrumentor:
+    @staticmethod
+    def is_azure(instance: Any) -> bool:
+        from openai import AzureOpenAI, AsyncAzureOpenAI # type: ignore # noqa: I001
+
+        return isinstance(instance._client, (AsyncAzureOpenAI, AzureOpenAI))
+
     @staticmethod
     def instrument(instrumentor: PayiInstrumentor) -> None:
         try:

{payi-0.1.0a42 → payi-0.1.0a44}/src/payi/lib/instrument.py

@@ -1,11 +1,13 @@
 import json
 import uuid
+import asyncio
 import inspect
 import logging
 import traceback
 from enum import Enum
 from typing import Any, Set, Union, Callable, Optional
 
+import nest_asyncio  # type: ignore
 from wrapt import ObjectProxy  # type: ignore
 
 from payi import Payi, AsyncPayi
@@ -28,14 +30,16 @@ class PayiInstrumentor:
 
     def __init__(
         self,
-        payi: Union[Payi, AsyncPayi, None] = None,
+        payi: Optional[Payi],
+        apayi: Optional[AsyncPayi],
         instruments: Union[Set[Instruments], None] = None,
         log_prompt_and_response: bool = True,
         prompt_and_response_logger: Optional[
             Callable[[str, "dict[str, str]"], None]
         ] = None,  # (request id, dict of data to store) -> None
     ):
-        self._payi: Union[Payi, AsyncPayi, None] = payi
+        self._payi: Optional[Payi] = payi
+        self._apayi: Optional[AsyncPayi] = apayi
         self._context_stack: list[dict[str, Any]] = []  # Stack of context dictionaries
         self._log_prompt_and_response: bool = log_prompt_and_response
         self._prompt_and_response_logger: Optional[Callable[[str, dict[str, str]], None]] = prompt_and_response_logger
@@ -129,47 +133,82 @@ class PayiInstrumentor:
                 if removeBlockedId:
                     self._blocked_limits.discard(limit_id)
 
-    async def _aingest_units(self, ingest_units: IngestUnitsParams) -> None:
+    async def _aingest_units(self, ingest_units: IngestUnitsParams) -> Optional[IngestResponse]:
+        ingest_response: Optional[IngestResponse] = None
+    
         # return early if there are no units to ingest and on a successul ingest request
         log_data: 'dict[str,str]' = {}
         if not self._process_ingest_units(ingest_units, log_data):
-            return
+            return None
 
         try:
-            if isinstance(self._payi, AsyncPayi):
-                ingest_response= await self._payi.ingest.units(**ingest_units)
+            if self._apayi:    
+                ingest_response= await self._apayi.ingest.units(**ingest_units)
+            elif self._payi:
+                ingest_response = self._payi.ingest.units(**ingest_units)
+            else:
+                logging.error("No payi instance to ingest units")
+                return None         
 
+            if ingest_response:
                 self._process_ingest_units_response(ingest_response)
 
-                if self._log_prompt_and_response and self._prompt_and_response_logger:
+                if ingest_response and self._log_prompt_and_response and self._prompt_and_response_logger:
                     request_id = ingest_response.xproxy_result.request_id
                     self._prompt_and_response_logger(request_id, log_data)  # type: ignore
-            else:
-                logging.error("No payi instance to ingest units")
-                return
+
+            return ingest_response
         except Exception as e:
             logging.error(f"Error Pay-i ingesting result: {e}")
-
-    def _ingest_units(self, ingest_units: IngestUnitsParams) -> None:
+    
+        return None         
+    
+    def _call_aingest_sync(self, ingest_units: IngestUnitsParams) -> Optional[IngestResponse]:
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = None
+        
+        try:
+            if loop and loop.is_running():
+                nest_asyncio.apply(loop) # type: ignore
+                return asyncio.run(self._aingest_units(ingest_units))                
+            else:
+                # When there's no running loop, create a new one
+                return asyncio.run(self._aingest_units(ingest_units))
+        except Exception as e:
+            logging.error(f"Error calling aingest_units synchronously: {e}")
+        return None
+        
+    def _ingest_units(self, ingest_units: IngestUnitsParams) -> Optional[IngestResponse]:
+        ingest_response: Optional[IngestResponse] = None
+        
         # return early if there are no units to ingest and on a successul ingest request
         log_data: 'dict[str,str]' = {}
         if not self._process_ingest_units(ingest_units, log_data):
-            return
+            return None
 
         try:
-            if isinstance(self._payi, Payi):
+            if self._payi:
                 ingest_response = self._payi.ingest.units(**ingest_units)
-
                 self._process_ingest_units_response(ingest_response)
 
                 if self._log_prompt_and_response and self._prompt_and_response_logger:
                     request_id = ingest_response.xproxy_result.request_id
                     self._prompt_and_response_logger(request_id, log_data)  # type: ignore
+
+                return ingest_response
+            elif self._apayi:
+                # task runs async. aingest_units will invoke the callback and post process
+                ingest_response = self._call_aingest_sync(ingest_units)
+                return ingest_response
             else:
                 logging.error("No payi instance to ingest units")
-                return
+
         except Exception as e:
             logging.error(f"Error Pay-i ingesting result: {e}")
+        
+        return None
 
     def _setup_call_func(
         self
@@ -352,13 +391,9 @@ class PayiInstrumentor:
     ) -> Any:
         context = self.get_context()
 
-        is_bedrock:bool = category == "system.aws.bedrock"
+        # Bedrock client does not have an async method
 
-        if not context:
-            if is_bedrock:
-                # boto3 doesn't allow extra_headers
-                kwargs.pop("extra_headers", None)
-    
+        if not context:   
             # wrapped function invoked outside of decorator scope
             return await wrapped(*args, **kwargs)
 
@@ -373,12 +408,20 @@ class PayiInstrumentor:
             return await wrapped(*args, **kwargs)
 
         ingest: IngestUnitsParams = {"category": category, "units": {}} # type: ignore
-        if is_bedrock:
-            # boto3 doesn't allow extra_headers
-            kwargs.pop("extra_headers", None)
-            ingest["resource"] = kwargs.get("modelId", "")
-        else:
-            ingest["resource"] = kwargs.get("model", "")
+        ingest["resource"] = kwargs.get("model", "")
+
+        if category == "system.openai" and instance and hasattr(instance, "_client"):
+            from .OpenAIInstrumentor import OpenAiInstrumentor # noqa: I001
+
+            if OpenAiInstrumentor.is_azure(instance):
+                resource = extra_headers.pop("xProxy-RouteAs-Resource", None)
+                if not resource:
+                    logging.error("Azure OpenAI route as resource not found, not ingesting")
+                    return await wrapped(*args, **kwargs)
+
+                category = "system.azureopenai"
+                ingest["category"] = category
+                ingest["resource"] = resource
 
         current_frame = inspect.currentframe()
         # f_back excludes the current frame, strip() cleans up whitespace and newlines
@@ -421,16 +464,9 @@ class PayiInstrumentor:
                 ingest=ingest,
                 stopwatch=sw,
                 process_chunk=process_chunk,
-                is_bedrock=is_bedrock,
+                is_bedrock=False,
             )
 
-            if is_bedrock:
-                if "body" in response:
-                    response["body"] = stream_result
-                else:
-                    response["stream"] = stream_result
-                return response
-            
             return stream_result
 
         sw.stop()
@@ -493,6 +529,18 @@ class PayiInstrumentor:
         else:
             ingest["resource"] = kwargs.get("model", "")
 
+        if category == "system.openai" and instance and hasattr(instance, "_client"):
+            from .OpenAIInstrumentor import OpenAiInstrumentor
+            if OpenAiInstrumentor.is_azure(instance):
+                resource = extra_headers.pop("xProxy-RouteAs-Resource", None)
+                if not resource:
+                    logging.error("Azure OpenAI route as resource not found, not ingesting")
+                    return wrapped(*args, **kwargs)
+
+                category = "system.azureopenai"
+                ingest["category"] = category
+                ingest["resource"] = resource
+
         current_frame = inspect.currentframe()
         # f_back excludes the current frame, strip() cleans up whitespace and newlines
         stack = [frame.strip() for frame in traceback.format_stack(current_frame.f_back)]  # type: ignore
@@ -790,17 +838,37 @@ class ChatStreamWrapper(ObjectProxy):  # type: ignore
             return json.dumps(chunk)
 
 global _instrumentor
-_instrumentor: PayiInstrumentor
+_instrumentor: Optional[PayiInstrumentor] = None
 
 def payi_instrument(
-    payi: Optional[Union[Payi, AsyncPayi]] = None,
+    payi: Optional[Union[Payi, AsyncPayi, 'list[Union[Payi, AsyncPayi]]']] = None,
     instruments: Optional[Set[Instruments]] = None,
     log_prompt_and_response: bool = True,
     prompt_and_response_logger: Optional[Callable[[str, "dict[str, str]"], None]] = None,
 ) -> None:
     global _instrumentor
+    if _instrumentor:
+        return
+    
+    payi_param: Optional[Payi] = None
+    apayi_param: Optional[AsyncPayi] = None
+
+    if isinstance(payi, Payi):
+        payi_param = payi
+    elif isinstance(payi, AsyncPayi):
+        apayi_param = payi
+    elif isinstance(payi, list):
+        for p in payi:
+            if isinstance(p, Payi):
+                payi_param = p
+            elif isinstance(p, AsyncPayi): # type: ignore
+                apayi_param = p
+
+    # allow for both payi and apayi to be None for the @proxy case
+    
     _instrumentor = PayiInstrumentor(
-        payi=payi,
+        payi=payi_param,
+        apayi=apayi_param,
         instruments=instruments,
         log_prompt_and_response=log_prompt_and_response,
         prompt_and_response_logger=prompt_and_response_logger,
@@ -817,6 +885,8 @@ def ingest(
         import asyncio
         if asyncio.iscoroutinefunction(func):
             async def awrapper(*args: Any, **kwargs: Any) -> Any:
+                if not _instrumentor:
+                    return await func(*args, **kwargs)
                 # Call the instrumentor's _call_func for async functions
                 return await _instrumentor._acall_func(
                     func,
@@ -832,6 +902,8 @@ def ingest(
             return awrapper
         else:
             def wrapper(*args: Any, **kwargs: Any) -> Any:
+                if not _instrumentor:
+                    return func(*args, **kwargs)
                 return _instrumentor._call_func(
                     func,
                     False,
@@ -857,6 +929,8 @@ def proxy(
         import asyncio
         if asyncio.iscoroutinefunction(func):
             async def _proxy_awrapper(*args: Any, **kwargs: Any) -> Any:
+                if not _instrumentor:
+                    return await func(*args, **kwargs)
                 return await _instrumentor._call_func(
                     func,
                     True,
@@ -872,6 +946,8 @@ def proxy(
             return _proxy_awrapper
         else:
             def _proxy_wrapper(*args: Any, **kwargs: Any) -> Any:
+                if not _instrumentor:
+                    return func(*args, **kwargs)
                 return _instrumentor._call_func(
                     func,
                     True,

payi-0.1.0a42/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.1.0-alpha.42"
-}