fabricatio 0.2.0.dev13__tar.gz → 0.2.0.dev14__tar.gz

{fabricatio-0.2.0.dev13 → fabricatio-0.2.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.2.0.dev13
+Version: 0.2.0.dev14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12

fabricatio-0.2.0.dev14/examples/propose_task/propose.py

@@ -0,0 +1,31 @@
+import asyncio
+from typing import Any
+
+from fabricatio import Action, Role, Task, WorkFlow, logger
+
+task = Task(name="say hello", goal="say hello", description="say hello to the world")
+
+
+class Talk(Action):
+    """Action that says hello to the world."""
+
+    name: str = "talk"
+    output_key: str = "task_output"
+
+    async def _execute(self, task_input: Task[str], **_) -> Any:
+        ret = "Hello fabricatio!"
+        logger.info("executing talk action")
+        return ret
+
+
+async def main() -> None:
+    """Main function."""
+    role = Role(
+        name="talker", description="talker role", registry={task.pending_label: WorkFlow(name="talk", steps=(Talk,))}
+    )
+    logger.info(Task.json_example())
+    logger.info(f"proposed task: {await role.propose('write a rust clap cli that can download a html page')}")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

{fabricatio-0.2.0.dev13 → fabricatio-0.2.0.dev14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fabricatio"
-version = "0.2.0-dev.13"
+version = "0.2.0-dev.14"
 description = "A LLM multi-agent framework."
 readme = "README.md"
 license = { file = "LICENSE" }

{fabricatio-0.2.0.dev13 → fabricatio-0.2.0.dev14}/python/fabricatio/models/action.py

@@ -8,10 +8,11 @@ from typing import Any, Dict, Self, Tuple, Type, Unpack
 from fabricatio.journal import logger
 from fabricatio.models.generic import LLMUsage, WithBriefing
 from fabricatio.models.task import ProposeTask, Task
+from fabricatio.models.tool import ToolBoxUsage
 from pydantic import Field, PrivateAttr
 
 
-class Action(ProposeTask):
+class Action(ProposeTask, ToolBoxUsage):
     """Class that represents an action to be executed in a workflow."""
 
     personality: str = Field(default="")
@@ -50,7 +51,7 @@ class Action(ProposeTask):
         return f"# The action you are going to perform: \n{super().briefing}"
 
 
-class WorkFlow[A: Type[Action] | Action](WithBriefing, LLMUsage):
+class WorkFlow[A: Type[Action] | Action](WithBriefing, LLMUsage, ToolBoxUsage):
     """Class that represents a workflow to be executed in a task."""
 
     _context: Queue[Dict[str, Any]] = PrivateAttr(default_factory=lambda: Queue(maxsize=1))
@@ -121,7 +122,12 @@ class WorkFlow[A: Type[Action] | Action](WithBriefing, LLMUsage):
         logger.debug(f"Initializing context for workflow: {self.name}")
         await self._context.put({self.task_input_key: None, **dict(self.extra_init_context)})
 
-    def fallback_to_self(self) -> Self:
+    def steps_fallback_to_self(self) -> Self:
         """Set the fallback for each step to the workflow itself."""
         self.hold_to(self._instances)
         return self
+
+    def steps_supply_tools_from_self(self) -> Self:
+        """Supply the tools from the workflow to each step."""
+        self.provide_tools_to(self._instances)
+        return self

{fabricatio-0.2.0.dev13 → fabricatio-0.2.0.dev14}/python/fabricatio/models/role.py

@@ -1,25 +1,36 @@
 """Module that contains the Role class."""
 
-from typing import Any
+from typing import Any, Set
 
 from fabricatio.core import env
 from fabricatio.journal import logger
 from fabricatio.models.action import WorkFlow
 from fabricatio.models.events import Event
 from fabricatio.models.task import ProposeTask
+from fabricatio.models.tool import ToolBox, ToolBoxUsage
+from fabricatio.toolboxes import basic_toolboxes
 from pydantic import Field
 
 
-class Role(ProposeTask):
+class Role(ProposeTask, ToolBoxUsage):
     """Class that represents a role with a registry of events and workflows."""
 
     registry: dict[Event | str, WorkFlow] = Field(...)
     """ The registry of events and workflows."""
 
+    toolboxes: Set[ToolBox] = Field(default=basic_toolboxes)
+
     def model_post_init(self, __context: Any) -> None:
         """Register the workflows in the role to the event bus."""
         for event, workflow in self.registry.items():
-            workflow.fallback_to(self).fallback_to_self().inject_personality(self.briefing)
+            (
+                workflow.fallback_to(self)
+                .steps_fallback_to_self()
+                .inject_personality(self.briefing)
+                .supply_tools_from(self)
+                .steps_supply_tools_from_self()
+            )
+
             logger.debug(
                 f"Registering workflow: {workflow.name} for event: {event.collapse() if isinstance(event, Event) else event}"
             )

{fabricatio-0.2.0.dev13 → fabricatio-0.2.0.dev14}/python/fabricatio/models/tool.py

@@ -1,8 +1,9 @@
 """A module for defining tools and toolboxes."""
 
 from inspect import iscoroutinefunction, signature
-from typing import Any, Callable, Iterable, List, Optional, Self, Union
+from typing import Any, Callable, Iterable, List, Self, Set, Union
 
+from fabricatio.journal import logger
 from fabricatio.models.generic import Base, WithBriefing
 from pydantic import Field
 
@@ -28,6 +29,7 @@ class Tool[**P, R](WithBriefing):
 
     def invoke(self, *args: P.args, **kwargs: P.kwargs) -> R:
         """Invoke the tool's source function with the provided arguments."""
+        logger.info(f"Invoking tool: {self.name} with args: {args} and kwargs: {kwargs}")
         return self.source(*args, **kwargs)
 
     @property
@@ -105,14 +107,23 @@ class ToolBox(WithBriefing):
         assert tool, f"No tool named {name} found."
         return tool
 
+    def __hash__(self) -> int:
+        """Return a hash of the toolbox based on its briefing."""
+        return hash(self.briefing)
 
-class ToolUsage(Base):
+
+class ToolBoxUsage(Base):
     """A class representing the usage of tools in a task."""
 
-    toolboxes: Optional[List[ToolBox]]
-    """The tools used by the task, a list of ToolBox instances."""
+    toolboxes: Set[ToolBox] = Field(default_factory=set)
+    """A set of toolboxes used by the instance."""
+
+    @property
+    def available_toolbox_names(self) -> List[str]:
+        """Return a list of available toolbox names."""
+        return [toolbox.name for toolbox in self.toolboxes]
 
-    def supply_tools_from(self, others: Union["ToolUsage", Iterable["ToolUsage"]]) -> Self:
+    def supply_tools_from(self, others: Union["ToolBoxUsage", Iterable["ToolBoxUsage"]]) -> Self:
         """Supplies tools from other ToolUsage instances to this instance.
 
         Args:
@@ -122,13 +133,13 @@ class ToolUsage(Base):
         Returns:
             Self: The current ToolUsage instance with updated tools.
         """
-        if isinstance(others, ToolUsage):
+        if isinstance(others, ToolBoxUsage):
             others = [others]
         for other in others:
-            self.toolboxes.extend(other.toolboxes)
+            self.toolboxes.update(other.toolboxes)
         return self
 
-    def provide_tools_to(self, others: Union["ToolUsage", Iterable["ToolUsage"]]) -> Self:
+    def provide_tools_to(self, others: Union["ToolBoxUsage", Iterable["ToolBoxUsage"]]) -> Self:
         """Provides tools from this instance to other ToolUsage instances.
 
         Args:
@@ -138,8 +149,8 @@ class ToolUsage(Base):
         Returns:
             Self: The current ToolUsage instance.
         """
-        if isinstance(others, ToolUsage):
+        if isinstance(others, ToolBoxUsage):
             others = [others]
         for other in others:
-            other.toolboxes.extend(self.toolboxes)
+            other.toolboxes.update(self.toolboxes)
         return self

fabricatio-0.2.0.dev14/python/fabricatio/toolboxes/__init__.py

@@ -0,0 +1,15 @@
+"""Contains the built-in toolboxes for the Fabricatio package."""
+
+from typing import Set
+
+from fabricatio.models.tool import ToolBox
+from fabricatio.toolboxes.arithmetic import arithmetic_toolbox
+from fabricatio.toolboxes.task import task_toolbox
+
+basic_toolboxes: Set[ToolBox] = {task_toolbox, arithmetic_toolbox}
+
+__all__ = [
+    "arithmetic_toolbox",
+    "basic_toolboxes",
+    "task_toolbox",
+]

{fabricatio-0.2.0.dev13 → fabricatio-0.2.0.dev14}/python/fabricatio/toolboxes/arithmetic.py

@@ -2,10 +2,10 @@
 
 from fabricatio.models.tool import ToolBox
 
-arithmetic_tools = ToolBox(name="ArithmeticToolBox", description="A toolbox for arithmetic operations.")
+arithmetic_toolbox = ToolBox(name="ArithmeticToolBox", description="A toolbox for arithmetic operations.")
 
 
-@arithmetic_tools.collect_tool
+@arithmetic_toolbox.collect_tool
 def add(a: float, b: float) -> float:
     """Add two numbers.
 
@@ -19,7 +19,7 @@ def add(a: float, b: float) -> float:
     return a + b
 
 
-@arithmetic_tools.collect_tool
+@arithmetic_toolbox.collect_tool
 def subtract(a: float, b: float) -> float:
     """Subtract two numbers.
 
@@ -33,7 +33,7 @@ def subtract(a: float, b: float) -> float:
     return a - b
 
 
-@arithmetic_tools.collect_tool
+@arithmetic_toolbox.collect_tool
 def multiply(a: float, b: float) -> float:
     """Multiply two numbers.
 
@@ -47,7 +47,7 @@ def multiply(a: float, b: float) -> float:
     return a * b
 
 
-@arithmetic_tools.collect_tool
+@arithmetic_toolbox.collect_tool
 def divide(a: float, b: float) -> float:
     """Divide two numbers.
 

fabricatio-0.2.0.dev14/python/fabricatio/toolboxes/task.py

@@ -0,0 +1,4 @@
+from fabricatio.models.task import Task
+from fabricatio.models.tool import ToolBox
+
+task_toolbox = ToolBox(name="TaskToolBox", description="A toolbox for tasks management.").add_tool(Task.simple_task)

{fabricatio-0.2.0.dev13 → fabricatio-0.2.0.dev14}/uv.lock

@@ -260,7 +260,7 @@ wheels = [
 
 [[package]]
 name = "fabricatio"
-version = "0.2.0.dev13"
+version = "0.2.0.dev14"
 source = { editable = "." }
 dependencies = [
     { name = "appdirs" },

fabricatio-0.2.0.dev13/python/fabricatio/toolboxes/__init__.py

@@ -1,7 +0,0 @@
-"""Contains the built-in toolboxes for the Fabricatio package."""
-
-from fabricatio.toolboxes.task import TaskToolBox
-
-__all__ = [
-    "TaskToolBox",
-]

fabricatio-0.2.0.dev13/python/fabricatio/toolboxes/task.py

@@ -1,4 +0,0 @@
-from fabricatio.models.task import Task
-from fabricatio.models.tool import ToolBox
-
-TaskToolBox = ToolBox(name="TaskToolBox", description="A toolbox for tasks management.").add_tool(Task.simple_task)