fabricatio 0.2.1.dev0__cp312-cp312-win_amd64.whl → 0.2.1.dev1__cp312-cp312-win_amd64.whl

fabricatio/fs/readers.py

@@ -1,24 +1,43 @@
 """Filesystem readers for Fabricatio."""
 
 from pathlib import Path
+from typing import Dict
 
 from magika import Magika
+from orjson import orjson
 
 from fabricatio.config import configs
 
 magika = Magika(model_dir=configs.magika.model_dir)
 
 
-def safe_text_read(path: Path) -> str:
+def safe_text_read(path: Path | str) -> str:
     """Safely read the text from a file.
 
     Args:
-        path (Path): The path to the file.
+        path (Path|str): The path to the file.
 
     Returns:
         str: The text from the file.
     """
+    path = Path(path)
     try:
         return path.read_text(encoding="utf-8")
     except (UnicodeDecodeError, IsADirectoryError, FileNotFoundError):
         return ""
+
+
+def safe_json_read(path: Path | str) -> Dict:
+    """Safely read the JSON from a file.
+
+    Args:
+        path (Path|str): The path to the file.
+
+    Returns:
+        dict: The JSON from the file.
+    """
+    path = Path(path)
+    try:
+        return orjson.loads(path.read_text(encoding="utf-8"))
+    except (orjson.JSONDecodeError, IsADirectoryError, FileNotFoundError):
+        return {}

fabricatio/models/generic.py

@@ -1,7 +1,7 @@
 """This module defines generic classes for models in the Fabricatio library."""
 
 from pathlib import Path
-from typing import List, Self
+from typing import Callable, List, Self
 
 import orjson
 from fabricatio._rust import blake3_hash
@@ -108,17 +108,25 @@ class WithDependency(Base):
         self.dependencies.clear()
         return self
 
-    def override_dependencies[P: str | Path](self, dependencies: List[P]) -> Self:
+    def override_dependencies[P: str | Path](self, dependencies: List[P] | P) -> Self:
         """Override the file dependencies of the task.
 
         Args:
-            dependencies (List[str | Path]): The file dependencies to override the task's dependencies.
+            dependencies (List[str | Path] | str | Path): The file dependencies to override the task's dependencies.
 
         Returns:
             Self: The current instance of the task.
         """
         return self.clear_dependencies().add_dependency(dependencies)
 
+    def pop_dependence[T](self, idx: int = -1, reader: Callable[[str], T] = safe_text_read) -> T:
+        """Pop the file dependencies from the task.
+
+        Returns:
+            str: The popped file dependency
+        """
+        return reader(self.dependencies.pop(idx))
+
     @property
     def dependencies_prompt(self) -> str:
         """Generate a prompt for the task based on the file dependencies.

fabricatio/models/usages.py

@@ -1,6 +1,7 @@
 """This module contains classes that manage the usage of language models and tools in tasks."""
 
-from typing import Callable, Dict, Iterable, List, Optional, Self, Set, Union, Unpack
+from asyncio import gather
+from typing import Callable, Dict, Iterable, List, Optional, Self, Set, Union, Unpack, overload
 
 import asyncstdlib
 import litellm
@@ -130,12 +131,42 @@ class LLMUsage(Base):
         logger.critical(err := f"Unexpected response type: {type(resp)}")
         raise ValueError(err)
 
+    @overload
+    async def aask(
+        self,
+        question: List[str],
+        system_message: Optional[List[str]] = None,
+        **kwargs: Unpack[LLMKwargs],
+    ) -> List[str]: ...
+    @overload
     async def aask(
         self,
         question: str,
-        system_message: str = "",
+        system_message: Optional[List[str]] = None,
+        **kwargs: Unpack[LLMKwargs],
+    ) -> List[str]: ...
+    @overload
+    async def aask(
+        self,
+        question: List[str],
+        system_message: Optional[str] = None,
         **kwargs: Unpack[LLMKwargs],
-    ) -> str:
+    ) -> List[str]: ...
+
+    @overload
+    async def aask(
+        self,
+        question: str,
+        system_message: Optional[str] = None,
+        **kwargs: Unpack[LLMKwargs],
+    ) -> str: ...
+
+    async def aask(
+        self,
+        question: str | List[str],
+        system_message: Optional[str | List[str]] = None,
+        **kwargs: Unpack[LLMKwargs],
+    ) -> str | List[str]:
         """Asynchronously asks the language model a question and returns the response content.
 
         Args:
