omnimancer-cli 0.3.1__tar.gz → 0.3.2__tar.gz

{omnimancer_cli-0.3.1 → omnimancer_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omnimancer-cli
-Version: 0.3.1
+Version: 0.3.2
 Summary: A unified command-line interface for multiple AI language models
 Author-email: Kellan Strong <kellan@jite.ai>
 License: MIT

{omnimancer_cli-0.3.1 → omnimancer_cli-0.3.2}/omnimancer/core/agent/web_client.py

@@ -16,7 +16,7 @@ from urllib.parse import urljoin, urlparse
 
 import aiohttp
 import html2text
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup, Tag
 from readability import Document
 
 from ..security import SecurityManager
@@ -668,6 +668,9 @@ class WebClient:
         # Extract links
         links: List[Dict[str, str]] = []
         for link in soup.find_all("a", href=True):
+            # bs4>=4.13 types find_all() as PageElement | Tag | NavigableString
+            if not isinstance(link, Tag):
+                continue
             href = str(link["href"])
             text = link.get_text().strip()
             if href and text:
@@ -677,6 +680,8 @@ class WebClient:
         # Extract images
         images: List[Dict[str, str]] = []
         for img in soup.find_all("img", src=True):
+            if not isinstance(img, Tag):
+                continue
             src = str(img["src"])
             alt_attr = img.get("alt", "")
             alt = str(alt_attr).strip() if alt_attr else ""

{omnimancer_cli-0.3.1 → omnimancer_cli-0.3.2}/omnimancer/providers/bedrock.py

@@ -488,18 +488,26 @@ class BedrockProvider(BaseProvider):
 
     def _convert_tool_to_bedrock_format(self, tool: ToolDefinition) -> Dict:
         """
-        Convert tool definition to Bedrock format.
+        Convert tool definition to Bedrock Converse format.
+
+        Converse requires every entry in ``toolConfig.tools`` to set one of
+        toolSpec, systemTool, modelTool or cachePoint, and it nests the JSON
+        Schema under ``inputSchema.json``. Sending the Anthropic Messages
+        shape (name/description/input_schema at the top level) is a hard
+        ValidationException on toolConfig.tool.0.
 
         Args:
             tool: Tool definition
 
         Returns:
-            Tool formatted for Bedrock API
+            Tool formatted for the Bedrock Converse API
         """
         return {
-            "name": tool.name,
-            "description": tool.description,
-            "input_schema": tool.parameters,
+            "toolSpec": {
+                "name": tool.name,
+                "description": tool.description,
+                "inputSchema": {"json": tool.parameters},
+            }
         }
 
     def _handle_response(self, response: httpx.Response) -> ChatResponse:
@@ -587,14 +595,19 @@ class BedrockProvider(BaseProvider):
                 text_content = ""
                 tool_calls = []
 
+                # Converse tags content blocks by key, not by a "type"
+                # field: text is {"text": ...} and a call is
+                # {"toolUse": {"toolUseId", "name", "input"}}.
                 for block in content_blocks:
-                    if block.get("type") == "text":
-                        text_content += block.get("text", "")
-                    elif block.get("type") == "toolUse":
+                    if "text" in block:
+                        text_content += block.get("text") or ""
+                    elif "toolUse" in block:
+                        tool_use = block.get("toolUse") or {}
                         tool_calls.append(
                             ToolCall(
-                                name=block.get("name", ""),
-                                arguments=block.get("input", {}),
+                                name=tool_use.get("name", ""),
+                                arguments=tool_use.get("input") or {},
+                                id=tool_use.get("toolUseId"),
                             )
                         )
 

{omnimancer_cli-0.3.1 → omnimancer_cli-0.3.2}/omnimancer_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omnimancer-cli
-Version: 0.3.1
+Version: 0.3.2
 Summary: A unified command-line interface for multiple AI language models
 Author-email: Kellan Strong <kellan@jite.ai>
 License: MIT

{omnimancer_cli-0.3.1 → omnimancer_cli-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "omnimancer-cli"
-version = "0.3.1"
+version = "0.3.2"
 description = "A unified command-line interface for multiple AI language models"
 readme = "README.md"
 requires-python = ">=3.10"

{omnimancer_cli-0.3.1 → omnimancer_cli-0.3.2}/tests/test_bedrock_provider.py

@@ -158,17 +158,24 @@ def mock_converse_response():
 
 @pytest.fixture
 def mock_tool_response():
-    """Create a mock Bedrock Converse API response with tool use."""
+    """Create a mock Bedrock Converse API response with tool use.
+
+    Converse identifies content blocks by key, not by a ``type`` field:
+    a text block is ``{"text": ...}`` and a tool call is
+    ``{"toolUse": {"toolUseId", "name", "input"}}``.
+    """
     return {
         "output": {
             "message": {
                 "role": "assistant",
                 "content": [
-                    {"type": "text", "text": "I will query the database."},
+                    {"text": "I will query the database."},
                     {
-                        "type": "toolUse",
-                        "name": "query_database",
-                        "input": {"sql": "SELECT * FROM users LIMIT 10"},
+                        "toolUse": {
+                            "toolUseId": "tooluse_abc123",
+                            "name": "query_database",
+                            "input": {"sql": "SELECT * FROM users LIMIT 10"},
+                        }
                     },
                 ],
             }
@@ -320,13 +327,33 @@ class TestBedrockProviderRequestPreparation:
         assert len(body["toolConfig"]["tools"]) == 2
 
     def test_convert_tool_to_bedrock_format(self, bedrock_provider, sample_tools):
-        """Test tool conversion to Bedrock format."""
+        """Tools are converted to the Converse toolSpec shape."""
         tool = sample_tools[0]
         bedrock_tool = bedrock_provider._convert_tool_to_bedrock_format(tool)
 
-        assert bedrock_tool["name"] == "query_database"
-        assert bedrock_tool["description"] == "Run a query against the database"
-        assert "input_schema" in bedrock_tool
+        assert set(bedrock_tool) == {"toolSpec"}
+        spec = bedrock_tool["toolSpec"]
+        assert spec["name"] == "query_database"
+        assert spec["description"] == "Run a query against the database"
+        # Converse nests the JSON Schema under inputSchema.json.
+        assert spec["inputSchema"] == {"json": tool.parameters}
+
+    def test_every_tool_entry_is_wrapped_in_toolspec(
+        self, bedrock_provider, sample_chat_context, sample_tools
+    ):
+        """Reproduces the Converse ValidationException on toolConfig.tool.0.
+
+        Converse rejects any entry in ``toolConfig.tools`` that does not set
+        one of toolSpec, systemTool, modelTool or cachePoint.
+        """
+        body_str = bedrock_provider._prepare_bedrock_request_with_tools(
+            "Query the DB", sample_chat_context, sample_tools
+        )
+        body = json.loads(body_str)
+
+        allowed = {"toolSpec", "systemTool", "modelTool", "cachePoint"}
+        for entry in body["toolConfig"]["tools"]:
+            assert allowed & set(entry), f"invalid tool entry: {entry}"
 
 
 # ---------------------------------------------------------------------------
@@ -560,6 +587,39 @@ class TestBedrockProviderToolCalling:
             assert response.tool_calls is not None
             assert len(response.tool_calls) == 1
             assert response.tool_calls[0].name == "query_database"
+            assert response.tool_calls[0].arguments == {
+                "sql": "SELECT * FROM users LIMIT 10"
+            }
+            assert response.tool_calls[0].id == "tooluse_abc123"
+
+    @pytest.mark.asyncio
+    async def test_text_only_converse_response_still_parsed_with_tools(
+        self, bedrock_provider, sample_chat_context, sample_tools
+    ):
+        """A tools request answered with text only yields content, no calls."""
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {
+            "output": {
+                "message": {
+                    "role": "assistant",
+                    "content": [{"text": "No query needed."}],
+                }
+            },
+            "usage": {"inputTokens": 7, "outputTokens": 4},
+        }
+
+        with patch("httpx.AsyncClient") as mock_client:
+            mock_client.return_value.__aenter__.return_value.post = AsyncMock(
+                return_value=mock_response
+            )
+
+            response = await bedrock_provider.send_message_with_tools(
+                "Say hi", sample_chat_context, sample_tools
+            )
+
+            assert response.content == "No query needed."
+            assert response.tool_calls is None
 
     @pytest.mark.asyncio
     async def test_send_message_with_tools_authentication_error(