payi 0.1.0a39__tar.gz → 0.1.0a41__tar.gz

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

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

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

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.1.0-alpha.41 (2025-02-04)
+
+Full Changelog: [v0.1.0-alpha.40...v0.1.0-alpha.41](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.40...v0.1.0-alpha.41)
+
+### Chores
+
+* **internal:** bummp ruff dependency ([#204](https://github.com/Pay-i/pay-i-python/issues/204)) ([d6e457f](https://github.com/Pay-i/pay-i-python/commit/d6e457f7e62b5d08199e170abfda75fab75099f6))
+* **internal:** change default timeout to an int ([#202](https://github.com/Pay-i/pay-i-python/issues/202)) ([c65e2c5](https://github.com/Pay-i/pay-i-python/commit/c65e2c5c8f420505025be81f7d566f048aa7bc19))
+
+## 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.0a41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a39
+Version: 0.1.0a41
 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.0a41}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.39"
+version = "0.1.0-alpha.41"
 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 = [
@@ -179,7 +180,7 @@ select = [
   "T201",
   "T203",
   # misuse of typing.TYPE_CHECKING
-  "TCH004",
+  "TC004",
   # import rules
   "TID251",
 ]

{payi-0.1.0a39 → payi-0.1.0a41}/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,9 +80,13 @@ 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
+ruff==0.9.4
 setuptools==68.2.2
     # via nodeenv
 six==1.16.0
@@ -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.0a41}/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.0a41}/src/payi/_constants.py

@@ -6,7 +6,7 @@ RAW_RESPONSE_HEADER = "X-Stainless-Raw-Response"
 OVERRIDE_CAST_TO_HEADER = "____stainless_override_cast_to"
 
 # default timeout is 1 minute
-DEFAULT_TIMEOUT = httpx.Timeout(timeout=60.0, connect=5.0)
+DEFAULT_TIMEOUT = httpx.Timeout(timeout=60, connect=5.0)
 DEFAULT_MAX_RETRIES = 2
 DEFAULT_CONNECTION_LIMITS = httpx.Limits(max_connections=100, max_keepalive_connections=20)
 

{payi-0.1.0a39 → payi-0.1.0a41}/src/payi/_models.py

@@ -172,7 +172,7 @@ class BaseModel(pydantic.BaseModel):
     @override
     def __str__(self) -> str:
         # mypy complains about an invalid self arg
-        return f'{self.__repr_name__()}({self.__repr_str__(", ")})'  # type: ignore[misc]
+        return f"{self.__repr_name__()}({self.__repr_str__(', ')})"  # type: ignore[misc]
 
     # Override the 'construct' method in a way that supports recursive parsing without validation.
     # Based on https://github.com/samuelcolvin/pydantic/issues/1168#issuecomment-817742836.

{payi-0.1.0a39 → payi-0.1.0a41}/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.41"  # x-release-please-version

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

@@ -1,12 +1,13 @@
 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
 from payi.types.ingest_units_params import Units
 
-from .instrument import PayiInstrumentor
+from .instrument import IsStreaming, PayiInstrumentor
 
 
 class AnthropicIntrumentor:
@@ -47,13 +48,15 @@ def chat_wrapper(
     kwargs: Any,
 ) -> Any:
     return instrumentor.chat_wrapper(
-        "system.anthropic",
-        process_chunk,
-        process_synchronous_response,
-        wrapped,
-        instance,
-        args,
-        kwargs,
+        category="system.anthropic",
+        process_chunk=process_chunk,
+        process_request=process_request,
+        process_synchronous_response=process_synchronous_response,
+        is_streaming=IsStreaming.kwargs,
+        wrapped=wrapped,
+        instance=instance,
+        args=args,
+        kwargs=kwargs,
     )
 
 
@@ -62,7 +65,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
@@ -77,10 +82,10 @@ def process_chunk(chunk: Any, ingest: IngestUnitsParams) -> None:
         ingest["units"]["text"]["output"] = usage.output_tokens
 
 
-def process_synchronous_response(response: Any, ingest: IngestUnitsParams, log_prompt_and_response: bool) -> None:
+def process_synchronous_response(response: Any, ingest: IngestUnitsParams, log_prompt_and_response: bool, *args: Any, **kwargs: 'dict[str, Any]') -> Any: # noqa: ARG001
     usage = response.usage
     input = usage.input_tokens
-    ouptut = usage.output_tokens
+    output = usage.output_tokens
     units: dict[str, Units] = ingest["units"]
 
     if hasattr(usage, "cache_creation_input_tokens") and usage.cache_creation_input_tokens > 0:
@@ -91,7 +96,43 @@ 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)
 
-    units["text"] = Units(input=input, output=ouptut)
+    input = PayiInstrumentor.update_for_vision(input, units)
+
+    units["text"] = Units(input=input, output=output)
 
     if log_prompt_and_response:
         ingest["provider_response_json"] = response.to_json()
+
+    return None
+
+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.0a41/src/payi/lib/BedrockInstrumentor.py

@@ -0,0 +1,288 @@
+import json
+import logging
+from typing import Any
+from functools import wraps
+
+from wrapt import ObjectProxy, wrap_function_wrapper  # type: ignore
+
+from payi.types.ingest_units_params import Units, IngestUnitsParams
+from payi.types.pay_i_common_models_api_router_header_info_param import PayICommonModelsAPIRouterHeaderInfoParam
+
+from .instrument import IsStreaming, PayiInstrumentor
+
+
+class BedrockInstrumentor:
+    @staticmethod
+    def instrument(instrumentor: PayiInstrumentor) -> None:
+        try:
+            import boto3  # type: ignore #  noqa: F401  I001
+
+            # wrap_function_wrapper(
+            #     "anthropic.resources.completions",
+            #     "Completions.create",
+            #     chat_wrapper(instrumentor),
+            # )
+
+            wrap_function_wrapper(
+                "botocore.client",
+                "ClientCreator.create_client",
+                create_client_wrapper(instrumentor),
+            )
+
+            wrap_function_wrapper(
+                "botocore.session",
+                "Session.create_client",
+                create_client_wrapper(instrumentor),
+            )
+
+        except Exception as e:
+            logging.debug(f"Error instrumenting bedrock: {e}")
+            return
+
+@PayiInstrumentor.payi_wrapper
+def create_client_wrapper(instrumentor: PayiInstrumentor, wrapped: Any, instance: Any, args: Any, kwargs: Any) -> Any: #  noqa: ARG001
+    if kwargs.get("service_name") != "bedrock-runtime":
+        return wrapped(*args, **kwargs)
+
+    try:
+        client: Any = wrapped(*args, **kwargs)
+        client.invoke_model = wrap_invoke(instrumentor, client.invoke_model)
+        client.invoke_model_with_response_stream = wrap_invoke_stream(instrumentor, client.invoke_model_with_response_stream)
+        client.converse = wrap_converse(instrumentor, client.converse)
+        client.converse_stream = wrap_converse_stream(instrumentor, client.converse_stream)
+
+        return client
+    except Exception as e:
+        logging.debug(f"Error instrumenting bedrock client: {e}")
+    
+    return wrapped(*args, **kwargs)
+    
+class InvokeResponseWrapper(ObjectProxy): # type: ignore
+    def __init__(
+        self,
+        response: Any,
+        instrumentor: PayiInstrumentor,
+        ingest: IngestUnitsParams,
+        log_prompt_and_response: bool
+        ) -> None:
+
+        super().__init__(response) # type: ignore
+        self._response = response
+        self._instrumentor = instrumentor
+        self._ingest = ingest
+        self._log_prompt_and_response = log_prompt_and_response
+
+    def read(self, amt: Any =None): # type: ignore
+        # data is array of bytes
+        data: Any = self.__wrapped__.read(amt) # type: ignore
+        response = json.loads(data)
+
+        resource = self._ingest["resource"]
+        if not resource:
+            return
+        
+        input: int = 0
+        output: int = 0
+        units: dict[str, Units] = self._ingest["units"]
+
+        if resource.startswith("meta.llama3"):
+            input = response['prompt_token_count']
+            output = response['generation_token_count']
+        elif resource.startswith("anthropic."):
+            usage = response['usage']
+            input = usage['input_tokens']
+            output = usage['output_tokens']
+        units["text"] = Units(input=input, output=output)
+
+        if self._log_prompt_and_response:
+            self._ingest["provider_response_json"] = data.decode('utf-8')
+            
+        self._instrumentor._ingest_units(self._ingest)
+
+        return data
+
+def wrap_invoke(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+    @wraps(wrapped)
+    def invoke_wrapper(*args: Any, **kwargs: 'dict[str, Any]') -> Any:
+        modelId:str = kwargs.get("modelId", "") # type: ignore
+
+        if modelId.startswith("meta.llama3") or modelId.startswith("anthropic."):
+            return instrumentor.chat_wrapper(
+                category="system.aws.bedrock",
+                process_chunk=None,
+                process_request=process_invoke_request,  
+                process_synchronous_response=process_synchronous_invoke_response,  
+                is_streaming=IsStreaming.false,
+                wrapped=wrapped,
+                instance=None,
+                args=args,
+                kwargs=kwargs,
+        )
+        return wrapped(*args, **kwargs)
+    
+    return invoke_wrapper
+
+def wrap_invoke_stream(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+    @wraps(wrapped)
+    def invoke_wrapper(*args: Any, **kwargs: Any) -> Any:
+        modelId:str = kwargs.get("modelId", "") # type: ignore
+
+        if modelId.startswith("meta.llama3") or modelId.startswith("anthropic."):
+            return instrumentor.chat_wrapper(
+                category="system.aws.bedrock",
+                process_chunk=process_invoke_streaming_anthropic_chunk if modelId.startswith("anthropic.") else process_invoke_streaming_llama_chunk,
+                process_request=process_invoke_request, 
+                process_synchronous_response=None,  
+                is_streaming=IsStreaming.true,
+                wrapped=wrapped,
+                instance=None,
+                args=args,
+                kwargs=kwargs,
+            )
+        return wrapped(*args, **kwargs)
+
+    return invoke_wrapper
+
+def wrap_converse(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+    @wraps(wrapped)
+    def invoke_wrapper(*args: Any, **kwargs: 'dict[str, Any]') -> Any:
+        modelId:str = kwargs.get("modelId", "") # type: ignore
+
+        if modelId.startswith("meta.llama3") or modelId.startswith("anthropic."):
+            return instrumentor.chat_wrapper(
+                category="system.aws.bedrock",
+                process_chunk=None,
+                process_request=process_converse_request,  
+                process_synchronous_response=process_synchronous_converse_response,  
+                is_streaming=IsStreaming.false,
+                wrapped=wrapped,
+                instance=None,
+                args=args,
+                kwargs=kwargs,
+        )
+        return wrapped(*args, **kwargs)
+    
+    return invoke_wrapper
+
+def wrap_converse_stream(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+    @wraps(wrapped)
+    def invoke_wrapper(*args: Any, **kwargs: Any) -> Any:
+        modelId:str = kwargs.get("modelId", "") # type: ignore
+
+        if modelId.startswith("meta.llama3") or modelId.startswith("anthropic."):
+            return instrumentor.chat_wrapper(
+                category="system.aws.bedrock",
+                process_chunk=process_converse_streaming_chunk,
+                process_request=process_converse_request, 
+                process_synchronous_response=None,  
+                is_streaming=IsStreaming.true,
+                wrapped=wrapped,
+                instance=None,
+                args=args,
+                kwargs=kwargs,
+            )
+        return wrapped(*args, **kwargs)
+
+    return invoke_wrapper
+
+def process_invoke_streaming_anthropic_chunk(chunk: str, ingest: IngestUnitsParams) -> None:
+    chunk_dict =  json.loads(chunk)
+    type = chunk_dict.get("type", "")
+
+    if type == "message_start":
+        usage = chunk_dict['message']['usage']
+        units = ingest["units"]
+
+        input = PayiInstrumentor.update_for_vision(usage['input_tokens'], units)
+
+        units["text"] = Units(input=input, output=0)
+
+        text_cache_write: int = usage.get("cache_creation_input_tokens", 0)
+        if text_cache_write > 0:
+            units["text_cache_write"] = Units(input=text_cache_write, output=0)
+
+        text_cache_read: int = usage.get("cache_read_input_tokens", 0)
+        if text_cache_read > 0:
+            units["text_cache_read"] = Units(input=text_cache_read, output=0)
+
+    elif type == "message_delta":
+        usage = chunk_dict['usage']
+        ingest["units"]["text"]["output"] = usage['output_tokens']
+
+def process_invoke_streaming_llama_chunk(chunk: str, ingest: IngestUnitsParams) -> None:
+    chunk_dict =  json.loads(chunk)
+    metrics = chunk_dict.get("amazon-bedrock-invocationMetrics", {})
+    if metrics:
+        input = metrics.get("inputTokenCount", 0)
+        output = metrics.get("outputTokenCount", 0)
+        ingest["units"]["text"] = Units(input=input, output=output)
+    
+def process_synchronous_invoke_response(
+        response: Any,
+        ingest: IngestUnitsParams,
+        log_prompt_and_response: bool,
+        instrumentor: PayiInstrumentor,
+        **kargs: Any) -> Any: #  noqa: ARG001
+
+    metadata = response.get("ResponseMetadata", {})
+
+    # request_id = metadata.get("RequestId", "")
+    # if request_id:
+    #     ingest["provider_request_id"] = request_id
+
+    response_headers = metadata.get("HTTPHeaders", {}).copy()
+    if response_headers:
+        ingest["provider_response_headers"] = [PayICommonModelsAPIRouterHeaderInfoParam(name=k, value=v) for k, v in response_headers.items()]
+
+    response["body"] = InvokeResponseWrapper(
+        response=response["body"],
+        instrumentor=instrumentor,
+        ingest=ingest,
+        log_prompt_and_response=log_prompt_and_response)
+
+    return response
+
+def process_invoke_request(ingest: IngestUnitsParams, kwargs: Any) -> None: #  noqa: ARG001
+    return
+
+def process_converse_streaming_chunk(chunk: 'dict[str, Any]', ingest: IngestUnitsParams) -> None:
+    metadata = chunk.get("metadata", {})
+
+    if metadata:
+        usage = metadata['usage']
+        input = usage["inputTokens"]
+        output = usage["outputTokens"]
+        ingest["units"]["text"] = Units(input=input, output=output)
+
+def process_synchronous_converse_response(
+        response: 'dict[str, Any]',
+        ingest: IngestUnitsParams,
+        log_prompt_and_response: bool,
+        **kargs: Any) -> Any: #  noqa: ARG001
+
+    usage = response["usage"]
+    input = usage["inputTokens"]
+    output = usage["outputTokens"]
+    
+    units: dict[str, Units] = ingest["units"]
+    units["text"] = Units(input=input, output=output)
+
+    metadata = response.get("ResponseMetadata", {})
+
+    # request_id = metadata.get("RequestId", "")
+    # if request_id:
+    #     ingest["provider_request_id"] = request_id
+
+    response_headers = metadata.get("HTTPHeaders", {})
+    if response_headers:
+        ingest["provider_response_headers"] = [PayICommonModelsAPIRouterHeaderInfoParam(name=k, value=v) for k, v in response_headers.items()]
+
+    if log_prompt_and_response:
+        response_without_metadata = response.copy()
+        response_without_metadata.pop("ResponseMetadata", None)
+        ingest["provider_response_json"] = json.dumps(response_without_metadata)
+
+    return None    
+
+def process_converse_request(ingest: IngestUnitsParams, kwargs: Any) -> None: #  noqa: ARG001
+    return

{payi-0.1.0a39 → payi-0.1.0a41}/src/payi/lib/Instruments.py

@@ -5,3 +5,4 @@ class Instruments(Enum):
     ALL = "all"
     OPENAI = "openai"
     ANTHROPIC = "anthropic"
+    AWS_BEDROCK = "aws.bedrock"