promptlayer 1.0.22__py3-none-any.whl → 1.0.24__py3-none-any.whl

promptlayer/__init__.py

@@ -1,4 +1,4 @@
 from .promptlayer import PromptLayer
 
-__version__ = "1.0.22"
+__version__ = "1.0.24"
 __all__ = ["PromptLayer", "__version__"]

promptlayer/promptlayer.py

@@ -20,6 +20,7 @@ from promptlayer.utils import (
     anthropic_request,
     anthropic_stream_completion,
     anthropic_stream_message,
+    azure_openai_request,
     openai_request,
     openai_stream_chat,
     openai_stream_completion,
@@ -50,11 +51,22 @@ MAP_PROVIDER_TO_FUNCTION_NAME = {
             "stream_function": anthropic_stream_completion,
         },
     },
+    "openai.azure": {
+        "chat": {
+            "function_name": "openai.AzureOpenAI.chat.completions.create",
+            "stream_function": openai_stream_chat,
+        },
+        "completion": {
+            "function_name": "openai.AzureOpenAI.completions.create",
+            "stream_function": openai_stream_completion,
+        },
+    },
 }
 
 MAP_PROVIDER_TO_FUNCTION = {
     "openai": openai_request,
     "anthropic": anthropic_request,
+    "openai.azure": azure_openai_request,
 }
 
 
@@ -170,7 +182,7 @@ class PromptLayer:
             kwargs["base_url"] = provider_base_url["url"]
 
         kwargs["stream"] = stream
-        if stream and provider == "openai":
+        if stream and provider in ["openai", "openai.azure"]:
             kwargs["stream_options"] = {"include_usage": True}
 
         return {
@@ -365,7 +377,9 @@ class PromptLayer:
         input_variables: Optional[Dict[str, Any]] = None,
         metadata: Optional[Dict[str, str]] = None,
         workflow_label_name: Optional[str] = None,
-        workflow_version_number: Optional[int] = None,
+        workflow_version: Optional[
+            int
+        ] = None,  # This is the version number, not the version ID
     ) -> Dict[str, Any]:
         try:
             result = run_workflow_request(
@@ -373,7 +387,7 @@ class PromptLayer:
                 input_variables=input_variables or {},
                 metadata=metadata,
                 workflow_label_name=workflow_label_name,
-                workflow_version_number=workflow_version_number,
+                workflow_version_number=workflow_version,
                 api_key=self.api_key,
             )
             return result

promptlayer/utils.py

@@ -772,8 +772,10 @@ def openai_stream_chat(results: list):
         ChatCompletion,
         ChatCompletionChunk,
         ChatCompletionMessage,
+        ChatCompletionMessageToolCall,
     )
     from openai.types.chat.chat_completion import Choice
