fabricatio 0.2.0.dev12__cp312-cp312-win_amd64.whl → 0.2.0.dev13__cp312-cp312-win_amd64.whl

fabricatio/models/generic.py

@@ -17,6 +17,7 @@ from pydantic import (
     Field,
     HttpUrl,
     NonNegativeFloat,
+    NonNegativeInt,
     PositiveInt,
     SecretStr,
 )
@@ -295,6 +296,7 @@ class LLMUsage(Base):
         self,
         instruction: str,
         choices: List[T],
+        k: NonNegativeInt = 0,
         max_validations: PositiveInt = 2,
         system_message: str = "",
         model: str | None = None,
@@ -311,6 +313,7 @@ class LLMUsage(Base):
         Args:
             instruction: The user-provided instruction/question description.
             choices: A list of candidate options, requiring elements to have `name` and `briefing` fields.
+            k: The number of choices to select, 0 means infinite.
             max_validations: Maximum number of validation failures, default is 2.
             system_message: Custom system-level prompt, defaults to an empty string.
             model: The name of the LLM model to use.
@@ -332,14 +335,17 @@ class LLMUsage(Base):
         """
         prompt = template_manager.render_template(
             "make_choice",
-            {"instruction": instruction, "options": [m.model_dump(include={"name", "briefing"}) for m in choices]},
+            {
+                "instruction": instruction,
+                "options": [m.model_dump(include={"name", "briefing"}) for m in choices],
+                "k": k,
+            },
         )
         names = [c.name for c in choices]
 
         def _validate(response: str) -> List[T] | None:
-            cap = JsonCapture.capture(response)
-            ret = orjson.loads(cap)
-            if not isinstance(ret, List):
+            ret = JsonCapture.convert_with(response, orjson.loads)
+            if not isinstance(ret, List) or len(ret) != k:
                 return None
             if any(n not in names for n in ret):
                 return None
@@ -360,6 +366,70 @@ class LLMUsage(Base):
             max_retries=max_retries,
         )
 
+    async def ajudge(
+        self,
+        prompt: str,
+        affirm_case: str = "",
+        deny_case: str = "",
+        max_validations: PositiveInt = 2,
+        system_message: str = "",
+        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,
+    ) -> bool:
+        """Asynchronously judges a prompt using AI validation.
+
+        Args:
+            prompt (str): The input prompt to be judged.
+            affirm_case (str, optional): The affirmative case for the AI model. Defaults to "".
+            deny_case (str, optional): The negative case for the AI model. Defaults to "".
+            max_validations (PositiveInt, optional): Maximum number of validation attempts. Defaults to 2.
+            system_message (str, optional): System message for the AI model. Defaults to "".
+            model (str | None, optional): AI model to use. Defaults to None.
+            temperature (NonNegativeFloat | None, optional): Sampling temperature. Defaults to None.
+            stop (str | List[str] | None, optional): Stop sequences. Defaults to None.
+            top_p (NonNegativeFloat | None, optional): Nucleus sampling parameter. Defaults to None.
+            max_tokens (PositiveInt | None, optional): Maximum number of tokens to generate. Defaults to None.
+            stream (bool | None, optional): Whether to stream the response. Defaults to None.
+            timeout (PositiveInt | None, optional): Timeout in seconds. Defaults to None.
+            max_retries (PositiveInt | None, optional): Maximum number of retries. Defaults to None.
+
+        Returns:
+            bool: The judgment result (True or False) based on the AI's response.
+
+        Notes:
+            The method uses an internal validator to ensure the response is a boolean value.
+            If the response cannot be converted to a boolean, it will return None.
+        """
+
+        def _validate(response: str) -> bool | None:
+            ret = JsonCapture.convert_with(response, orjson.loads)
+            if not isinstance(ret, bool):
+                return None
+            return ret
+
+        return await self.aask_validate(
+            question=template_manager.render_template(
+                "make_judgment", {"prompt": prompt, "affirm_case": affirm_case, "deny_case": deny_case}
+            ),
+            validator=_validate,
+            max_validations=max_validations,
+            system_message=system_message,
+            model=model,
+            temperature=temperature,
+            stop=stop,
+            top_p=top_p,
+            max_tokens=max_tokens,
+            stream=stream,
+            timeout=timeout,
+            max_retries=max_retries,
+        )
+
     def fallback_to(self, other: "LLMUsage") -> Self:
         """Fallback to another instance's attribute values if the current instance's attributes are None.
 

fabricatio/models/task.py

