Add validated function

pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Application Frameworks",
 ]
 license = { file = "LICENSE" }
-dependencies = ["numpy~=2.3", "haiway~=0.38.1"]
+dependencies = ["numpy~=2.3", "haiway~=0.39.1"]
 
 [project.urls]
 Homepage = "https://miquido.com"

src/draive/evaluation/suite.py

@@ -17,6 +17,7 @@
     ctx,
     execute_concurrently,
 )
+from haiway.attributes import AttributesJSONEncoder
 
 from draive.evaluation.evaluator import EvaluatorResult
 from draive.evaluation.scenario import EvaluatorScenarioResult
@@ -945,4 +946,9 @@ def _file_save(
     ) -> None:
         self._path.parent.mkdir(parents=True, exist_ok=True)
         with open(self._path, mode="wb+") as file:
-            file.write(json.dumps([case.to_mapping() for case in cases]).encode("utf-8"))
+            file.write(
+                json.dumps(
+                    [case.to_mapping() for case in cases],
+                    cls=AttributesJSONEncoder,
+                ).encode("utf-8")
+            )

src/draive/mcp/server.py

@@ -162,7 +162,7 @@ def _expose_resources(  # noqa: C901
                             )
 
                 case ResourceTemplate():
-                    if resource.arguments:
+                    if resource.has_args:
                         resource_template_declarations.append(
                             MCPResourceTemplate(
                                 uriTemplate=resource.declaration.template_uri,

src/draive/models/tools/function.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable, Coroutine, Iterable
 from typing import Any, Protocol, Self, cast, final, overload
 
-from haiway import Meta, MetaValues, TypeSpecification, ctx
+from haiway import Function, Meta, MetaValues, TypeSpecification, ctx
 
 from draive.models.tools.types import (
     ToolAvailabilityChecking,
@@ -19,7 +19,6 @@
     Multimodal,
     MultimodalContent,
 )
-from draive.parameters import ParametrizedFunction
 
 __all__ = (
     "FunctionTool",
@@ -28,7 +27,7 @@
 
 
 @final
-class FunctionTool[**Args, Result](ParametrizedFunction[Args, Coroutine[None, None, Result]]):
+class FunctionTool[**Args, Result](Function[Args, Coroutine[None, None, Result]]):
     """Wraps an async function and exposes it as a Tool.
 
     Builds the tool specification from the function signature (or provided parameters),
@@ -87,21 +86,23 @@ def __init__(
             "description",
             description,
         )
+        assert all(arg.name in self._keyword_arguments for arg in self._positional_arguments)  # nosec: B101
+        assert self._variadic_positional_arguments is None  # nosec: B101
 
         if parameters is None:
             aliased_required: list[str] = []
             specifications: dict[str, TypeSpecification] = {}
-            for parameter in self._parameters.values():
-                specification: TypeSpecification | None = parameter.specification
+            for argument in self._keyword_arguments.values():
+                specification: TypeSpecification | None = argument.specification
                 if specification is None:
                     raise RuntimeError(
-                        f"Function argument {parameter.name} does not provide a valid specification"
+                        f"Function argument {argument.name} does not provide a valid specification"
                     )
 
-                specifications[parameter.alias or parameter.name] = specification
+                specifications[argument.alias or argument.name] = specification
 
-                if parameter.required:
-                    aliased_required.append(parameter.alias or parameter.name)
+                if argument.required:
+                    aliased_required.append(argument.alias or argument.name)
 
             parameters = {
                 "type": "object",

src/draive/parameters/__init__.py

@@ -1,7 +1,3 @@
-from draive.parameters.function import ParametrizedFunction
 from draive.parameters.model import DataModel
 
-__all__ = (
-    "DataModel",
-    "ParametrizedFunction",
-)
+__all__ = ("DataModel",)