payi 0.1.0a51__py3-none-any.whl → 0.1.0a52__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.51"  # x-release-please-version
+__version__ = "0.1.0-alpha.52"  # x-release-please-version

payi/lib/helpers.py

@@ -1,4 +1,3 @@
-from enum import Enum
 from typing import Dict, List, Union
 
 PAYI_BASE_URL = "https://api.pay-i.com"
@@ -11,12 +10,13 @@ class PayiHeaderNames:
     user_id:str = "xProxy-User-ID"
     route_as_resource:str = "xProxy-RouteAs-Resource"
     provider_base_uri = "xProxy-Provider-BaseUri"
+    resource_scope:str = "xProxy-Resource-Scope"
 
-class PayiCategories(Enum):
-    anthropic = "system.anthropic"
-    openai = "system.openai"
-    azure_openai = "system.azureopenai"
-    aws_bedrock = "system.aws.bedrock"
+class PayiCategories:
+    anthropic:str  = "system.anthropic"
+    openai:str = "system.openai"
+    azure_openai:str = "system.azureopenai"
+    aws_bedrock:str = "system.aws.bedrock"
 
 def create_limit_header_from_ids(limit_ids: List[str]) -> Dict[str, str]:
     if not isinstance(limit_ids, list):  # type: ignore

payi/lib/instrument.py

@@ -41,7 +41,7 @@ class PayiInstrumentor:
         self,
         payi: Optional[Payi],
         apayi: Optional[AsyncPayi],
-        instruments: Union[Set[PayiCategories], None] = None,
+        instruments: Union[Set[str], None] = None,
         log_prompt_and_response: bool = True,
         prompt_and_response_logger: Optional[
             Callable[[str, "dict[str, str]"], None]
@@ -56,7 +56,7 @@ class PayiInstrumentor:
         self._blocked_limits: set[str] = set()
         self._exceeded_limits: set[str] = set()
 
-        if instruments is None:
+        if instruments is None or "*" in instruments:
             self._instrument_all()
         else:
             self._instrument_specific(instruments)
@@ -66,7 +66,7 @@ class PayiInstrumentor:
         self._instrument_anthropic()
         self._instrument_aws_bedrock()
 
-    def _instrument_specific(self, instruments: Set[PayiCategories]) -> None:
+    def _instrument_specific(self, instruments: Set[str]) -> None:
         if PayiCategories.openai in instruments or PayiCategories.azure_openai in instruments:
             self._instrument_openai()
         if PayiCategories.anthropic in instruments:
@@ -375,14 +375,18 @@ class PayiInstrumentor:
         if len(ingest_extra_headers) > 0:
             ingest["provider_request_headers"] = [PayICommonModelsAPIRouterHeaderInfoParam(name=k, value=v) for k, v in ingest_extra_headers.items()]
 
-        provider_prompt = {}
+        provider_prompt: "dict[str, Any]" = {}
         for k, v in kwargs.items():
             if k == "messages":
                 provider_prompt[k] = [m.model_dump() if hasattr(m, "model_dump") else m for m in v]
             elif k in ["extra_headers", "extra_query"]:
                 pass
             else:
-                provider_prompt[k] = v
+                try:
+                    json.dumps(v)
+                    provider_prompt[k] = v
+                except (TypeError, ValueError):
+                    pass
 
         if self._log_prompt_and_response:
             ingest["provider_request_json"] = json.dumps(provider_prompt)
@@ -420,18 +424,28 @@ class PayiInstrumentor:
         ingest: IngestUnitsParams = {"category": category, "units": {}} # type: ignore
         ingest["resource"] = kwargs.get("model", "")
 
-        if category == "system.openai" and instance and hasattr(instance, "_client"):
+        if category == PayiCategories.openai and instance and hasattr(instance, "_client"):
             from .OpenAIInstrumentor import OpenAiInstrumentor # noqa: I001
 
             if OpenAiInstrumentor.is_azure(instance):
-                resource = extra_headers.pop(PayiHeaderNames.route_as_resource, None)
-                if not resource:
+                route_as_resource = extra_headers.pop(PayiHeaderNames.route_as_resource, None)
+                resource_scope = extra_headers.pop(PayiHeaderNames.resource_scope, None)
+
+                if not route_as_resource:
                     logging.error("Azure OpenAI route as resource not found, not ingesting")
                     return await wrapped(*args, **kwargs)
 
-                category = "system.azureopenai"
+                if resource_scope:
+                    if not(resource_scope in ["global", "datazone"] or resource_scope.startswith("region")):
+                        logging.error("Azure OpenAI invalid resource scope, not ingesting")
+                        return wrapped(*args, **kwargs)
+
+                    ingest["resource_scope"] = resource_scope
+
+                category = PayiCategories.azure_openai
+
                 ingest["category"] = category
-                ingest["resource"] = resource
+                ingest["resource"] = route_as_resource
 
         current_frame = inspect.currentframe()
         # f_back excludes the current frame, strip() cleans up whitespace and newlines
@@ -511,7 +525,7 @@ class PayiInstrumentor:
     ) -> Any:
         context = self.get_context()
 
