promptlayer 1.0.57__py3-none-any.whl → 1.0.59__py3-none-any.whl

promptlayer/__init__.py

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

promptlayer/promptlayer_mixins.py

@@ -26,6 +26,7 @@ from promptlayer.utils import (
     aopenai_request,
     aopenai_stream_chat,
     aopenai_stream_completion,
+    avertexai_request,
     azure_openai_request,
     google_request,
     google_stream_chat,
@@ -35,6 +36,7 @@ from promptlayer.utils import (
     openai_request,
     openai_stream_chat,
     openai_stream_completion,
+    vertexai_request,
 )
 
 MAP_PROVIDER_TO_FUNCTION_NAME = {
@@ -97,6 +99,7 @@ MAP_PROVIDER_TO_FUNCTION = {
     "mistral": mistral_request,
     "openai": openai_request,
     "openai.azure": azure_openai_request,
+    "vertexai": vertexai_request,
 }
 
 AMAP_PROVIDER_TO_FUNCTION_NAME = {
@@ -159,6 +162,7 @@ AMAP_PROVIDER_TO_FUNCTION = {
     "mistral": amistral_request,
     "openai": aopenai_request,
     "openai.azure": aazure_openai_request,
+    "vertexai": avertexai_request,
 }
 
 
@@ -233,11 +237,18 @@ class PromptLayerMixin:
         if stream and provider in ["openai", "openai.azure"]:
             function_kwargs["stream_options"] = {"include_usage": True}
 
+        provider_function_name = provider
+        if provider_function_name == "vertexai":
+            if "gemini" in prompt_blueprint_model["name"]:
+                provider_function_name = "google"
+            elif "claude" in prompt_blueprint_model["name"]:
+                provider_function_name = "anthropic"
+
         if is_async:
-            config = AMAP_PROVIDER_TO_FUNCTION_NAME[provider][prompt_template["type"]]
+            config = AMAP_PROVIDER_TO_FUNCTION_NAME[provider_function_name][prompt_template["type"]]
             request_function = AMAP_PROVIDER_TO_FUNCTION[provider]
         else:
-            config = MAP_PROVIDER_TO_FUNCTION_NAME[provider][prompt_template["type"]]
+            config = MAP_PROVIDER_TO_FUNCTION_NAME[provider_function_name][prompt_template["type"]]
             request_function = MAP_PROVIDER_TO_FUNCTION[provider]
 
         return {

promptlayer/utils.py

@@ -1911,7 +1911,7 @@ def google_chat_request(client, **kwargs):
     history = [Content(**item) for item in kwargs.get("history", [])]
     generation_config = kwargs.get("generation_config", {})
     chat = client.chats.create(model=model, history=history, config=generation_config)
-    last_message = history[-1].parts[0] if history else None
+    last_message = history[-1].parts[0] if history else ""
     if stream:
         return chat.send_message_stream(message=last_message)
     return chat.send_message(message=last_message)
@@ -2008,7 +2008,7 @@ async def agoogle_chat_request(client, **kwargs):
     history = [Content(**item) for item in kwargs.get("history", [])]
     generation_config = kwargs.get("generation_config", {})
     chat = client.aio.chats.create(model=model, history=history, config=generation_config)
-    last_message = history[-1].parts[0] if history else None
+    last_message = history[-1].parts[0] if history else ""
     if stream:
         return await chat.send_message_stream(message=last_message)
     return await chat.send_message(message=last_message)
@@ -2072,3 +2072,49 @@ async def agoogle_stream_chat(generator: AsyncIterable[Any]):
 
 async def agoogle_stream_completion(generator: AsyncIterable[Any]):
     return await amap_google_stream_response(generator)
+
+
+def vertexai_request(prompt_blueprint: GetPromptTemplateResponse, client_kwargs: dict, function_kwargs: dict):
+    if "gemini" in prompt_blueprint["metadata"]["model"]["name"]:
+        return google_request(
+            prompt_blueprint=prompt_blueprint,
+            client_kwargs=client_kwargs,
+            function_kwargs=function_kwargs,
+        )
+
+    if "claude" in prompt_blueprint["metadata"]["model"]["name"]:
+        from anthropic import AnthropicVertex
+
+        client = AnthropicVertex(**client_kwargs)
+        if prompt_blueprint["prompt_template"]["type"] == "chat":
+            return anthropic_chat_request(client=client, **function_kwargs)
+        raise NotImplementedError(
+            f"Unsupported prompt template type {prompt_blueprint['prompt_template']['type']}' for Anthropic Vertex AI"
+        )
+
+    raise NotImplementedError(
+        f"Vertex AI request for model {prompt_blueprint['metadata']['model']['name']} is not implemented yet."
+    )
+
+
+async def avertexai_request(prompt_blueprint: GetPromptTemplateResponse, client_kwargs: dict, function_kwargs: dict):
+    if "gemini" in prompt_blueprint["metadata"]["model"]["name"]:
+        return await agoogle_request(
+            prompt_blueprint=prompt_blueprint,
+            client_kwargs=client_kwargs,
+            function_kwargs=function_kwargs,
+        )
+
+    if "claude" in prompt_blueprint["metadata"]["model"]["name"]:
+        from anthropic import AsyncAnthropicVertex
+
+        client = AsyncAnthropicVertex(**client_kwargs)
+        if prompt_blueprint["prompt_template"]["type"] == "chat":
+            return await aanthropic_chat_request(client=client, **function_kwargs)
+        raise NotImplementedError(
+            f"Unsupported prompt template type {prompt_blueprint['prompt_template']['type']}' for Anthropic Vertex AI"
+        )
+
+    raise NotImplementedError(
+        f"Vertex AI request for model {prompt_blueprint['metadata']['model']['name']} is not implemented yet."
+    )

{promptlayer-1.0.57.dist-info → promptlayer-1.0.59.dist-info}/METADATA

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

{promptlayer-1.0.57.dist-info → promptlayer-1.0.59.dist-info}/RECORD

@@ -1,9 +1,9 @@
-promptlayer/__init__.py,sha256=uvVwr1nN_g3tfP5Ka_jwOhCRuY1vQIweZrXfYK801Ak,140
+promptlayer/__init__.py,sha256=Gj2sG2OFxyf6LP1lCysUZUGPVSegsJn2FhSc5HBc1ww,140
 promptlayer/groups/__init__.py,sha256=xhOAolLUBkr76ZHvJr29OwjCIk1V9qKQXjZCuyTJUIY,429
 promptlayer/groups/groups.py,sha256=YPROicy-TzpkrpA8vOpZS2lwvJ6VRtlbQ1S2oT1N0vM,338
 promptlayer/promptlayer.py,sha256=4MtP_byvYdVi4yZp_VCyVpPGx3iAaijwDZHPoYDfqZc,22212
 promptlayer/promptlayer_base.py,sha256=jOgXzNZlV1LKOOsXSSAOgn8o4hXn_EV0oY9Nf3Bsu_s,6872
-promptlayer/promptlayer_mixins.py,sha256=MTOIx2jyebph4pu8fZA7QQPm22W_leX_CUmCiNt1K8U,11677
+promptlayer/promptlayer_mixins.py,sha256=1DfNk9woiB-EWtbydFRPp55f3Y88gt6be0m1OdVcDxs,12134
 promptlayer/span_exporter.py,sha256=Pc1-zWAcjVCSykh-4rYPqiEZvzkG9xaYLVoHFY_TWaQ,2410
 promptlayer/templates.py,sha256=7ObDPMzHXjttDdJdCXA_pDL9XAnmcujIWucmgZJcOC8,1179
 promptlayer/track/__init__.py,sha256=tyweLTAY7UpYpBHWwY-T3pOPDIlGjcgccYXqU_r0694,1710
@@ -11,8 +11,8 @@ promptlayer/track/track.py,sha256=A-awcYwsSwxktrlCMchy8NITIquwxU1UXbgLZMwqrA0,31
 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=bUrDMZtG4jSfp7nHc6A5ce3n7-5K1LCAlzEOr3y2ACw,73819
-promptlayer-1.0.57.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.57.dist-info/METADATA,sha256=lh7g5d0UA4rZXzJTxueyn8oobJqosEB9EbM3ytnISF4,4819
-promptlayer-1.0.57.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-promptlayer-1.0.57.dist-info/RECORD,,
+promptlayer/utils.py,sha256=lJoEMhXteIdkztX67rRoel8EcIMEcxH7JwQXXmg_yLo,75790
+promptlayer-1.0.59.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.59.dist-info/METADATA,sha256=xoBHjtE7yxwwx4gsuRCCqrPIgg6PxQ7vM_1u9iOa978,4819
+promptlayer-1.0.59.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+promptlayer-1.0.59.dist-info/RECORD,,