promptlayer 1.0.28__tar.gz → 1.0.30__tar.gz

{promptlayer-1.0.28 → promptlayer-1.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: promptlayer
-Version: 1.0.28
+Version: 1.0.30
 Summary: PromptLayer is a platform for prompt engineering and tracks your LLM requests.
 License: Apache-2.0
 Author: Magniv
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: ably (>=2.0.6,<3.0.0)
 Requires-Dist: aiohttp (>=3.10.10,<4.0.0)
 Requires-Dist: httpx (>=0.27.2,<0.28.0)
+Requires-Dist: nest-asyncio (>=1.6.0,<2.0.0)
 Requires-Dist: opentelemetry-api (>=1.26.0,<2.0.0)
 Requires-Dist: opentelemetry-sdk (>=1.26.0,<2.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)

{promptlayer-1.0.28 → promptlayer-1.0.30}/promptlayer/__init__.py

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

{promptlayer-1.0.28 → promptlayer-1.0.30}/promptlayer/promptlayer.py

@@ -5,6 +5,7 @@ from copy import deepcopy
 from functools import wraps
 from typing import Any, Dict, List, Literal, Optional, Union
 
+import nest_asyncio
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
@@ -20,12 +21,12 @@ from promptlayer.utils import (
     anthropic_request,
     anthropic_stream_completion,
     anthropic_stream_message,
+    arun_workflow_request,
     autil_log_request,
     azure_openai_request,
     openai_request,
     openai_stream_chat,
     openai_stream_completion,
-    run_workflow_async,
     stream_response,
     track_request,
     util_log_request,
@@ -173,7 +174,12 @@ class PromptLayer:
 
     @staticmethod
     def _prepare_llm_request_params(
-        *, prompt_blueprint, prompt_template, prompt_blueprint_model, stream
+        *,
+        prompt_blueprint,
+        prompt_template,
+        prompt_blueprint_model,
+        model_parameter_overrides,
+        stream,
     ):
         provider = prompt_blueprint_model["provider"]
         kwargs = deepcopy(prompt_blueprint["llm_kwargs"])
@@ -182,6 +188,9 @@ class PromptLayer:
         if provider_base_url := prompt_blueprint.get("provider_base_url"):
             kwargs["base_url"] = provider_base_url["url"]
 
+        if model_parameter_overrides:
+            kwargs.update(model_parameter_overrides)
+
         kwargs["stream"] = stream
         if stream and provider in ["openai", "openai.azure"]:
             kwargs["stream_options"] = {"include_usage": True}
@@ -235,6 +244,7 @@ class PromptLayer:
         prompt_version: Union[int, None] = None,
         prompt_release_label: Union[str, None] = None,
         input_variables: Union[Dict[str, Any], None] = None,
+        model_parameter_overrides: Union[Dict[str, Any], None] = None,
         tags: Union[List[str], None] = None,
         metadata: Union[Dict[str, str], None] = None,
         group_id: Union[int, None] = None,
@@ -255,6 +265,7 @@ class PromptLayer:
             prompt_blueprint=prompt_blueprint,
             prompt_template=prompt_blueprint["prompt_template"],
             prompt_blueprint_model=prompt_blueprint_model,
+            model_parameter_overrides=model_parameter_overrides,
             stream=stream,
         )
 
@@ -343,6 +354,7 @@ class PromptLayer:
         prompt_version: Union[int, None] = None,
         prompt_release_label: Union[str, None] = None,
         input_variables: Union[Dict[str, Any], None] = None,
+        model_parameter_overrides: Union[Dict[str, Any], None] = None,
         tags: Union[List[str], None] = None,
         metadata: Union[Dict[str, str], None] = None,
         group_id: Union[int, None] = None,
@@ -353,6 +365,7 @@ class PromptLayer:
             "prompt_version": prompt_version,
             "prompt_release_label": prompt_release_label,
             "input_variables": input_variables,
+            "model_parameter_overrides": model_parameter_overrides,
             "tags": tags,
             "metadata": metadata,
             "group_id": group_id,
@@ -384,16 +397,39 @@ class PromptLayer:
         return_all_outputs: Optional[bool] = False,
     ) -> Dict[str, Any]:
         try:
-            result = run_workflow_async(
-                workflow_name=workflow_name,
-                input_variables=input_variables or {},
-                metadata=metadata,
-                workflow_label_name=workflow_label_name,
-                workflow_version_number=workflow_version,
-                api_key=self.api_key,
-                return_all_outputs=return_all_outputs,
-            )
-            return result
+            try:
+                # Check if we're inside a running event loop
+                loop = asyncio.get_running_loop()
+            except RuntimeError:
+                loop = None
+
+            if loop and loop.is_running():
+                nest_asyncio.apply()
+                # If there's an active event loop, use `await` directly
+                return asyncio.run(
+                    arun_workflow_request(
+                        workflow_name=workflow_name,
+                        input_variables=input_variables or {},
+                        metadata=metadata,
+                        workflow_label_name=workflow_label_name,
+                        workflow_version_number=workflow_version,
+                        api_key=self.api_key,
+                        return_all_outputs=return_all_outputs,
+                    )
+                )
+            else:
+                # If there's no active event loop, use `asyncio.run()`
+                return asyncio.run(
+                    arun_workflow_request(
+                        workflow_name=workflow_name,
+                        input_variables=input_variables or {},
+                        metadata=metadata,
+                        workflow_label_name=workflow_label_name,
+                        workflow_version_number=workflow_version,
+                        api_key=self.api_key,
+                        return_all_outputs=return_all_outputs,
+                    )
+                )
         except Exception as e:
             raise Exception(f"Error running workflow: {str(e)}")
 
