payi 0.1.0a46__py3-none-any.whl → 0.1.0a48__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.46"  # x-release-please-version
+__version__ = "0.1.0-alpha.48"  # x-release-please-version

payi/lib/helpers.py

@@ -1,14 +1,22 @@
-# Step 1: Define the new methods outside of the Payi class definition
 from typing import Dict, List, Union
 
 
+class PayiHeaderNames:
+    limit_ids:str  = "xProxy-Limit-IDs"
+    request_tags:str = "xProxy-Request-Tags"
+    experience_id:str = "xProxy-Experience-ID"
+    experience_name:str = "xProxy-Experience-Name"
+    user_id:str = "xProxy-User-ID"
+    route_as_resource:str = "xProxy-RouteAs-Resource"
+    provider_base_uri = "xProxy-Provider-BaseUri"
+
 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")
 
     valid_ids = [id.strip() for id in limit_ids if isinstance(id, str) and id.strip()]  # type: ignore
 
-    return {"xProxy-Limit-IDs": ",".join(valid_ids)} if valid_ids else {}
+    return { PayiHeaderNames.limit_ids: ",".join(valid_ids) } if valid_ids else {}
 
 
 def create_request_header_from_tags(request_tags: List[str]) -> Dict[str, str]:
@@ -17,7 +25,7 @@ def create_request_header_from_tags(request_tags: List[str]) -> Dict[str, str]:
 
     valid_tags = [tag.strip() for tag in request_tags if isinstance(tag, str) and tag.strip()]  # type: ignore
 
-    return {"xProxy-Request-Tags": ",".join(valid_tags)} if valid_tags else {}
+    return { PayiHeaderNames.request_tags: ",".join(valid_tags) } if valid_tags else {}
 
 
 def create_headers(
@@ -34,10 +42,10 @@ def create_headers(
     if request_tags:
         headers.update(create_request_header_from_tags(request_tags))
     if user_id:
-        headers.update({"xProxy-User-ID": user_id})
+        headers.update({ PayiHeaderNames.user_id: user_id})
     if experience_id:
-        headers.update({"xProxy-Experience-Id": experience_id})
+        headers.update({ PayiHeaderNames.experience_id: experience_id})
     if experience_name:
-        headers.update({"xProxy-Experience-Name": experience_name})
+        headers.update({ PayiHeaderNames.experience_name: experience_name})
 
     return headers

payi/lib/instrument.py

@@ -5,13 +5,14 @@ import inspect
 import logging
 import traceback
 from enum import Enum
-from typing import Any, Set, Union, Callable, Optional
+from typing import Any, Set, Union, Callable, Optional, TypedDict
 
 import nest_asyncio  # type: ignore
 from wrapt import ObjectProxy  # type: ignore
 
 from payi import Payi, AsyncPayi
 from payi.types import IngestUnitsParams
+from payi.lib.helpers import PayiHeaderNames
 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
@@ -20,6 +21,14 @@ from .Stopwatch import Stopwatch
 from .Instruments import Instruments
 
 
+class Context(TypedDict, total=False):
+    proxy: bool
+    experience_name: Optional[str]
+    experience_id: Optional[str]
+    limit_ids: Optional['list[str]']
+    request_tags: Optional['list[str]']
+    user_id: Optional[str]
+
 class IsStreaming(Enum):
     false = 0
     true = 1 
@@ -40,7 +49,7 @@ class PayiInstrumentor:
     ):
         self._payi: Optional[Payi] = payi
         self._apayi: Optional[AsyncPayi] = apayi
-        self._context_stack: list[dict[str, Any]] = []  # Stack of context dictionaries
+        self._context_stack: list[Context] = []  # Stack of context dictionaries
         self._log_prompt_and_response: bool = log_prompt_and_response
         self._prompt_and_response_logger: Optional[Callable[[str, dict[str, str]], None]] = prompt_and_response_logger
 
@@ -212,22 +221,23 @@ class PayiInstrumentor:
 
     def _setup_call_func(
         self
-        ) -> 'tuple[dict[str, Any], Optional[str], Optional[str]]':
+        ) -> 'tuple[Context, Optional[str], Optional[str]]':
+        context: Context = {}
+
         if len(self._context_stack) > 0:
             # copy current context into the upcoming context
             context = self._context_stack[-1].copy()
-            context.pop("proxy", None)
-            previous_experience_name = context["experience_name"]
-            previous_experience_id = context["experience_id"]
+            context.pop("proxy")
+            previous_experience_name = context.get("experience_name", None)
+            previous_experience_id = context.get("experience_id", None)
         else:
