promptlayer 1.0.61__py3-none-any.whl → 1.0.63__py3-none-any.whl

promptlayer/__init__.py

@@ -1,4 +1,4 @@
 from .promptlayer import AsyncPromptLayer, PromptLayer
 
-__version__ = "1.0.61"
+__version__ = "1.0.63"
 __all__ = ["PromptLayer", "AsyncPromptLayer", "__version__"]

promptlayer/promptlayer_mixins.py

@@ -27,10 +27,12 @@ from promptlayer.streaming import (
     openai_stream_completion,
 )
 from promptlayer.utils import (
+    aanthropic_bedrock_request,
     aanthropic_request,
     aazure_openai_request,
     agoogle_request,
     amistral_request,
+    anthropic_bedrock_request,
     anthropic_request,
     aopenai_request,
     avertexai_request,
@@ -92,6 +94,16 @@ MAP_PROVIDER_TO_FUNCTION_NAME = {
             "stream_function": google_stream_completion,
         },
     },
+    "anthropic.bedrock": {
+        "chat": {
+            "function_name": "anthropic.messages.create",
+            "stream_function": anthropic_stream_message,
+        },
+        "completion": {
+            "function_name": "anthropic.completions.create",
+            "stream_function": anthropic_stream_completion,
+        },
+    },
 }
 
 
@@ -102,6 +114,7 @@ MAP_PROVIDER_TO_FUNCTION = {
     "openai": openai_request,
     "openai.azure": azure_openai_request,
     "vertexai": vertexai_request,
+    "anthropic.bedrock": anthropic_bedrock_request,
 }
 
 AMAP_PROVIDER_TO_FUNCTION_NAME = {
@@ -155,6 +168,16 @@ AMAP_PROVIDER_TO_FUNCTION_NAME = {
             "stream_function": agoogle_stream_completion,
         },
     },
+    "anthropic.bedrock": {
+        "chat": {
+            "function_name": "anthropic.messages.create",
+            "stream_function": aanthropic_stream_message,
+        },
+        "completion": {
+            "function_name": "anthropic.completions.create",
+            "stream_function": aanthropic_stream_completion,
+        },
+    },
 }
 
 
@@ -165,6 +188,7 @@ AMAP_PROVIDER_TO_FUNCTION = {
     "openai": aopenai_request,
     "openai.azure": aazure_openai_request,
     "vertexai": avertexai_request,
+    "anthropic.bedrock": aanthropic_bedrock_request,
 }
 
 

promptlayer/streaming/stream_processor.py

