inferencesh 0.4.19__tar.gz → 0.4.22__tar.gz

{inferencesh-0.4.19/src/inferencesh.egg-info → inferencesh-0.4.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inferencesh
-Version: 0.4.19
+Version: 0.4.22
 Summary: inference.sh Python SDK
 Author-email: "Inference Shell Inc." <hello@inference.sh>
 Project-URL: Homepage, https://github.com/inference-sh/sdk

{inferencesh-0.4.19 → inferencesh-0.4.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "inferencesh"
-version = "0.4.19"
+version = "0.4.22"
 description = "inference.sh Python SDK"
 authors = [
     {name = "Inference Shell Inc.", email = "hello@inference.sh"},

{inferencesh-0.4.19 → inferencesh-0.4.22}/src/inferencesh/models/llm.py

@@ -224,8 +224,6 @@ def build_messages(
                 parts.append({"type": "image_url", "image_url": {"url": image_data_uri}})
             elif msg.image.uri:
                 parts.append({"type": "image_url", "image_url": {"url": msg.image.uri}})
-        if msg.tool_calls:
-            parts.append({"type": "tool_call", "tool_calls": msg.tool_calls})
         if allow_multipart:
             return parts
         if len(parts) == 1 and parts[0]["type"] == "text":
@@ -239,6 +237,13 @@ def build_messages(
         images = [msg.image for msg in messages if msg.image]
         image = images[0] if images else None # TODO: handle multiple images
         return ContextMessage(role=messages[0].role, text=text, image=image)
+    
+    def merge_tool_calls(messages: List[ContextMessage]) -> List[Dict[str, Any]]:
+        tool_calls = []
+        for msg in messages:
+            if msg.tool_calls:
+                tool_calls.extend(msg.tool_calls)
+        return tool_calls
 
     user_input_text = ""
     if hasattr(input_data, "text"):
@@ -250,7 +255,8 @@ def build_messages(
         user_input_image = input_data.image
         multipart = multipart or input_data.image is not None
 
-    user_msg = ContextMessage(role=ContextMessageRole.USER, text=user_input_text, image=user_input_image)
+    input_role = input_data.role if hasattr(input_data, "role") else ContextMessageRole.USER
+    user_msg = ContextMessage(role=input_role, text=user_input_text, image=user_input_image)
 
     input_data.context.append(user_msg)
 
@@ -264,14 +270,16 @@ def build_messages(
         else:
             messages.append({
                 "role": current_role,
-                "content": render_message(merge_messages(current_messages), allow_multipart=multipart)
+                "content": render_message(merge_messages(current_messages), allow_multipart=multipart),
+                "tool_calls": merge_tool_calls(current_messages)
             })
             current_messages = [msg]
             current_role = msg.role
     if len(current_messages) > 0:
         messages.append({
             "role": current_role,
-            "content": render_message(merge_messages(current_messages), allow_multipart=multipart)
+            "content": render_message(merge_messages(current_messages), allow_multipart=multipart),
+            "tool_calls": merge_tool_calls(current_messages)
         })
 
     return messages

{inferencesh-0.4.19 → inferencesh-0.4.22/src/inferencesh.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inferencesh
-Version: 0.4.19
+Version: 0.4.22
 Summary: inference.sh Python SDK
 Author-email: "Inference Shell Inc." <hello@inference.sh>
 Project-URL: Homepage, https://github.com/inference-sh/sdk