@@ -146,16 +177,39 @@ class LLMUsage(Base):
         Returns:
             str: The content of the model's response message.
         """
-        return (
-            (
-                await self.ainvoke(
-                    n=1,
-                    question=question,
-                    system_message=system_message,
-                    **kwargs,
+        system_message = system_message or ""
+        match (isinstance(question, list), isinstance(system_message, list)):
+            case (True, True):
+                res = await gather(
+                    *[
+                        self.ainvoke(n=1, question=q, system_message=sm, **kwargs)
+                        for q, sm in zip(question, system_message, strict=True)
+                    ]
+                )
+                return [r.pop().message.content for r in res]
+            case (True, False):
+                res = await gather(
+                    *[self.ainvoke(n=1, question=q, system_message=system_message, **kwargs) for q in question]
                 )
-            ).pop()
-        ).message.content
+                return [r.pop().message.content for r in res]
+            case (False, True):
+                res = await gather(
+                    *[self.ainvoke(n=1, question=question, system_message=sm, **kwargs) for sm in system_message]
+                )
+                return [r.pop().message.content for r in res]
+            case (False, False):
+                return (
+                    (
+                        await self.ainvoke(
+                            n=1,
+                            question=question,
+                            system_message=system_message,
+                            **kwargs,
+                        )
+                    ).pop()
+                ).message.content
+            case _:
+                raise RuntimeError("Should not reach here.")
 
     async def aask_validate[T](
         self,
@@ -278,13 +332,15 @@ class LLMUsage(Base):
         Raises:
             ValueError: If validation fails after maximum attempts or if no valid selection is made.
         """