@@ -1,10 +1,3 @@
-"""
-Stream processors for handling streaming responses
-
-This module contains the main streaming logic that processes streaming responses
-from various LLM providers and builds progressive prompt blueprints.
-"""
-
 from typing import Any, AsyncGenerator, AsyncIterable, Callable, Dict, Generator
 
 from .blueprint_builder import (
@@ -14,35 +7,41 @@ from .blueprint_builder import (
 )
 
 
-def stream_response(*, generator: Generator, after_stream: Callable, map_results: Callable, metadata: Dict):
-    """
-    Process streaming responses and build progressive prompt blueprints
+def _build_stream_blueprint(result: Any, metadata: Dict) -> Any:
+    model_info = metadata.get("model", {}) if metadata else {}
+    provider = model_info.get("provider", "")
+    model_name = model_info.get("name", "")
 
-    Supports OpenAI, Anthropic, and Google (Gemini) streaming formats, building blueprints
-    progressively as the stream progresses.
-    """
-    results = []
-    stream_blueprint = None
-    for result in generator:
-        results.append(result)
+    if provider == "openai" or provider == "openai.azure":
+        return build_prompt_blueprint_from_openai_chunk(result, metadata)
+
+    elif provider == "google" or (provider == "vertexai" and model_name.startswith("gemini")):
+        return build_prompt_blueprint_from_google_event(result, metadata)
+
+    elif provider in ["anthropic", "anthropic.bedrock"] or (provider == "vertexai" and model_name.startswith("claude")):
+        return build_prompt_blueprint_from_anthropic_event(result, metadata)
+
+    elif provider == "mistral":
+        return build_prompt_blueprint_from_openai_chunk(result.data, metadata)
+
+    return None
 
-        # Handle OpenAI streaming format - process each chunk individually
-        if hasattr(result, "choices"):
-            stream_blueprint = build_prompt_blueprint_from_openai_chunk(result, metadata)
 
-        # Handle Google streaming format (Gemini) - GenerateContentResponse objects
-        elif hasattr(result, "candidates"):
-            stream_blueprint = build_prompt_blueprint_from_google_event(result, metadata)
+def _build_stream_data(result: Any, stream_blueprint: Any, request_id: Any = None) -> Dict[str, Any]:
+    return {
+        "request_id": request_id,
+        "raw_response": result,
+        "prompt_blueprint": stream_blueprint,
+    }
 
-        # Handle Anthropic streaming format - process each event individually
-        elif hasattr(result, "type"):
-            stream_blueprint = build_prompt_blueprint_from_anthropic_event(result, metadata)
 
-        data = {
-            "request_id": None,
-            "raw_response": result,
-            "prompt_blueprint": stream_blueprint,
-        }
+def stream_response(*, generator: Generator, after_stream: Callable, map_results: Callable, metadata: Dict):
+    results = []
+    for result in generator:
+        results.append(result)
+
+        stream_blueprint = _build_stream_blueprint(result, metadata)
+        data = _build_stream_data(result, stream_blueprint)
         yield data
 
     request_response = map_results(results)
@@ -58,35 +57,13 @@ async def astream_response(
     map_results: Callable[[Any], Any],
     metadata: Dict[str, Any] = None,
 ) -> AsyncGenerator[Dict[str, Any], None]:
-    """
-    Async version of stream_response
-
-    Process streaming responses asynchronously and build progressive prompt blueprints
-    Supports OpenAI, Anthropic, and Google (Gemini) streaming formats.
-    """
     results = []
-    stream_blueprint = None
 
     async for result in generator:
         results.append(result)
 
-        # Handle OpenAI streaming format - process each chunk individually
-        if hasattr(result, "choices"):
-            stream_blueprint = build_prompt_blueprint_from_openai_chunk(result, metadata)
-
-        # Handle Google streaming format (Gemini) - GenerateContentResponse objects
-        elif hasattr(result, "candidates"):
-            stream_blueprint = build_prompt_blueprint_from_google_event(result, metadata)
-
-        # Handle Anthropic streaming format - process each event individually
-        elif hasattr(result, "type"):
-            stream_blueprint = build_prompt_blueprint_from_anthropic_event(result, metadata)
-
-        data = {
-            "request_id": None,
-            "raw_response": result,
-            "prompt_blueprint": stream_blueprint,
-        }
+        stream_blueprint = _build_stream_blueprint(result, metadata)
+        data = _build_stream_data(result, stream_blueprint)
         yield data
 
     async def async_generator_from_list(lst):

promptlayer/utils.py

@@ -59,6 +59,10 @@ def _make_httpx_client():
     return httpx.AsyncClient(timeout=_get_http_timeout())
 
 
+def _make_simple_httpx_client():
+    return httpx.Client(timeout=_get_http_timeout())
+
+
 def _get_workflow_workflow_id_or_name(workflow_id_or_name, workflow_name):
     # This is backward compatibility code
     if (workflow_id_or_name := workflow_name if workflow_id_or_name is None else workflow_id_or_name) is None:
@@ -1396,7 +1400,7 @@ async def autil_log_request(api_key: str, **kwargs) -> Union[RequestLog, None]:
 def mistral_request(prompt_blueprint: GetPromptTemplateResponse, client_kwargs: dict, function_kwargs: dict):
     from mistralai import Mistral
 
-    client = Mistral(api_key=os.environ.get("MISTRAL_API_KEY"))
+    client = Mistral(api_key=os.environ.get("MISTRAL_API_KEY"), client=_make_simple_httpx_client())
     if "stream" in function_kwargs and function_kwargs["stream"]:
         function_kwargs.pop("stream")
         return client.chat.stream(**function_kwargs)
@@ -1412,7 +1416,7 @@ async def amistral_request(
 ):
     from mistralai import Mistral
 
-    client = Mistral(api_key=os.environ.get("MISTRAL_API_KEY"))
+    client = Mistral(api_key=os.environ.get("MISTRAL_API_KEY"), async_client=_make_httpx_client())
     if "stream" in function_kwargs and function_kwargs["stream"]:
         return await client.chat.stream_async(**function_kwargs)
     return await client.chat.complete_async(**function_kwargs)
@@ -1538,3 +1542,45 @@ async def avertexai_request(prompt_blueprint: GetPromptTemplateResponse, client_
     raise NotImplementedError(
         f"Vertex AI request for model {prompt_blueprint['metadata']['model']['name']} is not implemented yet."
     )
+
+
+def anthropic_bedrock_request(prompt_blueprint: GetPromptTemplateResponse, client_kwargs: dict, function_kwargs: dict):
+    from anthropic import AnthropicBedrock
+
+    client = AnthropicBedrock(
+        aws_access_key=function_kwargs.pop("aws_access_key", None),
+        aws_secret_key=function_kwargs.pop("aws_secret_key", None),
+        aws_region=function_kwargs.pop("aws_region", None),
+        aws_session_token=function_kwargs.pop("aws_session_token", None),
+        base_url=function_kwargs.pop("base_url", None),
+        **client_kwargs,
+    )
+    if prompt_blueprint["prompt_template"]["type"] == "chat":
+        return anthropic_chat_request(client=client, **function_kwargs)
+    elif prompt_blueprint["prompt_template"]["type"] == "completion":
+        return anthropic_completions_request(client=client, **function_kwargs)
+    raise NotImplementedError(
+        f"Unsupported prompt template type {prompt_blueprint['prompt_template']['type']}' for Anthropic Bedrock"
+    )
+
+
+async def aanthropic_bedrock_request(
+    prompt_blueprint: GetPromptTemplateResponse, client_kwargs: dict, function_kwargs: dict
+):
+    from anthropic import AsyncAnthropicBedrock
+
+    client = AsyncAnthropicBedrock(
+        aws_access_key=function_kwargs.pop("aws_access_key", None),
+        aws_secret_key=function_kwargs.pop("aws_secret_key", None),
+        aws_region=function_kwargs.pop("aws_region", None),
+        aws_session_token=function_kwargs.pop("aws_session_token", None),
+        base_url=function_kwargs.pop("base_url", None),
+        **client_kwargs,
+    )
+    if prompt_blueprint["prompt_template"]["type"] == "chat":
+        return await aanthropic_chat_request(client=client, **function_kwargs)
+    elif prompt_blueprint["prompt_template"]["type"] == "completion":
+        return await aanthropic_completions_request(client=client, **function_kwargs)
+    raise NotImplementedError(
+        f"Unsupported prompt template type {prompt_blueprint['prompt_template']['type']}' for Anthropic Bedrock"
+    )

{promptlayer-1.0.61.dist-info → promptlayer-1.0.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: promptlayer
-Version: 1.0.61
+Version: 1.0.63
 Summary: PromptLayer is a platform for prompt engineering and tracks your LLM requests.
 License: Apache-2.0
 Author: Magniv

{promptlayer-1.0.61.dist-info → promptlayer-1.0.63.dist-info}/RECORD

@@ -1,22 +1,22 @@
-promptlayer/__init__.py,sha256=nPvZs4XEeUdjEe3DmFZ5C-KBN4LifXxdYbK2mIextTY,140
+promptlayer/__init__.py,sha256=i_U-wg6qSSPBh8OcEf8G3SnNhnlNFx42LJZLadGC1gg,140
 promptlayer/groups/__init__.py,sha256=xhOAolLUBkr76ZHvJr29OwjCIk1V9qKQXjZCuyTJUIY,429
 promptlayer/groups/groups.py,sha256=YPROicy-TzpkrpA8vOpZS2lwvJ6VRtlbQ1S2oT1N0vM,338
 promptlayer/promptlayer.py,sha256=qaxxSvimmXgN45q-IvWsAtyzIJ-w397F97ofsH_7w00,22516
 promptlayer/promptlayer_base.py,sha256=jOgXzNZlV1LKOOsXSSAOgn8o4hXn_EV0oY9Nf3Bsu_s,6872
-promptlayer/promptlayer_mixins.py,sha256=x-HOqd7SaKnVHoGeySYKzwlPVnqpFH5oCohJQIEjLQY,12172
+promptlayer/promptlayer_mixins.py,sha256=TYxcAAosWG7wmST-TmE4ScAM9KhJy7_K8VfW4Z2Fjlk,13010
 promptlayer/span_exporter.py,sha256=Pc1-zWAcjVCSykh-4rYPqiEZvzkG9xaYLVoHFY_TWaQ,2410
 promptlayer/streaming/__init__.py,sha256=yNO77fyOi_scNPbE-eIEDGwSOyp8WYyPZ7ZrHaoipmM,1523
 promptlayer/streaming/blueprint_builder.py,sha256=NLmqwspHoAsecrY7varbF4EQaUg5yBKfBxS4y7UycuU,5925
 promptlayer/streaming/response_handlers.py,sha256=vNvpP-RLVl2uHkKLc8Ci9bmNldCezRey40tgtBEd4bo,19005
-promptlayer/streaming/stream_processor.py,sha256=wgY2B1PEJA3xWotDtJaeGS7rjhadAh7SVZ_q5QkEPbg,3752
+promptlayer/streaming/stream_processor.py,sha256=vB9pB25bd0vG-Pl2UYqB8Ae6b9iKSH-WCB9S-SNOSAU,2836
 promptlayer/templates.py,sha256=7ObDPMzHXjttDdJdCXA_pDL9XAnmcujIWucmgZJcOC8,1179
 promptlayer/track/__init__.py,sha256=tyweLTAY7UpYpBHWwY-T3pOPDIlGjcgccYXqU_r0694,1710
 promptlayer/track/track.py,sha256=A-awcYwsSwxktrlCMchy8NITIquwxU1UXbgLZMwqrA0,3164
 promptlayer/types/__init__.py,sha256=xJcvQuOk91ZBBePb40-1FDNDKYrZoH5lPE2q6_UhprM,111
 promptlayer/types/prompt_template.py,sha256=blkVBhh4u5pMhgX_Dsn78sN7Rv2Vy_zhd1-NERLXTpM,5075
 promptlayer/types/request_log.py,sha256=xU6bcxQar6GaBOJlgZTavXUV3FjE8sF_nSjPu4Ya_00,174
-promptlayer/utils.py,sha256=hUljiXqyatTvyMmKwHZQr53BsqJ7AaSwP91qXZ5Gb_g,55859
-promptlayer-1.0.61.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.61.dist-info/METADATA,sha256=xOL_XD0NZ9kjyr57x7YBotqkflTMLm-FR7_dM1PLNWk,4819
-promptlayer-1.0.61.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-promptlayer-1.0.61.dist-info/RECORD,,
+promptlayer/utils.py,sha256=DNhX6ydXXIBDKI9c0d_Jke2l-ZjpdvIpWqXM7ebjt20,58029
+promptlayer-1.0.63.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.63.dist-info/METADATA,sha256=m9PDd_ZohbPjrl2jB4yfAbg96q9IpfeVUFxaFzm8wrQ,4819
+promptlayer-1.0.63.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+promptlayer-1.0.63.dist-info/RECORD,,