payi 0.1.0a51__py3-none-any.whl → 0.1.0a53__py3-none-any.whl

payi/_base_client.py

@@ -63,7 +63,7 @@ from ._types import (
     ModelBuilderProtocol,
 )
 from ._utils import is_dict, is_list, asyncify, is_given, lru_cache, is_mapping
-from ._compat import model_copy, model_dump
+from ._compat import PYDANTIC_V2, model_copy, model_dump
 from ._models import GenericModel, FinalRequestOptions, validate_type, construct_type
 from ._response import (
     APIResponse,
@@ -207,6 +207,9 @@ class BaseSyncPage(BasePage[_T], Generic[_T]):
         model: Type[_T],
         options: FinalRequestOptions,
     ) -> None:
+        if PYDANTIC_V2 and getattr(self, "__pydantic_private__", None) is None:
+            self.__pydantic_private__ = {}
+
         self._model = model
         self._client = client
         self._options = options
@@ -292,6 +295,9 @@ class BaseAsyncPage(BasePage[_T], Generic[_T]):
         client: AsyncAPIClient,
         options: FinalRequestOptions,
     ) -> None:
+        if PYDANTIC_V2 and getattr(self, "__pydantic_private__", None) is None:
+            self.__pydantic_private__ = {}
+
         self._model = model
         self._client = client
         self._options = options
@@ -518,7 +524,7 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
             # so that passing a `TypedDict` doesn't cause an error.
             # https://github.com/microsoft/pyright/issues/3526#event-6715453066
             params=self.qs.stringify(cast(Mapping[str, Any], params)) if params else None,
-            json=json_data,
+            json=json_data if is_given(json_data) else None,
             files=files,
             **kwargs,
         )

payi/_client.py

@@ -77,7 +77,7 @@ class Payi(SyncAPIClient):
         # part of our public interface in the future.
         _strict_response_validation: bool = False,
     ) -> None:
-        """Construct a new synchronous payi client instance.
+        """Construct a new synchronous Payi client instance.
 
         This automatically infers the `api_key` argument from the `PAYI_API_KEY` environment variable if it is not provided.
         """
@@ -257,7 +257,7 @@ class AsyncPayi(AsyncAPIClient):
         # part of our public interface in the future.
         _strict_response_validation: bool = False,
     ) -> None:
-        """Construct a new async payi client instance.
+        """Construct a new async AsyncPayi client instance.
 
         This automatically infers the `api_key` argument from the `PAYI_API_KEY` environment variable if it is not provided.
         """

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.53"  # 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/resources/ingest.py

