promptlayer 1.0.62__py3-none-any.whl → 1.0.64__py3-none-any.whl

promptlayer/__init__.py

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

promptlayer/promptlayer.py

@@ -135,6 +135,7 @@ class PromptLayer(PromptLayerMixin):
             metadata=metadata,
             provider=provider,
             model=model,
+            model_parameter_overrides=model_parameter_overrides,
         )
         prompt_blueprint = self.templates.get(prompt_name, get_prompt_template_params)
         prompt_blueprint_model = self._validate_and_extract_model_from_prompt_blueprint(
@@ -144,7 +145,6 @@ class PromptLayer(PromptLayerMixin):
             prompt_blueprint=prompt_blueprint,
             prompt_template=prompt_blueprint["prompt_template"],
             prompt_blueprint_model=prompt_blueprint_model,
-            model_parameter_overrides=model_parameter_overrides,
             stream=stream,
         )
 
@@ -572,6 +572,7 @@ class AsyncPromptLayer(PromptLayerMixin):
             metadata=metadata,
             provider=provider,
             model=model,
+            model_parameter_overrides=model_parameter_overrides,
         )
         prompt_blueprint = await self.templates.get(prompt_name, get_prompt_template_params)
         prompt_blueprint_model = self._validate_and_extract_model_from_prompt_blueprint(
@@ -581,7 +582,6 @@ class AsyncPromptLayer(PromptLayerMixin):
             prompt_blueprint=prompt_blueprint,
             prompt_template=prompt_blueprint["prompt_template"],
             prompt_blueprint_model=prompt_blueprint_model,
-            model_parameter_overrides=model_parameter_overrides,
             stream=stream,
             is_async=True,
         )

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,
 }
 
 
@@ -191,6 +215,7 @@ class PromptLayerMixin:
         metadata: Union[Dict[str, str], None],
         provider: Union[str, None] = None,
         model: Union[str, None] = None,
+        model_parameter_overrides: Union[Dict[str, Any], None] = None,
     ) -> Dict[str, Any]:
         params = {}
 
@@ -206,6 +231,8 @@ class PromptLayerMixin:
             params["provider"] = provider
         if model:
             params["model"] = model
+        if model_parameter_overrides:
+            params["model_parameter_overrides"] = model_parameter_overrides
 
         return params
 
@@ -215,7 +242,6 @@ class PromptLayerMixin:
         prompt_blueprint,
         prompt_template,
         prompt_blueprint_model,
-        model_parameter_overrides,
         stream,
         is_async=False,
     ):
@@ -233,9 +259,6 @@ class PromptLayerMixin:
         elif provider_base_url := prompt_blueprint.get("provider_base_url"):
             client_kwargs["base_url"] = provider_base_url["url"]
 
-        if model_parameter_overrides:
-            function_kwargs.update(model_parameter_overrides)
-
         if stream and provider in ["openai", "openai.azure"]:
             function_kwargs["stream_options"] = {"include_usage": True}
 

promptlayer/streaming/stream_processor.py

@@ -18,7 +18,7 @@ def _build_stream_blueprint(result: Any, metadata: Dict) -> Any:
     elif provider == "google" or (provider == "vertexai" and model_name.startswith("gemini")):
         return build_prompt_blueprint_from_google_event(result, metadata)
 
-    elif provider == "anthropic" or (provider == "vertexai" and model_name.startswith("claude")):
+    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":

promptlayer/utils.py

@@ -1542,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.62.dist-info → promptlayer-1.0.64.dist-info}/METADATA

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

{promptlayer-1.0.62.dist-info → promptlayer-1.0.64.dist-info}/RECORD

@@ -1,22 +1,22 @@
-promptlayer/__init__.py,sha256=GjRpGyl6bTJY05ZQlkVZOr8_ahNCmuYI3BPS3vyKvsk,140
+promptlayer/__init__.py,sha256=espGWsb2ruTQuV58LwrySNcRa1K-qfY8VACy73H1OHI,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.py,sha256=MVEcQUQoGopyfB5LIo4LACeg_AN-86J0MPTLS8NJFhc,22516
 promptlayer/promptlayer_base.py,sha256=jOgXzNZlV1LKOOsXSSAOgn8o4hXn_EV0oY9Nf3Bsu_s,6872
-promptlayer/promptlayer_mixins.py,sha256=x-HOqd7SaKnVHoGeySYKzwlPVnqpFH5oCohJQIEjLQY,12172
+promptlayer/promptlayer_mixins.py,sha256=nHRV-KFI6dHiEX-lr554Q7f1DeTDlzmJsIjbyQRWUAM,13059
 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=NQIumPzDwceFyqxLOHDe3tpAr2v39luICJlByVgB9mA,2813
+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=ds8F-pF-1xcrJrurg4Uamg7GcMx8VHc-0vaD0zEtZnw,56018
-promptlayer-1.0.62.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.62.dist-info/METADATA,sha256=xNrV0NJFpwRnLmWm7yStyQqdh1YCq3vCoU7LbMhHj3o,4819
-promptlayer-1.0.62.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-promptlayer-1.0.62.dist-info/RECORD,,
+promptlayer/utils.py,sha256=DNhX6ydXXIBDKI9c0d_Jke2l-ZjpdvIpWqXM7ebjt20,58029
+promptlayer-1.0.64.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.64.dist-info/METADATA,sha256=dVMp07jg6DLiXm7U0kegC7K3IgDDcFbExo-qCJmXrdc,4819
+promptlayer-1.0.64.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+promptlayer-1.0.64.dist-info/RECORD,,