payi 0.1.0a47__py3-none-any.whl → 0.1.0a49__py3-none-any.whl

payi/_models.py

@@ -426,10 +426,16 @@ def construct_type(*, value: object, type_: object) -> object:
 
     If the given value does not match the expected type then it is returned as-is.
     """
+
+    # store a reference to the original type we were given before we extract any inner
+    # types so that we can properly resolve forward references in `TypeAliasType` annotations
+    original_type = None
+
     # we allow `object` as the input type because otherwise, passing things like
     # `Literal['value']` will be reported as a type error by type checkers
     type_ = cast("type[object]", type_)
     if is_type_alias_type(type_):
+        original_type = type_  # type: ignore[unreachable]
         type_ = type_.__value__  # type: ignore[unreachable]
 
     # unwrap `Annotated[T, ...]` -> `T`
@@ -446,7 +452,7 @@ def construct_type(*, value: object, type_: object) -> object:
 
     if is_union(origin):
         try:
-            return validate_type(type_=cast("type[object]", type_), value=value)
+            return validate_type(type_=cast("type[object]", original_type or type_), value=value)
         except Exception:
             pass
 

payi/_utils/_transform.py

@@ -25,7 +25,7 @@ from ._typing import (
     is_annotated_type,
     strip_annotated_type,
 )
-from .._compat import model_dump, is_typeddict
+from .._compat import get_origin, model_dump, is_typeddict
 
 _T = TypeVar("_T")
 
@@ -164,9 +164,14 @@ def _transform_recursive(
         inner_type = annotation
 
     stripped_type = strip_annotated_type(inner_type)
+    origin = get_origin(stripped_type) or stripped_type
     if is_typeddict(stripped_type) and is_mapping(data):
         return _transform_typeddict(data, stripped_type)
 
+    if origin == dict and is_mapping(data):
+        items_type = get_args(stripped_type)[1]
+        return {key: _transform_recursive(value, annotation=items_type) for key, value in data.items()}
+
     if (
         # List[T]
         (is_list_type(stripped_type) and is_list(data))
@@ -307,9 +312,14 @@ async def _async_transform_recursive(
         inner_type = annotation
 
     stripped_type = strip_annotated_type(inner_type)
+    origin = get_origin(stripped_type) or stripped_type
     if is_typeddict(stripped_type) and is_mapping(data):
         return await _async_transform_typeddict(data, stripped_type)
 
+    if origin == dict and is_mapping(data):
+        items_type = get_args(stripped_type)[1]
+        return {key: _transform_recursive(value, annotation=items_type) for key, value in data.items()}
+
     if (
         # List[T]
         (is_list_type(stripped_type) and is_list(data))

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

payi/lib/AnthropicInstrumentor.py

@@ -88,6 +88,8 @@ async def achat_wrapper(
 
 def process_chunk(chunk: Any, ingest: IngestUnitsParams) -> None:
     if chunk.type == "message_start":
+        ingest["provider_response_id"] = chunk.message.id
+
         usage = chunk.message.usage
         units = ingest["units"]
 
@@ -128,7 +130,9 @@ def process_synchronous_response(response: Any, ingest: IngestUnitsParams, log_p
 
     if log_prompt_and_response:
         ingest["provider_response_json"] = response.to_json()
-
+    
+    ingest["provider_response_id"] = response.id
+    
     return None
 
 def has_image_and_get_texts(encoding: tiktoken.Encoding, content: Union[str, 'list[Any]']) -> 'tuple[bool, int]':

payi/lib/BedrockInstrumentor.py

@@ -220,9 +220,9 @@ def process_synchronous_invoke_response(
 
     metadata = response.get("ResponseMetadata", {})
 
-    # request_id = metadata.get("RequestId", "")
-    # if request_id:
-    #     ingest["provider_request_id"] = request_id
+    request_id = metadata.get("RequestId", "")
+    if request_id:
+        ingest["provider_response_id"] = request_id
 
     response_headers = metadata.get("HTTPHeaders", {}).copy()
     if response_headers:
@@ -263,9 +263,9 @@ def process_synchronous_converse_response(
 
     metadata = response.get("ResponseMetadata", {})
 
-    # request_id = metadata.get("RequestId", "")
-    # if request_id:
-    #     ingest["provider_request_id"] = request_id
+    request_id = metadata.get("RequestId", "")
+    if request_id:
+        ingest["provider_response_id"] = request_id
 
     response_headers = metadata.get("HTTPHeaders", {})
     if response_headers:

payi/lib/OpenAIInstrumentor.py

@@ -144,10 +144,19 @@ def process_chat_synchronous_response(response: str, ingest: IngestUnitsParams,
     if log_prompt_and_response:
         ingest["provider_response_json"] = [json.dumps(response_dict)]
 
+    if "id" in response_dict:
+        ingest["provider_response_id"] = response_dict["id"]
+
     return None
 
 def process_chat_chunk(chunk: Any, ingest: IngestUnitsParams) -> None:
     model = model_to_dict(chunk)
+    
+    if "provider_response_id" not in ingest:
+        response_id = model.get("id", None)
+        if response_id:
+            ingest["provider_response_id"] = response_id
+
     usage = model.get("usage")
     if usage:
         add_usage_units(usage, ingest["units"])

payi/lib/helpers.py

@@ -1,5 +1,7 @@
+from enum import Enum
 from typing import Dict, List, Union
 
+PAYI_BASE_URL = "https://api.pay-i.com"
 
 class PayiHeaderNames:
     limit_ids:str  = "xProxy-Limit-IDs"
@@ -10,6 +12,12 @@ class PayiHeaderNames:
     route_as_resource:str = "xProxy-RouteAs-Resource"
     provider_base_uri = "xProxy-Provider-BaseUri"
 
+class PayiCategories(Enum):
+    anthropic = "system.anthropic"
+    openai = "system.openai"
+    azure_openai = "system.azureopenai"
+    aws_bedrock = "system.aws.bedrock"
+
 def create_limit_header_from_ids(limit_ids: List[str]) -> Dict[str, str]:
     if not isinstance(limit_ids, list):  # type: ignore
         raise TypeError("limit_ids must be a list")
@@ -49,3 +57,23 @@ def create_headers(
         headers.update({ PayiHeaderNames.experience_name: experience_name})
 
     return headers
+
+def payi_anthropic_url(payi_base_url: Union[str, None] = None) -> str:
+    if payi_base_url is None:
+        payi_base_url = PAYI_BASE_URL
+    return payi_base_url + "/api/v1/proxy/anthropic"
+
+def payi_openai_url(payi_base_url: Union[str, None] = None) -> str:
+    if payi_base_url is None:
+        payi_base_url = PAYI_BASE_URL
+    return payi_base_url +  "/api/v1/proxy/openai/v1"
+
+def payi_azure_openai_url(payi_base_url: Union[str, None] = None) -> str:
+    if payi_base_url is None:
+        payi_base_url = PAYI_BASE_URL
+    return payi_base_url + "/api/v1/proxy/azure.openai"
+
+def payi_aws_bedrock_url(payi_base_url: Union[str, None] = None) -> str:
+    if payi_base_url is None:
+        payi_base_url = PAYI_BASE_URL
+    return payi_base_url + "/api/v1/proxy/aws.bedrock"

payi/lib/instrument.py

@@ -17,8 +17,8 @@ from payi.types.ingest_response import IngestResponse
 from payi.types.ingest_units_params import Units
 from payi.types.pay_i_common_models_api_router_header_info_param import PayICommonModelsAPIRouterHeaderInfoParam
 
+from .helpers import PayiCategories
 from .Stopwatch import Stopwatch
-from .Instruments import Instruments
 
 
 class Context(TypedDict, total=False):
@@ -41,7 +41,7 @@ class PayiInstrumentor:
         self,
         payi: Optional[Payi],
         apayi: Optional[AsyncPayi],
-        instruments: Union[Set[Instruments], None] = None,
+        instruments: Union[Set[PayiCategories], 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 or Instruments.ALL in instruments:
+        if instruments is None:
             self._instrument_all()
         else:
             self._instrument_specific(instruments)
@@ -66,12 +66,12 @@ class PayiInstrumentor:
         self._instrument_anthropic()
         self._instrument_aws_bedrock()
 
-    def _instrument_specific(self, instruments: Set[Instruments]) -> None:
-        if Instruments.OPENAI in instruments:
+    def _instrument_specific(self, instruments: Set[PayiCategories]) -> None:
+        if PayiCategories.openai in instruments or PayiCategories.azure_openai in instruments:
             self._instrument_openai()
-        if Instruments.ANTHROPIC in instruments:
+        if PayiCategories.anthropic in instruments:
             self._instrument_anthropic()
-        if Instruments.AWS_BEDROCK in instruments:
+        if PayiCategories.aws_bedrock in instruments:
             self._instrument_aws_bedrock()
 
     def _instrument_openai(self) -> None:
@@ -736,7 +736,9 @@ class ChatStreamWrapper(ObjectProxy):  # type: ignore
 
         bedrock_from_stream: bool = False
         if is_bedrock:
+            ingest["provider_response_id"] = response["ResponseMetadata"]["RequestId"]
             stream = response.get("stream", None)
+
             if stream:
                 response = stream
                 bedrock_from_stream = True
@@ -862,7 +864,7 @@ _instrumentor: Optional[PayiInstrumentor] = None
 
 def payi_instrument(
     payi: Optional[Union[Payi, AsyncPayi, 'list[Union[Payi, AsyncPayi]]']] = None,
-    instruments: Optional[Set[Instruments]] = None,
+    instruments: Optional[Set[PayiCategories]] = None,
     log_prompt_and_response: bool = True,
     prompt_and_response_logger: Optional[Callable[[str, "dict[str, str]"], None]] = None,
 ) -> None:

payi/resources/ingest.py

@@ -97,6 +97,7 @@ class IngestResource(SyncAPIResource):
         provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
         provider_request_json: Optional[str] | NotGiven = NOT_GIVEN,
         provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
+        provider_response_id: Optional[str] | NotGiven = NOT_GIVEN,
         provider_response_json: Union[str, List[str], None] | NotGiven = NOT_GIVEN,
         provider_uri: Optional[str] | NotGiven = NOT_GIVEN,
         time_to_first_token_ms: Optional[int] | NotGiven = NOT_GIVEN,
@@ -201,6 +202,7 @@ class IngestResource(SyncAPIResource):
                     "provider_request_headers": provider_request_headers,
                     "provider_request_json": provider_request_json,
                     "provider_response_headers": provider_response_headers,
+                    "provider_response_id": provider_response_id,
                     "provider_response_json": provider_response_json,
                     "provider_uri": provider_uri,
                     "time_to_first_token_ms": time_to_first_token_ms,
@@ -280,6 +282,7 @@ class AsyncIngestResource(AsyncAPIResource):
         provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
         provider_request_json: Optional[str] | NotGiven = NOT_GIVEN,
         provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
+        provider_response_id: Optional[str] | NotGiven = NOT_GIVEN,
         provider_response_json: Union[str, List[str], None] | NotGiven = NOT_GIVEN,
         provider_uri: Optional[str] | NotGiven = NOT_GIVEN,
         time_to_first_token_ms: Optional[int] | NotGiven = NOT_GIVEN,
@@ -383,6 +386,7 @@ class AsyncIngestResource(AsyncAPIResource):
                     "provider_request_headers": provider_request_headers,
                     "provider_request_json": provider_request_json,
                     "provider_response_headers": provider_response_headers,
+                    "provider_response_id": provider_response_id,
                     "provider_response_json": provider_response_json,
                     "provider_uri": provider_uri,
                     "time_to_first_token_ms": time_to_first_token_ms,

payi/types/ingest_event_param.py

@@ -49,6 +49,8 @@ class IngestEventParam(TypedDict, total=False):
 
     provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]]
 
+    provider_response_id: Optional[str]
+
     provider_response_json: Union[str, List[str], None]
 
     provider_uri: Optional[str]

payi/types/ingest_units_params.py

@@ -35,6 +35,8 @@ class IngestUnitsParams(TypedDict, total=False):
 
     provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]]
 
+    provider_response_id: Optional[str]
+
     provider_response_json: Union[str, List[str], None]
 
     provider_uri: Optional[str]

{payi-0.1.0a47.dist-info → payi-0.1.0a49.dist-info}/METADATA

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

@@ -5,13 +5,13 @@ payi/_compat.py,sha256=VWemUKbj6DDkQ-O4baSpHVLJafotzeXmCQGJugfVTIw,6580
 payi/_constants.py,sha256=S14PFzyN9-I31wiV7SmIlL5Ga0MLHxdvegInGdXH7tM,462
 payi/_exceptions.py,sha256=ItygKNrNXIVY0H6LsGVZvFuAHB3Vtm_VZXmWzCnpHy0,3216
 payi/_files.py,sha256=mf4dOgL4b0ryyZlbqLhggD3GVgDf6XxdGFAgce01ugE,3549
-payi/_models.py,sha256=uZvPAaaeDwCYwvB-yq7nxZnZ70I2Na_KjSAqaPQWfh0,28659
+payi/_models.py,sha256=PDLSNsn3Umxm3UMZPgyBiyN308rRzzPX6F9NO9FU2vs,28943
 payi/_qs.py,sha256=AOkSz4rHtK4YI3ZU_kzea-zpwBUgEY8WniGmTPyEimc,4846
 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=N00y7kbKrJJbJK9vgyPPQGaIBsqFwinsS7Hu5oSU3j4,165
+payi/_version.py,sha256=rmhSv-iqFMLwhHLJFziU4UexjO1cgGNYoRU7D4BYZBc,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
@@ -19,20 +19,19 @@ payi/_utils/_proxy.py,sha256=z3zsateHtb0EARTWKk8QZNHfPkqJbqwd1lM993LBwGE,1902
 payi/_utils/_reflection.py,sha256=ZmGkIgT_PuwedyNBrrKGbxoWtkpytJNU1uU4QHnmEMU,1364
 payi/_utils/_streams.py,sha256=SMC90diFFecpEg_zgDRVbdR3hSEIgVVij4taD-noMLM,289
 payi/_utils/_sync.py,sha256=jJl-iCEaZZUAkq4IUtzN1-aMsKTUFaNoNbeYnnpQjIQ,2438
-payi/_utils/_transform.py,sha256=Dkkyr7OveGmOolepcvXmVJWE3kqim4b0nM0h7yWbgeY,13468
+payi/_utils/_transform.py,sha256=tsSFOIZ7iczaUsMSGBD_iSFOOdUyT2xtkcq1xyF0L9o,13986
 payi/_utils/_typing.py,sha256=nTJz0jcrQbEgxwy4TtAkNxuU0QHHlmc6mQtA6vIR8tg,4501
 payi/_utils/_utils.py,sha256=8UmbPOy_AAr2uUjjFui-VZSrVBHRj6bfNEKRp5YZP2A,12004
 payi/lib/.keep,sha256=wuNrz-5SXo3jJaJOJgz4vFHM41YH_g20F5cRQo0vLes,224
-payi/lib/AnthropicInstrumentor.py,sha256=1dJTFs5WfPxbIjWcYV2tP3kiYc4g3WyyyR4XWQ-WI_g,5300
-payi/lib/BedrockInstrumentor.py,sha256=B5deT8TcUvOsRdIewbbHtsxTS7_oHJ05ZUIdFziWf8E,10082
-payi/lib/Instruments.py,sha256=bapmVS9jbHtFknXCKDzsFFWvf5XLtzEpdlvI7iEWY-o,147
-payi/lib/OpenAIInstrumentor.py,sha256=rxu5wOUBZaGwFjUoUhk5UDeTcYSmmO6BVgnXL4yYb08,6613
+payi/lib/AnthropicInstrumentor.py,sha256=h-yebG7r7cSRVM_utva55Gc4BVcoW6WGrQrDg55mZQ0,5417
+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=RRJ0esC8T-b6n9Bc_WbUHMlucdv_ARhiV3oiAAUg-KU,1915
-payi/lib/instrument.py,sha256=HgKyy7nAWf0X66VuBJtc87J5eokGjnGcm-Hq0IOmgzA,36185
+payi/lib/helpers.py,sha256=fcT6gAHUP77YaLmgw9HWdIyTDJPI72weUsUVDGW0CbE,2929
+payi/lib/instrument.py,sha256=oJdF1ocd-wbQgNF9MIZWAaGDInzbu4TRy9946GVRuvI,36302
 payi/resources/__init__.py,sha256=isHGXSl9kOrZDduKrX3UenTwrdTpuKJVBjw6NYSBV20,3592
 payi/resources/billing_models.py,sha256=5w3RfGXtGlyq5vbTw6hQrx1UlzRBtlq8ArcFlf5e3TY,20152
-payi/resources/ingest.py,sha256=xdVD0fHGkVpsgqxNTkly_X7UdLyWLNb9_uU8tzWB5Jc,18430
+payi/resources/ingest.py,sha256=Ti-wnHj_A0_h3LxybPIahmxfsBTPG60ndnyCJZRJybo,18698
 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
@@ -67,9 +66,9 @@ payi/types/cost_details.py,sha256=w9p79opEG3kcsjkRRP7niaMcUswdfB4Y7HCkVTcQ1zQ,30
 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_event_param.py,sha256=wA9YuiQceNL3veHO_rVuKZg9o-EB1WLoz0aaF6Wcm-k,1498
+payi/types/ingest_event_param.py,sha256=IoOQuEEafJtWmXWsBbRCMbt16PXQR_nscnEEIRsEC1s,1539
 payi/types/ingest_response.py,sha256=KZfsgUhC942QkkjDFMqjJwCRoO2vkXv-Sx3X_xjijfg,1449
-payi/types/ingest_units_params.py,sha256=0s_j6268ZmeXDw9lQ_HKLldA_EvNyPcOxM6kFxLwxkA,1749
+payi/types/ingest_units_params.py,sha256=bPEo-bTlTrboi24gAlxw7jTBeB1ZoLI59ZgcuwDq_bg,1790
 payi/types/limit_create_params.py,sha256=Av8oMCxlKH7VB2MtYN5-25rAjqDDTPHjsXIQ2xubmck,549
 payi/types/limit_history_response.py,sha256=sCx2qKBiHU9X2KrYWV8NZiarYMGurof5GF4QobR2-EU,787
 payi/types/limit_list_params.py,sha256=iWM67oL53y2IZ7D3Gyy8mdYv-B7vF-rbmRFn7SBUnJk,364
@@ -113,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.0a47.dist-info/METADATA,sha256=gu1S-z1vRWWMofHT6Qfg2--vi-h5R8aD8g7eAox4-2Y,12660
-payi-0.1.0a47.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-payi-0.1.0a47.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a47.dist-info/RECORD,,
+payi-0.1.0a49.dist-info/METADATA,sha256=e8-FDTdXNFG7JPg5LR1eCGn3h-uaeiHKF-UwNKQJEHM,12660
+payi-0.1.0a49.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+payi-0.1.0a49.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a49.dist-info/RECORD,,

payi/lib/Instruments.py

@@ -1,8 +0,0 @@
-from enum import Enum
-
-
-class Instruments(Enum):
-    ALL = "all"
-    OPENAI = "openai"
-    ANTHROPIC = "anthropic"
-    AWS_BEDROCK = "aws.bedrock"