payi 0.1.0a35__tar.gz → 0.1.0a36__tar.gz

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

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

{payi-0.1.0a35 → payi-0.1.0a36}/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.1.0-alpha.36 (2025-01-28)
+
+Full Changelog: [v0.1.0-alpha.35...v0.1.0-alpha.36](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.35...v0.1.0-alpha.36)
+
+### Bug Fixes
+
+* **tests:** make test_get_platform less flaky ([#181](https://github.com/Pay-i/pay-i-python/issues/181)) ([86d5b4a](https://github.com/Pay-i/pay-i-python/commit/86d5b4aa623c276776f0bdba5fa936d5408c6ab3))
+
+
+### Chores
+
+* **internal:** avoid pytest-asyncio deprecation warning ([#182](https://github.com/Pay-i/pay-i-python/issues/182)) ([38bb22c](https://github.com/Pay-i/pay-i-python/commit/38bb22ca2fa0f6dd88942b4744f9b0ffee030d5c))
+* **internal:** codegen related update ([#178](https://github.com/Pay-i/pay-i-python/issues/178)) ([315a2c5](https://github.com/Pay-i/pay-i-python/commit/315a2c576e14d51239590f3bfc53872a288559c7))
+* **internal:** codegen related update ([#183](https://github.com/Pay-i/pay-i-python/issues/183)) ([00fdbe7](https://github.com/Pay-i/pay-i-python/commit/00fdbe791e16fa12e73e1203dd0ab02270127e27))
+* **internal:** codegen related update ([#184](https://github.com/Pay-i/pay-i-python/issues/184)) ([bf04c0e](https://github.com/Pay-i/pay-i-python/commit/bf04c0e4707fc2218da6fa6e676fd6c2e85bff07))
+* **internal:** codegen related update ([#185](https://github.com/Pay-i/pay-i-python/issues/185)) ([e0d7ab1](https://github.com/Pay-i/pay-i-python/commit/e0d7ab154ce6d0a60095d8740b9ba5949a37aa00))
+
+
+### Documentation
+
+* **raw responses:** fix duplicate `the` ([#180](https://github.com/Pay-i/pay-i-python/issues/180)) ([ef72f36](https://github.com/Pay-i/pay-i-python/commit/ef72f367b02d8a71b6ef108a8e3544be77d5bd60))
+
 ## 0.1.0-alpha.35 (2025-01-12)
 
 Full Changelog: [v0.1.0-alpha.34...v0.1.0-alpha.35](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.34...v0.1.0-alpha.35)

{payi-0.1.0a35 → payi-0.1.0a36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a35
+Version: 0.1.0a36
 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
@@ -28,6 +28,7 @@ Requires-Dist: httpx<1,>=0.23.0
 Requires-Dist: pydantic<3,>=1.9.0
 Requires-Dist: sniffio
 Requires-Dist: typing-extensions<5,>=4.10
+Requires-Dist: wrapt>=1.17.2
 Description-Content-Type: text/markdown
 
 # Payi Python API library
@@ -65,7 +66,7 @@ client = Payi(
 
 limit_response = client.limits.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 print(limit_response.request_id)
 ```
@@ -92,7 +93,7 @@ client = AsyncPayi(
 async def main() -> None:
     limit_response = await client.limits.create(
         limit_name="x",
-        max=0,
+        max=1,
     )
     print(limit_response.request_id)
 
@@ -129,7 +130,7 @@ client = Payi()
 try:
     client.limits.create(
         limit_name="x",
-        max=0,
+        max=1,
     )
 except payi.APIConnectionError as e:
     print("The server could not be reached")
@@ -175,7 +176,7 @@ client = Payi(
 # Or, configure per-request:
 client.with_options(max_retries=5).limits.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 ```
 
@@ -201,7 +202,7 @@ client = Payi(
 # Override per-request:
 client.with_options(timeout=5.0).limits.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 ```
 
@@ -245,7 +246,7 @@ from payi import Payi
 client = Payi()
 response = client.limits.with_raw_response.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 print(response.headers.get('X-My-Header'))
 
@@ -266,7 +267,7 @@ To stream the response body, use `.with_streaming_response` instead, which requi
 ```python
 with client.limits.with_streaming_response.create(
     limit_name="x",
-    max=0,
+    max=1,
 ) as response:
     print(response.headers.get("X-My-Header"))
 

{payi-0.1.0a35 → payi-0.1.0a36}/README.md

@@ -33,7 +33,7 @@ client = Payi(
 
 limit_response = client.limits.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 print(limit_response.request_id)
 ```
@@ -60,7 +60,7 @@ client = AsyncPayi(
 async def main() -> None:
     limit_response = await client.limits.create(
         limit_name="x",
-        max=0,
+        max=1,
     )
     print(limit_response.request_id)
 
@@ -97,7 +97,7 @@ client = Payi()
 try:
     client.limits.create(
         limit_name="x",
-        max=0,
+        max=1,
     )
 except payi.APIConnectionError as e:
     print("The server could not be reached")
@@ -143,7 +143,7 @@ client = Payi(
 # Or, configure per-request:
 client.with_options(max_retries=5).limits.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 ```
 
@@ -169,7 +169,7 @@ client = Payi(
 # Override per-request:
 client.with_options(timeout=5.0).limits.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 ```
 
@@ -213,7 +213,7 @@ from payi import Payi
 client = Payi()
 response = client.limits.with_raw_response.create(
     limit_name="x",
-    max=0,
+    max=1,
 )
 print(response.headers.get('X-My-Header'))
 
@@ -234,7 +234,7 @@ To stream the response body, use `.with_streaming_response` instead, which requi
 ```python
 with client.limits.with_streaming_response.create(
     limit_name="x",
-    max=0,
+    max=1,
 ) as response:
     print(response.headers.get("X-My-Header"))
 

{payi-0.1.0a35 → payi-0.1.0a36}/mypy.ini

@@ -41,7 +41,7 @@ cache_fine_grained = True
 # ```
 # Changing this codegen to make mypy happy would increase complexity
 # and would not be worth it.
-disable_error_code = func-returns-value
+disable_error_code = func-returns-value,overload-cannot-match
 
 # https://github.com/python/mypy/issues/12162
 [mypy.overrides]

{payi-0.1.0a35 → payi-0.1.0a36}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.35"
+version = "0.1.0-alpha.36"
 description = "The official Python library for the payi API"
 dynamic = ["readme"]
 license = "Apache-2.0"
@@ -14,6 +14,7 @@ dependencies = [
     "anyio>=3.5.0, <5",
     "distro>=1.7.0, <2",
     "sniffio",
+    "wrapt>=1.17.2",
 ]
 requires-python = ">= 3.8"
 classifiers = [
@@ -55,6 +56,7 @@ dev-dependencies = [
     "importlib-metadata>=6.7.0",
     "rich>=13.7.1",
     "nest_asyncio==1.6.0",
+    "wrapt",
 ]
 
 [tool.rye.scripts]
@@ -129,6 +131,7 @@ testpaths = ["tests"]
 addopts = "--tb=short"
 xfail_strict = true
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
 filterwarnings = [
   "error"
 ]

{payi-0.1.0a35 → payi-0.1.0a36}/requirements-dev.lock

@@ -7,6 +7,7 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -48,7 +49,7 @@ markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-mypy==1.13.0
+mypy==1.14.1
 mypy-extensions==1.0.0
     # via mypy
 nest-asyncio==1.6.0
@@ -68,7 +69,7 @@ pydantic-core==2.27.1
     # via pydantic
 pygments==2.18.0
     # via rich
-pyright==1.1.390
+pyright==1.1.392.post0
 pytest==8.3.3
     # via pytest-asyncio
 pytest-asyncio==0.24.0
@@ -99,5 +100,7 @@ typing-extensions==4.12.2
     # via pyright
 virtualenv==20.24.5
     # via nox
+wrapt==1.17.2
+    # via payi
 zipp==3.17.0
     # via importlib-metadata

{payi-0.1.0a35 → payi-0.1.0a36}/requirements.lock

@@ -7,6 +7,7 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -42,3 +43,5 @@ typing-extensions==4.12.2
     # via payi
     # via pydantic
     # via pydantic-core
+wrapt==1.17.2
+    # via payi

{payi-0.1.0a35 → payi-0.1.0a36}/src/payi/_models.py

@@ -179,14 +179,14 @@ class BaseModel(pydantic.BaseModel):
     @classmethod
     @override
     def construct(  # pyright: ignore[reportIncompatibleMethodOverride]
-        cls: Type[ModelT],
+        __cls: Type[ModelT],
         _fields_set: set[str] | None = None,
         **values: object,
     ) -> ModelT:
-        m = cls.__new__(cls)
+        m = __cls.__new__(__cls)
         fields_values: dict[str, object] = {}
 
-        config = get_model_config(cls)
+        config = get_model_config(__cls)
         populate_by_name = (
             config.allow_population_by_field_name
             if isinstance(config, _ConfigProtocol)
@@ -196,7 +196,7 @@ class BaseModel(pydantic.BaseModel):
         if _fields_set is None:
             _fields_set = set()
 
-        model_fields = get_model_fields(cls)
+        model_fields = get_model_fields(__cls)
         for name, field in model_fields.items():
             key = field.alias
             if key is None or (key not in values and populate_by_name):

{payi-0.1.0a35 → payi-0.1.0a36}/src/payi/_response.py

@@ -136,6 +136,8 @@ class BaseAPIResponse(Generic[R]):
         if cast_to and is_annotated_type(cast_to):
             cast_to = extract_type_arg(cast_to, 0)
 
+        origin = get_origin(cast_to) or cast_to
+
         if self._is_sse_stream:
             if to:
                 if not is_stream_class_type(to):
@@ -195,8 +197,6 @@ class BaseAPIResponse(Generic[R]):
         if cast_to == bool:
             return cast(R, response.text.lower() == "true")
 
-        origin = get_origin(cast_to) or cast_to
-
         if origin == APIResponse:
             raise RuntimeError("Unexpected state - cast_to is `APIResponse`")
 
@@ -210,7 +210,13 @@ class BaseAPIResponse(Generic[R]):
                 raise ValueError(f"Subclasses of httpx.Response cannot be passed to `cast_to`")
             return cast(R, response)
 
-        if inspect.isclass(origin) and not issubclass(origin, BaseModel) and issubclass(origin, pydantic.BaseModel):
+        if (
+            inspect.isclass(
+                origin  # pyright: ignore[reportUnknownArgumentType]
+            )
+            and not issubclass(origin, BaseModel)
+            and issubclass(origin, pydantic.BaseModel)
+        ):
             raise TypeError("Pydantic models must subclass our base model type, e.g. `from payi import BaseModel`")
 
         if (

{payi-0.1.0a35 → payi-0.1.0a36}/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.35"  # x-release-please-version
+__version__ = "0.1.0-alpha.36"  # x-release-please-version

payi-0.1.0a36/src/payi/lib/AnthropicInstrumentor.py

@@ -0,0 +1,97 @@
+import logging
+from typing import Any
+
+from wrapt import wrap_function_wrapper  # type: ignore
+
+from payi.types import IngestUnitsParams
+from payi.types.ingest_units_params import Units
+
+from .instrument import PayiInstrumentor
+
+
+class AnthropicIntrumentor:
+    @staticmethod
+    def instrument(instrumentor: PayiInstrumentor) -> None:
+        try:
+            import anthropic  # type: ignore #  noqa: F401  I001
+
+            # wrap_function_wrapper(
+            #     "anthropic.resources.completions",
+            #     "Completions.create",
+            #     chat_wrapper(instrumentor),
+            # )
+
+            wrap_function_wrapper(
+                "anthropic.resources.messages",
+                "Messages.create",
+                chat_wrapper(instrumentor),
+            )
+
+            wrap_function_wrapper(
+                "anthropic.resources.messages",
+                "Messages.stream",
+                chat_wrapper(instrumentor),
+            )
+
+        except Exception as e:
+            logging.debug(f"Error instrumenting anthropic: {e}")
+            return
+
+
+@PayiInstrumentor.payi_wrapper
+def chat_wrapper(
+    instrumentor: PayiInstrumentor,
+    wrapped: Any,
+    instance: Any,
+    args: Any,
+    kwargs: Any,
+) -> Any:
+    return instrumentor.chat_wrapper(
+        "system.anthropic",
+        process_chunk,
+        process_synchronous_response,
+        wrapped,
+        instance,
+        args,
+        kwargs,
+    )
+
+
+def process_chunk(chunk: Any, ingest: IngestUnitsParams) -> None:
+    if chunk.type == "message_start":
+        usage = chunk.message.usage
+        units = ingest["units"]
+
+        units["text"] = Units(input=usage.input_tokens, output=0)
+
+        if hasattr(usage, "cache_creation_input_tokens") and usage.cache_creation_input_tokens > 0:
+            text_cache_write = usage.cache_creation_input_tokens
+            units["text_cache_write"] = Units(input=text_cache_write, output=0)
+
+        if hasattr(usage, "cache_read_input_tokens") and usage.cache_read_input_tokens > 0:
+            text_cache_read = usage.cache_read_input_tokens
+            units["text_cache_read"] = Units(input=text_cache_read, output=0)
+
+    elif chunk.type == "message_delta":
+        usage = chunk.usage
+        ingest["units"]["text"]["output"] = usage.output_tokens
+
+
+def process_synchronous_response(response: Any, ingest: IngestUnitsParams, log_prompt_and_response: bool) -> None:
+    usage = response.usage
+    input = usage.input_tokens
+    ouptut = usage.output_tokens
+    units: dict[str, Units] = ingest["units"]
+
+    if hasattr(usage, "cache_creation_input_tokens") and usage.cache_creation_input_tokens > 0:
+        text_cache_write = usage.cache_creation_input_tokens
+        units["text_cache_write"] = Units(input=text_cache_write, output=0)
+
+    if hasattr(usage, "cache_read_input_tokens") and usage.cache_read_input_tokens > 0:
+        text_cache_read = usage.cache_read_input_tokens
+        units["text_cache_read"] = Units(input=text_cache_read, output=0)
+
+    units["text"] = Units(input=input, output=ouptut)
+
+    if log_prompt_and_response:
+        ingest["provider_response_json"] = response.to_json()

payi-0.1.0a36/src/payi/lib/Instruments.py

@@ -0,0 +1,7 @@
+from enum import Enum
+
+
+class Instruments(Enum):
+    ALL = "all"
+    OPENAI = "openai"
+    ANTHROPIC = "anthropic"

payi-0.1.0a36/src/payi/lib/OpenAIInstrumentor.py

@@ -0,0 +1,89 @@
+import json
+import logging
+from typing import Any
+from importlib.metadata import version
+
+from wrapt import wrap_function_wrapper  # type: ignore
+
+from payi.types import IngestUnitsParams
+from payi.types.ingest_units_params import Units
+
+from .instrument import PayiInstrumentor
+
+
+class OpenAiInstrumentor:
+    @staticmethod
+    def instrument(instrumentor: PayiInstrumentor) -> None:
+        try:
+            from openai import OpenAI  # type: ignore #  noqa: F401  I001
+
+            wrap_function_wrapper(
+                "openai.resources.chat.completions",
+                "Completions.create",
+                chat_wrapper(instrumentor),
+            )
+        except Exception as e:
+            logging.debug(f"Error instrumenting openai: {e}")
+            return
+
+
+@PayiInstrumentor.payi_wrapper
+def chat_wrapper(
+    instrumentor: PayiInstrumentor,
+    wrapped: Any,
+    instance: Any,
+    args: Any,
+    kwargs: Any,
+) -> Any:
+    return instrumentor.chat_wrapper(
+        "system.openai",
+        process_chat_chunk,
+        process_chat_synchronous_response,
+        wrapped,
+        instance,
+        args,
+        kwargs,
+    )
+
+
+def process_chat_synchronous_response(response: str, ingest: IngestUnitsParams, log_prompt_and_response: bool) -> None:
+    response_dict = model_to_dict(response)
+
+    add_usage_units(response_dict["usage"], ingest["units"])
+
+    if log_prompt_and_response:
+        ingest["provider_response_json"] = [json.dumps(response_dict)]
+
+
+def process_chat_chunk(chunk: Any, ingest: IngestUnitsParams) -> None:
+    model = model_to_dict(chunk)
+    usage = model.get("usage")
+    if usage:
+        add_usage_units(usage, ingest["units"])
+
+
+def model_to_dict(model: Any) -> Any:
+    if version("pydantic") < "2.0.0":
+        return model.dict()
+    if hasattr(model, "model_dump"):
+        return model.model_dump()
+    elif hasattr(model, "parse"):  # Raw API response
+        return model_to_dict(model.parse())
+    else:
+        return model
+
+
+def add_usage_units(usage: "dict[str, Any]", units: "dict[str, Units]") -> None:
+    input = usage["prompt_tokens"] if "prompt_tokens" in usage else 0
+    output = usage["completion_tokens"] if "completion_tokens" in usage else 0
+    input_cache = 0
+
+    prompt_tokens_details = usage.get("prompt_tokens_details")
+    if prompt_tokens_details:
+        input_cache = prompt_tokens_details.get("cached_tokens", 0)
+        if input_cache != 0:
+            units["text_cache_read"] = Units(input=input_cache, output=0)
+
+    input -= input_cache
+
+    units["text"] = Units(input=input, output=output)

payi-0.1.0a36/src/payi/lib/Stopwatch.py

@@ -0,0 +1,27 @@
+import time
+from typing import Optional
+
+
+class Stopwatch:
+    def __init__(self) -> None:
+        self.start_time: Optional[float] = None
+        self.end_time: Optional[float] = None
+
+    def start(self) -> None:
+        self.start_time = time.perf_counter()
+
+    def stop(self) -> None:
+        self.end_time = time.perf_counter()
+
+    def elapsed_s(self) -> float:
+        if self.start_time is None:
+            raise ValueError("Stopwatch has not been started")
+        if self.end_time is None:
+            return time.perf_counter() - self.start_time
+        return self.end_time - self.start_time
+
+    def elapsed_ms(self) -> float:
+        return self.elapsed_s() * 1000
+
+    def elapsed_ms_int(self) -> int:
+        return int(self.elapsed_ms())

{payi-0.1.0a35 → payi-0.1.0a36}/src/payi/lib/helpers.py

@@ -3,28 +3,30 @@ from typing import Dict, List, Union
 
 
 def create_limit_header_from_ids(limit_ids: List[str]) -> Dict[str, str]:
-    if not isinstance(limit_ids, list): # type: ignore
+    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
+    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 {}
 
+
 def create_request_header_from_tags(request_tags: List[str]) -> Dict[str, str]:
-    if not isinstance(request_tags, list): # type: ignore
+    if not isinstance(request_tags, list):  # type: ignore
         raise TypeError("request_tags must be a list")
 
-    valid_tags = [tag.strip() for tag in request_tags if isinstance(tag, str) and tag.strip()] # type: ignore
-    
+    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 {}
 
+
 def create_headers(
-    limit_ids: Union[List[str], None] = None, 
+    limit_ids: Union[List[str], None] = None,
     request_tags: Union[List[str], None] = None,
     user_id: Union[str, None] = None,
-    experience_id: Union[str, None] = None, 
-    experience_name: Union[str, None] = None, 
-    ) -> Dict[str, str]:
+    experience_id: Union[str, None] = None,
+    experience_name: Union[str, None] = None,
+) -> Dict[str, str]:
     headers: Dict[str, str] = {}
 
     if limit_ids:
@@ -38,4 +40,4 @@ def create_headers(
     if experience_name:
         headers.update({"xProxy-Experience-Name": experience_name})
 
-    return headers
+    return headers