@@ -503,6 +539,31 @@ class AsyncPromptLayer:
         self.group = AsyncGroupManager(api_key)
         self.track = AsyncTrackManager(api_key)
 
+    async def run_workflow(
+        self,
+        workflow_name: str,
+        input_variables: Optional[Dict[str, Any]] = None,
+        metadata: Optional[Dict[str, str]] = None,
+        workflow_label_name: Optional[str] = None,
+        workflow_version: Optional[
+            int
+        ] = None,  # This is the version number, not the version ID
+        return_all_outputs: Optional[bool] = False,
+    ) -> Dict[str, Any]:
+        try:
+            result = await arun_workflow_request(
+                workflow_name=workflow_name,
+                input_variables=input_variables or {},
+                metadata=metadata,
+                workflow_label_name=workflow_label_name,
+                workflow_version_number=workflow_version,
+                api_key=self.api_key,
+                return_all_outputs=return_all_outputs,
+            )
+            return result
+        except Exception as e:
+            raise Exception(f"Error running workflow: {str(e)}")
+
     async def log_request(
         self,
         *,

{promptlayer-1.0.28 → promptlayer-1.0.30}/promptlayer/utils.py

@@ -10,10 +10,10 @@ from copy import deepcopy
 from enum import Enum
 from typing import Any, Callable, Dict, Generator, List, Optional, Union
 
-import aiohttp
 import httpx
 import requests
 from ably import AblyRealtime
+from ably.types.message import Message
 from opentelemetry import context, trace
 
 from promptlayer.types import RequestLog
@@ -30,41 +30,16 @@ URL_API_PROMPTLAYER = os.environ.setdefault(
 )
 
 
-def run_workflow_async(
+async def arun_workflow_request(
     *,
     workflow_name: str,
     input_variables: Dict[str, Any],
-    metadata: Optional[Dict[str, str]] = None,
+    metadata: Optional[Dict[str, Any]] = None,
     workflow_label_name: Optional[str] = None,
     workflow_version_number: Optional[int] = None,
     api_key: str,
     return_all_outputs: Optional[bool] = False,
     timeout: Optional[int] = 120,
-) -> Dict[str, Any]:
-    return asyncio.run(
-        run_workflow_request(
-            workflow_name=workflow_name,
-            input_variables=input_variables,
-            metadata=metadata,
-            workflow_label_name=workflow_label_name,
-            workflow_version_number=workflow_version_number,
-            api_key=api_key,
-            return_all_outputs=return_all_outputs,
-            timeout=timeout,
-        )
-    )
-
-
-async def run_workflow_request(
-    *,
-    workflow_name: str,
-    input_variables: Dict[str, Any],
-    metadata: Optional[Dict[str, str]] = None,
-    workflow_label_name: Optional[str] = None,
-    workflow_version_number: Optional[int] = None,
-    api_key: str,
-    return_all_outputs: Optional[bool] = None,
-    timeout: Optional[int] = 120,
 ) -> Dict[str, Any]:
     payload = {
         "input_variables": input_variables,
@@ -78,15 +53,21 @@ async def run_workflow_request(
     headers = {"X-API-KEY": api_key}
 
     try:
-        async with aiohttp.ClientSession() as session:
-            async with session.post(url, json=payload, headers=headers) as response:
-                if response.status != 201:
-                    error_message = f"Failed to run workflow: {response.status} {await response.text()}"
-                    print(error_message)
-                    raise Exception(error_message)
-                result = await response.json()
+        async with httpx.AsyncClient() as client:
+            response = await client.post(url, json=payload, headers=headers)
+            if response.status_code != 201:
+                raise_on_bad_response(
+                    response,
+                    "PromptLayer had the following error while running your workflow",
+                )
+
+            result = response.json()
+            warning = result.get("warning")
+            if warning:
+                print(f"WARNING: {warning}")
+
     except Exception as e:
-        error_message = f"Failed to run workflow: {e}"
+        error_message = f"Failed to run workflow: {str(e)}"
         print(error_message)
         raise Exception(error_message)
 
@@ -96,12 +77,24 @@ async def run_workflow_request(
 
     channel_name = f"workflow_updates:{execution_id}"
 
-    ws_response = requests.post(
-        f"{URL_API_PROMPTLAYER}/ws-token-request-library",
-        headers=headers,
-        params={"capability": channel_name},
-    )
-    token_details = ws_response.json()["token_details"]
+    # Get WebSocket token
+    try:
+        async with httpx.AsyncClient() as client:
+            ws_response = await client.post(
+                f"{URL_API_PROMPTLAYER}/ws-token-request-library",
+                headers=headers,
+                params={"capability": channel_name},
+            )
+            if ws_response.status_code != 201:
+                raise_on_bad_response(
+                    ws_response,
+                    "PromptLayer had the following error while getting WebSocket token",
+                )
+            token_details = ws_response.json()["token_details"]
+    except Exception as e:
+        error_message = f"Failed to get WebSocket token: {e}"
+        print(error_message)
+        raise Exception(error_message)
 
     # Initialize Ably client
     ably_client = AblyRealtime(token=token_details["token"])
@@ -112,7 +105,7 @@ async def run_workflow_request(
     final_output = {}
     message_received_event = asyncio.Event()
 
-    async def message_listener(message):
+    async def message_listener(message: Message):
         if message.name == "set_workflow_node_output":
             data = json.loads(message.data)
             if data.get("status") == "workflow_complete":
@@ -130,7 +123,7 @@ async def run_workflow_request(
         await ably_client.close()
         raise Exception("Workflow execution did not complete properly")
 
-    # Unsubscribe from the channel
+    # Unsubscribe from the channel and close the client
     channel.unsubscribe("set_workflow_node_output", message_listener)
     await ably_client.close()
 
@@ -761,7 +754,9 @@ def warn_on_bad_response(request_response, main_message):
 def raise_on_bad_response(request_response, main_message):
     if hasattr(request_response, "json"):
         try:
-            raise Exception(f"{main_message}: {request_response.json().get('message')}")
+            raise Exception(
+                f"{main_message}: {request_response.json().get('message') or request_response.json().get('error')}"
+            )
         except json.JSONDecodeError:
             raise Exception(f"{main_message}: {request_response}")
     else:
@@ -953,7 +948,11 @@ async def aget_prompt_template(
                 headers={"X-API-KEY": api_key},
                 json=json_body,
             )
-        response.raise_for_status()
+            if response.status_code != 200:
+                raise_on_bad_response(
+                    response,
+                    "PromptLayer had the following error while getting your prompt template",
+                )
         warning = response.json().get("warning", None)
         if warning:
             warn_on_bad_response(
@@ -961,10 +960,6 @@ async def aget_prompt_template(
                 "WARNING: While getting your prompt template",
             )
         return response.json()
-    except httpx.HTTPStatusError as e:
-        raise Exception(
-            f"PromptLayer had the following error while getting your prompt template: {e.response.text}"
-        ) from e
     except httpx.RequestError as e:
         raise Exception(
             f"PromptLayer had the following error while getting your prompt template: {str(e)}"
@@ -1015,12 +1010,12 @@ async def apublish_prompt_template(
             raise Exception(
                 f"PromptLayer had the following error while publishing your prompt template: {response.text}"
             )
-        response.raise_for_status()
+        if response.status_code != 201:
+            raise_on_bad_response(
+                response,
+                "PromptLayer had the following error while publishing your prompt template",
+            )
         return response.json()
-    except httpx.HTTPStatusError as e:
-        raise Exception(
-            f"PromptLayer had the following error while publishing your prompt template: {e.response.text}"
-        ) from e
     except httpx.RequestError as e:
         raise Exception(
             f"PromptLayer had the following error while publishing your prompt template: {str(e)}"
@@ -1058,13 +1053,13 @@ async def aget_all_prompt_templates(
                 headers={"X-API-KEY": api_key},
                 params={"page": page, "per_page": per_page},
             )
-        response.raise_for_status()
+        if response.status_code != 200:
+            raise_on_bad_response(
+                response,
+                "PromptLayer had the following error while getting all your prompt templates",
+            )
         items = response.json().get("items", [])
         return items
-    except httpx.HTTPStatusError as e:
-        raise Exception(
-            f"PromptLayer had the following error while getting all your prompt templates: {e.response.text}"
-        ) from e
     except httpx.RequestError as e:
         raise Exception(
             f"PromptLayer had the following error while getting all your prompt templates: {str(e)}"

{promptlayer-1.0.28 → promptlayer-1.0.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "promptlayer"
-version = "1.0.28"
+version = "1.0.30"
 description = "PromptLayer is a platform for prompt engineering and tracks your LLM requests."
 authors = ["Magniv <hello@magniv.io>"]
 license = "Apache-2.0"
@@ -14,6 +14,7 @@ opentelemetry-sdk = "^1.26.0"
 ably = "^2.0.6"
 aiohttp = "^3.10.10"
 httpx = "^0.27.2"
+nest-asyncio = "^1.6.0"
 
 [tool.poetry.group.dev.dependencies]
 langchain = "^0.0.260"