v0.0.13

Author: azdolinski

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/),
 and this project adheres to [SimpleTool](https://github.com/nchekwa/simpletool-python/tree/master).
 
+# [0.0.13] - 2025-01-08 Milestone Alpha2
+
+## Fixed
+- Updated test import from `BoolContents` to `BoolContent` to match type definition
+
 
 # [0.0.12] - 2025-01-08 Milestone Alpha2
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='simpletool',
-      version='0.0.12',
+      version='0.0.13',
       description='simpletool',
       url='https://github.com/nchekwa/simpletool-python/tree/master',
       author='Artur Zdolinski',

simpletool/__init__.py

@@ -13,20 +13,20 @@
 from typing import Optional, TypeVar, AnyStr, Callable, Awaitable, Coroutine, ClassVar   # noqa: F401, F403
 from pydantic import BaseModel, Field
 from pydantic.fields import FieldInfo
-from .types import Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContents, ErrorContent
+from .types import Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContent, ErrorContent
 from .models import SimpleInputModel
 from .schema import NoTitleDescriptionJsonSchema
 from .errors import SimpleToolError, ValidationError
 
 
 def get_valid_content_types() -> Tuple[Type, ...]:
     """Directly return the types from the TypeVar definition as a tuple"""
-    return (Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContents, ErrorContent)
+    return (Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContent, ErrorContent)
 
 
 def validate_tool_output(func):
     @functools.wraps(func)
-    async def wrapper(*args: Any, **kwargs: Any) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContents, ErrorContent]]:
+    async def wrapper(*args: Any, **kwargs: Any) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContent, ErrorContent]]:
         result = await func(*args, **kwargs)
         if not isinstance(result, list):
             raise ValidationError("output", "Tool output must be a list")
@@ -204,7 +204,7 @@ def __repr__(self):
 
     @validate_tool_output
     @set_timeout(DEFAULT_TIMEOUT)
-    async def run(self, arguments: Dict[str, Any]) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContents, ErrorContent]]:
+    async def run(self, arguments: Dict[str, Any]) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContent, ErrorContent]]:
         """
         Execute the tool with the given arguments.
 
@@ -250,7 +250,7 @@ async def run(self, arguments: Dict[str, Any]) -> Sequence[Union[Content, TextCo
             # No timeout if _timeout is 0 or negative
             return await self._run_implementation(validated_arguments)
 
-    async def _run_implementation(self, arguments: SimpleInputModel) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContents, ErrorContent]]:
+    async def _run_implementation(self, arguments: SimpleInputModel) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContent, ErrorContent]]:
         """
         Actual implementation of the tool's run method.
         Must be implemented by child classes.
@@ -263,7 +263,7 @@ async def _run_implementation(self, arguments: SimpleInputModel) -> Sequence[Uni
         """
         raise SimpleToolError(f"Subclass {self.__class__.__name__} must implement _run_implementation method")
 
-    async def __call__(self, arguments: Dict[str, Any]) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContents, ErrorContent]]:
+    async def __call__(self, arguments: Dict[str, Any]) -> Sequence[Union[Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContent, ErrorContent]]:
         """Alias for run method"""
         return await self.run(arguments)
 

simpletool/types.py

@@ -123,7 +123,7 @@ class ErrorContent(Content):
     model_config = ConfigDict(extra="allow")
 
 
-class BoolContents(Content):
+class BoolContent(Content):
     type: Literal["blob"] = "blob"  # type: ignore
     bool: bool
     description: Optional[str] | None = None

tests/test_simpletool.py

@@ -20,7 +20,7 @@
     ResourceContent, 
     ErrorContent,
     Content,
-    BoolContents
+    BoolContent
 )
 from simpletool.errors import ValidationError
 
@@ -45,7 +45,7 @@ def test_get_valid_content_types():
     """Test get_valid_content_types function."""
     valid_types = get_valid_content_types()
     assert len(valid_types) == 7
-    assert set(valid_types) == {Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContents, ErrorContent}
+    assert set(valid_types) == {Content, TextContent, ImageContent, FileContent, ResourceContent, BoolContent, ErrorContent}
 
 
 def test_validate_tool_output_decorator():

tests/test_types.py

@@ -9,7 +9,8 @@
     ImageContent,
     FileContent,
     ResourceContent,
-    ErrorContent
+    ErrorContent,
+    BoolContent
 )
 
 
@@ -132,3 +133,21 @@ def test_error_data():
     assert error.code == 404
     assert error.message == "Resource not found"
     assert error.data == {"details": "Additional error info"}
+
+
+def test_bool_content():
+    """Test BoolContent model."""
+    bool_content = BoolContent(type="blob", bool=True)
+    assert bool_content.type == "blob"
+    assert bool_content.bool is True
+
+    bool_content_from_bool = BoolContent(**{"bool": True})
+    assert bool_content_from_bool.bool is True
+
+    bool_content_with_desc = BoolContent(
+        type="blob", 
+        bool=False, 
+        description="A boolean content"
+    )
+    assert bool_content_with_desc.bool is False
+    assert bool_content_with_desc.description == "A boolean content"