payi 0.1.0a117__py3-none-any.whl → 0.1.0a119__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.117"  # x-release-please-version
+__version__ = "0.1.0-alpha.119"  # x-release-please-version

payi/lib/BedrockInstrumentor.py

@@ -513,6 +513,8 @@ class _BedrockInvokeProviderRequest(_BedrockProviderRequest):
 class _BedrockConverseProviderRequest(_BedrockProviderRequest):
     @override
     def process_request(self, instance: Any, extra_headers: 'dict[str, str]', args: Sequence[Any], kwargs: Any) -> bool:
+        super().process_request(instance, extra_headers, args, kwargs)
+        
         guardrail_config = kwargs.get("guardrailConfig", {})
         if guardrail_config:
             guardrailIdentifier = guardrail_config.get("guardrailIdentifier", "")

payi/lib/instrument.py

@@ -571,7 +571,7 @@ class _PayiInstrumentor:
             # Try to get the response body as JSON
             body = e.body
             if body is None:
-                self._logger.error("APIStatusError response has no body attribute")
+                self._logger.warning(f"Pay-i connection exception {e} has no body")
                 return XproxyError(code="unknown_error", message=str(e))
 
             # If body is bytes, decode to string
@@ -585,8 +585,9 @@ class _PayiInstrumentor:
             if not body_dict:
                 try:
                     body_dict = json.loads(body)  # type: ignore
-                except Exception as json_ex:
-                    self._logger.error(f"Failed to parse response body as JSON: {json_ex}")
+                except Exception:
+                    body_type = type(body).__name__ # type: ignore
+                    self._logger.warning(f"Pay-i connection exception {e} cannot parse response JSON body for body type {body_type}")
                     return XproxyError(code="invalid_json", message=str(e))
 
             xproxy_error = body_dict.get("xproxy_error", {})
@@ -595,7 +596,7 @@ class _PayiInstrumentor:
             return XproxyError(code=code, message=message)
 
         except Exception as ex:
-            self._logger.error(f"Exception in _process_api_status_error: {ex}")
+            self._logger.warning(f"Pay-i connection exception {e}  _process_api_status_error handled exception {ex}")
             return XproxyError(code="exception", message=str(ex))
 
     def _ingest_units_worker(self, request: _ProviderRequest) -> Optional[Union[XproxyResult, XproxyError]]:
@@ -989,12 +990,14 @@ class _PayiInstrumentor:
 
         # after _udpate_headers, all metadata to add to ingest is in extra_headers, keyed by the xproxy-xxx header name
         extra_headers: Optional[dict[str, str]] = kwargs.get("extra_headers")
-        if extra_headers is None:
-            extra_headers = {}
+        extra_headers = (extra_headers or {}).copy()
         self._update_extra_headers(context, extra_headers)
 
         if context.get("proxy", self._proxy_default):
-            if "extra_headers" not in kwargs and extra_headers:
+            if not request.supports_extra_headers:
+                kwargs.pop("extra_headers", None)
+            elif extra_headers:
+                # Pass the copy to the wrapped function. Assumes anthropic and openai clients
                 kwargs["extra_headers"] = extra_headers
 
             self._logger.debug(f"async_invoke_wrapper: sending proxy request")
@@ -1025,6 +1028,10 @@ class _PayiInstrumentor:
             self._prepare_ingest(request, context, extra_headers, args, kwargs)
             self._logger.debug(f"async_invoke_wrapper: calling wrapped instance (stream={stream})")
 
+            if "extra_headers" in kwargs:
+                # replace the original extra_headers with the updated copy which has all of the Pay-i headers removed
+                kwargs["extra_headers"] = extra_headers
+
             sw.start()
             response = await wrapped(*args, **kwargs)
 
@@ -1109,15 +1116,14 @@ class _PayiInstrumentor:
 
         # after _udpate_headers, all metadata to add to ingest is in extra_headers, keyed by the xproxy-xxx header name
         extra_headers: Optional[dict[str, str]] = kwargs.get("extra_headers")
-        if extra_headers is None:
-            extra_headers = {}
+        extra_headers = (extra_headers or {}).copy()
         self._update_extra_headers(context, extra_headers)
 
         if context.get("proxy", self._proxy_default):
             if not request.supports_extra_headers:
                 kwargs.pop("extra_headers", None)
-            elif "extra_headers" not in kwargs and extra_headers:
-                # assumes anthropic and openai clients
+            elif extra_headers:
+                # Pass the copy to the wrapped function. Assumes anthropic and openai clients
                 kwargs["extra_headers"] = extra_headers
 
             self._logger.debug(f"invoke_wrapper: sending proxy request")
@@ -1148,6 +1154,10 @@ class _PayiInstrumentor:
             self._prepare_ingest(request, context, extra_headers, args, kwargs)
             self._logger.debug(f"invoke_wrapper: calling wrapped instance (stream={stream})")
 