-        is_bedrock:bool = category == "system.aws.bedrock"
+        is_bedrock:bool = category == PayiCategories.aws_bedrock
 
         if not context:
             if is_bedrock:
@@ -539,17 +553,28 @@ class PayiInstrumentor:
         else:
             ingest["resource"] = kwargs.get("model", "")
 
-        if category == "system.openai" and instance and hasattr(instance, "_client"):
-            from .OpenAIInstrumentor import OpenAiInstrumentor
+        if category == PayiCategories.openai and instance and hasattr(instance, "_client"):
+            from .OpenAIInstrumentor import OpenAiInstrumentor # noqa: I001
+
             if OpenAiInstrumentor.is_azure(instance):
-                resource = extra_headers.pop(PayiHeaderNames.route_as_resource, None)
-                if not resource:
+                route_as_resource:str = extra_headers.pop(PayiHeaderNames.route_as_resource, None)
+                resource_scope:str = extra_headers.pop(PayiHeaderNames.resource_scope, None)
+
+                if not route_as_resource:
                     logging.error("Azure OpenAI route as resource not found, not ingesting")
                     return wrapped(*args, **kwargs)
 
-                category = "system.azureopenai"
+                if resource_scope:
+                    if not(resource_scope in ["global", "datazone"] or resource_scope.startswith("region")):
+                        logging.error("Azure OpenAI invalid resource scope, not ingesting")
+                        return wrapped(*args, **kwargs)
+
+                    ingest["resource_scope"] = resource_scope
+
+                category = PayiCategories.azure_openai
+
                 ingest["category"] = category
-                ingest["resource"] = resource
+                ingest["resource"] = route_as_resource
 
         current_frame = inspect.currentframe()
         # f_back excludes the current frame, strip() cleans up whitespace and newlines
@@ -864,7 +889,7 @@ _instrumentor: Optional[PayiInstrumentor] = None
 
 def payi_instrument(
     payi: Optional[Union[Payi, AsyncPayi, 'list[Union[Payi, AsyncPayi]]']] = None,
-    instruments: Optional[Set[PayiCategories]] = None,
+    instruments: Optional[Set[str]] = None,
     log_prompt_and_response: bool = True,
     prompt_and_response_logger: Optional[Callable[[str, "dict[str, str]"], None]] = None,
 ) -> None:

{payi-0.1.0a51.dist-info → payi-0.1.0a52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a51
+Version: 0.1.0a52
 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.0a51.dist-info → payi-0.1.0a52.dist-info}/RECORD

@@ -11,7 +11,7 @@ payi/_resource.py,sha256=j2jIkTr8OIC8sU6-05nxSaCyj4MaFlbZrwlyg4_xJos,1088
 payi/_response.py,sha256=CfrNS_3wbL8o9dRyRVfZQ5E1GUlA4CUIUEK8olmfGqE,28777
 payi/_streaming.py,sha256=Z_wIyo206T6Jqh2rolFg2VXZgX24PahLmpURp0-NssU,10092
 payi/_types.py,sha256=2mbMK86K3W1aMTW7sOGQ-VND6-A2IuXKm8p4sYFztBU,6141
