payi 0.1.0a84__tar.gz → 0.1.0a85__tar.gz

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

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

{payi-0.1.0a84 → payi-0.1.0a85}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.0-alpha.85 (2025-06-12)
+
+Full Changelog: [v0.1.0-alpha.84...v0.1.0-alpha.85](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.84...v0.1.0-alpha.85)
+
+### Features
+
+* AnthropicBedrock ([#320](https://github.com/Pay-i/pay-i-python/issues/320)) ([33b42e3](https://github.com/Pay-i/pay-i-python/commit/33b42e38d7ba3245e0633254b4401cf991937933))
+
 ## 0.1.0-alpha.84 (2025-06-09)
 
 Full Changelog: [v0.1.0-alpha.83...v0.1.0-alpha.84](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.83...v0.1.0-alpha.84)

{payi-0.1.0a84 → payi-0.1.0a85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: payi
-Version: 0.1.0a84
+Version: 0.1.0a85
 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.0a84 → payi-0.1.0a85}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.84"
+version = "0.1.0-alpha.85"
 description = "The official Python library for the payi API"
 dynamic = ["readme"]
 license = "Apache-2.0"

{payi-0.1.0a84 → payi-0.1.0a85}/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.84"  # x-release-please-version
+__version__ = "0.1.0-alpha.85"  # x-release-please-version

{payi-0.1.0a84 → payi-0.1.0a85}/src/payi/lib/AnthropicInstrumentor.py

@@ -18,6 +18,12 @@ class AnthropicInstrumentor:
 
         return isinstance(instance._client, (AsyncAnthropicVertex, AnthropicVertex))
 
+    @staticmethod
+    def is_bedrock(instance: Any) -> bool:
+        from anthropic import AnthropicBedrock, AsyncAnthropicBedrock  # type: ignore # noqa: I001
+
+        return isinstance(instance._client, (AsyncAnthropicBedrock, AnthropicBedrock))
+
     @staticmethod
     def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
@@ -126,10 +132,22 @@ async def astream_messages_wrapper(
 
 class _AnthropicProviderRequest(_ProviderRequest):
     def __init__(self, instrumentor: _PayiInstrumentor, streaming_type: _StreamingType, instance: Any = None) -> None:
-        self._vertex: bool = AnthropicInstrumentor.is_vertex(instance)
+        self._is_vertex: bool = AnthropicInstrumentor.is_vertex(instance)
+        self._is_bedrock: bool = AnthropicInstrumentor.is_bedrock(instance)
+    
+        category: str = ""
+        if self._is_vertex:
+            category = PayiCategories.google_vertex
+        elif self._is_bedrock:
+            category = PayiCategories.aws_bedrock
+        else:
+            category = PayiCategories.anthropic
+
+        instrumentor._logger.debug(f"Anthropic messages instrumenting category {category}")
+
         super().__init__(
             instrumentor=instrumentor,
-            category=PayiCategories.google_vertex if self._vertex else PayiCategories.anthropic,
+            category=category,
             streaming_type=streaming_type,
             )
 
@@ -149,7 +167,7 @@ class _AnthropicProviderRequest(_ProviderRequest):
 
     @override
     def process_request(self, instance: Any, extra_headers: 'dict[str, str]', args: Sequence[Any], kwargs: Any) -> bool:
-        self._ingest["resource"] = ("anthropic." if self._vertex else "") + kwargs.get("model", "")
+        self._ingest["resource"] = ("anthropic." if self._is_vertex else "") + kwargs.get("model", "")
 
         messages = kwargs.get("messages")
         if messages:

{payi-0.1.0a84 → payi-0.1.0a85}/src/payi/lib/BedrockInstrumentor.py

@@ -217,6 +217,7 @@ class _BedrockProviderRequest(_ProviderRequest):
             instrumentor=instrumentor,
             category=PayiCategories.aws_bedrock,
             streaming_type=_StreamingType.iterator,
+            is_aws_client=True,
             )
 
     @override

{payi-0.1.0a84 → payi-0.1.0a85}/src/payi/lib/GoogleGenAiInstrumentor.py

@@ -119,6 +119,7 @@ class _GoogleGenAiRequest(_ProviderRequest):
             instrumentor=instrumentor,
             category=PayiCategories.google_vertex,
             streaming_type=_StreamingType.generator,
+            is_google_vertex_or_genai_client=True,
             )
         self._prompt_character_count = 0
         self._candidates_character_count = 0

{payi-0.1.0a84 → payi-0.1.0a85}/src/payi/lib/VertexInstrumentor.py

@@ -94,6 +94,7 @@ class _GoogleVertexRequest(_ProviderRequest):
             instrumentor=instrumentor,
             category=PayiCategories.google_vertex,
             streaming_type=_StreamingType.generator,
+            is_google_vertex_or_genai_client=True,
             )
         self._prompt_character_count = 0
         self._candidates_character_count = 0