-        return await self.achoose(
-            instruction=instruction,
-            choices=choices,
-            k=1,
-            max_validations=max_validations,
-            system_message=system_message,
-            **kwargs,
+        return (
+            await self.achoose(
+                instruction=instruction,
+                choices=choices,
+                k=1,
+                max_validations=max_validations,
+                system_message=system_message,
+                **kwargs,
+            )
         )[0]
 
     async def ajudge(

{fabricatio-0.2.1.dev0.dist-info → fabricatio-0.2.1.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.2.1.dev0
+Version: 0.2.1.dev1
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12

{fabricatio-0.2.1.dev0.dist-info → fabricatio-0.2.1.dev1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fabricatio-0.2.1.dev0.dist-info/METADATA,sha256=x6D37kGKzWuvkI5qEifdCCJLFhrHPoBBsmxatVxXB1w,12351
-fabricatio-0.2.1.dev0.dist-info/WHEEL,sha256=tpW5AN9B-9qsM9WW2FXG2r193YXiqexDadpKp0A2daI,96
-fabricatio-0.2.1.dev0.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio-0.2.1.dev1.dist-info/METADATA,sha256=RPmruN8dtRCXoGz9b8Yy59VVAnGecm_eEDPMZnF_XIU,12351
+fabricatio-0.2.1.dev1.dist-info/WHEEL,sha256=tpW5AN9B-9qsM9WW2FXG2r193YXiqexDadpKp0A2daI,96
+fabricatio-0.2.1.dev1.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
 fabricatio/actions/communication.py,sha256=NZxIIncKgJSDyBrqNebUtH_haqtxHa8ld2TZxT3CMdU,429
 fabricatio/actions/transmission.py,sha256=xpvKqbXqgpi1BWy-vUUvmd8NZ1GhRNfsYUBp-l2jLyk,862
 fabricatio/actions/__init__.py,sha256=eFmFVPQvtNgFynIXBVr3eP-vWQDWCPng60YY5LXvZgg,115
@@ -8,18 +8,18 @@ fabricatio/config.py,sha256=TVge_fujKzvEZhOZYiYOMXdVn0YZ9SL5L1_mDzyeFUg,10260
 fabricatio/core.py,sha256=yQK2ZrbPYDJOaNDp0Bky3muTkB-ZaQ1ld_Qfflm2dY0,5938
 fabricatio/decorators.py,sha256=uzsP4tFKQNjDHBkofsjjoJA0IUAaYOtt6YVedoyOqlo,6551
 fabricatio/fs/curd.py,sha256=faMstgGUiQ4k2AW3OXfvvWWTldTtKXco7QINYaMjmyA,3981
-fabricatio/fs/readers.py,sha256=eDL9QhKEd6xfJBZaiwraObpGJWWpUd9NVYHoIvWgVqY,551
+fabricatio/fs/readers.py,sha256=Pz1-cdZYtmqr032dsroImlkFXAd0kCYY_9qVpD4UrG4,1045
 fabricatio/fs/__init__.py,sha256=lWcKYg0v3mv2LnnSegOQaTtlVDODU0vtw_s6iKU5IqQ,122
 fabricatio/journal.py,sha256=siqimKF0M_QaaOCMxtjr_BJVNyUIAQWILzE9Q4T6-7c,781
 fabricatio/models/action.py,sha256=1V3upL79e3ekyGXA4bSY70N60yeL0aWak7ZPBVsFE3A,5652
 fabricatio/models/advanced.py,sha256=xAt0rgxzpw-gw-1LwRhvIbYKoNI8kzzcYPvcL7Q1z1U,5027
 fabricatio/models/events.py,sha256=mrihNEFgQ5o7qFWja1z_qX8dnaTLwPBoJdVlzxQV5oM,2719
-fabricatio/models/generic.py,sha256=HRslLNvP6v6wWag0tGda1FtAbjbjn096583u_IrixWs,4823
+fabricatio/models/generic.py,sha256=WEjZ96rTyBjaBjkM6e8E4Pg_Naot4xWRvGJteqBiCCI,5133
 fabricatio/models/kwargs_types.py,sha256=lSZAxOnhFdQwRkm-NrbJVMSyBbfdeuVNx807LvJpEOo,901
 fabricatio/models/role.py,sha256=RPdOcjmM6KNyH310Vx4524JQG94P5sXl_3doSrRpiKQ,1802
 fabricatio/models/task.py,sha256=hogTBx74IAKfKDWghhWFR7i-LVQAn7L9PQM5tyOA5Rk,9257
 fabricatio/models/tool.py,sha256=WTFnpF6xZ1nJbmIOonLsGQcM-kkDCeZiAFqyil9xg2U,6988
-fabricatio/models/usages.py,sha256=JwVanhu5v87LUbnPjwFPriFI5O3HG4SppesYvYLAb50,23636
+fabricatio/models/usages.py,sha256=6qoh9w1xeC-olkQjiH1oZYgqxohp0GX4dwOmSrhMn0E,25756
 fabricatio/models/utils.py,sha256=i_kpcQpct04mQFk1nbcVGV-pl1YThWu4Qk3wbewzKkc,2535
 fabricatio/parser.py,sha256=uLabsvF07wRKW1PoTGuGEENCx3P4mhmuO8JkmOEkKko,3522
 fabricatio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,6 +30,6 @@ fabricatio/toolboxes/__init__.py,sha256=b13KmASO8q5fBLwew964fn9oH86ER5g-S1PgA4fZ
 fabricatio/_rust.pyi,sha256=0wCqtwWkVxxoqprvk8T27T8QYKIAKHS7xgsmdMNjQKc,1756
 fabricatio/_rust_instances.py,sha256=dl0-yZ4UvT5g20tQgnPJpmqtkjFGXNG_YK4eLfi_ugQ,279
 fabricatio/__init__.py,sha256=opIrN8lGyT-h2If4Qez0bRuWBa3uIT9GsM9CZy7_XJ0,1100
-fabricatio/_rust.cp312-win_amd64.pyd,sha256=JrZsNCEZJqdoeo2x9MlTG-H7kdQo_3uTKek0P9DdG60,1260544
-fabricatio-0.2.1.dev0.data/scripts/tdown.exe,sha256=n9vd_Mp4D-DcGm24C7exfhzphS2HIyS_lRb8lMPJzdk,3396608
-fabricatio-0.2.1.dev0.dist-info/RECORD,,
+fabricatio/_rust.cp312-win_amd64.pyd,sha256=MBHhCwM2VaYRbZlDgshZ2fGy3owWguBKWmSsngMwL0A,1261568
+fabricatio-0.2.1.dev1.data/scripts/tdown.exe,sha256=WwgYGM0hyWe1vzFIOwAAS3unnwygxCLw-GrNgwDTAT4,3396608
+fabricatio-0.2.1.dev1.dist-info/RECORD,,