-payi/_version.py,sha256=2jjziS33NunQR_UCbEBJktWH8e7UFNDVKxDIbHSAi68,165
+payi/_version.py,sha256=8EiC_xRCoylkMdtygYL1cGog4vO86O8lPQot0lXlxNU,165
 payi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payi/_utils/__init__.py,sha256=PNZ_QJuzZEgyYXqkO1HVhGkj5IU9bglVUcw7H-Knjzw,2062
 payi/_utils/_logs.py,sha256=fmnf5D9TOgkgZKfgYmSa3PiUc3SZgkchn6CzJUeo0SQ,768
@@ -27,8 +27,8 @@ payi/lib/AnthropicInstrumentor.py,sha256=h-yebG7r7cSRVM_utva55Gc4BVcoW6WGrQrDg55
 payi/lib/BedrockInstrumentor.py,sha256=4WSZLzLHMv-5U1OFr0ZErESNHTyPHn0kHATUw4HTDkQ,10072
 payi/lib/OpenAIInstrumentor.py,sha256=ZUu-Byhz7AXhvxjOMdX8tB2JOpM5sCj0KnyRB49lQg0,6881
 payi/lib/Stopwatch.py,sha256=7OJlxvr2Jyb6Zr1LYCYKczRB7rDVKkIR7gc4YoleNdE,764
-payi/lib/helpers.py,sha256=fcT6gAHUP77YaLmgw9HWdIyTDJPI72weUsUVDGW0CbE,2929
-payi/lib/instrument.py,sha256=oJdF1ocd-wbQgNF9MIZWAaGDInzbu4TRy9946GVRuvI,36302
+payi/lib/helpers.py,sha256=ghW4v_ZmCfy4ImGJr1PFTPfzHYwCCtdtyq9UqKwxpGc,2967
+payi/lib/instrument.py,sha256=Fk-Vh9NEhfp6UNaTAkkEgL5Kiq7nFPDwUT-EuzCMF5Y,37443
 payi/resources/__init__.py,sha256=isHGXSl9kOrZDduKrX3UenTwrdTpuKJVBjw6NYSBV20,3592
 payi/resources/billing_models.py,sha256=5w3RfGXtGlyq5vbTw6hQrx1UlzRBtlq8ArcFlf5e3TY,20152
 payi/resources/ingest.py,sha256=RFfN1hwUngFgHJNcMaqZ1C6Xw1Qdve81dtUgjJSOb_A,19159
@@ -112,7 +112,7 @@ payi/types/requests/request_result.py,sha256=phYQiqhwNaR9igP-Fhs34Y-__dlT7L4wq-r
 payi/types/shared/__init__.py,sha256=-xz5dxK5LBjLnsi2LpLq5btaGDFp-mSjJ0y2qKy0Yus,264
 payi/types/shared/evaluation_response.py,sha256=ejEToMA57PUu1SldEtJ5z9r4fAO3U0tvdjbsyIoVX1s,214
 payi/types/shared/pay_i_common_models_budget_management_cost_details_base.py,sha256=XmIzJXy4zAi-mfrDvEXiYjO3qF1EvugGUl-Gijj4TA4,268
-payi-0.1.0a51.dist-info/METADATA,sha256=jiW2Y5pjt4_e9bMHsMGGvAczDQZrf5i-1aC4CuRRE3A,12660
-payi-0.1.0a51.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-payi-0.1.0a51.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a51.dist-info/RECORD,,
+payi-0.1.0a52.dist-info/METADATA,sha256=uBhSl9Hp-zULHZsstIS7MVDPGcLbrVTE_0Zd3ZFzxvA,12660
+payi-0.1.0a52.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+payi-0.1.0a52.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a52.dist-info/RECORD,,