+    from openai.types.chat.chat_completion_message_tool_call import Function
 
     chat_completion_chunks: List[ChatCompletionChunk] = results
     response: ChatCompletion = ChatCompletion(
@@ -796,10 +798,42 @@ def openai_stream_chat(results: list):
     response.system_fingerprint = last_result.system_fingerprint
     response.usage = last_result.usage
     content = ""
+    tool_calls: Union[List[ChatCompletionMessageToolCall], None] = None
     for result in chat_completion_chunks:
-        if len(result.choices) > 0 and result.choices[0].delta.content:
+        choices = result.choices
+        if len(choices) == 0:
+            continue
+        if choices[0].delta.content:
             content = f"{content}{result.choices[0].delta.content}"
+
+        delta = choices[0].delta
+        if delta.tool_calls:
+            tool_calls = tool_calls or []
+            last_tool_call = None
+            if len(tool_calls) > 0:
+                last_tool_call = tool_calls[-1]
+            tool_call = delta.tool_calls[0]
+            if not tool_call.function:
+                continue
+            if not last_tool_call or tool_call.id:
+                tool_calls.append(
+                    ChatCompletionMessageToolCall(
+                        id=tool_call.id or "",
+                        function=Function(
+                            name=tool_call.function.name or "",
+                            arguments=tool_call.function.arguments or "",
+                        ),
+                        type=tool_call.type or "function",
+                    )
+                )
+                continue
+            last_tool_call.function.name = (
+                f"{last_tool_call.function.name}{tool_call.function.name or ''}"
+            )
+            last_tool_call.function.arguments = f"{last_tool_call.function.arguments}{tool_call.function.arguments or ''}"
+
     response.choices[0].message.content = content
+    response.choices[0].message.tool_calls = tool_calls
     return response
 
 
@@ -923,6 +957,16 @@ def openai_request(prompt_blueprint: GetPromptTemplateResponse, **kwargs):
     return request_to_make(client, **kwargs)
 
 
+def azure_openai_request(prompt_blueprint: GetPromptTemplateResponse, **kwargs):
+    from openai import AzureOpenAI
+
+    client = AzureOpenAI(base_url=kwargs.pop("base_url", None))
+    request_to_make = MAP_TYPE_TO_OPENAI_FUNCTION[
+        prompt_blueprint["prompt_template"]["type"]
+    ]
+    return request_to_make(client, **kwargs)
+
+
 def anthropic_chat_request(client, **kwargs):
     return client.messages.create(**kwargs)
 

{promptlayer-1.0.22.dist-info → promptlayer-1.0.24.dist-info}/METADATA

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

{promptlayer-1.0.22.dist-info → promptlayer-1.0.24.dist-info}/RECORD

@@ -1,7 +1,7 @@
-promptlayer/__init__.py,sha256=aF6sRMIn2_Y9xori_4spKkreZWQiBat3aauSIgiBKo4,102
+promptlayer/__init__.py,sha256=JTVK-6FTroG1GYTAY06uIChUCDWGll51745efZYKqlw,102
 promptlayer/groups/__init__.py,sha256=-xs-2cn0nc0D_5YxZr3nC86iTdRVZmBhEpOKDJXE-sQ,224
 promptlayer/groups/groups.py,sha256=yeO6T0TM3qB0ondZRiHhcH8G06YygrpFoM8b9RmoIao,165
-promptlayer/promptlayer.py,sha256=oyoH-toEteTAqt2rCBFqo4cWRIo1le-4eiwakNikOB8,16229
+promptlayer/promptlayer.py,sha256=Qyju-mDJcf0NiGjV6SQHsyf1syXHekvKhzRzExOn31k,16719
 promptlayer/promptlayer_base.py,sha256=sev-EZehRXJSZSmJtMkqmAUK1345pqbDY_lNjPP5MYA,7158
 promptlayer/span_exporter.py,sha256=zIJNsb3Fe6yb5wKLDmkoPF2wqFjk1p39E0jWHD2plzI,2658
 promptlayer/templates.py,sha256=aY_-BCrL0AgIdYEUE28pi0AP_avTVAgwv5hgzrh75vo,717
@@ -10,8 +10,8 @@ promptlayer/track/track.py,sha256=XNEZT9yNiRBPp9vaDZo_f0dP_ldOu8q1qafpVfS5Ze8,16
 promptlayer/types/__init__.py,sha256=xJcvQuOk91ZBBePb40-1FDNDKYrZoH5lPE2q6_UhprM,111
 promptlayer/types/prompt_template.py,sha256=TUXLXvuvew0EBLfTMBa2LhFeQoF7R-tcFKg7_UUtHMQ,4433
 promptlayer/types/request_log.py,sha256=xU6bcxQar6GaBOJlgZTavXUV3FjE8sF_nSjPu4Ya_00,174
-promptlayer/utils.py,sha256=Q1IHSK98e-VCcbpU7bdmpA2iQ7YY5wlQ4K8lMV16vaM,31921
-promptlayer-1.0.22.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.22.dist-info/METADATA,sha256=_cafx2H-l4TmvMTXNoi7BblkXMtucp8HklieARIvnCI,4660
-promptlayer-1.0.22.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-promptlayer-1.0.22.dist-info/RECORD,,
+promptlayer/utils.py,sha256=Oyk_n0hIbYaCFK98QaUzHQeEdGxfQL3HRfXY-AlbPm0,33662
+promptlayer-1.0.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.24.dist-info/METADATA,sha256=iGmVrzJEanaYQsBLYY7t2hF4ly4jCAHQnJJD01QHXdc,4660
+promptlayer-1.0.24.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+promptlayer-1.0.24.dist-info/RECORD,,