promptlayer 1.0.32__py3-none-any.whl → 1.0.34__py3-none-any.whl

promptlayer/__init__.py

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

promptlayer/promptlayer.py

@@ -483,7 +483,7 @@ class AsyncPromptLayer(PromptLayerMixin):
             )
             return await atrack_request(**track_request_kwargs)
 
-        return await _track_request
+        return _track_request
 
     async def _track_request_log(
         self,
@@ -547,15 +547,16 @@ class AsyncPromptLayer(PromptLayerMixin):
         )
 
         if stream:
+            track_request_callable = await self._create_track_request_callable(
+                request_params=llm_request_params,
+                tags=tags,
+                input_variables=input_variables,
+                group_id=group_id,
+                pl_run_span_id=pl_run_span_id,
+            )
             return astream_response(
                 response,
-                self._create_track_request_callable(
-                    request_params=llm_request_params,
-                    tags=tags,
-                    input_variables=input_variables,
-                    group_id=group_id,
-                    pl_run_span_id=pl_run_span_id,
-                ),
+                track_request_callable,
                 llm_request_params["stream_function"],
             )
 

promptlayer/promptlayer_mixins.py

@@ -15,6 +15,8 @@ from promptlayer.utils import (
     aanthropic_stream_completion,
     aanthropic_stream_message,
     aazure_openai_request,
+    amistral_request,
+    amistral_stream_chat,
     anthropic_request,
     anthropic_stream_completion,
     anthropic_stream_message,
@@ -22,6 +24,8 @@ from promptlayer.utils import (
     aopenai_stream_chat,
     aopenai_stream_completion,
     azure_openai_request,
+    mistral_request,
+    mistral_stream_chat,
     openai_request,
     openai_stream_chat,
     openai_stream_completion,
@@ -58,6 +62,16 @@ MAP_PROVIDER_TO_FUNCTION_NAME = {
             "stream_function": openai_stream_completion,
         },
     },
+    "mistral": {
+        "chat": {
+            "function_name": "mistral.client.chat",
+            "stream_function": mistral_stream_chat,
+        },
+        "completion": {
+            "function_name": None,
+            "stream_function": None,
+        },
+    },
 }
 
 
@@ -65,6 +79,7 @@ MAP_PROVIDER_TO_FUNCTION = {
     "openai": openai_request,
     "anthropic": anthropic_request,
     "openai.azure": azure_openai_request,
+    "mistral": mistral_request,
 }
 
 AMAP_PROVIDER_TO_FUNCTION_NAME = {
@@ -98,6 +113,16 @@ AMAP_PROVIDER_TO_FUNCTION_NAME = {
             "stream_function": aopenai_stream_completion,
         },
     },
+    "mistral": {
+        "chat": {
+            "function_name": "mistral.client.chat",
+            "stream_function": amistral_stream_chat,
+        },
+        "completion": {
+            "function_name": None,
+            "stream_function": None,
+        },
+    },
 }
 
 
@@ -105,6 +130,7 @@ AMAP_PROVIDER_TO_FUNCTION = {
     "openai": aopenai_request,
     "anthropic": aanthropic_request,
     "openai.azure": aazure_openai_request,
+    "mistral": amistral_request,
 }
 
 

promptlayer/utils.py

@@ -2,7 +2,6 @@ import asyncio
 import contextvars
 import datetime
 import functools
-import inspect
 import json
 import os
 import sys
@@ -1449,15 +1448,17 @@ async def astream_response(
         results.append(result)
         data["raw_response"] = result
         yield data
-    request_response = await map_results(results)
-    if inspect.iscoroutinefunction(after_stream):
-        # after_stream is an async function
-        response = await after_stream(request_response=request_response.model_dump())
-    else:
-        # after_stream is synchronous
-        response = after_stream(request_response=request_response.model_dump())
-    data["request_id"] = response.get("request_id")
-    data["prompt_blueprint"] = response.get("prompt_blueprint")
+
+    async def async_generator_from_list(lst):
+        for item in lst:
+            yield item
+
+    request_response = await map_results(async_generator_from_list(results))
+    after_stream_response = await after_stream(
+        request_response=request_response.model_dump()
+    )
+    data["request_id"] = after_stream_response.get("request_id")
+    data["prompt_blueprint"] = after_stream_response.get("prompt_blueprint")
     yield data
 
 
@@ -1631,3 +1632,165 @@ async def autil_log_request(api_key: str, **kwargs) -> Union[RequestLog, None]:
             file=sys.stderr,
         )
         return None
