payi 0.1.0a80__py3-none-any.whl → 0.1.0a81__py3-none-any.whl

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

payi/lib/AnthropicInstrumentor.py

@@ -1,4 +1,3 @@
-import logging
 from typing import Any, Union, Optional, Sequence
 from typing_extensions import override
 
@@ -48,7 +47,7 @@ class AnthropicInstrumentor:
             )
 
         except Exception as e:
-            logging.debug(f"Error instrumenting anthropic: {e}")
+            instrumentor._logger.debug(f"Error instrumenting anthropic: {e}")
             return
 
 
@@ -60,6 +59,7 @@ def messages_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("Anthropic messages wrapper")
     return instrumentor.invoke_wrapper(
         _AnthropicProviderRequest(instrumentor=instrumentor, streaming_type=_StreamingType.iterator, instance=instance),
         _IsStreaming.kwargs,
@@ -77,6 +77,7 @@ def stream_messages_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("Anthropic stream wrapper")
     return instrumentor.invoke_wrapper(
         _AnthropicProviderRequest(instrumentor=instrumentor, streaming_type=_StreamingType.stream_manager, instance=instance),
         _IsStreaming.true,
@@ -94,6 +95,7 @@ async def amessages_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("aync Anthropic messages wrapper")
     return await instrumentor.async_invoke_wrapper(
         _AnthropicProviderRequest(instrumentor=instrumentor, streaming_type=_StreamingType.iterator, instance=instance),
         _IsStreaming.kwargs,
@@ -111,6 +113,7 @@ async def astream_messages_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("aync Anthropic stream wrapper")
     return await instrumentor.async_invoke_wrapper(
         _AnthropicProviderRequest(instrumentor=instrumentor, streaming_type=_StreamingType.stream_manager, instance=instance),
         _IsStreaming.true,
@@ -202,7 +205,7 @@ class _AnthropicProviderRequest(_ProviderRequest):
                     self._estimated_prompt_tokens = estimated_token_count
      
             except Exception:
-                logging.warning("Error getting encoding for cl100k_base")
+                self._instrumentor._logger.warning("Error getting encoding for cl100k_base")
 
         return True
 
@@ -233,7 +236,7 @@ class _AnthropicProviderRequest(_ProviderRequest):
                         self._ingest["provider_response_json"] = text
 
         except Exception as e:
-            logging.debug(f"Error processing exception: {e}")
+            self._instrumentor._logger.debug(f"Error processing exception: {e}")
             return False
 
         return True

payi/lib/BedrockInstrumentor.py

@@ -1,6 +1,5 @@
 import os
 import json
-import logging
 from typing import Any, Sequence
 from functools import wraps
 from typing_extensions import override
@@ -38,12 +37,13 @@ class BedrockInstrumentor:
             )
 
         except Exception as e:
-            logging.debug(f"Error instrumenting bedrock: {e}")
+            instrumentor._logger.debug(f"Error instrumenting bedrock: {e}")
             return
 
 @_PayiInstrumentor.payi_wrapper
 def create_client_wrapper(instrumentor: _PayiInstrumentor, wrapped: Any, instance: Any, *args: Any, **kwargs: Any) -> Any: #  noqa: ARG001
     if kwargs.get("service_name") != "bedrock-runtime":
+        instrumentor._logger.debug(f"skipping client wrapper creation for {kwargs.get('service_name', '')} service")
         return wrapped(*args, **kwargs)
 
     try:
@@ -53,13 +53,16 @@ def create_client_wrapper(instrumentor: _PayiInstrumentor, wrapped: Any, instanc
         client.converse = wrap_converse(instrumentor, client.converse)
         client.converse_stream = wrap_converse_stream(instrumentor, client.converse_stream)
 
+        instrumentor._logger.debug(f"Instrumented bedrock client")
+
         if BedrockInstrumentor._instrumentor._proxy_default:
             # Register client callbacks to handle the Pay-i extra_headers parameter in the inference calls and redirect the request to the Pay-i endpoint
             _register_bedrock_client_callbacks(client)
+            instrumentor._logger.debug(f"Registered bedrock client callbaks for proxy")
 
         return client
     except Exception as e:
-        logging.debug(f"Error instrumenting bedrock client: {e}")
+        instrumentor._logger.debug(f"Error instrumenting bedrock client: {e}")
     
     return wrapped(*args, **kwargs)
 
@@ -148,6 +151,7 @@ def wrap_invoke(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
         modelId:str = kwargs.get("modelId", "") # type: ignore
 
         if _is_supported_model(modelId):
+            instrumentor._logger.debug(f"bedrock invoke wrapper, modelId: {modelId}")
             return instrumentor.invoke_wrapper(
                 _BedrockInvokeSynchronousProviderRequest(instrumentor=instrumentor),
                 _IsStreaming.false,
@@ -156,6 +160,8 @@ def wrap_invoke(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
                 args,
                 kwargs,
             )   
+
+        instrumentor._logger.debug(f"bedrock invoke wrapper, unsupported modelId: {modelId}")
         return wrapped(*args, **kwargs)
     
     return invoke_wrapper
@@ -166,6 +172,7 @@ def wrap_invoke_stream(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
         modelId: str = kwargs.get("modelId", "") # type: ignore
 
         if _is_supported_model(modelId):
+            instrumentor._logger.debug(f"bedrock invoke stream wrapper, modelId: {modelId}")
             return instrumentor.invoke_wrapper(
                 _BedrockInvokeStreamingProviderRequest(instrumentor=instrumentor, model_id=modelId),
                 _IsStreaming.true,
@@ -174,6 +181,7 @@ def wrap_invoke_stream(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
                 args,
                 kwargs,
             )
+        instrumentor._logger.debug(f"bedrock invoke stream wrapper, unsupported modelId: {modelId}")
         return wrapped(*args, **kwargs)
 
     return invoke_wrapper
@@ -184,6 +192,7 @@ def wrap_converse(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
         modelId:str = kwargs.get("modelId", "") # type: ignore
 
         if _is_supported_model(modelId):
+            instrumentor._logger.debug(f"bedrock converse wrapper, modelId: {modelId}")
             return instrumentor.invoke_wrapper(
                 _BedrockConverseSynchronousProviderRequest(instrumentor=instrumentor),
                 _IsStreaming.false,
@@ -192,6 +201,7 @@ def wrap_converse(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
                 args,
                 kwargs,
         )
+        instrumentor._logger.debug(f"bedrock converse wrapper, unsupported modelId: {modelId}")
         return wrapped(*args, **kwargs)
     
     return invoke_wrapper
@@ -202,6 +212,7 @@ def wrap_converse_stream(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
         modelId: str = kwargs.get("modelId", "") # type: ignore
 
         if _is_supported_model(modelId):
+            instrumentor._logger.debug(f"bedrock converse stream wrapper, modelId: {modelId}")
             return instrumentor.invoke_wrapper(
                 _BedrockConverseStreamingProviderRequest(instrumentor=instrumentor),
                 _IsStreaming.true,
@@ -210,6 +221,7 @@ def wrap_converse_stream(instrumentor: _PayiInstrumentor, wrapped: Any) -> Any:
                 args,
                 kwargs,
             )
+        instrumentor._logger.debug(f"bedrock converse stream wrapper, unsupported modelId: {modelId}")
         return wrapped(*args, **kwargs)
 
     return invoke_wrapper
@@ -251,7 +263,7 @@ class _BedrockProviderRequest(_ProviderRequest):
             return True
 
         except Exception as e:
-            logging.debug(f"Error processing exception: {e}")
+            self._instrumentor._logger.debug(f"Error processing exception: {e}")
             return False
 
 class _BedrockInvokeStreamingProviderRequest(_BedrockProviderRequest):

payi/lib/GoogleGenAiInstrumentor.py

@@ -1,6 +1,5 @@
 import json
 import math
-import logging
 from typing import Any, List, Union, Optional, Sequence
 from typing_extensions import override
 
@@ -41,7 +40,7 @@ class GoogleGenAiInstrumentor:
             )
 
         except Exception as e:
-            logging.debug(f"Error instrumenting vertex: {e}")
+            instrumentor._logger.debug(f"Error instrumenting vertex: {e}")
             return
 
 @_PayiInstrumentor.payi_wrapper
@@ -52,6 +51,7 @@ def generate_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("genai generate_content wrapper")
     return instrumentor.invoke_wrapper(
         _GoogleGenAiRequest(instrumentor),
         _IsStreaming.false,
@@ -69,6 +69,7 @@ def generate_stream_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("genai generate_content_stream wrapper")
     return instrumentor.invoke_wrapper(
         _GoogleGenAiRequest(instrumentor),
         _IsStreaming.true,
@@ -86,6 +87,7 @@ async def agenerate_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("async genai generate_content wrapper")
     return await instrumentor.async_invoke_wrapper(
         _GoogleGenAiRequest(instrumentor),
         _IsStreaming.false,
@@ -103,6 +105,7 @@ async def agenerate_stream_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("async genai generate_content_stream wrapper")
     return await instrumentor.async_invoke_wrapper(
         _GoogleGenAiRequest(instrumentor),
         _IsStreaming.true,

payi/lib/OpenAIInstrumentor.py

@@ -1,5 +1,4 @@
 import json
-import logging
 from typing import Any, Union, Optional, Sequence
 from typing_extensions import override
 from importlib.metadata import version
@@ -62,7 +61,7 @@ class OpenAiInstrumentor:
             )
 
         except Exception as e:
-            logging.debug(f"Error instrumenting openai: {e}")
+            instrumentor._logger.debug(f"Error instrumenting openai: {e}")
             return
 
 
@@ -74,6 +73,7 @@ def embeddings_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("OpenAI Embeddings wrapper")
     return instrumentor.invoke_wrapper(
         _OpenAiEmbeddingsProviderRequest(instrumentor),
         _IsStreaming.false,
@@ -91,6 +91,7 @@ async def aembeddings_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("async OpenAI Embeddings wrapper")
     return await instrumentor.async_invoke_wrapper(
         _OpenAiEmbeddingsProviderRequest(instrumentor),
         _IsStreaming.false,
@@ -108,6 +109,7 @@ def chat_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("OpenAI completions wrapper")
     return instrumentor.invoke_wrapper(
         _OpenAiChatProviderRequest(instrumentor),
         _IsStreaming.kwargs,
@@ -125,6 +127,7 @@ async def achat_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("async OpenAI completions wrapper")
     return await instrumentor.async_invoke_wrapper(
         _OpenAiChatProviderRequest(instrumentor),
         _IsStreaming.kwargs,
@@ -142,6 +145,7 @@ def responses_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("OpenAI responses wrapper")
     return instrumentor.invoke_wrapper(
         _OpenAiResponsesProviderRequest(instrumentor),
         _IsStreaming.kwargs,
@@ -159,6 +163,7 @@ async def aresponses_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("async OpenAI responses wrapper")
     return await instrumentor.async_invoke_wrapper(
         _OpenAiResponsesProviderRequest(instrumentor),
         _IsStreaming.kwargs,
@@ -207,12 +212,12 @@ class _OpenAiProviderRequest(_ProviderRequest):
             del extra_headers[PayiHeaderNames.resource_scope]
             
         if not price_as_resource and not price_as_category:
-            logging.error("Azure OpenAI requires price as resource and/or category to be specified, not ingesting")
+            self._instrumentor._logger.error("Azure OpenAI requires price as resource and/or category to be specified, not ingesting")
             return False
 
         if resource_scope:
             if not(resource_scope in ["global", "datazone"] or resource_scope.startswith("region")):
-                logging.error("Azure OpenAI invalid resource scope, not ingesting")
+                self._instrumentor._logger.error("Azure OpenAI invalid resource scope, not ingesting")
                 return False
 
             self._ingest["resource_scope"] = resource_scope
@@ -256,7 +261,7 @@ class _OpenAiProviderRequest(_ProviderRequest):
                         self._ingest["provider_response_json"] = text
 
         except Exception as e:
-            logging.debug(f"Error processing exception: {e}")
+            self._instrumentor._logger.debug(f"Error processing exception: {e}")
             return False
 
         return True
@@ -372,7 +377,7 @@ class _OpenAiChatProviderRequest(_OpenAiProviderRequest):
                 try:
                     enc = tiktoken.get_encoding("o200k_base") # type: ignore
                 except Exception:
-                    logging.warning("Error getting encoding for fallback o200k_base")
+                    self._instrumentor._logger.warning("Error getting encoding for fallback o200k_base")
                     enc = None
             
             if enc:
@@ -450,7 +455,7 @@ class _OpenAiResponsesProviderRequest(_OpenAiProviderRequest):
             try:
                 enc = tiktoken.get_encoding("o200k_base") # type: ignore
             except Exception:
-                logging.warning("Error getting encoding for fallback o200k_base")
+                self._instrumentor._logger.warning("Error getting encoding for fallback o200k_base")
                 enc = None
         
         # find each content..type="input_text" and count tokens

payi/lib/VertexInstrumentor.py

@@ -1,6 +1,5 @@
 import json
 import math
-import logging
 from typing import Any, List, Union, Optional, Sequence
 from typing_extensions import override
 
@@ -43,7 +42,7 @@ class VertexInstrumentor:
             )
 
         except Exception as e:
-            logging.debug(f"Error instrumenting vertex: {e}")
+            instrumentor._logger.debug(f"Error instrumenting vertex: {e}")
             return
 
 @_PayiInstrumentor.payi_wrapper
@@ -54,6 +53,7 @@ def generate_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("vertexai generate_content wrapper")
     return instrumentor.invoke_wrapper(
         _GoogleVertexRequest(instrumentor),
         _IsStreaming.kwargs,
@@ -71,6 +71,7 @@ async def agenerate_wrapper(
     *args: Any,
     **kwargs: Any,
 ) -> Any:
+    instrumentor._logger.debug("async vertexai generate_content wrapper")
     return await instrumentor.async_invoke_wrapper(
         _GoogleVertexRequest(instrumentor),
         _IsStreaming.kwargs,

payi/lib/instrument.py

@@ -25,6 +25,8 @@ from payi.types.pay_i_common_models_api_router_header_info_param import PayIComm
 from .helpers import PayiCategories
 from .Stopwatch import Stopwatch
 
+global _g_logger
+_g_logger: logging.Logger = logging.getLogger("payi.instrument")
 
 class _ProviderRequest:
     def __init__(self, instrumentor: '_PayiInstrumentor', category: str, streaming_type: '_StreamingType'):
@@ -147,15 +149,24 @@ class _PayiInstrumentor:
         apayi: Optional[AsyncPayi],
         instruments: Union[Set[str], None] = None,
         log_prompt_and_response: bool = True,
+        logger: Optional[logging.Logger] = None,
         prompt_and_response_logger: Optional[
             Callable[[str, "dict[str, str]"], None]
         ] = None,  # (request id, dict of data to store) -> None
         global_config: PayiInstrumentConfig = {},
         caller_filename: str = ""
     ):
+        global _g_logger
+        self._logger: logging.Logger = logger if logger else _g_logger
+
         self._payi: Optional[Payi] = payi
         self._apayi: Optional[AsyncPayi] = apayi
 
+        if self._payi:
+            _g_logger.debug(f"Pay-i instrumentor initialized with Payi instance: {self._payi}")
+        if self._apayi:
+            _g_logger.debug(f"Pay-i instrumentor initialized with AsyncPayi instance: {self._apayi}")            
+
         self._context_stack: list[_Context] = []  # 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
@@ -191,7 +202,7 @@ class _PayiInstrumentor:
                         self._call_async_use_case_definition_create(use_case_name=caller_filename, use_case_description=description)
                     global_config["use_case_name"] = caller_filename
                 except Exception as e:
-                    logging.error(f"Error creating default use case definition based on file name {caller_filename}: {e}")
+                    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
@@ -222,7 +233,7 @@ class _PayiInstrumentor:
             OpenAiInstrumentor.instrument(self)
 
         except Exception as e:
-            logging.error(f"Error instrumenting OpenAI: {e}")
+            self._logger.error(f"Error instrumenting OpenAI: {e}")
 
     def _instrument_anthropic(self) -> None:
         from .AnthropicInstrumentor import AnthropicInstrumentor
@@ -231,7 +242,7 @@ class _PayiInstrumentor:
             AnthropicInstrumentor.instrument(self)
 
         except Exception as e:
-            logging.error(f"Error instrumenting Anthropic: {e}")
+            self._logger.error(f"Error instrumenting Anthropic: {e}")
 
     def _instrument_aws_bedrock(self) -> None:
         from .BedrockInstrumentor import BedrockInstrumentor
@@ -240,7 +251,7 @@ class _PayiInstrumentor:
             BedrockInstrumentor.instrument(self)
 
         except Exception as e:
-            logging.error(f"Error instrumenting AWS bedrock: {e}")
+            self._logger.error(f"Error instrumenting AWS bedrock: {e}")
 
     def _instrument_google_vertex(self) -> None:
         from .VertexInstrumentor import VertexInstrumentor
@@ -249,7 +260,7 @@ class _PayiInstrumentor:
             VertexInstrumentor.instrument(self)
 
         except Exception as e:
-            logging.error(f"Error instrumenting Google Vertex: {e}")
+            self._logger.error(f"Error instrumenting Google Vertex: {e}")
 
     def _instrument_google_genai(self) -> None:
         from .GoogleGenAiInstrumentor import GoogleGenAiInstrumentor
@@ -258,13 +269,13 @@ class _PayiInstrumentor:
             GoogleGenAiInstrumentor.instrument(self)
 
         except Exception as e:
-            logging.error(f"Error instrumenting Google GenAi: {e}")
+            self._logger.error(f"Error instrumenting Google GenAi: {e}")
 
     def _process_ingest_units(self, ingest_units: IngestUnitsParams, log_data: 'dict[str, str]') -> bool:
         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()):
-                logging.error('No units to ingest')
+                self._logger.error('No units to ingest!')
                 return False
 
         if self._log_prompt_and_response and self._prompt_and_response_logger:
@@ -302,20 +313,25 @@ class _PayiInstrumentor:
     async def _aingest_units(self, ingest_units: IngestUnitsParams) -> Optional[IngestResponse]:
         ingest_response: Optional[IngestResponse] = None
     
+        self._logger.debug(f"_aingest_units")
+
         # 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):
+            self._logger.debug(f"_aingest_units: exit early")
             return None
 
         try:
             if self._apayi:    
-                ingest_response= await self._apayi.ingest.units(**ingest_units)
+                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")
+                self._logger.error("No payi instance to ingest units")
                 return None         
 
+            self._logger.debug(f"_aingest_units: success ({ingest_response})")
+
             if ingest_response:
                 self._process_ingest_units_response(ingest_response)
 
@@ -325,7 +341,7 @@ class _PayiInstrumentor:
 
             return ingest_response
         except Exception as e:
-            logging.error(f"Error Pay-i ingesting result: {e}")
+            self._logger.error(f"Error Pay-i ingesting request: {e}")
     
         return None         
     
@@ -346,7 +362,7 @@ class _PayiInstrumentor:
                 # When there's no running loop, create a new one
                 asyncio.run(self._apayi.use_cases.definitions.create(name=use_case_name, description=use_case_description))
         except Exception as e:
-            logging.error(f"Error calling async use_cases.definitions.create synchronously: {e}")
+            self._logger.error(f"Error calling async use_cases.definitions.create synchronously: {e}")
 
     def _call_aingest_sync(self, ingest_units: IngestUnitsParams) -> Optional[IngestResponse]:
         try:
@@ -362,20 +378,25 @@ class _PayiInstrumentor:
                 # 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}")
+            self._logger.error(f"Error calling aingest_units synchronously: {e}")
         return None
         
     def _ingest_units(self, ingest_units: IngestUnitsParams) -> Optional[IngestResponse]:
         ingest_response: Optional[IngestResponse] = None
         
+        self._logger.debug(f"_ingest_units")
+
         # 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):
+            self._logger.debug(f"_ingest_units: exit early")
             return None
 
         try:
             if self._payi:
                 ingest_response = self._payi.ingest.units(**ingest_units)
+                self._logger.debug(f"_ingest_units: success ({ingest_response})")
+
                 self._process_ingest_units_response(ingest_response)
 
                 if self._log_prompt_and_response and self._prompt_and_response_logger:
@@ -386,12 +407,13 @@ class _PayiInstrumentor:
             elif self._apayi:
                 # task runs async. aingest_units will invoke the callback and post process
                 ingest_response = self._call_aingest_sync(ingest_units)
+                self._logger.debug(f"_ingest_units: apayi success ({ingest_response})")
                 return ingest_response
             else:
-                logging.error("No payi instance to ingest units")
+                self._logger.error("No payi instance to ingest units")
 
         except Exception as e:
-            logging.error(f"Error Pay-i ingesting result: {e}")
+            self._logger.error(f"Error Pay-i ingesting request: {e}")
         
         return None
 
@@ -655,11 +677,15 @@ class _PayiInstrumentor:
         args: Sequence[Any],
         kwargs: 'dict[str, Any]',
     ) -> Any:
+        self._logger.debug(f"async_invoke_wrapper: instance {instance}, category {request._category}")
+
         context = self.get_context()
 
         # Bedrock client does not have an async method
 
         if not context:   
+            self._logger.debug(f"async_invoke_wrapper: no instrumentation context, exit early")
+
             # wrapped function invoked outside of decorator scope
             return await wrapped(*args, **kwargs)
 
@@ -673,6 +699,8 @@ class _PayiInstrumentor:
             if "extra_headers" not in kwargs and extra_headers:
                 kwargs["extra_headers"] = extra_headers
 
+            self._logger.debug(f"async_invoke_wrapper: sending proxy request")
+
             return await wrapped(*args, **kwargs)
 
         current_frame = inspect.currentframe()
@@ -682,6 +710,7 @@ class _PayiInstrumentor:
         request._ingest['properties'] = { 'system.stack_trace': json.dumps(stack) }
 
         if request.process_request(instance, extra_headers, args, kwargs) is False:
+            self._logger.debug(f"async_invoke_wrapper: calling wrapped instance")
             return await wrapped(*args, **kwargs)
 
         sw = Stopwatch()
@@ -696,6 +725,8 @@ class _PayiInstrumentor:
 
         try:
             self._prepare_ingest(request, extra_headers, args, kwargs)
+            self._logger.debug(f"async_invoke_wrapper: calling wrapped instance (stream={stream})")
+
             sw.start()
             response = await wrapped(*args, **kwargs)
 
@@ -703,6 +734,8 @@ class _PayiInstrumentor:
             sw.stop()
             duration = sw.elapsed_ms_int()
 
+            self._logger.debug(f"invoke_wrapper: calling wrapped instance exception {e}")
+
             if request.process_exception(e, kwargs):
                 request._ingest["end_to_end_latency_ms"] = duration
                 await self._aingest_units(request._ingest)
@@ -746,10 +779,12 @@ class _PayiInstrumentor:
             kwargs=kwargs)
 
         if return_result:
+            self._logger.debug(f"async_invoke_wrapper: process sync response return")
             return return_result
 
         await self._aingest_units(request._ingest)
 
+        self._logger.debug(f"async_invoke_wrapper: finished")
         return response
 
     def invoke_wrapper(
@@ -761,13 +796,17 @@ class _PayiInstrumentor:
         args: Sequence[Any],
         kwargs: 'dict[str, Any]',
     ) -> Any:
+        self._logger.debug(f"invoke_wrapper: instance {instance}, category {request._category}")
+
         context = self.get_context()
 
         if not context:
             if request.is_bedrock():
                 # boto3 doesn't allow extra_headers
                 kwargs.pop("extra_headers", None)
-    
+
+            self._logger.debug(f"invoke_wrapper: no instrumentation context, exit early")
+
             # wrapped function invoked outside of decorator scope
             return wrapped(*args, **kwargs)
 
@@ -785,6 +824,8 @@ class _PayiInstrumentor:
                 # assumes anthropic and openai clients
                 kwargs["extra_headers"] = extra_headers
 
+            self._logger.debug(f"invoke_wrapper: sending proxy request")
+
             return wrapped(*args, **kwargs)
         
         current_frame = inspect.currentframe()
@@ -794,6 +835,7 @@ class _PayiInstrumentor:
         request._ingest['properties'] = { 'system.stack_trace': json.dumps(stack) }
 
         if request.process_request(instance, extra_headers, args, kwargs) is False:
+            self._logger.debug(f"invoke_wrapper: calling wrapped instance")
             return wrapped(*args, **kwargs)
 
         sw = Stopwatch()
@@ -808,6 +850,8 @@ class _PayiInstrumentor:
 
         try:
             self._prepare_ingest(request, extra_headers, args, kwargs)
+            self._logger.debug(f"invoke_wrapper: calling wrapped instance (stream={stream})")
+
             sw.start()
             response = wrapped(*args, **kwargs)
             
@@ -815,6 +859,8 @@ class _PayiInstrumentor:
             sw.stop()
             duration = sw.elapsed_ms_int()
 
+            self._logger.debug(f"invoke_wrapper: calling wrapped instance exception {e}")
+
             if request.process_exception(e, kwargs):
                 request._ingest["end_to_end_latency_ms"] = duration
                 self._ingest_units(request._ingest)
@@ -867,10 +913,12 @@ class _PayiInstrumentor:
             log_prompt_and_response=self._log_prompt_and_response,
             kwargs=kwargs)
         if return_result:
+            self._logger.debug(f"invoke_wrapper: process sync response return")
             return return_result
 
         self._ingest_units(request._ingest)
 
+        self._logger.debug(f"invoke_wrapper: finished")
         return response
 
     def _create_extra_headers(
@@ -1029,6 +1077,8 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
         request: _ProviderRequest,
     ) -> None:
 
+        instrumentor._logger.debug(f"StreamIteratorWrapper: instance {instance}, category {request._category}")
+
         bedrock_from_stream: bool = False
         if request.is_bedrock():
             request._ingest["provider_response_id"] = response["ResponseMetadata"]["RequestId"]
@@ -1057,21 +1107,28 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
         self._bedrock_from_stream: bool = bedrock_from_stream
 
     def __enter__(self) -> Any:
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: __enter__")
         return self
 
     def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None: 
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: __exit__")
         self.__wrapped__.__exit__(exc_type, exc_val, exc_tb)  # type: ignore
 
     async def __aenter__(self) -> Any:
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: __aenter__")
         return self
 
     async def __aexit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: __aexit__")
         await self.__wrapped__.__aexit__(exc_type, exc_val, exc_tb)  # type: ignore
 
     def __iter__(self) -> Any:  
         if self._is_bedrock:
             # MUST reside in a separate function so that the yield statement (e.g. the generator) doesn't implicitly return its own iterator and overriding self
+            self._instrumentor._logger.debug(f"StreamIteratorWrapper: bedrock __iter__")
             return self._iter_bedrock()
+
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: __iter__")
         return self
 
     def _iter_bedrock(self) -> Any:
@@ -1086,9 +1143,12 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
                     self._evaluate_chunk(decode)
             yield event
 
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: bedrock iter finished")
+
         self._stop_iteration()
 
     def __aiter__(self) -> Any:
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: __aiter__")
         return self
 
     def __next__(self) -> object:
@@ -1097,6 +1157,8 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
         except Exception as e:
             if isinstance(e, StopIteration):
                 self._stop_iteration()
+            else:
+                self._instrumentor._logger.debug(f"StreamIteratorWrapper: __next__ exception {e}")
             raise e
         else:
             if self._evaluate_chunk(chunk) == False:
@@ -1110,6 +1172,8 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
         except Exception as e:
             if isinstance(e, StopAsyncIteration):
                 await self._astop_iteration()
+            else:
+                self._instrumentor._logger.debug(f"StreamIteratorWrapper: __anext__ exception {e}")
             raise e
         else:
             if self._evaluate_chunk(chunk) == False:
@@ -1128,6 +1192,8 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
         return self._request.process_chunk(chunk)
 
     def _process_stop_iteration(self) -> None:
+        self._instrumentor._logger.debug(f"StreamIteratorWrapper: stop iteration")
+
         self._stopwatch.stop()
         self._request._ingest["end_to_end_latency_ms"] = self._stopwatch.elapsed_ms_int()
         self._request._ingest["http_status_code"] = 200
@@ -1164,6 +1230,8 @@ class _StreamManagerWrapper(ObjectProxy):  # type: ignore
         stopwatch: Stopwatch,
         request: _ProviderRequest,
     ) -> None:
+        instrumentor._logger.debug(f"StreamManagerWrapper: instance {instance}, category {request._category}")
+
         super().__init__(stream_manager)  # type: ignore
 
         self._stream_manager = stream_manager  
@@ -1176,6 +1244,8 @@ class _StreamManagerWrapper(ObjectProxy):  # type: ignore
         self._done: bool = False
 
     def __enter__(self) -> _StreamIteratorWrapper:
+        self._instrumentor._logger.debug(f"_StreamManagerWrapper: __enter__")
+
         return _StreamIteratorWrapper(
             response=self.__wrapped__.__enter__(),  # type: ignore
             instance=self._instance,
@@ -1193,6 +1263,8 @@ class _GeneratorWrapper:  # type: ignore
         stopwatch: Stopwatch,
         request: _ProviderRequest,
     ) -> None:
+        instrumentor._logger.debug(f"GeneratorWrapper: instance {instance}, category {request._category}")
+
         super().__init__()  # type: ignore
         
         self._generator = generator
@@ -1206,9 +1278,11 @@ class _GeneratorWrapper:  # type: ignore
         self._done: bool = False
         
     def __iter__(self) -> Any:
+        self._instrumentor._logger.debug(f"GeneratorWrapper: __iter__")
         return self
         
     def __aiter__(self) -> Any:
+        self._instrumentor._logger.debug(f"GeneratorWrapper: __aiter__")
         return self
         
     def __next__(self) -> Any:
@@ -1219,9 +1293,12 @@ class _GeneratorWrapper:  # type: ignore
             chunk = next(self._generator)
             return self._process_chunk(chunk)
 
-        except StopIteration as stop_exception:
-            self._process_stop_iteration()
-            raise stop_exception
+        except Exception as e:
+            if isinstance(e, StopIteration):
+                self._process_stop_iteration()
+            else:
+                self._instrumentor._logger.debug(f"GeneratorWrapper: __next__ exception {e}")            
+            raise e
 
     async def __anext__(self) -> Any:
         if self._done:
@@ -1231,9 +1308,12 @@ class _GeneratorWrapper:  # type: ignore
             chunk = await anext(self._generator) # type: ignore
             return self._process_chunk(chunk)
 
-        except StopAsyncIteration as stop_exception:
-            await self._process_async_stop_iteration()
-            raise stop_exception
+        except Exception as e:
+            if isinstance(e, StopAsyncIteration):
+                await self._process_async_stop_iteration()
+            else:
+                self._instrumentor._logger.debug(f"GeneratorWrapper: __anext__ exception {e}")
+            raise e
 
     @staticmethod
     def _chunk_to_dict(chunk: Any) -> 'dict[str, object]':
@@ -1257,6 +1337,8 @@ class _GeneratorWrapper:  # type: ignore
         return chunk
 
     def _process_stop_iteration(self) -> None:
+        self._instrumentor._logger.debug(f"GeneratorWrapper: stop iteration")
+
         self._stopwatch.stop()
         self._request._ingest["end_to_end_latency_ms"] = self._stopwatch.elapsed_ms_int()
         self._request._ingest["http_status_code"] = 200
@@ -1268,6 +1350,8 @@ class _GeneratorWrapper:  # type: ignore
         self._done = True
 
     async def _process_async_stop_iteration(self) -> None:
+        self._instrumentor._logger.debug(f"GeneratorWrapper: async stop iteration")
+        
         self._stopwatch.stop() 
         self._request._ingest["end_to_end_latency_ms"] = self._stopwatch.elapsed_ms_int()
         self._request._ingest["http_status_code"] = 200
@@ -1287,6 +1371,7 @@ def payi_instrument(
     log_prompt_and_response: bool = True,
     prompt_and_response_logger: Optional[Callable[[str, "dict[str, str]"], None]] = None,
     config: Optional[PayiInstrumentConfig] = None,
+    logger: Optional[logging.Logger] = None,
 ) -> None:
     global _instrumentor
     if (_instrumentor):
@@ -1316,6 +1401,7 @@ def payi_instrument(
         apayi=apayi_param,
         instruments=instruments,
         log_prompt_and_response=log_prompt_and_response,
+        logger=logger,
         prompt_and_response_logger=prompt_and_response_logger,
         global_config=config if config else PayiInstrumentConfig(),
         caller_filename=caller_filename
@@ -1335,7 +1421,10 @@ def track(
         if asyncio.iscoroutinefunction(func):
             async def awrapper(*args: Any, **kwargs: Any) -> Any:
                 if not _instrumentor:
+                    _g_logger.debug(f"track: no instrumentor!")
                     return await func(*args, **kwargs)
+
+                _instrumentor._logger.debug(f"track: call async function (proxy={proxy}, limit_ids={limit_ids}, use_case_name={use_case_name}, use_case_id={use_case_id}, use_case_version={use_case_version}, user_id={user_id})")
                 # Call the instrumentor's _call_func for async functions
                 return await _instrumentor._acall_func(
                     func,
@@ -1354,7 +1443,11 @@ def track(
         else:
             def wrapper(*args: Any, **kwargs: Any) -> Any:
                 if not _instrumentor:
+                    _g_logger.debug(f"track: no instrumentor!")
                     return func(*args, **kwargs)
+
+                _instrumentor._logger.debug(f"track: call sync function (proxy={proxy}, limit_ids={limit_ids}, use_case_name={use_case_name}, use_case_id={use_case_id}, use_case_version={use_case_version}, user_id={user_id})")
+
                 return _instrumentor._call_func(
                     func,
                     proxy,
@@ -1427,7 +1520,11 @@ def ingest(
         if asyncio.iscoroutinefunction(func):
             async def awrapper(*args: Any, **kwargs: Any) -> Any:
                 if not _instrumentor:
+                    _g_logger.debug(f"ingest: call no instrumentor!")
                     return await func(*args, **kwargs)
+
+                _instrumentor._logger.debug(f"ingest: call async function (limit_ids={limit_ids}, experience_name={experience_name}, experience_id={experience_id}, use_case_name={use_case_name}, use_case_id={use_case_id}, use_case_version={use_case_version}, user_id={user_id})")
+
                 # Call the instrumentor's _call_func for async functions
                 return await _instrumentor._acall_func(
                     func,
@@ -1446,7 +1543,11 @@ def ingest(
         else:
             def wrapper(*args: Any, **kwargs: Any) -> Any:
                 if not _instrumentor:
+                    _g_logger.debug(f"ingest: call no instrumentor!")
                     return func(*args, **kwargs)
+
+                _instrumentor._logger.debug(f"ingest: call sync function (limit_ids={limit_ids}, experience_name={experience_name}, experience_id={experience_id}, use_case_name={use_case_name}, use_case_id={use_case_id}, use_case_version={use_case_version}, user_id={user_id})")
+
                 return _instrumentor._call_func(
                     func,
                     False,
@@ -1478,7 +1579,6 @@ def proxy(
         "@proxy is deprecated and will be removed in a future version. Use @track instead.",
         DeprecationWarning,
         stacklevel=2
-
     )
 
     def _proxy(func: Any) -> Any:
@@ -1486,7 +1586,11 @@ def proxy(
         if asyncio.iscoroutinefunction(func):
             async def _proxy_awrapper(*args: Any, **kwargs: Any) -> Any:
                 if not _instrumentor:
+                    _g_logger.debug(f"proxy: call no instrumentor!")
                     return await func(*args, **kwargs)
+
+                _instrumentor._logger.debug(f"proxy: call async function (limit_ids={limit_ids}, experience_name={experience_name}, experience_id={experience_id}, use_case_name={use_case_name}, use_case_id={use_case_id}, use_case_version={use_case_version}, user_id={user_id})")
+
                 return await _instrumentor._call_func(
                     func,
                     True,
@@ -1505,7 +1609,11 @@ def proxy(
         else:
             def _proxy_wrapper(*args: Any, **kwargs: Any) -> Any:
                 if not _instrumentor:
+                    _g_logger.debug(f"proxy: call no instrumentor!")
                     return func(*args, **kwargs)
+
+                _instrumentor._logger.debug(f"proxy: call sync function (limit_ids={limit_ids}, experience_name={experience_name}, experience_id={experience_id}, use_case_name={use_case_name}, use_case_id={use_case_id}, use_case_version={use_case_version}, user_id={user_id})")
+
                 return _instrumentor._call_func(
                     func,
                     True,

{payi-0.1.0a80.dist-info → payi-0.1.0a81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: payi
-Version: 0.1.0a80
+Version: 0.1.0a81
 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

{payi-0.1.0a80.dist-info → payi-0.1.0a81.dist-info}/RECORD

@@ -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=8owWzJCmVOUMtN_Md7Vwk-OBmbGW5fhSMc2EUWFK3X8,165
+payi/_version.py,sha256=Qd6lF5RajvLf8hFmoc30hBbYRj8PsxJgDJhTJTwhcto,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,14 +25,14 @@ 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=Y7W99dwnaAM4W5IIkmeGLaTunoMsBDt-AjUasrI1mXM,8900
-payi/lib/BedrockInstrumentor.py,sha256=cIjHlPQmVEAixabUoT3mV8h50lfzdc1u8iLj0gQNukE,14076
-payi/lib/GoogleGenAiInstrumentor.py,sha256=isfuYH0y9LZZPcjPkynRQzwhtsN9H2p4DqtPYTm8hqI,13549
-payi/lib/OpenAIInstrumentor.py,sha256=6h5MYtj4jAXEJZ_IyMriZxWXrN-hQ7SdJXIQW7DrTFo,18014
+payi/lib/AnthropicInstrumentor.py,sha256=PNSrEsij-rRaRN0_rjqQI00NK_FahrrRN4gikpDiiTc,9186
+payi/lib/BedrockInstrumentor.py,sha256=qXkrYeYHba3gOnp_VnQ6sMAUVLx0RpeSJ8gMWz7-A2g,15136
+payi/lib/GoogleGenAiInstrumentor.py,sha256=ZEjkGJo8TJRQtyhmtbhVrRggEedFNQEWQx4hgB3kMRI,13833
+payi/lib/OpenAIInstrumentor.py,sha256=hrEEzzeGtQmZfLxGsyMKhDtB0S7YPNfsjgMG5vx5jMA,18485
 payi/lib/Stopwatch.py,sha256=7OJlxvr2Jyb6Zr1LYCYKczRB7rDVKkIR7gc4YoleNdE,764
-payi/lib/VertexInstrumentor.py,sha256=aW4ZT7YVXy8V_g91KkSEapzI7Cy6UQfaU1D0ZOU4eBE,11886
+payi/lib/VertexInstrumentor.py,sha256=0NJjbpFg3OPHdK7YJxiMGUlndbc7RkOfPi6uXKx-uyY,12026
 payi/lib/helpers.py,sha256=K1KAfWrpPT1UUGNxspLe1lHzQjP3XV5Pkh9IU4pKMok,4624
-payi/lib/instrument.py,sha256=UpZ6SGg3YI9lSxmwH5ziwe1xt_ca6FS35CcNJpG9ONM,58214
+payi/lib/instrument.py,sha256=w55jtWm6PoIJqAPEeRJXWc41QTuUxzgQB9BxIdFYMdU,64622
 payi/resources/__init__.py,sha256=1rtrPLWbNt8oJGOp6nwPumKLJ-ftez0B6qwLFyfcoP4,2972
 payi/resources/ingest.py,sha256=8HNHEyfgIyJNqCh0rOhO9msoc61-8IyifJ6AbxjCrDg,22612
 payi/resources/categories/__init__.py,sha256=w5gMiPdBSzJA_qfoVtFBElaoe8wGf_O63R7R1Spr6Gk,1093
@@ -142,7 +142,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.0a80.dist-info/METADATA,sha256=__22ITl_q65jasQ663-ur0WOvHXW-PYzIVu0tq6PnYs,15180
-payi-0.1.0a80.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-payi-0.1.0a80.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a80.dist-info/RECORD,,
+payi-0.1.0a81.dist-info/METADATA,sha256=52eqvXnc3d2pJpiwnT7FK7MwNmAkiQMCBntZAsuyNcc,15180
+payi-0.1.0a81.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+payi-0.1.0a81.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a81.dist-info/RECORD,,