inferencesh 0.4.23__tar.gz → 0.4.25__tar.gz

{inferencesh-0.4.23/src/inferencesh.egg-info → inferencesh-0.4.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inferencesh
-Version: 0.4.23
+Version: 0.4.25
 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.23 → inferencesh-0.4.25}/pyproject.toml

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

{inferencesh-0.4.23 → inferencesh-0.4.25}/src/inferencesh/models/llm.py

@@ -37,6 +37,10 @@ class ContextMessage(BaseAppInput):
         description="the tool calls of the message",
         default=None
     )
+    tool_call_id: Optional[str] = Field(
+        description="the tool call id for tool role messages",
+        default=None
+    )
 
 class BaseLLMInput(BaseAppInput):
     """Base class with common LLM fields."""
@@ -78,6 +82,13 @@ class ImageCapabilityMixin(BaseModel):
         default=None,
         contentMediaType="image/*",
     )
+    
+class MultipleImageCapabilityMixin(BaseModel):
+    """Mixin for models that support image inputs."""
+    images: Optional[List[File]] = Field(
+        description="the images to use for the model",
+        default=None,
+    )
 
 class ReasoningCapabilityMixin(BaseModel):
     """Mixin for models that support reasoning."""
@@ -92,6 +103,10 @@ class ToolsCapabilityMixin(BaseModel):
         description="tool definitions for function calling",
         default=None
     )
+    tool_call_id: Optional[str] = Field(
+        description="the tool call id for tool role messages",
+        default=None
+    )
 
 # Example of how to use:
 class LLMInput(BaseLLMInput):
@@ -217,18 +232,23 @@ def build_messages(
     def render_message(msg: ContextMessage, allow_multipart: bool) -> str | List[dict]:
         parts = []
         text = transform_user_message(msg.text) if transform_user_message and msg.role == ContextMessageRole.USER else msg.text
-        if msg.tool_calls:
-            for tool_call in msg.tool_calls:
-                tool_call_string = json.dumps(tool_call)
-                text += f"\n\nTool call: {tool_call_string}"
         if text:
             parts.append({"type": "text", "text": text})
+        else:
+            parts.append({"type": "text", "text": ""})
         if msg.image:
             if msg.image.path:
                 image_data_uri = image_to_base64_data_uri(msg.image.path)
                 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.images:
+            for image in msg.images:
+                if image.path:
+                    image_data_uri = image_to_base64_data_uri(image.path)
+                    parts.append({"type": "image_url", "image_url": {"url": image_data_uri}})
+                elif image.uri:
+                    parts.append({"type": "image_url", "image_url": {"url": image.uri}})
         if allow_multipart:
             return parts
         if len(parts) == 1 and parts[0]["type"] == "text":
@@ -265,7 +285,8 @@ def build_messages(
         multipart = multipart or input_data.image is not None
 
     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_tool_call_id = input_data.tool_call_id if hasattr(input_data, "tool_call_id") else None
+    user_msg = ContextMessage(role=input_role, text=user_input_text, image=user_input_image, tool_call_id=input_tool_call_id)
 
     input_data.context.append(user_msg)
 
@@ -277,23 +298,104 @@ def build_messages(
             current_messages.append(msg)
             current_role = msg.role
         else:
-            messages.append({
-                "role": current_role,
+            # Convert role enum to string for OpenAI API compatibility
+            role_str = current_role.value if hasattr(current_role, "value") else current_role
+            msg_dict = {
+                "role": role_str,
                 "content": render_message(merge_messages(current_messages), allow_multipart=multipart),
-                "tool_calls": merge_tool_calls(current_messages)
-            })
+            }
+            
+            # Only add tool_calls if not empty
+            tool_calls = merge_tool_calls(current_messages)
+            if tool_calls:
+                # Ensure arguments are JSON strings (OpenAI API requirement)
+                for tc in tool_calls:
+                    if "function" in tc and "arguments" in tc["function"]:
+                        if isinstance(tc["function"]["arguments"], dict):
+                            tc["function"]["arguments"] = json.dumps(tc["function"]["arguments"])
+                msg_dict["tool_calls"] = tool_calls
+            
+            # Add tool_call_id for tool role messages (required by OpenAI API)
+            if role_str == "tool":
+                if current_messages and current_messages[0].tool_call_id:
+                    msg_dict["tool_call_id"] = current_messages[0].tool_call_id
+                else:
+                    # If not provided, use empty string to satisfy schema
+                    msg_dict["tool_call_id"] = ""
+            
+            messages.append(msg_dict)
             current_messages = [msg]
             current_role = msg.role
+    
     if len(current_messages) > 0:
-        messages.append({
-            "role": current_role,
+        # Convert role enum to string for OpenAI API compatibility
+        role_str = current_role.value if hasattr(current_role, "value") else current_role
+        msg_dict = {
+            "role": role_str,
             "content": render_message(merge_messages(current_messages), allow_multipart=multipart),
-            "tool_calls": merge_tool_calls(current_messages)
-        })
+        }
+        
+        # Only add tool_calls if not empty
+        tool_calls = merge_tool_calls(current_messages)
+        if tool_calls:
+            # Ensure arguments are JSON strings (OpenAI API requirement)
+            for tc in tool_calls:
+                if "function" in tc and "arguments" in tc["function"]:
+                    if isinstance(tc["function"]["arguments"], dict):
+                        tc["function"]["arguments"] = json.dumps(tc["function"]["arguments"])
+            msg_dict["tool_calls"] = tool_calls
+        
+        # Add tool_call_id for tool role messages (required by OpenAI API)
+        if role_str == "tool":
+            if current_messages and current_messages[0].tool_call_id:
+                msg_dict["tool_call_id"] = current_messages[0].tool_call_id
+            else:
+                # If not provided, use empty string to satisfy schema
+                msg_dict["tool_call_id"] = ""
+        
+        messages.append(msg_dict)
 
     return messages
 
 
+def build_tools(tools: Optional[List[Dict[str, Any]]]) -> Optional[List[Dict[str, Any]]]:
+    """Build tools in OpenAI API format.
+    
+    Ensures tools are properly formatted:
+    - Wrapped in {"type": "function", "function": {...}}
+    - Parameters is never None (OpenAI API requirement)
+    """
+    if not tools:
+        return None
+    
+    result = []
+    for tool in tools:
+        # Extract function definition
+        if "type" in tool and "function" in tool:
+            func_def = tool["function"].copy()
+        else:
+            func_def = tool.copy()
+        
+        # Ensure parameters is not None (OpenAI API requirement)
+        if func_def.get("parameters") is None:
+            func_def["parameters"] = {"type": "object", "properties": {}}
+        # Also ensure properties within parameters is not None
+        elif func_def["parameters"].get("properties") is None:
+            func_def["parameters"]["properties"] = {}
+        else:
+            # Remove properties with null values (OpenAI API doesn't accept them)
+            properties = func_def["parameters"].get("properties", {})
+            if properties:
+                func_def["parameters"]["properties"] = {
+                    k: v for k, v in properties.items() if v is not None
+                }
+        
+        # Wrap in OpenAI format
+        result.append({"type": "function", "function": func_def})
+    
+    return result
+
+
 class StreamResponse:
     """Holds a single chunk of streamed response."""
     def __init__(self):

{inferencesh-0.4.23 → inferencesh-0.4.25/src/inferencesh.egg-info}/PKG-INFO

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