{payi-0.1.0a84 → payi-0.1.0a85}/src/payi/lib/instrument.py

@@ -35,12 +35,20 @@ class _ChunkResult:
     ingest: bool = False
     
 class _ProviderRequest:
-    def __init__(self, instrumentor: '_PayiInstrumentor', category: str, streaming_type: '_StreamingType'):
+    def __init__(
+            self, instrumentor: '_PayiInstrumentor',
+            category: str,
+            streaming_type: '_StreamingType',
+            is_aws_client: Optional[bool] = None,
+            is_google_vertex_or_genai_client: Optional[bool] = None,
+            ) -> None:
         self._instrumentor: '_PayiInstrumentor' = instrumentor
         self._estimated_prompt_tokens: Optional[int] = None
         self._category: str = category
         self._ingest: IngestUnitsParams = { "category": category, "units": {} } # type: ignore
         self._streaming_type: '_StreamingType' = streaming_type
+        self._is_aws_client: Optional[bool] = is_aws_client
+        self._is_google_vertex_or_genai_client: Optional[bool] = is_google_vertex_or_genai_client
 
     def process_chunk(self, _chunk: Any) -> _ChunkResult:
         return _ChunkResult(send_chunk_to_caller=True)
@@ -59,20 +67,20 @@ class _ProviderRequest:
         pass
 
     @property
-    def is_bedrock(self) -> bool:
-        return self._category == PayiCategories.aws_bedrock
+    def is_aws_client(self) -> bool:
+        return self._is_aws_client if self._is_aws_client is not None else False
 
     @property
-    def is_vertex(self) -> bool:
-        return self._category == PayiCategories.google_vertex 
-       
+    def is_google_vertex_or_genai_client(self) -> bool:
+        return self._is_google_vertex_or_genai_client if self._is_google_vertex_or_genai_client is not None else False
+
     def process_exception(self, exception: Exception, kwargs: Any, ) -> bool: # noqa: ARG002
         self.exception_to_semantic_failure(exception)
         return True
     
     @property
     def supports_extra_headers(self) -> bool:
-        return not self.is_bedrock and not self.is_vertex
+        return not self.is_aws_client and not self.is_google_vertex_or_genai_client
     
     @property
     def streaming_type(self) -> '_StreamingType':
@@ -286,6 +294,22 @@ class _PayiInstrumentor:
         except Exception as e:
             self._logger.error(f"Error instrumenting Google GenAi: {e}")
 
+    @staticmethod
+    def _create_logged_ingest_units(
+        ingest_units: IngestUnitsParams,
+    ) -> IngestUnitsParams:
+        # remove large and potentially sensitive data from the log
+        log_ingest_units: IngestUnitsParams = ingest_units.copy()
+        
+        log_ingest_units.pop('provider_request_json', None)
+        log_ingest_units.pop('provider_response_json', None)
+
+        # Pop system.stack_trace from properties if it exists
+        if 'properties' in log_ingest_units and isinstance(log_ingest_units['properties'], dict):
+            log_ingest_units['properties'].pop('system.stack_trace', None)
+
+        return log_ingest_units
+        
     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", {})
@@ -336,6 +360,9 @@ class _PayiInstrumentor:
             return None
 
         try:
+            if self._logger.isEnabledFor(logging.DEBUG):
+                self._logger.debug(f"_aingest_units: sending ({self._create_logged_ingest_units(ingest_units)})")
+
             if self._apayi:    
                 ingest_response = await self._apayi.ingest.units(**ingest_units)
             elif self._payi:
@@ -408,6 +435,9 @@ class _PayiInstrumentor:
 
         try:
             if self._payi:
+                if self._logger.isEnabledFor(logging.DEBUG):
+                    self._logger.debug(f"_ingest_units: sending ({self._create_logged_ingest_units(ingest_units)})")
+
                 ingest_response = self._payi.ingest.units(**ingest_units)
                 self._logger.debug(f"_ingest_units: success ({ingest_response})")
 
@@ -906,7 +936,7 @@ class _PayiInstrumentor:
                     request=request,
                 )
 
-                if request.is_bedrock:
+                if request.is_aws_client:
                     if "body" in response:
                         response["body"] = stream_result
                     else:
@@ -1094,7 +1124,7 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
         request.process_initial_stream_response(response)
 
         bedrock_from_stream: bool = False
-        if request.is_bedrock:
+        if request.is_aws_client:
             stream = response.get("stream", None)
 
             if stream:
@@ -1138,7 +1168,7 @@ class _StreamIteratorWrapper(ObjectProxy):  # type: ignore
 
     def __iter__(self) -> Any:  
         self._iter_started = True
-        if self._request.is_bedrock:
+        if self._request.is_aws_client:
             # 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()

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

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