fabricatio 0.2.0.dev17__cp312-cp312-win_amd64.whl → 0.2.0.dev18__cp312-cp312-win_amd64.whl

fabricatio/models/advanced.py

@@ -1,14 +1,19 @@
 """A module for advanced models and functionalities."""
 
-from typing import List
+from types import CodeType
+from typing import List, Optional, Tuple, Unpack
 
+import orjson
 from fabricatio._rust_instances import template_manager
+from fabricatio.config import configs
 from fabricatio.models.generic import WithBriefing
+from fabricatio.models.kwargs_types import LLMKwargs
 from fabricatio.models.task import Task
+from fabricatio.models.tool import Tool, ToolExecutor
 from fabricatio.models.usages import LLMUsage, ToolBoxUsage
-from fabricatio.parser import JsonCapture
+from fabricatio.parser import JsonCapture, PythonCapture
 from loguru import logger
-from pydantic import NonNegativeFloat, PositiveInt, ValidationError
+from pydantic import PositiveInt, ValidationError
 
 
 class ProposeTask(LLMUsage, WithBriefing):
@@ -18,28 +23,14 @@ class ProposeTask(LLMUsage, WithBriefing):
         self,
         prompt: str,
         max_validations: PositiveInt = 2,
-        model: str | None = None,
-        temperature: NonNegativeFloat | None = None,
-        stop: str | List[str] | None = None,
-        top_p: NonNegativeFloat | None = None,
-        max_tokens: PositiveInt | None = None,
-        stream: bool | None = None,
-        timeout: PositiveInt | None = None,
-        max_retries: PositiveInt | None = None,
+        **kwargs: Unpack[LLMKwargs],
     ) -> Task:
         """Asynchronously proposes a task based on a given prompt and parameters.
 
         Parameters:
             prompt: The prompt text for proposing a task, which is a string that must be provided.
             max_validations: The maximum number of validations allowed, default is 2.
-            model: The model to be used, default is None.
-            temperature: The sampling temperature, default is None.
-            stop: The stop sequence(s) for generation, default is None.
-            top_p: The nucleus sampling parameter, default is None.
-            max_tokens: The maximum number of tokens to be generated, default is None.
-            stream: Whether to stream the output, default is None.
-            timeout: The timeout for the operation, default is None.
-            max_retries: The maximum number of retries for the operation, default is None.
+            **kwargs: The keyword arguments for the LLM (Large Language Model) usage.
 
         Returns:
             A Task object based on the proposal result.
@@ -65,32 +56,64 @@ class ProposeTask(LLMUsage, WithBriefing):
             validator=_validate_json,
             system_message=f"# your personal briefing: \n{self.briefing}",
             max_validations=max_validations,
-            model=model,
-            temperature=temperature,
-            stop=stop,
-            top_p=top_p,
-            max_tokens=max_tokens,
-            stream=stream,
-            timeout=timeout,
-            max_retries=max_retries,
+            **kwargs,
         )
 
 
 class HandleTask(WithBriefing, ToolBoxUsage):
     """A class that handles a task based on a task object."""
 
-    async def handle[T](
+    async def draft_tool_usage_code(
         self,
-        task: Task[T],
-        max_validations: PositiveInt = 2,
-        model: str | None = None,
-        temperature: NonNegativeFloat | None = None,
-        stop: str | List[str] | None = None,
-        top_p: NonNegativeFloat | None = None,
-        max_tokens: PositiveInt | None = None,
-        stream: bool | None = None,
-        timeout: PositiveInt | None = None,
-        max_retries: PositiveInt | None = None,
-    ) -> T:
+        task: Task,
+        tools: List[Tool],
+        **kwargs: Unpack[LLMKwargs],
+    ) -> Tuple[CodeType, List[str]]:
+        """Asynchronously drafts the tool usage code for a task based on a given task object and tools."""
+        logger.info(f"Drafting tool usage code for task: {task.briefing}")
+
+        if not tools:
+            err = f"{self.name}: Tools must be provided to draft the tool usage code."
+            logger.error(err)
+            raise ValueError(err)
+
+        def _validator(response: str) -> Tuple[CodeType, List[str]] | None:
+            if (source := PythonCapture.convert_with(response, lambda resp: compile(resp, "<string>", "exec"))) and (
+                to_extract := JsonCapture.convert_with(response, orjson.loads)
+            ):
+                return source, to_extract
+            return None
+
+        return await self.aask_validate(
+            question=template_manager.render_template(
+                "draft_tool_usage_code",
+                {
+                    "tool_module_name": configs.toolbox.tool_module_name,
+                    "task": task.briefing,
+                    "tools": [tool.briefing for tool in tools],
+                },
+            ),
+            validator=_validator,
+            system_message=f"# your personal briefing: \n{self.briefing}",
+            **kwargs,
+        )
+
+    async def handle_fin_grind(
+        self,
+        task: Task,
+        **kwargs: Unpack[LLMKwargs],
+    ) -> Optional[Tuple]:
         """Asynchronously handles a task based on a given task object and parameters."""
-        # TODO: Implement the handle method
+        logger.info(f"Handling task: {task.briefing}")
+
+        tools = await self.gather_tools(task)
+        logger.info(f"{self.name} have gathered {len(tools)} tools gathered")
+
+        if tools:
+            executor = ToolExecutor(execute_sequence=tools)
+            code, to_extract = await self.draft_tool_usage_code(task, tools, **kwargs)
+            cxt = await executor.execute(code)
+            if to_extract:
+                return tuple(cxt.get(k) for k in to_extract)
+
+        return None

fabricatio/models/kwargs_types.py

@@ -0,0 +1,26 @@
+"""This module contains the types for the keyword arguments of the methods in the models module."""
+
+from typing import List, NotRequired, TypedDict
+
+from pydantic import NonNegativeFloat, NonNegativeInt, PositiveInt
+
+
+class LLMKwargs(TypedDict):
+    """A type representing the keyword arguments for the LLM (Large Language Model) usage."""
+
+    model: NotRequired[str]
+    temperature: NotRequired[NonNegativeFloat]
+    stop: NotRequired[str | List[str]]
+    top_p: NotRequired[NonNegativeFloat]
+    max_tokens: NotRequired[PositiveInt]
+    stream: NotRequired[bool]
+    timeout: NotRequired[PositiveInt]
+    max_retries: NotRequired[PositiveInt]
+
+
+class ChooseKwargs(LLMKwargs):
+    """A type representing the keyword arguments for the choose method."""
+
+    max_validations: NotRequired[PositiveInt]
+    system_message: NotRequired[str]
+    k: NotRequired[NonNegativeInt]

fabricatio/models/tool.py

@@ -167,6 +167,6 @@ class ToolExecutor(BaseModel):
         tools = []
         while tool_name := recipe.pop(0):
             for toolbox in toolboxes:
-                tools.append(toolbox.get(tool_name))
+                tools.append(toolbox[tool_name])
 
         return cls(execute_sequence=tools)

fabricatio/models/usages.py

@@ -1,6 +1,6 @@
 """This module contains classes that manage the usage of language models and tools in tasks."""
 
-from typing import Callable, Dict, Iterable, List, NotRequired, Optional, Self, Set, TypedDict, Union, Unpack
+from typing import Callable, Dict, Iterable, List, Optional, Self, Set, Union, Unpack
 
 import litellm
 import orjson
@@ -8,6 +8,7 @@ from fabricatio._rust_instances import template_manager
 from fabricatio.config import configs
 from fabricatio.journal import logger
 from fabricatio.models.generic import Base, WithBriefing
+from fabricatio.models.kwargs_types import ChooseKwargs, LLMKwargs
 from fabricatio.models.task import Task
 from fabricatio.models.tool import Tool, ToolBox
 from fabricatio.models.utils import Messages
@@ -16,19 +17,6 @@ from litellm.types.utils import Choices, ModelResponse, StreamingChoices
 from pydantic import Field, HttpUrl, NonNegativeFloat, NonNegativeInt, PositiveInt, SecretStr
 
 
-class LLMKwargs(TypedDict):
-    """A type representing the keyword arguments for the LLM (Large Language Model) usage."""
-
-    model: NotRequired[str]
-    temperature: NotRequired[NonNegativeFloat]
-    stop: NotRequired[str | List[str]]
-    top_p: NotRequired[NonNegativeFloat]
-    max_tokens: NotRequired[PositiveInt]
-    stream: NotRequired[bool]
-    timeout: NotRequired[PositiveInt]
-    max_retries: NotRequired[PositiveInt]
-
-
 class LLMUsage(Base):
     """Class that manages LLM (Large Language Model) usage parameters and methods."""
 
@@ -319,14 +307,6 @@ class LLMUsage(Base):
                     setattr(other, attr_name, attr)
 
 
-class ChooseKwargs(LLMKwargs):
-    """A type representing the keyword arguments for the choose method."""
-
-    max_validations: NotRequired[PositiveInt]
-    system_message: NotRequired[str]
-    k: NotRequired[NonNegativeInt]
-
-
 class ToolBoxUsage(LLMUsage):
     """A class representing the usage of tools in a task."""
 
@@ -362,7 +342,7 @@ class ToolBoxUsage(LLMUsage):
             logger.warning("No toolboxes available.")
             return []
         return await self.achoose(
-            instruction=task.briefing,
+            instruction=task.briefing,  # TODO write a template to build a more robust instruction
             choices=list(self.toolboxes),
             k=k,
             max_validations=max_validations,
@@ -396,7 +376,7 @@ class ToolBoxUsage(LLMUsage):
             logger.warning(f"No tools available in toolbox {toolbox.name}.")
             return []
         return await self.achoose(
-            instruction=task.briefing,
+            instruction=task.briefing,  # TODO write a template to build a more robust instruction
             choices=toolbox.tools,
             k=k,
             max_validations=max_validations,
@@ -404,7 +384,7 @@ class ToolBoxUsage(LLMUsage):
             **kwargs,
         )
 
-    async def gather_tools(
+    async def gather_tools_fine_grind(
         self,
         task: Task,
         box_choose_kwargs: Optional[ChooseKwargs] = None,
@@ -431,6 +411,18 @@ class ToolBoxUsage(LLMUsage):
             chosen_tools.extend(await self.choose_tools(task, toolbox, **tool_choose_kwargs))
         return chosen_tools
 
+    async def gather_tools(self, task: Task, **kwargs: Unpack[ChooseKwargs]) -> List[Tool]:
+        """Asynchronously gathers tools based on the provided task.
+
+        Args:
+            task (Task): The task for which to gather tools.
+            **kwargs (Unpack[ChooseKwargs]): Keyword arguments for choosing tools, such as `system_message`, `k`, `max_validations`, `model`, `temperature`, `stop`, `top_p`, `max_tokens`, `stream`, `timeout`, and `max_retries`.
+
+        Returns:
+            List[Tool]: A list of tools gathered based on the provided task.
+        """
+        return await self.gather_tools_fine_grind(task, kwargs, kwargs)
+
     def supply_tools_from[S: "ToolBoxUsage"](self, others: Union[S, Iterable[S]]) -> Self:
         """Supplies tools from other ToolUsage instances to this instance.
 

