mojentic 0.5.5__py3-none-any.whl → 0.5.6__py3-none-any.whl

mojentic/llm/gateways/models.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Optional, List, Union, Type
+from typing import Optional, List, Union, Annotated, Literal
 
 from pydantic import BaseModel, Field
 
@@ -14,6 +14,34 @@ class MessageRole(Enum):
     Tool = 'tool'
 
 
+class Annotations(BaseModel):
+    audience: list[MessageRole] | None = None
+    priority: Annotated[float, Field(ge=0.0, le=1.0)] | None = None
+
+
+class TextContent(BaseModel):
+    """Text content for a message."""
+
+    type: Literal["text"]
+    text: str
+    """The text content of the message."""
+    annotations: Annotations | None = None
+
+
+class ImageContent(BaseModel):
+    """Image content for a message."""
+
+    type: Literal["image"]
+    data: str
+    """The base64-encoded image data."""
+    mimeType: str
+    """
+    The MIME type of the image. Different providers may support different
+    image types.
+    """
+    annotations: Annotations | None = None
+
+
 class LLMToolCall(BaseModel):
     """
     A tool call to be made available to the LLM.

mojentic/llm/tools/llm_tool.py

@@ -1,7 +1,22 @@
+import json
+
+from mojentic.llm.gateways.models import TextContent
+
+
 class LLMTool:
     def run(self, **kwargs):
         raise NotImplementedError
 
+    def call_tool(self, **kwargs):
+        result = self.run(**kwargs)
+        if isinstance(result, dict):
+            result = json.dumps(result)
+        return {
+            "content": [
+                TextContent(type="text", text=result),
+            ]
+        }
+
     @property
     def descriptor(self):
         raise NotImplementedError

mojentic/llm/tools/llm_tool_spec.py

@@ -0,0 +1,68 @@
+import json
+from unittest.mock import Mock
+
+import pytest
+
+from mojentic.llm.gateways.models import TextContent
+from mojentic.llm.tools.llm_tool import LLMTool
+
+
+class MockLLMTool(LLMTool):
+    """A mock implementation of LLMTool for testing purposes."""
+
+    def __init__(self, run_result=None):
+        self._run_result = run_result
+        self._descriptor = {
+            "function": {
+                "name": "mock_tool",
+                "description": "A mock tool for testing"
+            }
+        }
+
+    def run(self, **kwargs):
+        return self._run_result
+
+    @property
+    def descriptor(self):
+        return self._descriptor
+
+
+@pytest.fixture
+def mock_tool_with_dict_result():
+    return MockLLMTool(run_result={"key": "value"})
+
+
+@pytest.fixture
+def mock_tool_with_string_result():
+    return MockLLMTool(run_result="test result")
+
+
+class DescribeLLMTool:
+    class DescribeCallTool:
+
+        def should_convert_dict_result_to_json_string(self, mock_tool_with_dict_result):
+            result = mock_tool_with_dict_result.call_tool()
+
+            assert "content" in result
+            assert isinstance(result["content"], list)
+            assert len(result["content"]) == 1
+            assert isinstance(result["content"][0], TextContent)
+            assert result["content"][0].text == json.dumps({"key": "value"})
+
+        def should_handle_string_result_directly(self, mock_tool_with_string_result):
+            result = mock_tool_with_string_result.call_tool()
+
+            assert "content" in result
+            assert isinstance(result["content"], list)
+            assert len(result["content"]) == 1
+            assert isinstance(result["content"][0], TextContent)
+            assert result["content"][0].text == "test result"
+
+        def should_pass_kwargs_to_run_method(self):
+            mock_run = Mock(return_value="test result")
+            tool = MockLLMTool()
+            tool.run = mock_run
+
+            tool.call_tool(param1="value1", param2="value2")
+
+            mock_run.assert_called_once_with(param1="value1", param2="value2")

{mojentic-0.5.5.dist-info → mojentic-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.5.5
+Version: 0.5.6
 Summary: Mojentic is an agentic framework that aims to provide a simple and flexible way to assemble teams of agents to solve complex problems.
 Author-email: Stacey Vetzal <stacey@vetzal.com>
 Project-URL: Homepage, https://github.com/mojility/mojentic

{mojentic-0.5.5.dist-info → mojentic-0.5.6.dist-info}/RECORD

@@ -71,7 +71,7 @@ mojentic/llm/gateways/anthropic_messages_adapter.py,sha256=K6kEZeVt7E1endbGMLsh5
 mojentic/llm/gateways/embeddings_gateway.py,sha256=kcOhiyHzOyQgKgwPDQJD5oVvfwk71GsBgMYJOIDv5NU,1347
 mojentic/llm/gateways/file_gateway.py,sha256=3bZpalSyl_R4016WzCmmjUBDtAgPsmx19eVGv6p1Ufk,1418
 mojentic/llm/gateways/llm_gateway.py,sha256=5BayP6VuMgMHdAzCFaXLRjRCWh-IOYnaq_s4LZ0_3x4,2559
-mojentic/llm/gateways/models.py,sha256=rHoXkaK5FOgWV5X-nkFhqubwk3sUQceJj3rBnxgqB-E,2335
+mojentic/llm/gateways/models.py,sha256=lnGvr3E4C5n15v0aI8Cc0FMOH6GBCrk5_XaEEe3vKkM,3015
 mojentic/llm/gateways/ollama.py,sha256=629fpZhC0zVCYqj360-PKTT4mQOLec5nzzvfMtS_mLQ,7581
 mojentic/llm/gateways/ollama_messages_adapter.py,sha256=kUN_p2FyN88_trXMcL-Xsn9xPBU7pGKlJwTUEUCf6G4,1404
 mojentic/llm/gateways/ollama_messages_adapter_spec.py,sha256=gVRbWDrHOa1EiZ0CkEWe0pGn-GKRqdGb-x56HBQeYSE,4981
@@ -89,7 +89,8 @@ mojentic/llm/tools/current_datetime.py,sha256=JkIFlBBnvE4CMcgZizqITVTtNfL7zeeLxD
 mojentic/llm/tools/date_resolver.py,sha256=VDxX59PTHo0PstDxaJUo3SF7vkvQoG92bo6j8ABq8y4,2185
 mojentic/llm/tools/date_resolver_spec.py,sha256=OaRvJyhSN8sgi75euk4E5ImaqUmvQdgZKY8u_NOiPWE,1185
 mojentic/llm/tools/file_manager.py,sha256=X8Uw4XtdH_Ol2EB3SN11-GYlC1diJ1cAywU9_EuCjCg,3788
-mojentic/llm/tools/llm_tool.py,sha256=wU1DNf9DpMtcHhP-YC6_NAn1Frel_Ota6yqgPK2Xsp4,407
+mojentic/llm/tools/llm_tool.py,sha256=i81TNkTiFNMtx-HAGV2bhRrTqoqzdxiPcI0lx05W3A4,745
+mojentic/llm/tools/llm_tool_spec.py,sha256=mDRBXrrNvKh-8ZBq6_AbnU1nqdjtdkP_C2XmztllGQM,2071
 mojentic/llm/tools/organic_web_search.py,sha256=X_WQSSFgeMp5jlm0tnqGOHDIZ2KHDvz3k6GF-XqsuN4,1301
 mojentic/llm/tools/tell_user_tool.py,sha256=bF_PTfF0-skCi_Exw6EPpdfoNUZRJ4MWg-XCe4VYd6s,999
 mojentic/llm/tools/tool_wrapper.py,sha256=6YZOhckgNsSUc7YK6bKjODjRTwi6wcH9bdcySUDPt3Q,1391
@@ -113,8 +114,8 @@ mojentic/llm/tools/ephemeral_task_manager/start_task_tool.py,sha256=VH8Wa4-ZmkMI
 mojentic/llm/tools/ephemeral_task_manager/start_task_tool_spec.py,sha256=oDeVPPfquM2ojwG0aaNnbWCB_LRgm8runtG-CumZkLg,1490
 mojentic/utils/__init__.py,sha256=lqECkkoFvHFttDnafRE1vvh0Dmna_lwupMToP5VvX5k,115
 mojentic/utils/formatting.py,sha256=bPrwwdluXdQ8TsFxfWtHNOeMWKNvAfABSoUnnA1g7c8,947
-mojentic-0.5.5.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
-mojentic-0.5.5.dist-info/METADATA,sha256=TUpgd_jz6xTBnJacDQm1588BgLKkVtfkhlSEnU7NldA,4956
-mojentic-0.5.5.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-mojentic-0.5.5.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
-mojentic-0.5.5.dist-info/RECORD,,
+mojentic-0.5.6.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
+mojentic-0.5.6.dist-info/METADATA,sha256=4kNiXBHxU0wqwBFCBWww1rmoggWOh1om23j8NMAgei8,4956
+mojentic-0.5.6.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+mojentic-0.5.6.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
+mojentic-0.5.6.dist-info/RECORD,,