fabricatio 0.2.0.dev12__tar.gz → 0.2.0.dev13__tar.gz

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

@@ -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 → fabricatio-0.2.0.dev13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fabricatio"
-version = "0.2.0-dev.12"
+version = "0.2.0-dev.13"
 description = "A LLM multi-agent framework."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -25,7 +25,6 @@ keywords = [
 ]
 
 
-
 requires-python = ">=3.12"
 dependencies = [
     "appdirs>=1.4.4",
@@ -44,7 +43,10 @@ dependencies = [
     "rich>=13.9.4",
 ]
 
-
+[project.urls]
+Homepage = "https://github.com/Whth/fabricatio"
+Repository = "https://github.com/Whth/fabricatio"
+Issues = "https://github.com/Whth/fabricatio/issues"
 [build-system]
 requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"

{fabricatio-0.2.0.dev12 → fabricatio-0.2.0.dev13}/python/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-0.2.0.dev12 → fabricatio-0.2.0.dev13}/python/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-0.2.0.dev12 → fabricatio-0.2.0.dev13}/python/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-0.2.0.dev12 → fabricatio-0.2.0.dev13}/python/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 → fabricatio-0.2.0.dev13}/templates/built-in/make_choice.hbs

@@ -18,7 +18,9 @@ Example:
 ```json
 ["option1", "option2"]
 ```
+
 ### Warnings:
 
 Note that All items in list you returned **MUST** be contained in [{{#each options}}"{{name}}", {{/each}}], No extra items are allowed.
 Your response shall not have any explanation, only the JSON array of selected option names.
+{{#if k}}The array returned MUST have a length of **{{k}}**.{{/if}}

fabricatio-0.2.0.dev13/templates/built-in/make_judgment.hbs

@@ -0,0 +1,27 @@
+# Prompt:
+
+{{ prompt }}
+
+# Task:
+
+Please provide a boolean response (true or false) based on the prompt given above.:
+
+# Example:
+
+e.g. 1
+```json
+true
+```
+
+e.g. 2
+```json
+false
+```
+
+# Warnings:
+
+- Your response shall not have any explanation, only the boolean response.
+- Your response shall be either `true` or `false`.
+{{#if affirm_case}}- If {{affirm_case}}, respond `true`.{{/if}}
+{{#if deny_case}}- If {{deny_case}}, respond `false`.{{/if}}
+

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

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