promptlayer 1.0.45__py3-none-any.whl → 1.0.47__py3-none-any.whl

promptlayer/__init__.py

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

promptlayer/promptlayer.py

@@ -71,24 +71,17 @@ class PromptLayer(PromptLayerMixin):
         if name == "openai":
             import openai as openai_module
 
-            openai = PromptLayerBase(
-                openai_module,
-                function_name="openai",
-                api_key=self.api_key,
-                tracer=self.tracer,
-            )
-            return openai
+            return PromptLayerBase(openai_module, function_name="openai", api_key=self.api_key, tracer=self.tracer)
         elif name == "anthropic":
             import anthropic as anthropic_module
 
-            anthropic = PromptLayerBase(
+            return PromptLayerBase(
                 anthropic_module,
                 function_name="anthropic",
                 provider_type="anthropic",
                 api_key=self.api_key,
                 tracer=self.tracer,
             )
-            return anthropic
         else:
             raise AttributeError(f"module {__name__} has no attribute {name}")
 
@@ -218,7 +211,7 @@ class PromptLayer(PromptLayerMixin):
             "prompt_name": prompt_name,
             "prompt_version": prompt_version,
             "prompt_release_label": prompt_release_label,
-            "input_variables": input_variables,
+            "input_variables": input_variables or {},
             "model_parameter_overrides": model_parameter_overrides,
             "tags": tags,
             "metadata": metadata,
@@ -290,8 +283,8 @@ class PromptLayer(PromptLayerMixin):
                         raise Exception(json.dumps(results, indent=4))
 
             return results
-        except Exception as e:
-            raise Exception(f"Error running workflow: {str(e)}")
+        except Exception as ex:
+            raise Exception(f"Error running workflow: {str(ex)}") from ex
 
     def log_request(
         self,

promptlayer/utils.py

@@ -26,6 +26,61 @@ from promptlayer.types.prompt_template import (
 )
 
 URL_API_PROMPTLAYER = os.environ.setdefault("URL_API_PROMPTLAYER", "https://api.promptlayer.com")
+WORKFLOWS_RUN_URL = URL_API_PROMPTLAYER + "/workflows/{}/run"
+WS_TOKEN_REQUEST_LIBRARY_URL = URL_API_PROMPTLAYER + "/ws-token-request-library"
+
+SET_WORKFLOW_COMPLETE_MESSAGE = "SET_WORKFLOW_COMPLETE"
+
+
+class FinalOutputCode(Enum):
+    OK = "OK"
+    EXCEEDS_SIZE_LIMIT = "EXCEEDS_SIZE_LIMIT"
+
+
+async def _get_final_output(execution_id: int, return_all_outputs: bool, *, headers: Dict[str, str]) -> Dict[str, Any]:
+    async with httpx.AsyncClient() as client:
+        response = await client.get(
+            f"{URL_API_PROMPTLAYER}/workflow-version-execution-results",
+            headers=headers,
+            params={"workflow_version_execution_id": execution_id, "return_all_outputs": return_all_outputs},
+        )
+        response.raise_for_status()
+        return response.json()
+
+
+def _make_message_listener(results_future, execution_id, return_all_outputs, headers):
+    async def message_listener(message: Message):
+        if message.name != SET_WORKFLOW_COMPLETE_MESSAGE:  # TODO(dmu) LOW: Do we really need this check?
+            return
+
+        message_data = json.loads(message.data)
+        result_code = message_data.get("result_code")
+        if result_code in (FinalOutputCode.OK.value, None):
+            results = message_data["final_output"]
+        elif result_code == FinalOutputCode.EXCEEDS_SIZE_LIMIT.value:
+            results = await _get_final_output(execution_id, return_all_outputs, headers=headers)
+        else:
+            raise NotImplementedError(f"Unsupported final output code: {result_code}")
+
+        results_future.set_result(results)
+
+    return message_listener
+
+
+async def _wait_for_workflow_completion(*, token, channel_name, execution_id, return_all_outputs, headers, timeout):
+    results = asyncio.Future()
+    message_listener = _make_message_listener(results, execution_id, return_all_outputs, headers)
+
+    client = AblyRealtime(token=token)
+    channel = client.channels.get(channel_name)
+    await channel.subscribe(SET_WORKFLOW_COMPLETE_MESSAGE, message_listener)
+    try:
+        return await asyncio.wait_for(results, timeout)
+    except asyncio.TimeoutError as ex:
+        raise Exception("Workflow execution did not complete properly") from ex
+    finally:
+        channel.unsubscribe(SET_WORKFLOW_COMPLETE_MESSAGE, message_listener)
+        await client.close()
 
 
 async def arun_workflow_request(
@@ -46,13 +101,10 @@ async def arun_workflow_request(
         "workflow_version_number": workflow_version_number,
         "return_all_outputs": return_all_outputs,
     }
-
-    url = f"{URL_API_PROMPTLAYER}/workflows/{workflow_name}/run"
     headers = {"X-API-KEY": api_key}
-
     try:
         async with httpx.AsyncClient() as client:
-            response = await client.post(url, json=payload, headers=headers)
+            response = await client.post(WORKFLOWS_RUN_URL.format(workflow_name), json=payload, headers=headers)
             if response.status_code != 201:
                 raise_on_bad_response(
                     response,
@@ -60,28 +112,22 @@ async def arun_workflow_request(
                 )
 
             result = response.json()
-            warning = result.get("warning")
-            if warning:
+            if warning := result.get("warning"):
                 print(f"WARNING: {warning}")
 
-    except Exception as e:
-        error_message = f"Failed to run workflow: {str(e)}"
+    except Exception as ex:
+        error_message = f"Failed to run workflow: {str(ex)}"
         print(error_message)
         raise Exception(error_message)
 
-    execution_id = result.get("workflow_version_execution_id")
-    if not execution_id:
+    if not (execution_id := result.get("workflow_version_execution_id")):
         raise Exception("No execution ID returned from workflow run")
 
     channel_name = f"workflow_updates:{execution_id}"
-
-    # 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},
+                WS_TOKEN_REQUEST_LIBRARY_URL, headers=headers, params={"capability": channel_name}
             )
             if ws_response.status_code != 201:
                 raise_on_bad_response(
@@ -89,44 +135,19 @@ async def arun_workflow_request(
                     "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}"
+    except Exception as ex:
+        error_message = f"Failed to get WebSocket token: {ex}"
         print(error_message)
-        raise Exception(error_message)
-
-    # Initialize Ably client
-    ably_client = AblyRealtime(token=token_details["token"])
-
-    # Subscribe to the channel named after the execution ID
-    channel = ably_client.channels.get(channel_name)
-
-    results = None
-    message_received_event = asyncio.Event()
-
-    async def message_listener(message: Message):
-        nonlocal results
-
-        if message.name == "SET_WORKFLOW_COMPLETE":
-            message_data = json.loads(message.data)
-            results = message_data["final_output"]
-            message_received_event.set()
-
-    # Subscribe to the channel
-    await channel.subscribe("SET_WORKFLOW_COMPLETE", message_listener)
-
-    # Wait for the message or timeout
-    try:
-        await asyncio.wait_for(message_received_event.wait(), timeout)
-    except asyncio.TimeoutError:
-        channel.unsubscribe("SET_WORKFLOW_COMPLETE", message_listener)
-        await ably_client.close()
-        raise Exception("Workflow execution did not complete properly")
-
-    # Unsubscribe from the channel and close the client
-    channel.unsubscribe("SET_WORKFLOW_COMPLETE", message_listener)
-    await ably_client.close()
-
-    return results
+        raise Exception(error_message) from ex
+
+    return await _wait_for_workflow_completion(
+        token=token_details["token"],
+        channel_name=channel_name,
+        execution_id=execution_id,
+        return_all_outputs=return_all_outputs,
+        headers=headers,
+        timeout=timeout,
+    )
 
 
 def promptlayer_api_handler(
@@ -1718,7 +1739,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] if history else None
+    last_message = history[-1].parts[0] if history else None
     if stream:
         return chat.send_message_stream(message=last_message)
     return chat.send_message(message=last_message)
@@ -1780,7 +1801,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] if history else None
+    last_message = history[-1].parts[0] if history else None
     if stream:
         return await chat.send_message_stream(message=last_message)
     return await chat.send_message(message=last_message)
@@ -1813,7 +1834,7 @@ async def agoogle_request(request: GetPromptTemplateResponse, **kwargs):
 async def amap_google_stream_response(generator: AsyncIterable[Any]):
     from google.genai.chats import GenerateContentResponse
 
-    response = GenerateContentResponse()
+    GenerateContentResponse()
     content = ""
     async for result in generator:
         content = f"{content}{result.candidates[0].content.parts[0].text}"

{promptlayer-1.0.45.dist-info → promptlayer-1.0.47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: promptlayer
-Version: 1.0.45
+Version: 1.0.47
 Summary: PromptLayer is a platform for prompt engineering and tracks your LLM requests.
 License: Apache-2.0
 Author: Magniv
@@ -15,7 +15,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: ably (>=2.0.11,<3.0.0)
 Requires-Dist: aiohttp (>=3.10.10,<4.0.0)
-Requires-Dist: anthropic (==0.49.0)
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
 Requires-Dist: nest-asyncio (>=1.6.0,<2.0.0)
 Requires-Dist: opentelemetry-api (>=1.26.0,<2.0.0)

{promptlayer-1.0.45.dist-info → promptlayer-1.0.47.dist-info}/RECORD

@@ -1,7 +1,7 @@
-promptlayer/__init__.py,sha256=lF0AT1-uoLyJOLux4SRaLhkoajT2xSDNpe057cQahMA,140
+promptlayer/__init__.py,sha256=hzHTt786KmdtfDauPf3Q1SF9wxA7wLTZsQ-wgZ9B3JI,140
 promptlayer/groups/__init__.py,sha256=xhOAolLUBkr76ZHvJr29OwjCIk1V9qKQXjZCuyTJUIY,429
 promptlayer/groups/groups.py,sha256=YPROicy-TzpkrpA8vOpZS2lwvJ6VRtlbQ1S2oT1N0vM,338
-promptlayer/promptlayer.py,sha256=j-2quL72MG0N5XzG55ZD8BD1zckVZROx5W8RYI4Y33Y,20776
+promptlayer/promptlayer.py,sha256=RRsZ2vFrLcR1Tb72HDdTpZd2CcXIpzQnZuZrY9eYbyo,20651
 promptlayer/promptlayer_base.py,sha256=jOgXzNZlV1LKOOsXSSAOgn8o4hXn_EV0oY9Nf3Bsu_s,6872
 promptlayer/promptlayer_mixins.py,sha256=Plx_zRWOzHxk49Rr5jv6Yq0-mrRfgwzxeU6wS4iahLE,10897
 promptlayer/span_exporter.py,sha256=wxJoYHsaS0zrMpYShCeHGChWI06DeNHQfeFf5ZRU498,2508
@@ -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=GoYSorgBmUgvtyXaGAOv0KgVC61Llzn8bND6PF1fW50,4929
 promptlayer/types/request_log.py,sha256=xU6bcxQar6GaBOJlgZTavXUV3FjE8sF_nSjPu4Ya_00,174
-promptlayer/utils.py,sha256=ojLyY0sQ8aVm2w1YRis3gQyKvdpnpMVD_wytnP6Dj8I,62824
-promptlayer-1.0.45.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.45.dist-info/METADATA,sha256=JYUScUnsix7vjwDzV3zWEbiBoOZYqk7NnIOGSj5a0yU,4855
-promptlayer-1.0.45.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-promptlayer-1.0.45.dist-info/RECORD,,
+promptlayer/utils.py,sha256=BECM_zD1uZB2vopru8ykJdFbeDMozWHWzJeVz5Svht0,64129
+promptlayer-1.0.47.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.47.dist-info/METADATA,sha256=mtGVfTXcsqTKODoe7XlJyQPBa14BlrjwUn9DX_R9gcc,4819
+promptlayer-1.0.47.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+promptlayer-1.0.47.dist-info/RECORD,,

{promptlayer-1.0.45.dist-info → promptlayer-1.0.47.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any