-            context = {}
             previous_experience_name = None
             previous_experience_id = None
         return (context, previous_experience_name, previous_experience_id)
 
     def _init_context(
         self,
-        context: "dict[str, Any]",
+        context: Context,
         previous_experience_name: Optional[str],
         previous_experience_id: Optional[str],
         proxy: bool,
@@ -329,12 +339,12 @@ class PayiInstrumentor:
         if self._context_stack:
             self._context_stack.pop()
 
-    def set_context(self, context: "dict[str, Any]") -> None:
+    def set_context(self, context: Context) -> None:
         # Update the current top of the stack with the provided context
         if self._context_stack:
             self._context_stack[-1].update(context)
 
-    def get_context(self) -> Optional["dict[str, Any]"]:
+    def get_context(self) -> Optional[Context]:
         # Return the current top of the stack
         return self._context_stack[-1] if self._context_stack else None
 
@@ -345,11 +355,11 @@ class PayiInstrumentor:
         ingest_extra_headers: "dict[str, str]", # do not coflict potential kwargs["extra_headers"]
         **kwargs: Any,
     ) -> None:
-        limit_ids = ingest_extra_headers.pop("xProxy-Limit-IDs", None)
-        request_tags = ingest_extra_headers.pop("xProxy-Request-Tags", None)
-        experience_name = ingest_extra_headers.pop("xProxy-Experience-Name", None)
-        experience_id = ingest_extra_headers.pop("xProxy-Experience-ID", None)
-        user_id = ingest_extra_headers.pop("xProxy-User-ID", None)
+        limit_ids = ingest_extra_headers.pop(PayiHeaderNames.limit_ids, None)
+        request_tags = ingest_extra_headers.pop(PayiHeaderNames.request_tags, None)
+        experience_name = ingest_extra_headers.pop(PayiHeaderNames.experience_name, None)
+        experience_id = ingest_extra_headers.pop(PayiHeaderNames.experience_id, None)
+        user_id = ingest_extra_headers.pop(PayiHeaderNames.user_id, None)
 
         if limit_ids:
             ingest["limit_ids"] = limit_ids.split(",")
@@ -414,7 +424,7 @@ class PayiInstrumentor:
             from .OpenAIInstrumentor import OpenAiInstrumentor # noqa: I001
 
             if OpenAiInstrumentor.is_azure(instance):
-                resource = extra_headers.pop("xProxy-RouteAs-Resource", None)
+                resource = extra_headers.pop(PayiHeaderNames.route_as_resource, None)
                 if not resource:
                     logging.error("Azure OpenAI route as resource not found, not ingesting")
                     return await wrapped(*args, **kwargs)
@@ -532,7 +542,7 @@ class PayiInstrumentor:
         if category == "system.openai" and instance and hasattr(instance, "_client"):
             from .OpenAIInstrumentor import OpenAiInstrumentor
             if OpenAiInstrumentor.is_azure(instance):
-                resource = extra_headers.pop("xProxy-RouteAs-Resource", None)
+                resource = extra_headers.pop(PayiHeaderNames.route_as_resource, None)
                 if not resource:
                     logging.error("Azure OpenAI route as resource not found, not ingesting")
                     return wrapped(*args, **kwargs)
@@ -614,7 +624,7 @@ class PayiInstrumentor:
 
     @staticmethod
     def _update_headers(
-        context: "dict[str, Any]",
+        context: Context,
         extra_headers: "dict[str, str]",
     ) -> None:
         limit_ids: Optional[list[str]] = context.get("limit_ids")
@@ -625,38 +635,48 @@ class PayiInstrumentor:
 
         # Merge limits from the decorator and extra headers
         if limit_ids is not None:
-            existing_limit_ids = extra_headers.get("xProxy-Limit-IDs", None)
+            existing_limit_ids = extra_headers.get(PayiHeaderNames.limit_ids, None)
             
             if not existing_limit_ids:
-                extra_headers["xProxy-Limit-IDs"] = ",".join(limit_ids)
+                extra_headers[PayiHeaderNames.limit_ids] = ",".join(limit_ids)
             else:
                 existing_ids = existing_limit_ids.split(',')
                 combined_ids = list(set(existing_ids + limit_ids))
-                extra_headers["xProxy-Limit-IDs"] = ",".join(combined_ids)
+                extra_headers[PayiHeaderNames.limit_ids] = ",".join(combined_ids)
 
         # Merge request from the decorator and extra headers
         if request_tags is not None:
-            existing_request_tags = extra_headers.get("xProxy-Request-Tags", None)
+            existing_request_tags = extra_headers.get(PayiHeaderNames.request_tags, None)
 
             if not existing_request_tags:
-                extra_headers["xProxy-Request-Tags"] = ",".join(request_tags)
+                extra_headers[PayiHeaderNames.request_tags] = ",".join(request_tags)
             else:
                 existing_tags = existing_request_tags.split(',')
                 combined_tags = list(set(existing_tags + request_tags))
