mojentic 0.5.5__tar.gz → 0.5.7__tar.gz

{mojentic-0.5.5/src/mojentic.egg-info → mojentic-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.5.5
+Version: 0.5.7
 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 → mojentic-0.5.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mojentic"
-version = "0.5.5"
+version = "0.5.7"
 authors = [
     { name = "Stacey Vetzal", email = "stacey@vetzal.com" },
 ]

{mojentic-0.5.5 → mojentic-0.5.7}/src/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-0.5.5 → mojentic-0.5.7}/src/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).model_dump(),
+            ]
+        }
+
     @property
     def descriptor(self):
         raise NotImplementedError

mojentic-0.5.7/src/mojentic/llm/tools/llm_tool_spec.py

@@ -0,0 +1,76 @@
+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 result == {
+                "content": [
+                    {
+                        "type": "text",
+                        "text": '{"key": "value"}',
+                        "annotations": None
+                    }
+                ]
+            }
+
+        def should_handle_string_result_directly(self, mock_tool_with_string_result):
+            result = mock_tool_with_string_result.call_tool()
+
+            assert result == {
+                "content": [
+                    {
+                        "type": "text",
+                        "text": "test result",
+                        "annotations": None
+                    }
+                ]
+            }
+
+        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 → mojentic-0.5.7/src/mojentic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.5.5
+Version: 0.5.7
 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 → mojentic-0.5.7}/src/mojentic.egg-info/SOURCES.txt

@@ -99,6 +99,7 @@ src/mojentic/llm/tools/date_resolver.py
 src/mojentic/llm/tools/date_resolver_spec.py
 src/mojentic/llm/tools/file_manager.py
 src/mojentic/llm/tools/llm_tool.py
+src/mojentic/llm/tools/llm_tool_spec.py
 src/mojentic/llm/tools/organic_web_search.py
 src/mojentic/llm/tools/tell_user_tool.py
 src/mojentic/llm/tools/tool_wrapper.py