@@ -268,8 +268,8 @@ class ProposeTask(LLMUsage, WithBriefing):
             try:
                 cap = JsonCapture.capture(response)
                 logger.debug(f"Response: \n{response}")
-                logger.info(f"Captured JSON: \n{cap[0]}")
-                return Task.model_validate_json(cap[0] if cap else response)
+                logger.info(f"Captured JSON: \n{cap}")
+                return Task.model_validate_json(cap)
             except ValidationError as e:
                 logger.error(f"Failed to parse task from JSON: {e}")
                 return None

fabricatio/parser.py

@@ -1,11 +1,13 @@
 """A module to parse text using regular expressions."""
 
-from typing import Any, Self, Tuple
+from typing import Any, Callable, Self, Tuple
 
 import regex
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, PrivateAttr
 from regex import Pattern, compile
 
+from fabricatio.journal import logger
+
 
 class Capture(BaseModel):
     """A class to capture patterns in text using regular expressions.
@@ -32,7 +34,7 @@ class Capture(BaseModel):
         """
         self._compiled = compile(self.pattern, self.flags)
 
-    def capture(self, text: str) -> Tuple[str, ...] | None:
+    def capture(self, text: str) -> Tuple[str, ...] | str | None:
         """Capture the first occurrence of the pattern in the given text.
 
         Args:
@@ -48,7 +50,25 @@ class Capture(BaseModel):
 
         if self.target_groups:
             return tuple(match.group(g) for g in self.target_groups)
-        return (match.group(),)
+        return match.group(1)
+
+    def convert_with[T](self, text: str, convertor: Callable[[Tuple[str, ...]], T] | Callable[[str], T]) -> T | None:
+        """Convert the given text using the pattern.
+
+        Args:
+            text (str): The text to search the pattern in.
+            convertor (Callable[[Tuple[str, ...]], T] | Callable[[str], T]): The function to convert the captured text.
+
+        Returns:
+            str | None: The converted text if the pattern is found, otherwise None.
+        """
+        if cap := self.capture(text) is None:
+            return None
+        try:
+            return convertor(cap)
+        except ValueError as e:
+            logger.error(f"Failed to convert text using convertor: {convertor.__name__}, error: \n{e}")
+            return None
 
     @classmethod
     def capture_code_block(cls, language: str) -> Self:
@@ -60,7 +80,7 @@ class Capture(BaseModel):
         Returns:
             Self: The instance of the class with the captured code block.
         """
-        return cls(pattern=f"```{language}\n(.*?)\n```", target_groups=(1,))
+        return cls(pattern=f"```{language}\n(.*?)\n```")
 
 
 JsonCapture = Capture.capture_code_block("json")

fabricatio/toolboxes/arithmetic.py

@@ -1,3 +1,5 @@
+"""Arithmetic tools for Fabricatio."""
+
 from fabricatio.models.tool import ToolBox
 
 arithmetic_tools = ToolBox(name="ArithmeticToolBox", description="A toolbox for arithmetic operations.")