-                extra_headers["xProxy-Request-Tags"] = ",".join(combined_tags)
+                extra_headers[PayiHeaderNames.request_tags] = ",".join(combined_tags)
 
         # inner extra_headers user_id takes precedence over outer decorator user_id
-        if user_id is not None and extra_headers.get("xProxy-User-ID", None) is None:
-            extra_headers["xProxy-User-ID"] = user_id   
+        if user_id is not None and extra_headers.get(PayiHeaderNames.user_id, None) is None:
+            extra_headers[PayiHeaderNames.user_id] = user_id   
 
         # inner extra_headers experience_name and experience_id take precedence over outer decorator experience_name and experience_id
         # if either inner value is specified, ignore outer decorator values
-        if extra_headers.get("xProxy-Experience-Name", None) is None and extra_headers.get("xProxy-Experience-ID", None) is None:
-            if experience_name is not None:
-                extra_headers["xProxy-Experience-Name"] = experience_name
+        if PayiHeaderNames.experience_name not in extra_headers and PayiHeaderNames.experience_id not in extra_headers:
 
+            # use both decorator values
+            if experience_name is not None:
+                extra_headers[PayiHeaderNames.experience_name] = experience_name
             if experience_id is not None:
-                extra_headers["xProxy-Experience-ID"] = experience_id
+                extra_headers[PayiHeaderNames.experience_id] = experience_id
+        
+        elif PayiHeaderNames.experience_id in extra_headers and PayiHeaderNames.experience_name not in extra_headers:
+            # use the decorator experience name and the inner experience id
+            if experience_name is not None:
+                extra_headers[PayiHeaderNames.experience_name] = experience_name
+        
+        else:
+            # use the inner experience name and id as-is
+            ...
 
     @staticmethod
     def update_for_vision(input: int, units: 'dict[str, Units]') -> int:

{payi-0.1.0a46.dist-info → payi-0.1.0a48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a46
+Version: 0.1.0a48
 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.0a46.dist-info → payi-0.1.0a48.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=ml75PCr3anMJW3fkTojqOUY2T3iVxRGV0E2gWIEhotQ,165
+payi/_version.py,sha256=GtYbN-yExify_mgm02kxxAg7YrHlP8HnvMwXvPXKAn4,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,7 +19,7 @@ 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
@@ -28,8 +28,8 @@ payi/lib/BedrockInstrumentor.py,sha256=B5deT8TcUvOsRdIewbbHtsxTS7_oHJ05ZUIdFziWf
 payi/lib/Instruments.py,sha256=bapmVS9jbHtFknXCKDzsFFWvf5XLtzEpdlvI7iEWY-o,147
 payi/lib/OpenAIInstrumentor.py,sha256=rxu5wOUBZaGwFjUoUhk5UDeTcYSmmO6BVgnXL4yYb08,6613
 payi/lib/Stopwatch.py,sha256=7OJlxvr2Jyb6Zr1LYCYKczRB7rDVKkIR7gc4YoleNdE,764
-payi/lib/helpers.py,sha256=ZgkY8UE2YRc7ok2Pmxg_T9UMqKI8D8542JY3CP8RZCM,1597
-payi/lib/instrument.py,sha256=rQCBCyFicTtOjuASwTtCEGvDoffUUgYQoYcuiSlVUlk,35356
+payi/lib/helpers.py,sha256=RRJ0esC8T-b6n9Bc_WbUHMlucdv_ARhiV3oiAAUg-KU,1915
+payi/lib/instrument.py,sha256=HgKyy7nAWf0X66VuBJtc87J5eokGjnGcm-Hq0IOmgzA,36185
 payi/resources/__init__.py,sha256=isHGXSl9kOrZDduKrX3UenTwrdTpuKJVBjw6NYSBV20,3592
 payi/resources/billing_models.py,sha256=5w3RfGXtGlyq5vbTw6hQrx1UlzRBtlq8ArcFlf5e3TY,20152
 payi/resources/ingest.py,sha256=xdVD0fHGkVpsgqxNTkly_X7UdLyWLNb9_uU8tzWB5Jc,18430
@@ -113,7 +113,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.0a46.dist-info/METADATA,sha256=4jSFupUbO3KTCTYi_UCy_-lvzGZ3hGi57g-J57Wi_1E,12660
-payi-0.1.0a46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-payi-0.1.0a46.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a46.dist-info/RECORD,,
+payi-0.1.0a48.dist-info/METADATA,sha256=gjbFkoar2_1p61b6hr0bDBVmtEHaaNKdw5LGrqLwLiE,12660
+payi-0.1.0a48.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+payi-0.1.0a48.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a48.dist-info/RECORD,,