payi 0.1.0a47__tar.gz → 0.1.0a49__tar.gz

payi-0.1.0a49/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.1.0-alpha.49"
+}

{payi-0.1.0a47 → payi-0.1.0a49}/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.1.0-alpha.49 (2025-02-10)
+
+Full Changelog: [v0.1.0-alpha.48...v0.1.0-alpha.49](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.48...v0.1.0-alpha.49)
+
+### Features
+
+* **api:** manual updates ([#227](https://github.com/Pay-i/pay-i-python/issues/227)) ([e32a7a1](https://github.com/Pay-i/pay-i-python/commit/e32a7a161132b2a0c85244db62a6bf3a37b37444))
+
+## 0.1.0-alpha.48 (2025-02-08)
+
+Full Changelog: [v0.1.0-alpha.47...v0.1.0-alpha.48](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.47...v0.1.0-alpha.48)
+
+### Chores
+
+* **internal:** fix type traversing dictionary params ([#223](https://github.com/Pay-i/pay-i-python/issues/223)) ([a68875f](https://github.com/Pay-i/pay-i-python/commit/a68875ff18bff2222b50567d2aeab5e3da1f2491))
+* **internal:** minor type handling changes ([#225](https://github.com/Pay-i/pay-i-python/issues/225)) ([d0085cf](https://github.com/Pay-i/pay-i-python/commit/d0085cf20ded356b6e00c4969bef62cd4fb68bc8))
+
 ## 0.1.0-alpha.47 (2025-02-08)
 
 Full Changelog: [v0.1.0-alpha.46...v0.1.0-alpha.47](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.46...v0.1.0-alpha.47)

{payi-0.1.0a47 → payi-0.1.0a49}/PKG-INFO

@@ -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 → payi-0.1.0a49}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.47"
+version = "0.1.0-alpha.49"
 description = "The official Python library for the payi API"
 dynamic = ["readme"]
 license = "Apache-2.0"

{payi-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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-0.1.0a47 → payi-0.1.0a49}/src/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 → payi-0.1.0a49}/tests/api_resources/test_ingest.py

@@ -105,6 +105,7 @@ class TestIngest:
                     "value": "value",
                 }
             ],
+            provider_response_id="provider_response_id",
             provider_response_json="string",
             provider_uri="provider_uri",
             time_to_first_token_ms=0,
@@ -235,6 +236,7 @@ class TestAsyncIngest:
                     "value": "value",
                 }
             ],
+            provider_response_id="provider_response_id",
             provider_response_json="string",
             provider_uri="provider_uri",
             time_to_first_token_ms=0,

{payi-0.1.0a47 → payi-0.1.0a49}/tests/test_transform.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import io
 import pathlib
-from typing import Any, List, Union, TypeVar, Iterable, Optional, cast
+from typing import Any, Dict, List, Union, TypeVar, Iterable, Optional, cast
 from datetime import date, datetime
 from typing_extensions import Required, Annotated, TypedDict
 
@@ -388,6 +388,15 @@ async def test_iterable_of_dictionaries(use_async: bool) -> None:
     }
 
 
+@parametrize
+@pytest.mark.asyncio
+async def test_dictionary_items(use_async: bool) -> None:
+    class DictItems(TypedDict):
+        foo_baz: Annotated[str, PropertyInfo(alias="fooBaz")]
+
+    assert await transform({"foo": {"foo_baz": "bar"}}, Dict[str, DictItems], use_async) == {"foo": {"fooBaz": "bar"}}
+
+
 class TypedDictIterableUnionStr(TypedDict):
     foo: Annotated[Union[str, Iterable[Baz8]], PropertyInfo(alias="FOO")]
 

payi-0.1.0a47/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.1.0-alpha.47"
-}

payi-0.1.0a47/src/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"