{fabricatio-0.2.0.dev12.dist-info → fabricatio-0.2.0.dev13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.2.0.dev12
+Version: 0.2.0.dev13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12
@@ -28,6 +28,9 @@ Keywords: ai,agents,multi-agent,llm,pyo3
 Author-email: Whth <zettainspector@foxmail.com>
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Project-URL: Homepage, https://github.com/Whth/fabricatio
+Project-URL: Repository, https://github.com/Whth/fabricatio
+Project-URL: Issues, https://github.com/Whth/fabricatio/issues
 
 # Fabricatio
 

{fabricatio-0.2.0.dev12.dist-info → fabricatio-0.2.0.dev13.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fabricatio-0.2.0.dev12.dist-info/METADATA,sha256=YEajxaRO-nlzAs-7NthqNeuxmcT2qjYECILk1gKZBSw,6017
-fabricatio-0.2.0.dev12.dist-info/WHEEL,sha256=tpW5AN9B-9qsM9WW2FXG2r193YXiqexDadpKp0A2daI,96
-fabricatio-0.2.0.dev12.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio-0.2.0.dev13.dist-info/METADATA,sha256=tNqBJKjBYmikfL1MjQOp6dVJQjkQ2dzzO3vcDUP6BkU,6198
+fabricatio-0.2.0.dev13.dist-info/WHEEL,sha256=tpW5AN9B-9qsM9WW2FXG2r193YXiqexDadpKp0A2daI,96
+fabricatio-0.2.0.dev13.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
 fabricatio/actions/communication.py,sha256=tmsr3H_w-V-b2WxLEyWByGuwSCLgHIHTdHYAgHrdUxc,425
 fabricatio/actions/transmission.py,sha256=PedZ6XsflKdT5ikzaqWr_6h8jci0kekAHfwygzKBUns,1188
 fabricatio/actions/__init__.py,sha256=eFmFVPQvtNgFynIXBVr3eP-vWQDWCPng60YY5LXvZgg,115
@@ -12,19 +12,19 @@ fabricatio/fs/__init__.py,sha256=lWcKYg0v3mv2LnnSegOQaTtlVDODU0vtw_s6iKU5IqQ,122
 fabricatio/journal.py,sha256=z5K5waad9xmGr1hGrqSgFDRH3wiDQ5Oqfe0o98DaM-k,707
 fabricatio/models/action.py,sha256=5s3pgFav3AOeZzzAoFAyL3f-uiHIpEE86W_w0qC2YIM,5009
 fabricatio/models/events.py,sha256=DDdcexweKV7jmPLHx51PIQ6eIByRrFyAMyx2VMhl9JY,2650
-fabricatio/models/generic.py,sha256=TqfVFxEm56l3LiIN4m4WS9CylzQacGfYGElkItkhF3A,19724
+fabricatio/models/generic.py,sha256=s2xz8yOlfSMnD2R9iRIe2xl12JNJXILBDfFZWzhl-xc,22932
 fabricatio/models/role.py,sha256=sgsympwkp6HIbWkaAt4gMU2WdVO-bHwX0Gy6DNyhoLA,1016
-fabricatio/models/task.py,sha256=bP3tKj9JXmtC_n3Y8-8Lgs0qhjcXxsuCDRD5DoYWsA4,9372
+fabricatio/models/task.py,sha256=rw4RCvziUDRixE5N5miZolhYl6mvfV9dGgDxrFbJZS0,9345
 fabricatio/models/tool.py,sha256=vSuFe-SsZHRGqSdpoCSumVZYoS9ktzQBFnJjDqOtZys,5031
 fabricatio/models/utils.py,sha256=i_kpcQpct04mQFk1nbcVGV-pl1YThWu4Qk3wbewzKkc,2535
-fabricatio/parser.py,sha256=M0-ywN2V512dHxomTo9hcdu80-pkXDh_vG4Wc_udOl8,2468
+fabricatio/parser.py,sha256=foEhrO_e-hhRhmABcttwdMyciyJx422MpNqCZOUx8bg,3278
 fabricatio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fabricatio/toolboxes/arithmetic.py,sha256=5eWTrwGFn_ap1pfAbDyXpw-NADk_QtD1dmxOr-A7rdk,1317
+fabricatio/toolboxes/arithmetic.py,sha256=aCBEUTe8nNop5tAgZsBIsuJYl-u8KI9n0PtgVVoEu5E,1359
 fabricatio/toolboxes/task.py,sha256=xgyPetm2R_HlQwpzE8YPnBN7QOYLd0-T8E6QPZG1PPQ,204
 fabricatio/toolboxes/__init__.py,sha256=bjefmPd7wBaWhbZzdMPXvrjMTeRzlUh_Dev2PUAc124,158
 fabricatio/_rust.pyi,sha256=IHNv9SHdjve24PBWhdRGCqWYdo2tSAkxYR9CddHhzX8,1540
 fabricatio/_rust_instances.py,sha256=PJC8TAkcH9f1Ak-0CKxSom_HTFHQEXZ8-aSDrYw7dwI,157
 fabricatio/__init__.py,sha256=C9r6OVyMBb8IqwERNUq8lKDLe4BqN7fiu-O4TsXZ5xU,913
-fabricatio/_rust.cp312-win_amd64.pyd,sha256=Rz8qC0BE2eYcGVxBZC3BoUuLw9Z0PF768Pyece2KWcA,1128960
-fabricatio-0.2.0.dev12.data/scripts/tdown.exe,sha256=3CNAK6oj52AI-WUdjB4DCmuB1Z4JByPxFvRkATtBw1A,3385856
-fabricatio-0.2.0.dev12.dist-info/RECORD,,
+fabricatio/_rust.cp312-win_amd64.pyd,sha256=JLo7LIETUZieXFbRXdNLb2WRIOxbYvkEOS11LfxID2g,1125888
+fabricatio-0.2.0.dev13.data/scripts/tdown.exe,sha256=1TDXTUKOGjcQ0SoFEZUNad9kf3swM_UWz1MySMdF-sA,3383296
+fabricatio-0.2.0.dev13.dist-info/RECORD,,