payi 0.1.0a59__py3-none-any.whl → 0.1.0a61__py3-none-any.whl

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.59"  # x-release-please-version
+__version__ = "0.1.0-alpha.61"  # x-release-please-version

payi/lib/AnthropicInstrumentor.py

@@ -7,12 +7,12 @@ from wrapt import wrap_function_wrapper  # type: ignore
 from payi.types import IngestUnitsParams
 from payi.types.ingest_units_params import Units
 
-from .instrument import IsStreaming, PayiInstrumentor
+from .instrument import _IsStreaming, _PayiInstrumentor
 
 
 class AnthropicIntrumentor:
     @staticmethod
-    def instrument(instrumentor: PayiInstrumentor) -> None:
+    def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
             import anthropic  # type: ignore #  noqa: F401  I001
 
@@ -45,9 +45,9 @@ class AnthropicIntrumentor:
             return
 
 
-@PayiInstrumentor.payi_wrapper
+@_PayiInstrumentor.payi_wrapper
 def chat_wrapper(
-    instrumentor: PayiInstrumentor,
+    instrumentor: _PayiInstrumentor,
     wrapped: Any,
     instance: Any,
     *args: Any,
@@ -58,16 +58,16 @@ def chat_wrapper(
         process_chunk,
         process_request,
         process_synchronous_response,
-        IsStreaming.kwargs,
+        _IsStreaming.kwargs,
         wrapped,
         instance,
         args,
         kwargs,
     )
 
-@PayiInstrumentor.payi_awrapper
+@_PayiInstrumentor.payi_awrapper
 async def achat_wrapper(
-    instrumentor: PayiInstrumentor,
+    instrumentor: _PayiInstrumentor,
     wrapped: Any,
     instance: Any,
     *args: Any,
@@ -78,7 +78,7 @@ async def achat_wrapper(
         process_chunk,
         process_request,
         process_synchronous_response,
-        IsStreaming.kwargs,
+        _IsStreaming.kwargs,
         wrapped,
         instance,
         args,
@@ -93,7 +93,7 @@ def process_chunk(chunk: Any, ingest: IngestUnitsParams) -> None:
         usage = chunk.message.usage
         units = ingest["units"]
 
-        input = PayiInstrumentor.update_for_vision(usage.input_tokens, units)
+        input = _PayiInstrumentor.update_for_vision(usage.input_tokens, units)
 
         units["text"] = Units(input=input, output=0)
 
@@ -124,7 +124,7 @@ 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)
+    input = _PayiInstrumentor.update_for_vision(input, units)
 
     units["text"] = Units(input=input, output=output)
 
@@ -165,4 +165,4 @@ def process_request(ingest: IngestUnitsParams, *args: Any, **kwargs: Any) -> Non
     if not has_image or estimated_token_count == 0:
         return
 
-    ingest["units"][PayiInstrumentor.estimated_prompt_tokens] = Units(input=estimated_token_count, output=0)
+    ingest["units"][_PayiInstrumentor.estimated_prompt_tokens] = Units(input=estimated_token_count, output=0)

payi/lib/BedrockInstrumentor.py

@@ -8,12 +8,12 @@ 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
+from .instrument import _IsStreaming, _PayiInstrumentor
 
 
 class BedrockInstrumentor:
     @staticmethod
-    def instrument(instrumentor: PayiInstrumentor) -> None:
+    def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
             import boto3  # type: ignore #  noqa: F401  I001
 
@@ -33,8 +33,8 @@ class BedrockInstrumentor:
             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
+@_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)
 
@@ -55,7 +55,7 @@ class InvokeResponseWrapper(ObjectProxy): # type: ignore
     def __init__(
         self,
         response: Any,
-        instrumentor: PayiInstrumentor,
+        instrumentor: _PayiInstrumentor,
         ingest: IngestUnitsParams,
         log_prompt_and_response: bool
         ) -> None:
@@ -95,7 +95,7 @@ class InvokeResponseWrapper(ObjectProxy): # type: ignore
 
         return data
 
-def wrap_invoke(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+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
@@ -106,7 +106,7 @@ def wrap_invoke(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
                 None,
                 process_invoke_request,  
                 process_synchronous_invoke_response,  
-                IsStreaming.false,
+                _IsStreaming.false,
                 wrapped,
                 None,
                 args,
@@ -116,7 +116,7 @@ def wrap_invoke(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
     
     return invoke_wrapper
 
-def wrap_invoke_stream(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+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
@@ -127,7 +127,7 @@ def wrap_invoke_stream(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
                 process_invoke_streaming_anthropic_chunk if modelId.startswith("anthropic.") else process_invoke_streaming_llama_chunk,
                 process_invoke_request, 
                 None,  
-                IsStreaming.true,
+                _IsStreaming.true,
                 wrapped,
                 None,
                 args,
@@ -137,7 +137,7 @@ def wrap_invoke_stream(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
 
     return invoke_wrapper
 
-def wrap_converse(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+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
@@ -148,7 +148,7 @@ def wrap_converse(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
                 None,
                 process_converse_request,  
                 process_synchronous_converse_response,  
-                IsStreaming.false,
+                _IsStreaming.false,
                 wrapped,
                 None,
                 args,
@@ -158,7 +158,7 @@ def wrap_converse(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
     
     return invoke_wrapper
 
-def wrap_converse_stream(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
+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
@@ -169,7 +169,7 @@ def wrap_converse_stream(instrumentor: PayiInstrumentor, wrapped: Any) -> Any:
                 process_converse_streaming_chunk,
                 process_converse_request, 
                 None,  
-                IsStreaming.true,
+                _IsStreaming.true,
                 wrapped,
                 None,
                 args,
@@ -187,7 +187,7 @@ def process_invoke_streaming_anthropic_chunk(chunk: str, ingest: IngestUnitsPara
         usage = chunk_dict['message']['usage']
         units = ingest["units"]
 
-        input = PayiInstrumentor.update_for_vision(usage['input_tokens'], units)
+        input = _PayiInstrumentor.update_for_vision(usage['input_tokens'], units)
 
         units["text"] = Units(input=input, output=0)
 
@@ -215,7 +215,7 @@ def process_synchronous_invoke_response(
         response: Any,
         ingest: IngestUnitsParams,
         log_prompt_and_response: bool,
-        instrumentor: PayiInstrumentor,
+        instrumentor: _PayiInstrumentor,
         **kargs: Any) -> Any: #  noqa: ARG001
 
     metadata = response.get("ResponseMetadata", {})

payi/lib/OpenAIInstrumentor.py

@@ -9,7 +9,7 @@ from wrapt import wrap_function_wrapper  # type: ignore
 from payi.types import IngestUnitsParams
 from payi.types.ingest_units_params import Units
 
-from .instrument import IsStreaming, PayiInstrumentor
+from .instrument import _IsStreaming, _PayiInstrumentor
 
 
 class OpenAiInstrumentor:
@@ -20,7 +20,7 @@ class OpenAiInstrumentor:
         return isinstance(instance._client, (AsyncAzureOpenAI, AzureOpenAI))
 
     @staticmethod
-    def instrument(instrumentor: PayiInstrumentor) -> None:
+    def instrument(instrumentor: _PayiInstrumentor) -> None:
         try:
             from openai import OpenAI  # type: ignore #  noqa: F401  I001
             
@@ -53,9 +53,9 @@ class OpenAiInstrumentor:
             return
 
 
-@PayiInstrumentor.payi_wrapper
+@_PayiInstrumentor.payi_wrapper
 def embeddings_wrapper(
-    instrumentor: PayiInstrumentor,
+    instrumentor: _PayiInstrumentor,
     wrapped: Any,
     instance: Any,
     *args: Any,
@@ -66,16 +66,16 @@ def embeddings_wrapper(
         None, # process_chat_chunk,
         None, # process_chat_request,
         process_ebmeddings_synchronous_response,
-        IsStreaming.false,
+        _IsStreaming.false,
         wrapped,
         instance,
         args,
         kwargs,
     )
 
-@PayiInstrumentor.payi_wrapper
+@_PayiInstrumentor.payi_wrapper
 async def aembeddings_wrapper(
-    instrumentor: PayiInstrumentor,
+    instrumentor: _PayiInstrumentor,
     wrapped: Any,
     instance: Any,
     *args: Any,
@@ -86,16 +86,16 @@ async def aembeddings_wrapper(
         None, # process_chat_chunk,
         None, # process_chat_request,
         process_ebmeddings_synchronous_response,
-        IsStreaming.false,
+        _IsStreaming.false,
         wrapped,
         instance,
         args,
         kwargs,
     )
 
-@PayiInstrumentor.payi_wrapper
+@_PayiInstrumentor.payi_wrapper
 def chat_wrapper(
-    instrumentor: PayiInstrumentor,
+    instrumentor: _PayiInstrumentor,
     wrapped: Any,
     instance: Any,
     *args: Any,
@@ -106,16 +106,16 @@ def chat_wrapper(
         process_chat_chunk,
         process_chat_request,
         process_chat_synchronous_response,
-        IsStreaming.kwargs,
+        _IsStreaming.kwargs,
         wrapped,
         instance,
         args,
         kwargs,
     )
 
-@PayiInstrumentor.payi_awrapper
+@_PayiInstrumentor.payi_awrapper
 async def achat_wrapper(
-    instrumentor: PayiInstrumentor,
+    instrumentor: _PayiInstrumentor,
     wrapped: Any,
     instance: Any,
     *args: Any,
@@ -126,7 +126,7 @@ async def achat_wrapper(
         process_chat_chunk,
         process_chat_request,
         process_chat_synchronous_response,
-        IsStreaming.kwargs,
+        _IsStreaming.kwargs,
         wrapped,
         instance,
         args,
@@ -184,7 +184,7 @@ 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 = PayiInstrumentor.update_for_vision(input - input_cache, units)
+    input = _PayiInstrumentor.update_for_vision(input - input_cache, units)
 
     units["text"] = Units(input=input, output=output)
 
@@ -221,4 +221,4 @@ def process_chat_request(ingest: IngestUnitsParams, *args: Any, **kwargs: Any) -
     if not has_image or estimated_token_count == 0:
         return
 
-    ingest["units"][PayiInstrumentor.estimated_prompt_tokens] = Units(input=estimated_token_count, output=0)
+    ingest["units"][_PayiInstrumentor.estimated_prompt_tokens] = Units(input=estimated_token_count, output=0)

payi/lib/helpers.py

@@ -1,3 +1,4 @@
+import os
 from typing import Dict, List, Union
 
 PAYI_BASE_URL = "https://api.pay-i.com"
@@ -69,22 +70,25 @@ def create_headers(
         headers.update({ PayiHeaderNames.use_case_version: str(use_case_version)})
     return headers
 
+def _resolve_payi_base_url(payi_base_url: Union[str, None]) -> str:
+    if payi_base_url:
+        return payi_base_url
+
+    payi_base_url = os.environ.get("PAYI_BASE_URL", None)
+
+    if payi_base_url:
+        return payi_base_url
+
+    return PAYI_BASE_URL
+
 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"
+    return _resolve_payi_base_url(payi_base_url=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"
+    return _resolve_payi_base_url(payi_base_url=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"
+    return _resolve_payi_base_url(payi_base_url=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"
+    return _resolve_payi_base_url(payi_base_url=payi_base_url) + "/api/v1/proxy/aws.bedrock"