payi 0.1.0a39__tar.gz → 0.1.0a40__tar.gz

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

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

{payi-0.1.0a39 → payi-0.1.0a40}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.0-alpha.40 (2025-01-31)
+
+Full Changelog: [v0.1.0-alpha.39...v0.1.0-alpha.40](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.39...v0.1.0-alpha.40)
+
+### Features
+
+* update units calculation ([a8dda4a](https://github.com/Pay-i/pay-i-python/commit/a8dda4a72b4fa6720e7e3b621f503e435630481f))
+
 ## 0.1.0-alpha.39 (2025-01-31)
 
 Full Changelog: [v0.1.0-alpha.38...v0.1.0-alpha.39](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.38...v0.1.0-alpha.39)

{payi-0.1.0a39 → payi-0.1.0a40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a39
+Version: 0.1.0a40
 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
@@ -27,6 +27,7 @@ Requires-Dist: distro<2,>=1.7.0
 Requires-Dist: httpx<1,>=0.23.0
 Requires-Dist: pydantic<3,>=1.9.0
 Requires-Dist: sniffio
+Requires-Dist: tiktoken>=0.8.0
 Requires-Dist: typing-extensions<5,>=4.10
 Requires-Dist: wrapt>=1.17.2
 Description-Content-Type: text/markdown

{payi-0.1.0a39 → payi-0.1.0a40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.39"
+version = "0.1.0-alpha.40"
 description = "The official Python library for the payi API"
 dynamic = ["readme"]
 license = "Apache-2.0"
@@ -15,6 +15,7 @@ dependencies = [
     "distro>=1.7.0, <2",
     "sniffio",
     "wrapt>=1.17.2",
+    "tiktoken>=0.8.0",
 ]
 requires-python = ">= 3.8"
 classifiers = [

{payi-0.1.0a39 → payi-0.1.0a40}/requirements-dev.lock

@@ -7,7 +7,6 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
-#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -20,6 +19,9 @@ argcomplete==3.1.2
 certifi==2023.7.22
     # via httpcore
     # via httpx
+    # via requests
+charset-normalizer==3.4.1
+    # via requests
 colorlog==6.7.0
     # via nox
 dirty-equals==0.6.0
@@ -42,6 +44,7 @@ httpx==0.28.1
 idna==3.4
     # via anyio
     # via httpx
+    # via requests
 importlib-metadata==7.0.0
 iniconfig==2.0.0
     # via pytest
@@ -77,6 +80,10 @@ python-dateutil==2.8.2
     # via time-machine
 pytz==2023.3.post1
     # via dirty-equals
+regex==2024.11.6
+    # via tiktoken
+requests==2.32.3
+    # via tiktoken
 respx==0.22.0
 rich==13.7.1
 ruff==0.6.9
@@ -87,6 +94,8 @@ six==1.16.0
 sniffio==1.3.0
     # via anyio
     # via payi
+tiktoken==0.8.0
+    # via payi
 time-machine==2.9.0
 tomli==2.0.2
     # via mypy
@@ -98,6 +107,8 @@ typing-extensions==4.12.2
     # via pydantic
     # via pydantic-core
     # via pyright
+urllib3==2.3.0
+    # via requests
 virtualenv==20.24.5
     # via nox
 wrapt==1.17.2

{payi-0.1.0a39 → payi-0.1.0a40}/requirements.lock

@@ -7,7 +7,6 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
-#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -18,6 +17,9 @@ anyio==4.4.0
 certifi==2023.7.22
     # via httpcore
     # via httpx
+    # via requests
+charset-normalizer==3.4.1
+    # via requests
 distro==1.8.0
     # via payi
 exceptiongroup==1.2.2
@@ -31,17 +33,26 @@ httpx==0.28.1
 idna==3.4
     # via anyio
     # via httpx
+    # via requests
 pydantic==2.10.3
     # via payi
 pydantic-core==2.27.1
     # via pydantic
+regex==2024.11.6
+    # via tiktoken
+requests==2.32.3
+    # via tiktoken
 sniffio==1.3.0
     # via anyio
     # via payi
+tiktoken==0.8.0
+    # via payi
 typing-extensions==4.12.2
     # via anyio
     # via payi
     # via pydantic
     # via pydantic-core
+urllib3==2.3.0
+    # via requests
 wrapt==1.17.2
     # via payi

{payi-0.1.0a39 → payi-0.1.0a40}/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.39"  # x-release-please-version
+__version__ = "0.1.0-alpha.40"  # x-release-please-version

{payi-0.1.0a39 → payi-0.1.0a40}/src/payi/lib/AnthropicInstrumentor.py

@@ -1,6 +1,7 @@
 import logging
-from typing import Any
+from typing import Any, Union
 
+import tiktoken
 from wrapt import wrap_function_wrapper  # type: ignore
 
 from payi.types import IngestUnitsParams
@@ -49,6 +50,7 @@ def chat_wrapper(
     return instrumentor.chat_wrapper(
         "system.anthropic",
         process_chunk,
+        process_request,
         process_synchronous_response,
         wrapped,
         instance,
@@ -62,7 +64,9 @@ def process_chunk(chunk: Any, ingest: IngestUnitsParams) -> None:
         usage = chunk.message.usage
         units = ingest["units"]
 
-        units["text"] = Units(input=usage.input_tokens, output=0)
+        input = PayiInstrumentor.update_for_vision(usage.input_tokens, units)
+
+        units["text"] = Units(input=input, output=0)
 
         if hasattr(usage, "cache_creation_input_tokens") and usage.cache_creation_input_tokens > 0:
             text_cache_write = usage.cache_creation_input_tokens
@@ -91,7 +95,41 @@ def process_synchronous_response(response: Any, ingest: IngestUnitsParams, log_p
         text_cache_read = usage.cache_read_input_tokens
         units["text_cache_read"] = Units(input=text_cache_read, output=0)
 
+    input = PayiInstrumentor.update_for_vision(input, units)
+
     units["text"] = Units(input=input, output=ouptut)
 
     if log_prompt_and_response:
         ingest["provider_response_json"] = response.to_json()
+
+def has_image_and_get_texts(encoding: tiktoken.Encoding, content: Union[str, 'list[Any]']) -> 'tuple[bool, int]':
+    if isinstance(content, str):
+        return False, 0
+    elif isinstance(content, list): # type: ignore
+        has_image = any(item.get("type") == "image" for item in content)
+        if has_image is False:
+            return has_image, 0
+        
+        token_count = sum(len(encoding.encode(item.get("text", ""))) for item in content if item.get("type") == "text")
+        return has_image, token_count
+
+def process_request(ingest: IngestUnitsParams, kwargs: Any) -> None:
+    messages = kwargs.get("messages")
+    if not messages or len(messages) == 0:
+        return
+    
+    estimated_token_count = 0 
+    has_image = False
+
+    enc = tiktoken.get_encoding("cl100k_base")
+    
+    for message in messages:
+        msg_has_image, msg_prompt_tokens = has_image_and_get_texts(enc, message.get('content', ''))
+        if msg_has_image:
+            has_image = True
+            estimated_token_count += msg_prompt_tokens
+    
+    if not has_image or estimated_token_count == 0:
+        return
+
+    ingest["units"][PayiInstrumentor.estimated_prompt_tokens] = Units(input=estimated_token_count, output=0)

{payi-0.1.0a39 → payi-0.1.0a40}/src/payi/lib/OpenAIInstrumentor.py

@@ -1,8 +1,9 @@
 import json
 import logging
-from typing import Any
+from typing import Any, Union
 from importlib.metadata import version
 
+import tiktoken
 from wrapt import wrap_function_wrapper  # type: ignore
 
 from payi.types import IngestUnitsParams
@@ -38,6 +39,7 @@ def chat_wrapper(
     return instrumentor.chat_wrapper(
         "system.openai",
         process_chat_chunk,
+        process_request,
         process_chat_synchronous_response,
         wrapped,
         instance,
@@ -84,6 +86,41 @@ def add_usage_units(usage: "dict[str, Any]", units: "dict[str, Units]") -> None:
         if input_cache != 0:
             units["text_cache_read"] = Units(input=input_cache, output=0)
 
-    input -= input_cache
+    input = PayiInstrumentor.update_for_vision(input - input_cache, units)
 
     units["text"] = Units(input=input, output=output)
+
+def has_image_and_get_texts(encoding: tiktoken.Encoding, content: Union[str, 'list[Any]']) -> 'tuple[bool, int]':
+    if isinstance(content, str):
+        return False, 0
+    elif isinstance(content, list): # type: ignore
+        has_image = any(item.get("type") == "image_url" for item in content)
+        if has_image is False:
+            return has_image, 0
+        
+        token_count = sum(len(encoding.encode(item.get("text", ""))) for item in content if item.get("type") == "text")
+        return has_image, token_count
+
+def process_request(ingest: IngestUnitsParams, kwargs: Any) -> None:
+    messages = kwargs.get("messages")
+    if not messages or len(messages) == 0:
+        return
+    
+    estimated_token_count = 0 
+    has_image = False
+
+    try: 
+        enc = tiktoken.encoding_for_model(kwargs.get("model"))
+    except KeyError:
+        enc = tiktoken.get_encoding("o200k_base")
+    
+    for message in messages:
+        msg_has_image, msg_prompt_tokens = has_image_and_get_texts(enc, message.get('content', ''))
+        if msg_has_image:
+            has_image = True
+            estimated_token_count += msg_prompt_tokens
+    
+    if not has_image or estimated_token_count == 0:
+        return
+
+    ingest["units"][PayiInstrumentor.estimated_prompt_tokens] = Units(input=estimated_token_count, output=0)

{payi-0.1.0a39 → payi-0.1.0a40}/src/payi/lib/instrument.py

@@ -10,12 +10,15 @@ from wrapt import ObjectProxy  # type: ignore
 
 from payi import Payi, AsyncPayi
 from payi.types import IngestUnitsParams
+from payi.types.ingest_units_params import Units
 
 from .Stopwatch import Stopwatch
 from .Instruments import Instruments
 
 
 class PayiInstrumentor:
+    estimated_prompt_tokens: str = "estimated_prompt_tokens"
+
     def __init__(
         self,
         payi: Union[Payi, AsyncPayi, None] = None,
@@ -204,11 +207,12 @@ class PayiInstrumentor:
         self,
         category: str,
         process_chunk: Callable[[Any, IngestUnitsParams], None],
+        process_request: Optional[Callable[[IngestUnitsParams, Any], None]],
         process_synchronous_response: Optional[Callable[[Any, IngestUnitsParams, bool], None]],
         wrapped: Any,
         instance: Any,
         args: Any,
-        kwargs: Any,
+        kwargs: 'dict[str, Any]',
     ) -> Any:
         context = self.get_context()
 
@@ -226,7 +230,7 @@ class PayiInstrumentor:
 
             return wrapped(*args, **kwargs)
 
-        ingest: IngestUnitsParams = {"category": category, "resource": kwargs.get("model"), "units": {}}
+        ingest: IngestUnitsParams = {"category": category, "resource": kwargs.get("model"), "units": {}} # type: ignore
 
         # blocked_limit = next((limit for limit in (context.get('limit_ids') or []) if limit in self._blocked_limits), None)
         # if blocked_limit:
@@ -235,8 +239,10 @@ class PayiInstrumentor:
         # f_back excludes the current frame, strip() cleans up whitespace and newlines
         stack = [frame.strip() for frame in traceback.format_stack(current_frame.f_back)]  # type: ignore
 
-        # TODO add back once feature is in prod
-        # ingest['properties'] = { 'system.stack_trace': json.dumps(stack) }
+        ingest['properties'] = { 'system.stack_trace': json.dumps(stack) }
+
+        if process_request:
+            process_request(ingest, kwargs)
 
         sw = Stopwatch()
         stream = kwargs.get("stream", False)
@@ -354,6 +360,17 @@ class PayiInstrumentor:
             if experience_id is not None:
                 extra_headers["xProxy-Experience-ID"] = experience_id
 
+    @staticmethod
+    def update_for_vision(input: int, units: 'dict[str, Units]') -> int:
+        if PayiInstrumentor.estimated_prompt_tokens in units:
+            prompt_token_estimate: int = units.pop(PayiInstrumentor.estimated_prompt_tokens)["input"] # type: ignore
+            vision = input - prompt_token_estimate
+            if (vision > 0):
+                units["vision"] = Units(input=vision, output=0)
+                input = prompt_token_estimate
+        
+        return input
+
     @staticmethod
     def payi_wrapper(func: Any) -> Any:
         def _payi_wrapper(o: Any) -> Any:

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

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