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

promptlayer/__init__.py

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

promptlayer/promptlayer.py

@@ -126,12 +126,16 @@ class PromptLayer(PromptLayerMixin):
         group_id: Union[int, None] = None,
         stream: bool = False,
         pl_run_span_id: Union[str, None] = None,
+        provider: Union[str, None] = None,
+        model: Union[str, None] = None,
     ) -> Dict[str, Any]:
         get_prompt_template_params = self._prepare_get_prompt_template_params(
             prompt_version=prompt_version,
             prompt_release_label=prompt_release_label,
             input_variables=input_variables,
             metadata=metadata,
+            provider=provider,
+            model=model,
         )
         prompt_blueprint = self.templates.get(prompt_name, get_prompt_template_params)
         prompt_blueprint_model = self._validate_and_extract_model_from_prompt_blueprint(
@@ -216,6 +220,8 @@ class PromptLayer(PromptLayerMixin):
         metadata: Union[Dict[str, str], None] = None,
         group_id: Union[int, None] = None,
         stream: bool = False,
+        provider: Union[str, None] = None,
+        model: Union[str, None] = None,
     ) -> Dict[str, Any]:
         _run_internal_kwargs = {
             "prompt_name": prompt_name,
@@ -227,6 +233,8 @@ class PromptLayer(PromptLayerMixin):
             "metadata": metadata,
             "group_id": group_id,
             "stream": stream,
+            "provider": provider,
+            "model": model,
         }
 
         if self.tracer:
@@ -422,6 +430,8 @@ class AsyncPromptLayer(PromptLayerMixin):
         metadata: Union[Dict[str, str], None] = None,
         group_id: Union[int, None] = None,
         stream: bool = False,
+        provider: Union[str, None] = None,
+        model: Union[str, None] = None,
     ) -> Dict[str, Any]:
         _run_internal_kwargs = {
             "prompt_name": prompt_name,
@@ -433,6 +443,8 @@ class AsyncPromptLayer(PromptLayerMixin):
             "metadata": metadata,
             "group_id": group_id,
             "stream": stream,
+            "provider": provider,
+            "model": model,
         }
 
         if self.tracer:
@@ -546,12 +558,16 @@ class AsyncPromptLayer(PromptLayerMixin):
         group_id: Union[int, None] = None,
         stream: bool = False,
         pl_run_span_id: Union[str, None] = None,
+        provider: Union[str, None] = None,
+        model: Union[str, None] = None,
     ) -> Dict[str, Any]:
         get_prompt_template_params = self._prepare_get_prompt_template_params(
             prompt_version=prompt_version,
             prompt_release_label=prompt_release_label,
             input_variables=input_variables,
             metadata=metadata,
+            provider=provider,
+            model=model,
         )
         prompt_blueprint = await self.templates.get(prompt_name, get_prompt_template_params)
         prompt_blueprint_model = self._validate_and_extract_model_from_prompt_blueprint(

promptlayer/promptlayer_mixins.py

@@ -183,6 +183,8 @@ class PromptLayerMixin:
         prompt_release_label: Union[str, None],
         input_variables: Union[Dict[str, Any], None],
         metadata: Union[Dict[str, str], None],
+        provider: Union[str, None] = None,
+        model: Union[str, None] = None,
     ) -> Dict[str, Any]:
         params = {}
 
@@ -194,6 +196,10 @@ class PromptLayerMixin:
             params["input_variables"] = input_variables
         if metadata:
             params["metadata_filters"] = metadata
+        if provider:
+            params["provider"] = provider
+        if model:
+            params["model"] = model
 
         return params
 

promptlayer/utils.py

@@ -697,6 +697,7 @@ def build_anthropic_content_blocks(events):
     current_signature = ""
     current_thinking = ""
     current_text = ""
+    current_tool_input_json = ""
     usage = None
     stop_reason = None
 
@@ -708,6 +709,8 @@ def build_anthropic_content_blocks(events):
                 current_thinking = ""
             elif current_block.type == "text":
                 current_text = ""
+            elif current_block.type == "tool_use":
+                current_tool_input_json = ""
         elif event.type == "content_block_delta" and current_block is not None:
             if current_block.type == "thinking":
                 if hasattr(event.delta, "signature"):
@@ -717,18 +720,26 @@ def build_anthropic_content_blocks(events):
             elif current_block.type == "text":
                 if hasattr(event.delta, "text"):
                     current_text += event.delta.text
+            elif current_block.type == "tool_use":
+                if hasattr(event.delta, "partial_json"):
+                    current_tool_input_json += event.delta.partial_json
         elif event.type == "content_block_stop" and current_block is not None:
             if current_block.type == "thinking":
                 current_block.signature = current_signature
                 current_block.thinking = current_thinking
             elif current_block.type == "text":
                 current_block.text = current_text
-
+            elif current_block.type == "tool_use":
+                try:
+                    current_block.input = json.loads(current_tool_input_json)
+                except json.JSONDecodeError:
+                    current_block.input = {}
             content_blocks.append(current_block)
             current_block = None
             current_signature = ""
             current_thinking = ""
             current_text = ""
+            current_tool_input_json = ""
         elif event.type == "message_delta":
             if hasattr(event, "usage"):
                 usage = event.usage