fabricatio/parser.py

@@ -66,7 +66,7 @@ class Capture(BaseModel):
             return None
         try:
             return convertor(cap)
-        except ValueError as e:
+        except (ValueError, SyntaxError) as e:
             logger.error(f"Failed to convert text using convertor: {convertor.__name__}, error: \n{e}")
             return None
 

{fabricatio-0.2.0.dev17.dist-info → fabricatio-0.2.0.dev18.dist-info}/METADATA

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

{fabricatio-0.2.0.dev17.dist-info → fabricatio-0.2.0.dev18.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fabricatio-0.2.0.dev17.dist-info/METADATA,sha256=1I6ycXWgI6ZRXlRrLYSubYm8tSkbfG8dqHYcHgCYIoc,6386
-fabricatio-0.2.0.dev17.dist-info/WHEEL,sha256=tpW5AN9B-9qsM9WW2FXG2r193YXiqexDadpKp0A2daI,96
-fabricatio-0.2.0.dev17.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio-0.2.0.dev18.dist-info/METADATA,sha256=iasqYxUndNOxKQXzDKo53YvvgDA9l9QujIHcGx_8h30,6386
+fabricatio-0.2.0.dev18.dist-info/WHEEL,sha256=tpW5AN9B-9qsM9WW2FXG2r193YXiqexDadpKp0A2daI,96
+fabricatio-0.2.0.dev18.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
 fabricatio/actions/communication.py,sha256=wyc1DfhVwrwadhYG_auI9ykGXM0fwVYNwxpp91sSfiU,484
 fabricatio/actions/transmission.py,sha256=fU-xL8fDG3oRDD9x7Q94OU2Sb9G6xQfrj5IMlMYsgiM,1240
 fabricatio/actions/__init__.py,sha256=eFmFVPQvtNgFynIXBVr3eP-vWQDWCPng60YY5LXvZgg,115
@@ -12,15 +12,16 @@ fabricatio/fs/readers.py,sha256=lwAoOGafusBWyTZeN11oXJc224nPZrfafVHMmGSajkY,167
 fabricatio/fs/__init__.py,sha256=lWcKYg0v3mv2LnnSegOQaTtlVDODU0vtw_s6iKU5IqQ,122
 fabricatio/journal.py,sha256=z5K5waad9xmGr1hGrqSgFDRH3wiDQ5Oqfe0o98DaM-k,707
 fabricatio/models/action.py,sha256=YbfCZc5pWzfSsOATMaoPNwQH8uR7AOdjzqo289XVnrE,5301
-fabricatio/models/advanced.py,sha256=tJ93mrQiuIAD5lJMwEcQP1IXY2L2ihUTacyVmVaq9lA,3952
+fabricatio/models/advanced.py,sha256=DTezOSrd9lni2Xjccu3BOhEdxGW3N0lsHnJIbtqLr34,4669
 fabricatio/models/events.py,sha256=p9uXXQNWmDcDvGuiCzeVudMC1cdwB0zSdf5FX8mEBnY,2704
 fabricatio/models/generic.py,sha256=bxH0TidKhDN8n8LOCHjPx3ViIclztHGao1N6YM1IGuQ,3425
+fabricatio/models/kwargs_types.py,sha256=lSZAxOnhFdQwRkm-NrbJVMSyBbfdeuVNx807LvJpEOo,901
 fabricatio/models/role.py,sha256=O0hMOGpSXFLPx2A5XhRis7BtPebG-EgT9tY9P5-8p4Y,1417
 fabricatio/models/task.py,sha256=vVOGwnT-oaIIgjemEa0riMMz_CpWdCasie2NSIRvTKM,8188
-fabricatio/models/tool.py,sha256=pOBjvOsMF6bX9cPy1mnaljzWnWE31rV1gPtTQ0ZPwxc,6389
-fabricatio/models/usages.py,sha256=PHoXqRzu7ItF0Wts4xzgN8Ek_BVTqAHOcQZXxVmU_3s,20567
+fabricatio/models/tool.py,sha256=mD0rlG7hpMxTd_pI6JfRxAVsqPaXGdw1VLThAlbrqFE,6385
+fabricatio/models/usages.py,sha256=SHY8DHNO8poTFGRmKc4AWXvKzLXS540qw8SBWDCjSbg,20719
 fabricatio/models/utils.py,sha256=i_kpcQpct04mQFk1nbcVGV-pl1YThWu4Qk3wbewzKkc,2535
-fabricatio/parser.py,sha256=foEhrO_e-hhRhmABcttwdMyciyJx422MpNqCZOUx8bg,3278
+fabricatio/parser.py,sha256=cpJtH711Lzl1JmwwJ1Jj3ZCzZxIblwrkl18QXLay2fE,3293
 fabricatio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fabricatio/toolboxes/arithmetic.py,sha256=WLqhY-Pikv11Y_0SGajwZx3WhsLNpHKf9drzAqOf_nY,1369
 fabricatio/toolboxes/fs.py,sha256=q5weqzAPv4RddC73blEeYYMTeXoIZjHuK55Us1yVlj0,455
@@ -29,6 +30,6 @@ fabricatio/toolboxes/__init__.py,sha256=xWObAUPasJjBw0pY9V_XTA9fTavdQkCZSYi7-CTf
 fabricatio/_rust.pyi,sha256=rZd_143JcGrLtRF-r5H1rErp8jQxH74n8ItA5FrohT0,1639
 fabricatio/_rust_instances.py,sha256=P5yKVZ9M9CC4ryI1G2rq4mHL96iu6DW_85RMTX8onpA,211
 fabricatio/__init__.py,sha256=C9r6OVyMBb8IqwERNUq8lKDLe4BqN7fiu-O4TsXZ5xU,913
-fabricatio/_rust.cp312-win_amd64.pyd,sha256=BaHm-8-2oT5dASWOXTsJxN17dnc3A2rRTh7RKILO8Cs,1132032
-fabricatio-0.2.0.dev17.data/scripts/tdown.exe,sha256=HsrHzB4dL8S5qCvg98dfRruvwEtwnUkPcmZcdX-efFw,3383808
-fabricatio-0.2.0.dev17.dist-info/RECORD,,
+fabricatio/_rust.cp312-win_amd64.pyd,sha256=zcOGopnAj1DXcPzdR7LV8NYWoumcl5jBeIZ3zC9EwXg,1132032
+fabricatio-0.2.0.dev18.data/scripts/tdown.exe,sha256=-wy8nh24fWDJ_M6NpAPqzQPJ2rIoStthYT1uFy4vCfU,3383808
+fabricatio-0.2.0.dev18.dist-info/RECORD,,