fabricatio 0.2.5.dev3__tar.gz → 0.2.5.dev4__tar.gz

{fabricatio-0.2.5.dev3 → fabricatio-0.2.5.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.2.5.dev3
+Version: 0.2.5.dev4
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12

{fabricatio-0.2.5.dev3 → fabricatio-0.2.5.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fabricatio"
-version = "0.2.5-dev3"
+version = "0.2.5-dev4"
 description = "A LLM multi-agent framework."
 readme = "README.md"
 license = { file = "LICENSE" }

{fabricatio-0.2.5.dev3 → fabricatio-0.2.5.dev4}/python/fabricatio/models/kwargs_types.py

@@ -74,7 +74,8 @@ class ValidateKwargs[T](LLMKwargs):
     max_validations: NotRequired[PositiveInt]
 
 
-class GenerateKwargs(ValidateKwargs):
+# noinspection PyTypedDict
+class GenerateKwargs[T](ValidateKwargs[T]):
     """Arguments for content generation operations.
 
     Extends ValidateKwargs with parameters specific to text generation,
@@ -84,7 +85,8 @@ class GenerateKwargs(ValidateKwargs):
     system_message: NotRequired[str]
 
 
-class ReviewKwargs(GenerateKwargs):
+# noinspection PyTypedDict
+class ReviewKwargs[T](GenerateKwargs[T]):
     """Arguments for content review operations.
 
     Extends GenerateKwargs with parameters for evaluating content against
@@ -95,7 +97,8 @@ class ReviewKwargs(GenerateKwargs):
     criteria: NotRequired[Set[str]]
 
 
-class ChooseKwargs(GenerateKwargs):
+# noinspection PyTypedDict
+class ChooseKwargs[T](GenerateKwargs[T]):
     """Arguments for selection operations.
 
     Extends GenerateKwargs with parameters for selecting among options,

{fabricatio-0.2.5.dev3 → fabricatio-0.2.5.dev4}/python/fabricatio/models/usages.py

@@ -188,6 +188,16 @@ class LLMUsage(ScopedConfig):
         system_message: str = "",
         **kwargs: Unpack[LLMKwargs],
     ) -> T: ...
+    @overload
+    async def aask_validate[T](
+        self,
+        question: str,
+        validator: Callable[[str], T | None],
+        default: None = None,
+        max_validations: PositiveInt = 2,
+        system_message: str = "",
+        **kwargs: Unpack[LLMKwargs],
+    ) -> Optional[T]: ...
 
     async def aask_validate[T](
         self,

{fabricatio-0.2.5.dev3 → fabricatio-0.2.5.dev4}/tests/test_models/test_usages.py

@@ -187,8 +187,8 @@ async def test_llmusage_aask_validate_failure(basic_llm_usage, monkeypatch):
         return mock_completion(*args, **kwargs)
 
     monkeypatch.setattr("litellm.acompletion", mock_comp)
-    with pytest.raises(ValueError):
-        await basic_llm_usage.aask_validate("test", validator=lambda x: int(x) if x.isdigit() else None)
+    assert await basic_llm_usage.aask_validate("test", validator=lambda x: None) is None
+    assert await basic_llm_usage.aask_validate("test", validator=lambda x: None, default="fallback") == "fallback"
 
 
 def test_toolboxusage_inheritance():