@@ -1916,6 +1927,31 @@ def google_completions_request(client, **kwargs):
     return client.models.generate_content(model=model, contents=contents, config=config)
 
 
+def _build_google_response_from_parts(thought_content: str, regular_content: str, function_calls: list, last_result):
+    """Helper function to build Google response with thought, regular, and function call parts."""
+    from google.genai.chats import Part
+
+    response = last_result.model_copy()
+    final_parts = []
+
+    if thought_content:
+        thought_part = Part(text=thought_content, thought=True)
+        final_parts.append(thought_part)
+
+    if regular_content:
+        text_part = Part(text=regular_content, thought=None)
+        final_parts.append(text_part)
+
+    for function_call in function_calls:
+        function_part = Part(function_call=function_call, thought=None)
+        final_parts.append(function_part)
+
+    if final_parts:
+        response.candidates[0].content.parts = final_parts
+
+    return response
+
+
 def map_google_stream_response(results: list):
     from google.genai.chats import GenerateContentResponse
 
@@ -1923,13 +1959,23 @@ def map_google_stream_response(results: list):
     if not results:
         return response
     results: List[GenerateContentResponse] = results
-    content = ""
+
+    thought_content = ""
+    regular_content = ""
+    function_calls = []
+
     for result in results:
-        content = f"{content}{result.candidates[0].content.parts[0].text}"
-    last_result = results[-1]
-    response = last_result.model_copy()
-    response.candidates[0].content.parts[0].text = content
-    return response
+        if result.candidates and result.candidates[0].content.parts:
+            for part in result.candidates[0].content.parts:
+                if hasattr(part, "text") and part.text:
+                    if hasattr(part, "thought") and part.thought:
+                        thought_content = f"{thought_content}{part.text}"
+                    else:
+                        regular_content = f"{regular_content}{part.text}"
+                elif hasattr(part, "function_call") and part.function_call:
+                    function_calls.append(part.function_call)
+
+    return _build_google_response_from_parts(thought_content, regular_content, function_calls, results[-1])
 
 
 def google_stream_chat(results: list):
@@ -1995,14 +2041,29 @@ async def agoogle_request(prompt_blueprint: GetPromptTemplateResponse, client_kw
 async def amap_google_stream_response(generator: AsyncIterable[Any]):
     from google.genai.chats import GenerateContentResponse
 
-    GenerateContentResponse()
-    content = ""
+    response = GenerateContentResponse()
+
+    thought_content = ""
+    regular_content = ""
+    function_calls = []
+    last_result = None
+
     async for result in generator:
-        content = f"{content}{result.candidates[0].content.parts[0].text}"
-    last_result = result
-    response = last_result.model_copy()
-    response.candidates[0].content.parts[0].text = content
-    return response
+        last_result = result
+        if result.candidates and result.candidates[0].content.parts:
+            for part in result.candidates[0].content.parts:
+                if hasattr(part, "text") and part.text:
+                    if hasattr(part, "thought") and part.thought:
+                        thought_content = f"{thought_content}{part.text}"
+                    else:
+                        regular_content = f"{regular_content}{part.text}"
+                elif hasattr(part, "function_call") and part.function_call:
+                    function_calls.append(part.function_call)
+
+    if not last_result:
+        return response
+
+    return _build_google_response_from_parts(thought_content, regular_content, function_calls, last_result)
 
 
 async def agoogle_stream_chat(generator: AsyncIterable[Any]):

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

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

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

@@ -1,9 +1,9 @@
-promptlayer/__init__.py,sha256=3bOSs86mp66otmP8k6Z02DZAgROmaPVD7xVjfS9EGaE,140
+promptlayer/__init__.py,sha256=uvVwr1nN_g3tfP5Ka_jwOhCRuY1vQIweZrXfYK801Ak,140
 promptlayer/groups/__init__.py,sha256=xhOAolLUBkr76ZHvJr29OwjCIk1V9qKQXjZCuyTJUIY,429
 promptlayer/groups/groups.py,sha256=YPROicy-TzpkrpA8vOpZS2lwvJ6VRtlbQ1S2oT1N0vM,338
-promptlayer/promptlayer.py,sha256=K4KRW9eB1FF_Cdllu_Z-fpof058P45WhITnap29vlOk,21644
+promptlayer/promptlayer.py,sha256=4MtP_byvYdVi4yZp_VCyVpPGx3iAaijwDZHPoYDfqZc,22212
 promptlayer/promptlayer_base.py,sha256=jOgXzNZlV1LKOOsXSSAOgn8o4hXn_EV0oY9Nf3Bsu_s,6872
-promptlayer/promptlayer_mixins.py,sha256=jBopvl3eAxzfBGTxSOaVR5kmR6TYbN1le533yZ5mzU0,11477
+promptlayer/promptlayer_mixins.py,sha256=MTOIx2jyebph4pu8fZA7QQPm22W_leX_CUmCiNt1K8U,11677
 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=H0rZBGC21RurBx50S1d-sIkGK6LXGScMlMqnNelL9rs,71267
-promptlayer-1.0.55.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.55.dist-info/METADATA,sha256=pVPLPA1oyhKrledC7veyjwqYfml5AG4Wfxx8_L2mE0c,4819
-promptlayer-1.0.55.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-promptlayer-1.0.55.dist-info/RECORD,,
+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,,