promptlayer 1.0.52__py3-none-any.whl → 1.0.54__py3-none-any.whl

promptlayer/__init__.py

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

promptlayer/types/prompt_template.py

@@ -23,6 +23,12 @@ class TextContent(TypedDict, total=False):
     text: str
 
 
+class ThinkingContent(TypedDict, total=False):
+    signature: str | None = None
+    type: Literal["thinking"]
+    thinking: str
+
+
 class ImageContent(TypedDict, total=False):
     type: Literal["image_url"]
     image_url: ImageUrl
@@ -44,7 +50,7 @@ class MediaVariable(TypedDict, total=False):
     name: str
 
 
-Content = Union[TextContent, ImageContent, MediaContnt, MediaVariable]
+Content = Union[TextContent, ThinkingContent, ImageContent, MediaContnt, MediaVariable]
 
 
 class Function(TypedDict, total=False):

promptlayer/utils.py

@@ -691,6 +691,52 @@ async def apromptlayer_track_score(
     return True
 
 
+def build_anthropic_content_blocks(events):
+    content_blocks = []
+    current_block = None
+    current_signature = ""
+    current_thinking = ""
+    current_text = ""
+    usage = None
+    stop_reason = None
+
+    for event in events:
+        if event.type == "content_block_start":
+            current_block = deepcopy(event.content_block)
+            if current_block.type == "thinking":
+                current_signature = ""
+                current_thinking = ""
+            elif current_block.type == "text":
+                current_text = ""
+        elif event.type == "content_block_delta" and current_block is not None:
+            if current_block.type == "thinking":
+                if hasattr(event.delta, "signature"):
+                    current_signature = event.delta.signature
+                if hasattr(event.delta, "thinking"):
+                    current_thinking += event.delta.thinking
+            elif current_block.type == "text":
+                if hasattr(event.delta, "text"):
+                    current_text += event.delta.text
+        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
+
+            content_blocks.append(current_block)
+            current_block = None
+            current_signature = ""
+            current_thinking = ""
+            current_text = ""
+        elif event.type == "message_delta":
+            if hasattr(event, "usage"):
+                usage = event.usage
+            if hasattr(event.delta, "stop_reason"):
+                stop_reason = event.delta.stop_reason
+    return content_blocks, usage, stop_reason
+
+
 class GeneratorProxy:
     def __init__(self, generator, api_request_arguments, api_key):
         self.generator = generator
@@ -788,30 +834,35 @@ class GeneratorProxy:
             response = ""
             for result in self.results:
                 if hasattr(result, "completion"):
-                    response = f"{response}{result.completion}"
+                    response += result.completion
                 elif hasattr(result, "message") and isinstance(result.message, str):
-                    response = f"{response}{result.message}"
+                    response += result.message
                 elif (
                     hasattr(result, "content_block")
                     and hasattr(result.content_block, "text")
-                    and "type" in result
-                    and result.type != "message_stop"
+                    and getattr(result, "type", None) != "message_stop"
                 ):
-                    response = f"{response}{result.content_block.text}"
-                elif hasattr(result, "delta") and hasattr(result.delta, "text"):
-                    response = f"{response}{result.delta.text}"
-            if (
-                hasattr(self.results[-1], "type") and self.results[-1].type == "message_stop"
-            ):  # this is a message stream and not the correct event
+                    response += result.content_block.text
+                elif hasattr(result, "delta"):
+                    if hasattr(result.delta, "thinking"):
+                        response += result.delta.thinking
+                    elif hasattr(result.delta, "text"):
+                        response += result.delta.text
+
+            # 2) If this is a “stream” (ended by message_stop), reconstruct both ThinkingBlock & TextBlock
+            last_event = self.results[-1]
+            if getattr(last_event, "type", None) == "message_stop":
                 final_result = deepcopy(self.results[0].message)
-                final_result.usage = None
-                content_block = deepcopy(self.results[1].content_block)
-                content_block.text = response
-                final_result.content = [content_block]
-            else:
-                final_result = deepcopy(self.results[-1])
-                final_result.completion = response
+
+                content_blocks, usage, stop_reason = build_anthropic_content_blocks(self.results)
+            final_result.content = content_blocks
+            if usage:
+                final_result.usage.output_tokens = usage.output_tokens
+            if stop_reason:
+                final_result.stop_reason = stop_reason
             return final_result
+        else:
+            return deepcopy(self.results[-1])
         if hasattr(self.results[0].choices[0], "text"):  # this is regular completion
             response = ""
             for result in self.results:
@@ -1376,7 +1427,7 @@ async def aopenai_stream_completion(generator: AsyncIterable[Any]) -> Any:
 
 
 def anthropic_stream_message(results: list):
-    from anthropic.types import Message, MessageStreamEvent, TextBlock, Usage
+    from anthropic.types import Message, MessageStreamEvent, Usage
 
     message_stream_events: List[MessageStreamEvent] = results
     response: Message = Message(
@@ -1389,24 +1440,24 @@ def anthropic_stream_message(results: list):
         stop_sequence=None,
         usage=Usage(input_tokens=0, output_tokens=0),
     )
-    content = ""
-    for result in message_stream_events:
-        if result.type == "message_start":
-            response = result.message
-        elif result.type == "content_block_delta":
-            if result.delta.type == "text_delta":
-                content = f"{content}{result.delta.text}"
-        elif result.type == "message_delta":
-            if hasattr(result, "usage"):
-                response.usage.output_tokens = result.usage.output_tokens
-            if hasattr(result.delta, "stop_reason"):
-                response.stop_reason = result.delta.stop_reason
-    response.content.append(TextBlock(type="text", text=content))
+
+    for event in message_stream_events:
+        if event.type == "message_start":
+            response = event.message
+            break
+
+    content_blocks, usage, stop_reason = build_anthropic_content_blocks(message_stream_events)
+    response.content = content_blocks
+    if usage:
+        response.usage.output_tokens = usage.output_tokens
+    if stop_reason:
+        response.stop_reason = stop_reason
+
     return response
 
 
 async def aanthropic_stream_message(generator: AsyncIterable[Any]) -> Any:
-    from anthropic.types import Message, MessageStreamEvent, TextBlock, Usage
+    from anthropic.types import Message, MessageStreamEvent, Usage
 
     message_stream_events: List[MessageStreamEvent] = []
     response: Message = Message(
@@ -1419,22 +1470,19 @@ async def aanthropic_stream_message(generator: AsyncIterable[Any]) -> Any:
         stop_sequence=None,
         usage=Usage(input_tokens=0, output_tokens=0),
     )
-    content = ""
 
-    async for result in generator:
-        message_stream_events.append(result)
-        if result.type == "message_start":
-            response = result.message
-        elif result.type == "content_block_delta":
-            if result.delta.type == "text_delta":
-                content = f"{content}{result.delta.text}"
-        elif result.type == "message_delta":
-            if hasattr(result, "usage"):
-                response.usage.output_tokens = result.usage.output_tokens
-            if hasattr(result.delta, "stop_reason"):
-                response.stop_reason = result.delta.stop_reason
-
-    response.content.append(TextBlock(type="text", text=content))
+    async for event in generator:
+        if event.type == "message_start":
+            response = event.message
+        message_stream_events.append(event)
+
+    content_blocks, usage, stop_reason = build_anthropic_content_blocks(message_stream_events)
+    response.content = content_blocks
+    if usage:
+        response.usage.output_tokens = usage.output_tokens
+    if stop_reason:
+        response.stop_reason = stop_reason
+
     return response
 
 
@@ -1898,11 +1946,11 @@ MAP_TYPE_TO_GOOGLE_FUNCTION = {
 }
 
 
-def google_request(request: GetPromptTemplateResponse, _: dict, function_kwargs: dict):
+def google_request(prompt_blueprint: GetPromptTemplateResponse, client_kwargs: dict, function_kwargs: dict):
     from google import genai
 
     client = genai.Client()
-    request_to_make = MAP_TYPE_TO_GOOGLE_FUNCTION[request["prompt_template"]["type"]]
+    request_to_make = MAP_TYPE_TO_GOOGLE_FUNCTION[prompt_blueprint["prompt_template"]["type"]]
     return request_to_make(client, **function_kwargs)
 
 
@@ -1936,11 +1984,11 @@ AMAP_TYPE_TO_GOOGLE_FUNCTION = {
 }
 
 
-async def agoogle_request(request: GetPromptTemplateResponse, _: dict, function_kwargs: dict):
+async def agoogle_request(prompt_blueprint: GetPromptTemplateResponse, client_kwargs: dict, function_kwargs: dict):
     from google import genai
 
     client = genai.Client()
-    request_to_make = AMAP_TYPE_TO_GOOGLE_FUNCTION[request["prompt_template"]["type"]]
+    request_to_make = AMAP_TYPE_TO_GOOGLE_FUNCTION[prompt_blueprint["prompt_template"]["type"]]
     return await request_to_make(client, **function_kwargs)
 
 

{promptlayer-1.0.52.dist-info → promptlayer-1.0.54.dist-info}/METADATA

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

{promptlayer-1.0.52.dist-info → promptlayer-1.0.54.dist-info}/RECORD

@@ -1,4 +1,4 @@
-promptlayer/__init__.py,sha256=iPgrSckrRsUyjKcOVRNOVz5tvY4EBFx7f6BpoAOY2Yw,140
+promptlayer/__init__.py,sha256=2e8KBwUPRkROzOicakNfmG1sPrkjOo1nyBvGQnqxcD4,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
@@ -9,10 +9,10 @@ promptlayer/templates.py,sha256=7ObDPMzHXjttDdJdCXA_pDL9XAnmcujIWucmgZJcOC8,1179
 promptlayer/track/__init__.py,sha256=tyweLTAY7UpYpBHWwY-T3pOPDIlGjcgccYXqU_r0694,1710
 promptlayer/track/track.py,sha256=A-awcYwsSwxktrlCMchy8NITIquwxU1UXbgLZMwqrA0,3164
 promptlayer/types/__init__.py,sha256=xJcvQuOk91ZBBePb40-1FDNDKYrZoH5lPE2q6_UhprM,111
-promptlayer/types/prompt_template.py,sha256=GoYSorgBmUgvtyXaGAOv0KgVC61Llzn8bND6PF1fW50,4929
+promptlayer/types/prompt_template.py,sha256=meL3KMeFnEZIIf16Wk0MX3f6Tw9qkQU6PgaRGoZ-2YA,5076
 promptlayer/types/request_log.py,sha256=xU6bcxQar6GaBOJlgZTavXUV3FjE8sF_nSjPu4Ya_00,174
-promptlayer/utils.py,sha256=iKA7kIBdOzYIORHdkS556Wf9MRCnD7ctEo4obI0etL8,69712
-promptlayer-1.0.52.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.52.dist-info/METADATA,sha256=CKfXX6iAXGCTna9bETZhCupDGsQ8jbUL4Qq3gd7yTHc,4819
-promptlayer-1.0.52.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-promptlayer-1.0.52.dist-info/RECORD,,
+promptlayer/utils.py,sha256=H0rZBGC21RurBx50S1d-sIkGK6LXGScMlMqnNelL9rs,71267
+promptlayer-1.0.54.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.54.dist-info/METADATA,sha256=MIW_OFvwN7okuw7MhO94YZPBXJdRhDC0HxYFjI_e8t8,4819
+promptlayer-1.0.54.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+promptlayer-1.0.54.dist-info/RECORD,,