+
+
+def mistral_request(
+    prompt_blueprint: GetPromptTemplateResponse,
+    **kwargs,
+):
+    from mistralai import Mistral
+
+    client = Mistral(api_key=os.environ.get("MISTRAL_API_KEY"))
+    if "stream" in kwargs and kwargs["stream"]:
+        kwargs.pop("stream")
+        return client.chat.stream(**kwargs)
+    if "stream" in kwargs:
+        kwargs.pop("stream")
+    return client.chat.complete(**kwargs)
+
+
+async def amistral_request(
+    prompt_blueprint: GetPromptTemplateResponse,
+    **kwargs,
+):
+    from mistralai import Mistral
+
+    client = Mistral(api_key=os.environ.get("MISTRAL_API_KEY"))
+    if "stream" in kwargs and kwargs["stream"]:
+        return await client.chat.stream_async(**kwargs)
+    return await client.chat.complete_async(**kwargs)
+
+
+def mistral_stream_chat(results: list):
+    from openai.types.chat import (
+        ChatCompletion,
+        ChatCompletionMessage,
+        ChatCompletionMessageToolCall,
+    )
+    from openai.types.chat.chat_completion import Choice
+    from openai.types.chat.chat_completion_message_tool_call import Function
+
+    last_result = results[-1]
+    response = ChatCompletion(
+        id=last_result.data.id,
+        object="chat.completion",
+        choices=[
+            Choice(
+                finish_reason=last_result.data.choices[0].finish_reason or "stop",
+                index=0,
+                message=ChatCompletionMessage(role="assistant"),
+            )
+        ],
+        created=last_result.data.created,
+        model=last_result.data.model,
+    )
+
+    content = ""
+    tool_calls = None
+
+    for result in results:
+        choices = result.data.choices
+        if len(choices) == 0:
+            continue
+
+        delta = choices[0].delta
+        if delta.content is not None:
+            content = f"{content}{delta.content}"
+
+        if delta.tool_calls:
+            tool_calls = tool_calls or []
+            for tool_call in delta.tool_calls:
+                if len(tool_calls) == 0 or tool_call.id:
+                    tool_calls.append(
+                        ChatCompletionMessageToolCall(
+                            id=tool_call.id or "",
+                            function=Function(
+                                name=tool_call.function.name,
+                                arguments=tool_call.function.arguments,
+                            ),
+                            type="function",
+                        )
+                    )
+                else:
+                    last_tool_call = tool_calls[-1]
+                    if tool_call.function.name:
+                        last_tool_call.function.name = (
+                            f"{last_tool_call.function.name}{tool_call.function.name}"
+                        )
+                    if tool_call.function.arguments:
+                        last_tool_call.function.arguments = f"{last_tool_call.function.arguments}{tool_call.function.arguments}"
+
+    response.choices[0].message.content = content
+    response.choices[0].message.tool_calls = tool_calls
+    response.usage = last_result.data.usage
+    return response
+
+
+async def amistral_stream_chat(generator: AsyncIterable[Any]) -> Any:
+    from openai.types.chat import (
+        ChatCompletion,
+        ChatCompletionMessage,
+        ChatCompletionMessageToolCall,
+    )
+    from openai.types.chat.chat_completion import Choice
+    from openai.types.chat.chat_completion_message_tool_call import Function
+
+    completion_chunks = []
+    response = ChatCompletion(
+        id="",
+        object="chat.completion",
+        choices=[
+            Choice(
+                finish_reason="stop",
+                index=0,
+                message=ChatCompletionMessage(role="assistant"),
+            )
+        ],
+        created=0,
+        model="",
+    )
+    content = ""
+    tool_calls = None
+
+    async for result in generator:
+        completion_chunks.append(result)
+        choices = result.data.choices
+        if len(choices) == 0:
+            continue
+        delta = choices[0].delta
+        if delta.content is not None:
+            content = f"{content}{delta.content}"
+
+        if delta.tool_calls:
+            tool_calls = tool_calls or []
+            for tool_call in delta.tool_calls:
+                if len(tool_calls) == 0 or tool_call.id:
+                    tool_calls.append(
+                        ChatCompletionMessageToolCall(
+                            id=tool_call.id or "",
+                            function=Function(
+                                name=tool_call.function.name,
+                                arguments=tool_call.function.arguments,
+                            ),
+                            type="function",
+                        )
+                    )
+                else:
+                    last_tool_call = tool_calls[-1]
+                    if tool_call.function.name:
+                        last_tool_call.function.name = (
+                            f"{last_tool_call.function.name}{tool_call.function.name}"
+                        )
+                    if tool_call.function.arguments:
+                        last_tool_call.function.arguments = f"{last_tool_call.function.arguments}{tool_call.function.arguments}"
+
+    if completion_chunks:
+        last_result = completion_chunks[-1]
+        response.id = last_result.data.id
+        response.created = last_result.data.created
+        response.model = last_result.data.model
+        response.usage = last_result.data.usage
+
+    response.choices[0].message.content = content
+    response.choices[0].message.tool_calls = tool_calls
+    return response