@@ -54,7 +54,7 @@ class IngestResource(SyncAPIResource):
     def bulk(
         self,
         *,
-        events: Iterable[IngestEventParam],
+        events: Iterable[IngestEventParam] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -242,7 +242,7 @@ class AsyncIngestResource(AsyncAPIResource):
     async def bulk(
         self,
         *,
-        events: Iterable[IngestEventParam],
+        events: Iterable[IngestEventParam] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,

payi/types/ingest_bulk_params.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Iterable
-from typing_extensions import Required, TypedDict
+from typing_extensions import TypedDict
 
 from .ingest_event_param import IngestEventParam
 
@@ -11,4 +11,4 @@ __all__ = ["IngestBulkParams"]
 
 
 class IngestBulkParams(TypedDict, total=False):
-    events: Required[Iterable[IngestEventParam]]
+    events: Iterable[IngestEventParam]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a51
+Version: 0.1.0a53
 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
@@ -41,7 +41,7 @@ The Payi Python library provides convenient access to the Payi REST API from any
 application. The library includes type definitions for all request params and response fields,
 and offers both synchronous and asynchronous clients powered by [httpx](https://github.com/encode/httpx).
 
-It is generated with [Stainless](https://www.stainlessapi.com/).
+It is generated with [Stainless](https://www.stainless.com/).
 
 ## Documentation
 

{payi-0.1.0a51.dist-info → payi-0.1.0a53.dist-info}/RECORD

@@ -1,6 +1,6 @@
 payi/__init__.py,sha256=_eeZx9fx2Wp81adXh7qrpkmXCso7TiRSvIlLkQ0sQhY,2399
-payi/_base_client.py,sha256=NT8ScfXiqpVkHrcGbynpNlv0q20HeHeF-oxKwmXggWM,68525
-payi/_client.py,sha256=aUtMEmV02nTs3_pYYAR-OchCkofUHeXhhRs43tyDHLE,18760
+payi/_base_client.py,sha256=ZOICzg2o9gt3MtXKHglWDFZ9aIehFRDoppVLLNleHxM,68819
+payi/_client.py,sha256=nYlt5NMJwXhptCNSf_VTDGIcMCJuMQG132qzaEt89UM,18765
 payi/_compat.py,sha256=VWemUKbj6DDkQ-O4baSpHVLJafotzeXmCQGJugfVTIw,6580
 payi/_constants.py,sha256=S14PFzyN9-I31wiV7SmIlL5Ga0MLHxdvegInGdXH7tM,462
 payi/_exceptions.py,sha256=ItygKNrNXIVY0H6LsGVZvFuAHB3Vtm_VZXmWzCnpHy0,3216
@@ -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=22wp7HhRLV8Mw-V1KjRV37acd4dGVzd4CFl1iogfznA,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,11 +27,11 @@ 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
+payi/resources/ingest.py,sha256=GQtgomlSTaMzPqWq8r51JkxkQMrqWhePl_llKG1XsVs,19205
 payi/resources/price_modifiers.py,sha256=t-k2F_zf2FhoxiqDHAPBPvhSgTjewlJqh50y58FNMuw,13475
 payi/resources/categories/__init__.py,sha256=w5gMiPdBSzJA_qfoVtFBElaoe8wGf_O63R7R1Spr6Gk,1093
 payi/resources/categories/categories.py,sha256=FohmajDcadMXzhG3Z1HKGkbSImO7rhzQ0olZXHz8z48,16074
@@ -65,7 +65,7 @@ payi/types/cost_data.py,sha256=1i842P25SBy2sB3OWGj9LO_mMKtzmyUPBrqY_mSw01o,488
 payi/types/cost_details.py,sha256=w9p79opEG3kcsjkRRP7niaMcUswdfB4Y7HCkVTcQ1zQ,307
 payi/types/default_response.py,sha256=o617LpRsCIZHCZxAc5nVI2JQ3HPGZo4gCDvSDkxkIJ8,270
 payi/types/experience_instance_response.py,sha256=N07MH6hjs1ISHLVpR2FG-u4awsZ_GGi97UNMXAWV1yA,296
-payi/types/ingest_bulk_params.py,sha256=d76YwiXaNeltLS3w86ZxLzTKGa7ymGLJDSelaMQGf8Y,382
+payi/types/ingest_bulk_params.py,sha256=A-IRb39d2tmVzEQqrvhlF_3si-9ufHBKYLlvdXupAHU,362
 payi/types/ingest_event_param.py,sha256=1-pr5wMiWXAGDqBmQHKdpHJy0Fk9vOQl7XTGLtcjtdI,1507
 payi/types/ingest_response.py,sha256=KZfsgUhC942QkkjDFMqjJwCRoO2vkXv-Sx3X_xjijfg,1449
 payi/types/ingest_units_params.py,sha256=QrfkSW-tFDKpn8cPbbyAOhM17W1prC-aJeXMFeGiqJI,1884
@@ -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.0a53.dist-info/METADATA,sha256=gY78Cxm41k39GvnmpNTrz2CGS8f8a-o5u-WTzC8eD9g,12657
+payi-0.1.0a53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+payi-0.1.0a53.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a53.dist-info/RECORD,,