fabricatio 0.2.1.dev0__cp312-cp312-manylinux_2_34_x86_64.whl → 0.2.1.dev1__cp312-cp312-manylinux_2_34_x86_64.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,8 +1,8 @@
-fabricatio-0.2.1.dev0.dist-info/METADATA,sha256=WJK231huI6SxJLItH3s3Yp2_T0ATZWcePe1wvlfijD8,11972
-fabricatio-0.2.1.dev0.dist-info/WHEEL,sha256=RIvmwLDYujv60MYBx2jxyP4vdn1DD7X0kBgz1TQvZuc,108
-fabricatio-0.2.1.dev0.dist-info/licenses/LICENSE,sha256=yDZaTLnOi03bi3Dk6f5IjhLUc5old2yOsihHWU0z-i0,1067
+fabricatio-0.2.1.dev1.dist-info/METADATA,sha256=_O09SWlzb0GQzgGetoZTN2L3YxDOlOQf9F4nhRA3i7M,11972
+fabricatio-0.2.1.dev1.dist-info/WHEEL,sha256=RIvmwLDYujv60MYBx2jxyP4vdn1DD7X0kBgz1TQvZuc,108
+fabricatio-0.2.1.dev1.dist-info/licenses/LICENSE,sha256=yDZaTLnOi03bi3Dk6f5IjhLUc5old2yOsihHWU0z-i0,1067
 fabricatio/fs/__init__.py,sha256=bYE9r8uR0dtknzbg_YaGv_6Wwa27ntkQt0Tl7Kb3HFI,117
-fabricatio/fs/readers.py,sha256=Q-rqgXAsNcVu6WGFTvK70gZFyi088C3cuBdZOhn1oRI,527
+fabricatio/fs/readers.py,sha256=lqMrM5Nt3l6QJmPDoBno2PSaN2BbFwfUjBqaghrbK3A,1002
 fabricatio/fs/curd.py,sha256=g74Pc2WPSkPlCXX0cWj2jyiDYTfkLwpwM480eyCkmc8,3851
 fabricatio/toolboxes/__init__.py,sha256=iEBsH0aRPLccIe6eyZ6iH5GdK8yYNQTnCwLzw4pWXAA,465
 fabricatio/toolboxes/fs.py,sha256=oZjGOmtN8ZbkMXxCMatqvdPavVXyQ87AEDc1lx9jimY,483
@@ -13,7 +13,7 @@ fabricatio/core.py,sha256=apwXgI94DCWpGujGlsmXsTZQvJOQMB9llmuUo7ohd-4,5771
 fabricatio/config.py,sha256=qpqqB38LivPEqkEdnTRswKSR4pVi-lsJb-Ohz3hqjcE,9997
 fabricatio/decorators.py,sha256=cJHsxxbnMhc4SzPl4454CPLuDP3H0qbTrzV_U2rLPrs,6372
 fabricatio/journal.py,sha256=bzxZay48ZWI0VIkkDXm4Wc_Cc9lBQYa2VGx3Hxy_PtA,753
-fabricatio/models/generic.py,sha256=U5MfGx4z_SMab3ZgOYUkvC3U4r3iUex6CfxQl-uRPnY,4679
+fabricatio/models/generic.py,sha256=4j6DRNkHLNhx8U6aijf0Cz9HSahtEPQBh22i6d_PGTs,4981
 fabricatio/models/kwargs_types.py,sha256=INQIZiCOfGVkRbPmUMp-ZYtSkPwZmgFowid-D3A3TpE,875
 fabricatio/models/action.py,sha256=Kjq0ozqgPjHK0tP61k0yhrSZBxzE9m68MJCWZUUgh1c,5513
 fabricatio/models/task.py,sha256=0HXaf8Ig47UeMBN7n3iUp0oyOvN6-DlKxQForHnt8RI,8981
@@ -21,7 +21,7 @@ fabricatio/models/role.py,sha256=TT_SxC1M8IawVA72BRI3h3KrK3XMb88UV7F897PuKyU,175
 fabricatio/models/tool.py,sha256=wgNXtobDSWZTVmIrSSaS5oyxhSUYWXhS0S2o9acE2ls,6800
 fabricatio/models/events.py,sha256=TkMSJYSzRgurbfY2knWIc8gYw7rmaWqB7KeYzy5jeWU,2637
 fabricatio/models/utils.py,sha256=u-eR_v-o0BSFSmCprP3mOyAO-WOyg_P68jjzLjyit_w,2457
-fabricatio/models/usages.py,sha256=XYTJjxDVFE2Ek6QBcrk1iNz5OjUPtwIArWuG4LkeLw8,23121
+fabricatio/models/usages.py,sha256=xpUF6luEiQUyAvjc6xBdXwA5gZHGckPsT-g-49McwIg,25185
 fabricatio/models/advanced.py,sha256=RzQE4fsN1uuEgG43Ym_C2N5gZI-9keGYzkaXE4hYGws,4899
 fabricatio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fabricatio/_rust_instances.py,sha256=JAtO-vL8ihvduf1SHLNf0w7ZSVGCJeIv6zZ9Ekyy1hY,271
@@ -30,6 +30,6 @@ fabricatio/actions/communication.py,sha256=MrL_revv1zm1VXqjDMKZkg4PHmyMxYThAmmw2
 fabricatio/actions/transmission.py,sha256=WM-kssiqzTLZuZSiqbRvBaC2qynd9kjrKXya4f9Zcb0,839
 fabricatio/_rust.pyi,sha256=clhcURuiB9zlFo4m3VyoWQ8Xs4tvg6KNHXpF-ok9h4o,1703
 fabricatio/parser.py,sha256=Q4laV79Svggl09UKa3lAw6NYPuDz1sP2F-6U4tsSvQw,3429
-fabricatio/_rust.cpython-312-x86_64-linux-gnu.so,sha256=eA0p5X5kUSF3rjbfCaiAgNJh4W_B0AQ00N16ts7z-7A,1337976
-fabricatio-0.2.1.dev0.data/scripts/tdown,sha256=HjD-SO1toTf3nXRCB7FpknfvS4KmohZfRyRwI7xIDOs,4571816
-fabricatio-0.2.1.dev0.dist-info/RECORD,,
+fabricatio/_rust.cpython-312-x86_64-linux-gnu.so,sha256=QbhnJVpJF98TxjmOERX1yujuxipSkTEdS-U-uLVeF6E,1339504
+fabricatio-0.2.1.dev1.data/scripts/tdown,sha256=zC9af9TkkwUb7kbwHqOdjVevGf9XY36tW5j5kGEP6gY,4570976
+fabricatio-0.2.1.dev1.dist-info/RECORD,,