{promptlayer-1.0.32.dist-info → promptlayer-1.0.34.dist-info}/METADATA

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

{promptlayer-1.0.32.dist-info → promptlayer-1.0.34.dist-info}/RECORD

@@ -1,9 +1,9 @@
-promptlayer/__init__.py,sha256=ZWwec3lasIs6PTQi77sYwX746yWKAQc2p8Lg8fLZrO4,140
+promptlayer/__init__.py,sha256=i7ms716ks4DoOJfFle-Me41ZwM58biK11-kQqjjH-Zo,140
 promptlayer/groups/__init__.py,sha256=xhOAolLUBkr76ZHvJr29OwjCIk1V9qKQXjZCuyTJUIY,429
 promptlayer/groups/groups.py,sha256=YPROicy-TzpkrpA8vOpZS2lwvJ6VRtlbQ1S2oT1N0vM,338
-promptlayer/promptlayer.py,sha256=ZzHLMwbF-qq9SXNb610tmAOnGzOEvugGjHp3MtGWMGA,20083
+promptlayer/promptlayer.py,sha256=rMqH5c-NpfGo41gbaZdurXvUIOa6-QJWDAZ4W5ajJko,20119
 promptlayer/promptlayer_base.py,sha256=sev-EZehRXJSZSmJtMkqmAUK1345pqbDY_lNjPP5MYA,7158
-promptlayer/promptlayer_mixins.py,sha256=CZRX-kjd067JLzxd0qOWBnOCHdC5CZ4bXFDs7CDMplg,9572
+promptlayer/promptlayer_mixins.py,sha256=_7LRo8Mj8FhkIQZByEh2gX_lS0GjB6Bo94k0QWFJVMM,10260
 promptlayer/span_exporter.py,sha256=zIJNsb3Fe6yb5wKLDmkoPF2wqFjk1p39E0jWHD2plzI,2658
 promptlayer/templates.py,sha256=bdX8ZxydWwF9QMF1UBD-qoYqYRPrUSTAt88r2D8ws7c,1193
 promptlayer/track/__init__.py,sha256=8J258daTXb_P8eHRbYR2Au1lJzTh_92UkOHf7q0NpKs,1757
@@ -11,8 +11,8 @@ promptlayer/track/track.py,sha256=UdkCxhWUvhvPdhsoHj4qmeiRq6xLcWmeIdYXrgZph04,32
 promptlayer/types/__init__.py,sha256=xJcvQuOk91ZBBePb40-1FDNDKYrZoH5lPE2q6_UhprM,111
 promptlayer/types/prompt_template.py,sha256=sv5iMV8Iix2LCMUSMTkfb8PohfKp-vR9hRMck8OXSVc,4728
 promptlayer/types/request_log.py,sha256=xU6bcxQar6GaBOJlgZTavXUV3FjE8sF_nSjPu4Ya_00,174
-promptlayer/utils.py,sha256=yPEzt3JZT7rbVch39Gv8Uk0-CR8Ih5Ym9iIfS0VEEH8,53960
-promptlayer-1.0.32.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.32.dist-info/METADATA,sha256=5TUZRxITDb2RVq9j9xdHlK8BHTFzp6_HNJjPhK3uKk8,4824
-promptlayer-1.0.32.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-promptlayer-1.0.32.dist-info/RECORD,,
+promptlayer/utils.py,sha256=230OFFkG2DoaRCh-sgUZNoQxKEQT0RVKW3jJ6CciQKo,59465
+promptlayer-1.0.34.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.34.dist-info/METADATA,sha256=SOTWiUCjpanIjd9YusTV9e3tb9Ihz9FBRanSqoY5aSQ,4824
+promptlayer-1.0.34.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+promptlayer-1.0.34.dist-info/RECORD,,