+            if "extra_headers" in kwargs:
+                # replace the original extra_headers with the updated copy which has all of the Pay-i headers removed
+                kwargs["extra_headers"] = extra_headers
+
             sw.start()
             response = wrapped(*args, **kwargs)
             

{payi-0.1.0a117.dist-info → payi-0.1.0a119.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: payi
-Version: 0.1.0a117
+Version: 0.1.0a119
 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.0a117.dist-info → payi-0.1.0a119.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=2pzimmgO1SZhjEsqgq0eOheAFRCdT4qakXMZm8cGeI0,7294
-payi/_version.py,sha256=CT_7R67aFGN6tU15d9jDUpNrFSdQKg2LnZnzMCLaoAA,166
+payi/_version.py,sha256=hXAufnsNH5vNZqhITRS6ohEnXE5aepQldW_2L860_Ik,166
 payi/pagination.py,sha256=k2356QGPOUSjRF2vHpwLBdF6P-2vnQzFfRIJQAHGQ7A,1258
 payi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payi/_utils/__init__.py,sha256=7fch0GT9zpNnErbciSpUNa-SjTxxjY6kxHxKMOM4AGs,2305
@@ -28,14 +28,14 @@ payi/_utils/_typing.py,sha256=N_5PPuFNsaygbtA_npZd98SVN1LQQvFTKL6bkWPBZGU,4786
 payi/_utils/_utils.py,sha256=D2QE7mVPNEJzaB50u8rvDQAUDS5jx7JoeFD7zdj-TeI,12231
 payi/lib/.keep,sha256=wuNrz-5SXo3jJaJOJgz4vFHM41YH_g20F5cRQo0vLes,224
 payi/lib/AnthropicInstrumentor.py,sha256=SI6nzU-eVufHbxV5gxgrZDhx3TewRVnsvtwDuwEG6WU,16484
-payi/lib/BedrockInstrumentor.py,sha256=AAuYBJrLiInz8F6vRcogVMFAHL1gVzn4VHUafjOgrCo,26361
+payi/lib/BedrockInstrumentor.py,sha256=sbjq5GKBOjjId1cj4x0vHQIGc_JBxewSE08cgvyAD3E,26441
 payi/lib/GoogleGenAiInstrumentor.py,sha256=LHiEZ7G5IhCcDlpVzQlXW9Ok96MHLeq7emEhFzPBTm0,8836
 payi/lib/OpenAIInstrumentor.py,sha256=_ULwIli11XP1yZK_pMGXuaSmHZ5pozuEt_v5DfhNuGw,22914
 payi/lib/Stopwatch.py,sha256=7OJlxvr2Jyb6Zr1LYCYKczRB7rDVKkIR7gc4YoleNdE,764
 payi/lib/VertexInstrumentor.py,sha256=OWuMPiW4LdLhj6DSAAy5qZiosVo8DSAuFWGxYpEucoE,7431
 payi/lib/VertexRequest.py,sha256=42F7xCRYY6h3EMUZD1x4-_cwyAcVhnzT9M5zl4KwtE0,11801
 payi/lib/helpers.py,sha256=jcMyxsuWmyPymDCYmDbQAb6IgbkmkiiNUaxeEPkCKZs,4457
-payi/lib/instrument.py,sha256=CASgkSmnAhMqK5DeE6veRkr-7AbJaC_xu-KlLfmsfIo,76634
+payi/lib/instrument.py,sha256=gEP6onrXVRWl6e1DqIrG1FU56A8nb6opQhkSzruk640,77348
 payi/lib/version_helper.py,sha256=v0lC3kuaXn6PBDolE3mkmwJiA8Ot3z4RkVR7wlBuZCs,540
 payi/lib/data/cohere_embed_english_v3.json,sha256=YEWwjml3_i16cdsOx_7UKe6xpVFnxTEhP8T1n54R6gY,718306
 payi/resources/__init__.py,sha256=B2bn1ZfCf6TbHlzZvy5TpFPtALnFcBRPYVKQH3S5qfQ,2457
@@ -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=sodtLT84tBmuO_0d-h0CZWCh4vWojJMtUbMjBmEN3IE,492
-payi-0.1.0a117.dist-info/METADATA,sha256=U3BPRxFBRJUJDmd0UMvdQ734n6NP2l4VYuZqqKByt7Y,16324
-payi-0.1.0a117.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-payi-0.1.0a117.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a117.dist-info/RECORD,,
+payi-0.1.0a119.dist-info/METADATA,sha256=a4dgBvrw-bwPoinDeyYpCa4JPqxA7mJYDSRfJU6X7t0,16324
+payi-0.1.0a119.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+payi-0.1.0a119.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a119.dist-info/RECORD,,