payi 0.1.0a96__tar.gz → 0.1.0a98__tar.gz

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

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

{payi-0.1.0a96 → payi-0.1.0a98}/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.1.0-alpha.98 (2025-07-11)
+
+Full Changelog: [v0.1.0-alpha.97...v0.1.0-alpha.98](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.97...v0.1.0-alpha.98)
+
+### Features
+
+* instrument provider module version ([9bc9596](https://github.com/Pay-i/pay-i-python/commit/9bc9596edb103b187dc468b9592d5e8a0c5f38f3))
+
+
+### Bug Fixes
+
+* **parsing:** correctly handle nested discriminated unions ([38be788](https://github.com/Pay-i/pay-i-python/commit/38be7889bf028750274f66a584e229a9578033eb))
+
+
+### Chores
+
+* **internal:** bump pinned h11 dep ([9a1ef2e](https://github.com/Pay-i/pay-i-python/commit/9a1ef2efb18e5bd7e2e66a8176feefdc1c22ea22))
+* **package:** mark python 3.13 as supported ([5ab6ac5](https://github.com/Pay-i/pay-i-python/commit/5ab6ac561585ffdc8ff1d07b06d873e0ef99a1ea))
+* **readme:** fix version rendering on pypi ([3f91efc](https://github.com/Pay-i/pay-i-python/commit/3f91efc050e6ffcf97617f2b727c2f68fd83d91f))
+
+## 0.1.0-alpha.97 (2025-07-08)
+
+Full Changelog: [v0.1.0-alpha.96...v0.1.0-alpha.97](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.96...v0.1.0-alpha.97)
+
 ## 0.1.0-alpha.96 (2025-07-07)
 
 Full Changelog: [v0.1.0-alpha.95...v0.1.0-alpha.96](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.95...v0.1.0-alpha.96)

{payi-0.1.0a96 → payi-0.1.0a98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: payi
-Version: 0.1.0a96
+Version: 0.1.0a98
 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
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
@@ -37,7 +38,8 @@ Description-Content-Type: text/markdown
 
 # Payi Python API library
 
-[![PyPI version](https://github.com/Pay-i/pay-i-python/tree/main/<https://img.shields.io/pypi/v/payi.svg?label=pypi%20(stable)>)](https://pypi.org/project/payi/)
+<!-- prettier-ignore -->
+[![PyPI version](https://img.shields.io/pypi/v/payi.svg?label=pypi%20(stable))](https://pypi.org/project/payi/)
 
 The Payi Python library provides convenient access to the Payi REST API from any Python 3.8+
 application. The library includes type definitions for all request params and response fields,

{payi-0.1.0a96 → payi-0.1.0a98}/README.md

@@ -1,6 +1,7 @@
 # Payi Python API library
 
-[![PyPI version](<https://img.shields.io/pypi/v/payi.svg?label=pypi%20(stable)>)](https://pypi.org/project/payi/)
+<!-- prettier-ignore -->
+[![PyPI version](https://img.shields.io/pypi/v/payi.svg?label=pypi%20(stable))](https://pypi.org/project/payi/)
 
 The Payi Python library provides convenient access to the Payi REST API from any Python 3.8+
 application. The library includes type definitions for all request params and response fields,

{payi-0.1.0a96 → payi-0.1.0a98}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.96"
+version = "0.1.0-alpha.98"
 description = "The official Python library for the payi API"
 dynamic = ["readme"]
 license = "Apache-2.0"
@@ -27,6 +27,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Operating System :: OS Independent",
   "Operating System :: POSIX",
   "Operating System :: MacOS",

{payi-0.1.0a96 → payi-0.1.0a98}/requirements-dev.lock

@@ -51,9 +51,9 @@ filelock==3.12.4
 frozenlist==1.6.2
     # via aiohttp
     # via aiosignal
-h11==0.14.0
+h11==0.16.0
     # via httpcore
-httpcore==1.0.2
+httpcore==1.0.9
     # via httpx
 httpx==0.28.1
     # via httpx-aiohttp

{payi-0.1.0a96 → payi-0.1.0a98}/requirements.lock

@@ -39,9 +39,9 @@ exceptiongroup==1.2.2
 frozenlist==1.6.2
     # via aiohttp
     # via aiosignal
-h11==0.14.0
+h11==0.16.0
     # via httpcore
-httpcore==1.0.2
+httpcore==1.0.9
     # via httpx
 httpx==0.28.1
     # via httpx-aiohttp

{payi-0.1.0a96 → payi-0.1.0a98}/src/payi/_models.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 import os
 import inspect
-from typing import TYPE_CHECKING, Any, Type, Union, Generic, TypeVar, Callable, cast
+from typing import TYPE_CHECKING, Any, Type, Union, Generic, TypeVar, Callable, Optional, cast
 from datetime import date, datetime
 from typing_extensions import (
+    List,
     Unpack,
     Literal,
     ClassVar,
@@ -366,7 +367,7 @@ def _construct_field(value: object, field: FieldInfo, key: str) -> object:
     if type_ is None:
         raise RuntimeError(f"Unexpected field type is None for {key}")
 
-    return construct_type(value=value, type_=type_)
+    return construct_type(value=value, type_=type_, metadata=getattr(field, "metadata", None))
 
 
 def is_basemodel(type_: type) -> bool:
@@ -420,7 +421,7 @@ def construct_type_unchecked(*, value: object, type_: type[_T]) -> _T:
     return cast(_T, construct_type(value=value, type_=type_))
 
 
-def construct_type(*, value: object, type_: object) -> object:
+def construct_type(*, value: object, type_: object, metadata: Optional[List[Any]] = None) -> object:
     """Loose coercion to the expected type with construction of nested values.
 
     If the given value does not match the expected type then it is returned as-is.
@@ -438,8 +439,10 @@ def construct_type(*, value: object, type_: object) -> object:
         type_ = type_.__value__  # type: ignore[unreachable]
 
     # unwrap `Annotated[T, ...]` -> `T`
-    if is_annotated_type(type_):
-        meta: tuple[Any, ...] = get_args(type_)[1:]
+    if metadata is not None:
+        meta: tuple[Any, ...] = tuple(metadata)
+    elif is_annotated_type(type_):
+        meta = get_args(type_)[1:]
         type_ = extract_type_arg(type_, 0)
     else:
         meta = tuple()

{payi-0.1.0a96 → payi-0.1.0a98}/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.96"  # x-release-please-version
+__version__ = "0.1.0-alpha.98"  # x-release-please-version

{payi-0.1.0a96 → payi-0.1.0a98}/src/payi/lib/AnthropicInstrumentor.py

@@ -9,9 +9,13 @@ from payi.lib.helpers import PayiCategories
 from payi.types.ingest_units_params import Units
 
 from .instrument import _ChunkResult, _IsStreaming, _StreamingType, _ProviderRequest, _PayiInstrumentor
+from .version_helper import get_version_helper
 
 
 class AnthropicInstrumentor:
+    _module_name: str = "anthropic"
+    _module_version: str = ""
+
     @staticmethod
     def is_vertex(instance: Any) -> bool:
         from anthropic import AnthropicVertex, AsyncAnthropicVertex  # type: ignore # noqa: I001
@@ -27,7 +31,7 @@ class AnthropicInstrumentor:
     @staticmethod
     def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
-            import anthropic  # type: ignore #  noqa: F401  I001
+            AnthropicInstrumentor._module_version = get_version_helper(AnthropicInstrumentor._module_name)
 
             wrap_function_wrapper(
                 "anthropic.resources.messages",
@@ -149,6 +153,8 @@ class _AnthropicProviderRequest(_ProviderRequest):
             instrumentor=instrumentor,
             category=category,
             streaming_type=streaming_type,
+            module_name=AnthropicInstrumentor._module_name,
+            module_version=AnthropicInstrumentor._module_version,
             )
 
     @override

{payi-0.1.0a96 → payi-0.1.0a98}/src/payi/lib/BedrockInstrumentor.py

@@ -11,15 +11,21 @@ from payi.types.ingest_units_params import Units
 from payi.types.pay_i_common_models_api_router_header_info_param import PayICommonModelsAPIRouterHeaderInfoParam
 
 from .instrument import _ChunkResult, _IsStreaming, _StreamingType, _ProviderRequest, _PayiInstrumentor
+from .version_helper import get_version_helper
 
 
 class BedrockInstrumentor:
+    _module_name: str = "boto3"
+    _module_version: str = ""
+
     _instrumentor: _PayiInstrumentor
 
     @staticmethod
     def instrument(instrumentor: _PayiInstrumentor) -> None:
         BedrockInstrumentor._instrumentor = instrumentor
 
+        BedrockInstrumentor._module_version = get_version_helper(BedrockInstrumentor._module_name)
+
         try:
             wrap_function_wrapper(
                 "botocore.client",
@@ -234,6 +240,8 @@ class _BedrockProviderRequest(_ProviderRequest):
             instrumentor=instrumentor,
             category=PayiCategories.aws_bedrock,
             streaming_type=_StreamingType.iterator,
+            module_name=BedrockInstrumentor._module_name,
+            module_version=BedrockInstrumentor._module_version,
             is_aws_client=True,
             )
 

{payi-0.1.0a96 → payi-0.1.0a98}/src/payi/lib/GoogleGenAiInstrumentor.py

@@ -5,12 +5,18 @@ from wrapt import wrap_function_wrapper  # type: ignore
 
 from .instrument import _ChunkResult, _IsStreaming, _PayiInstrumentor
 from .VertexRequest import _VertexRequest
+from .version_helper import get_version_helper
 
 
 class GoogleGenAiInstrumentor:
+    _module_name: str = "google-genai"
+    _module_version: str = ""
+
     @staticmethod
     def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
+            GoogleGenAiInstrumentor._module_version = get_version_helper(GoogleGenAiInstrumentor._module_name)
+
             wrap_function_wrapper(
                 "google.genai.models",
                 "Models.generate_content",
@@ -115,6 +121,8 @@ class _GoogleGenAiRequest(_VertexRequest):
     def __init__(self, instrumentor: _PayiInstrumentor):
         super().__init__(
             instrumentor=instrumentor,
+            module_name=GoogleGenAiInstrumentor._module_name,
+            module_version=GoogleGenAiInstrumentor._module_version,
             )
         self._prompt_character_count = 0
         self._candidates_character_count = 0

{payi-0.1.0a96 → payi-0.1.0a98}/src/payi/lib/OpenAIInstrumentor.py

@@ -10,9 +10,13 @@ from payi.lib.helpers import PayiCategories, PayiHeaderNames
 from payi.types.ingest_units_params import Units
 
 from .instrument import _ChunkResult, _IsStreaming, _StreamingType, _ProviderRequest, _PayiInstrumentor
+from .version_helper import get_version_helper
 
 
 class OpenAiInstrumentor:
+    _module_name: str = "openai"
+    _module_version: str = ""
+
     @staticmethod
     def is_azure(instance: Any) -> bool:
         from openai import AzureOpenAI, AsyncAzureOpenAI # type: ignore # noqa: I001
@@ -22,6 +26,8 @@ class OpenAiInstrumentor:
     @staticmethod
     def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
+            OpenAiInstrumentor._module_version = get_version_helper(OpenAiInstrumentor._module_name)
+
             wrap_function_wrapper(
                 "openai.resources.chat.completions",
                 "Completions.create",
@@ -187,6 +193,8 @@ class _OpenAiProviderRequest(_ProviderRequest):
             instrumentor=instrumentor,
             category=PayiCategories.openai,
             streaming_type=_StreamingType.iterator,
+            module_name=OpenAiInstrumentor._module_name,
+            module_version=OpenAiInstrumentor._module_version,
             )
         self._input_tokens_key = input_tokens_key
         self._output_tokens_key = output_tokens_key

{payi-0.1.0a96 → payi-0.1.0a98}/src/payi/lib/VertexInstrumentor.py

@@ -5,12 +5,18 @@ from wrapt import wrap_function_wrapper  # type: ignore
 
 from .instrument import _ChunkResult, _IsStreaming, _PayiInstrumentor
 from .VertexRequest import _VertexRequest
+from .version_helper import get_version_helper
 
 
 class VertexInstrumentor:
+    _module_name: str = "google-cloud-aiplatform"
+    _module_version: str = ""
+
     @staticmethod
     def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
+            VertexInstrumentor._module_version = get_version_helper(VertexInstrumentor._module_name)
+
             wrap_function_wrapper(
                 "vertexai.generative_models",
                 "GenerativeModel.generate_content",
@@ -85,6 +91,8 @@ class _GoogleVertexRequest(_VertexRequest):
     def __init__(self, instrumentor: _PayiInstrumentor):
         super().__init__(
             instrumentor=instrumentor,
+            module_name=VertexInstrumentor._module_name,
+            module_version=VertexInstrumentor._module_version,
             )
         self._prompt_character_count = 0
         self._candidates_character_count = 0

{payi-0.1.0a96 → payi-0.1.0a98}/src/payi/lib/VertexRequest.py

@@ -10,11 +10,20 @@ from .instrument import _ChunkResult, _StreamingType, _ProviderRequest, _PayiIns
 
 
 class _VertexRequest(_ProviderRequest): # type: ignore
-    def __init__(self, instrumentor: _PayiInstrumentor):
+    KNOWN_MODALITIES = ("VIDEO", "AUDIO", "TEXT", "VISION", "IMAGE")
+
+    def __init__(
+            self,
+            instrumentor: _PayiInstrumentor,
+            module_name: str,
+            module_version: str
+            ) -> None:
         super().__init__(
             instrumentor=instrumentor,
             category=PayiCategories.google_vertex,
             streaming_type=_StreamingType.generator,
+            module_name=module_name,
+            module_version=module_version,
             is_google_vertex_or_genai_client=True,
             )
         self._prompt_character_count = 0
@@ -154,6 +163,7 @@ class _VertexRequest(_ProviderRequest): # type: ignore
 
         prompt_tokens_details: list[dict[str, Any]] = usage.get("prompt_tokens_details", [])
         candidates_tokens_details: list[dict[str, Any]] = usage.get("candidates_tokens_details", [])
+        cache_tokens_details: list[dict[str, Any]] = usage.get("cache_tokens_details", [])
 
         if not model:
             model = ""
@@ -214,27 +224,50 @@ class _VertexRequest(_ProviderRequest): # type: ignore
             if is_large_context_token_model(model, input):
                 large_context = "_large_context"
 
+            cache_details: dict[str, int] = {}
+
+            for details in cache_tokens_details:
+                modality = details.get("modality", "")
+                if not modality:
+                    continue
+
+                modality_token_count = details.get("token_count", 0)
+                
+                if modality == "IMAGE":
+                    modality = "VISION"
+
+                if modality in _VertexRequest.KNOWN_MODALITIES:
+                    cache_details[modality] = modality_token_count
+                    add_units(self, modality.lower() + "_cache_read" + large_context, input=modality_token_count)
+
             for details in prompt_tokens_details:
                 modality = details.get("modality", "")
                 if not modality:
                     continue
 
                 modality_token_count = details.get("token_count", 0)
+
                 if modality == "IMAGE":
-                    add_units(self, "vision"+large_context, input=modality_token_count)
-                elif modality in ("VIDEO", "AUDIO", "TEXT"):
-                    add_units(self, modality.lower()+large_context, input=modality_token_count)
+                    modality = "VISION"
+
+                if modality in _VertexRequest.KNOWN_MODALITIES:
+                    # Subtract cache_details value if modality is present, floor at zero
+                    if modality in cache_details:
+                        modality_token_count = max(0, modality_token_count - cache_details[modality])
+
+                    add_units(self, modality.lower() + large_context, input=modality_token_count)
+
             for details in candidates_tokens_details:
                 modality = details.get("modality", "")
                 if not modality:
                     continue
 
                 modality_token_count = details.get("token_count", 0)
-                if modality in ("VIDEO", "AUDIO", "TEXT", "IMAGE"):
-                    add_units(self, modality.lower()+large_context, output=modality_token_count)
+                if modality in _VertexRequest.KNOWN_MODALITIES:
+                    add_units(self, modality.lower() + large_context, output=modality_token_count)
 
             if thinking_token_count > 0:
-                add_units(self, "reasoning"+large_context, output=thinking_token_count)
+                add_units(self, "reasoning" + large_context, output=thinking_token_count)
 
         if not self._ingest["units"]:
             input = usage.get("prompt_token_count", 0)