fabricatio 0.2.6.dev4__cp39-cp39-win_amd64.whl → 0.2.6.dev6__cp39-cp39-win_amd64.whl

fabricatio/models/usages.py

@@ -12,9 +12,9 @@ from fabricatio.models.generic import ScopedConfig, WithBriefing
 from fabricatio.models.kwargs_types import ChooseKwargs, EmbeddingKwargs, GenerateKwargs, LLMKwargs, ValidateKwargs
 from fabricatio.models.task import Task
 from fabricatio.models.tool import Tool, ToolBox
-from fabricatio.models.utils import Messages
+from fabricatio.models.utils import Messages, ok
 from fabricatio.parser import GenericCapture, JsonCapture
-from litellm import Router, stream_chunk_builder
+from litellm import Router, stream_chunk_builder  # pyright: ignore [reportPrivateImportUsage]
 from litellm.types.router import Deployment, LiteLLM_Params, ModelInfo
 from litellm.types.utils import (
     Choices,
@@ -70,14 +70,22 @@ class LLMUsage(ScopedConfig):
         """
         # Call the underlying asynchronous completion function with the provided and default parameters
         # noinspection PyTypeChecker,PydanticTypeChecker
-
         return await self._deploy(
             Deployment(
-                model_name=(m_name := kwargs.get("model") or self.llm_model or configs.llm.model),
+                model_name=(
+                    m_name := ok(
+                        kwargs.get("model") or self.llm_model or configs.llm.model, "model name is not set at any place"
+                    )
+                ),  # pyright: ignore [reportCallIssue]
                 litellm_params=(
                     p := LiteLLM_Params(
-                        api_key=(self.llm_api_key or configs.llm.api_key).get_secret_value(),
-                        api_base=(self.llm_api_endpoint or configs.llm.api_endpoint).unicode_string(),
+                        api_key=ok(
+                            self.llm_api_key or configs.llm.api_key, "llm api key is not set at any place"
+                        ).get_secret_value(),
+                        api_base=ok(
+                            self.llm_api_endpoint or configs.llm.api_endpoint,
+                            "llm api endpoint is not set at any place",
+                        ).unicode_string(),
                         model=m_name,
                         tpm=self.llm_tpm or configs.llm.tpm,
                         rpm=self.llm_rpm or configs.llm.rpm,
@@ -88,14 +96,14 @@ class LLMUsage(ScopedConfig):
                 model_info=ModelInfo(id=hash(m_name + p.model_dump_json(exclude_none=True))),
             )
         ).acompletion(
-            messages=messages,
+            messages=messages,  # pyright: ignore [reportArgumentType]
             n=n or self.llm_generation_count or configs.llm.generation_count,
             model=m_name,
             temperature=kwargs.get("temperature") or self.llm_temperature or configs.llm.temperature,
             stop=kwargs.get("stop") or self.llm_stop_sign or configs.llm.stop_sign,
             top_p=kwargs.get("top_p") or self.llm_top_p or configs.llm.top_p,
             max_tokens=kwargs.get("max_tokens") or self.llm_max_tokens or configs.llm.max_tokens,
-            stream=kwargs.get("stream") or self.llm_stream or configs.llm.stream,
+            stream=ok(kwargs.get("stream") or self.llm_stream or configs.llm.stream, "stream is not set at any place"),
             cache={
                 "no-cache": kwargs.get("no_cache"),
                 "no-store": kwargs.get("no_store"),
@@ -196,15 +204,15 @@ class LLMUsage(ScopedConfig):
                         for q, sm in zip(q_seq, sm_seq, strict=True)
                     ]
                 )
-                return [r[0].message.content for r in res]
+                return [r[0].message.content for r in res]  # pyright: ignore [reportReturnType, reportAttributeAccessIssue]
             case (list(q_seq), str(sm)):
                 res = await gather(*[self.ainvoke(n=1, question=q, system_message=sm, **kwargs) for q in q_seq])
-                return [r[0].message.content for r in res]
+                return [r[0].message.content for r in res]  # pyright: ignore [reportReturnType, reportAttributeAccessIssue]
             case (str(q), list(sm_seq)):
                 res = await gather(*[self.ainvoke(n=1, question=q, system_message=sm, **kwargs) for sm in sm_seq])
-                return [r[0].message.content for r in res]
+                return [r[0].message.content for r in res]  # pyright: ignore [reportReturnType, reportAttributeAccessIssue]
             case (str(q), str(sm)):
-                return ((await self.ainvoke(n=1, question=q, system_message=sm, **kwargs))[0]).message.content
+                return ((await self.ainvoke(n=1, question=q, system_message=sm, **kwargs))[0]).message.content  # pyright: ignore [reportReturnType, reportAttributeAccessIssue]
             case _:
                 raise RuntimeError("Should not reach here.")
 
@@ -213,8 +221,9 @@ class LLMUsage(ScopedConfig):
         self,
         question: str,
         validator: Callable[[str], T | None],
-        default: T,
+        default: T = ...,
         max_validations: PositiveInt = 2,
+        co_extractor: Optional[GenerateKwargs] = None,
         **kwargs: Unpack[GenerateKwargs],
     ) -> T: ...
     @overload
@@ -222,8 +231,9 @@ class LLMUsage(ScopedConfig):
         self,
         question: List[str],
         validator: Callable[[str], T | None],
-        default: T,
+        default: T = ...,
         max_validations: PositiveInt = 2,
+        co_extractor: Optional[GenerateKwargs] = None,
         **kwargs: Unpack[GenerateKwargs],
     ) -> List[T]: ...
     @overload
@@ -233,6 +243,7 @@ class LLMUsage(ScopedConfig):
         validator: Callable[[str], T | None],
         default: None = None,
         max_validations: PositiveInt = 2,
+        co_extractor: Optional[GenerateKwargs] = None,
         **kwargs: Unpack[GenerateKwargs],
     ) -> Optional[T]: ...
 
@@ -243,6 +254,7 @@ class LLMUsage(ScopedConfig):
         validator: Callable[[str], T | None],
         default: None = None,
         max_validations: PositiveInt = 2,
+        co_extractor: Optional[GenerateKwargs] = None,
         **kwargs: Unpack[GenerateKwargs],
     ) -> List[Optional[T]]: ...
 
@@ -252,6 +264,7 @@ class LLMUsage(ScopedConfig):
         validator: Callable[[str], T | None],
         default: Optional[T] = None,
         max_validations: PositiveInt = 2,
+        co_extractor: Optional[GenerateKwargs] = None,
         **kwargs: Unpack[GenerateKwargs],
     ) -> Optional[T] | List[Optional[T]] | List[T] | T:
         """Asynchronously asks a question and validates the response using a given validator.
@@ -261,6 +274,7 @@ class LLMUsage(ScopedConfig):
             validator (Callable[[str], T | None]): A function to validate the response.
             default (T | None): Default value to return if validation fails. Defaults to None.
             max_validations (PositiveInt): Maximum number of validation attempts. Defaults to 2.
+            co_extractor (Optional[GenerateKwargs]): Keyword arguments for the co-extractor, if provided will enable co-extraction.
             **kwargs (Unpack[LLMKwargs]): Additional keyword arguments for the LLM usage.
 
         Returns:
@@ -274,11 +288,29 @@ class LLMUsage(ScopedConfig):
                     if (response := await self.aask(question=q, **kwargs)) and (validated := validator(response)):
                         logger.debug(f"Successfully validated the response at {lap}th attempt.")
                         return validated
+
+                    if co_extractor and (
+                        (
+                            co_response := await self.aask(
+                                question=(
+                                    TEMPLATE_MANAGER.render_template(
+                                        configs.templates.co_validation_template,
+                                        {"original_q": q, "original_a": response},
+                                    )
+                                ),
+                                **co_extractor,
+                            )
+                        )
+                        and (validated := validator(co_response))
+                    ):
+                        logger.debug(f"Successfully validated the co-response at {lap}th attempt.")
+                        return validated
                 except Exception as e:  # noqa: BLE001
                     logger.error(f"Error during validation: \n{e}")
                     break
-                kwargs["no_cache"] = True
-                logger.debug("Closed the cache for the next attempt")
+                if not kwargs.get("no_cache"):
+                    kwargs["no_cache"] = True
+                    logger.debug("Closed the cache for the next attempt")
             if default is None:
                 logger.error(f"Failed to validate the response after {max_validations} attempts.")
             return default
@@ -290,7 +322,7 @@ class LLMUsage(ScopedConfig):
 
     async def aliststr(
         self, requirement: str, k: NonNegativeInt = 0, **kwargs: Unpack[ValidateKwargs[List[str]]]
-    ) -> List[str]:
+    ) -> Optional[List[str]]:
         """Asynchronously generates a list of strings based on a given requirement.
 
         Args:
@@ -310,7 +342,7 @@ class LLMUsage(ScopedConfig):
             **kwargs,
         )
 
-    async def apathstr(self, requirement: str, **kwargs: Unpack[ChooseKwargs[List[str]]]) -> List[str]:
+    async def apathstr(self, requirement: str, **kwargs: Unpack[ChooseKwargs[List[str]]]) -> Optional[List[str]]:
         """Asynchronously generates a list of strings based on a given requirement.
 
         Args:
@@ -338,7 +370,7 @@ class LLMUsage(ScopedConfig):
         Returns:
             str: The validated response as a single string.
         """
-        return (
+        return ok(
             await self.apathstr(
                 requirement,
                 k=1,
@@ -346,7 +378,7 @@ class LLMUsage(ScopedConfig):
             )
         ).pop()
 
-    async def ageneric_string(self, requirement: str, **kwargs: Unpack[ValidateKwargs[str]]) -> str:
+    async def ageneric_string(self, requirement: str, **kwargs: Unpack[ValidateKwargs[str]]) -> Optional[str]:
         """Asynchronously generates a generic string based on a given requirement.
 
         Args:
@@ -356,7 +388,7 @@ class LLMUsage(ScopedConfig):
         Returns:
             str: The generated string.
         """
-        return await self.aask_validate(
+        return await self.aask_validate(  # pyright: ignore [reportReturnType]
             TEMPLATE_MANAGER.render_template(
                 configs.templates.generic_string_template,
                 {"requirement": requirement, "language": GenericCapture.capture_type},
@@ -371,7 +403,7 @@ class LLMUsage(ScopedConfig):
         choices: List[T],
         k: NonNegativeInt = 0,
         **kwargs: Unpack[ValidateKwargs[List[T]]],
-    ) -> List[T]:
+    ) -> Optional[List[T]]:
         """Asynchronously executes a multi-choice decision-making process, generating a prompt based on the instruction and options, and validates the returned selection results.
 
         Args:
@@ -436,13 +468,13 @@ class LLMUsage(ScopedConfig):
         Raises:
             ValueError: If validation fails after maximum attempts or if no valid selection is made.
         """
-        return (
+        return ok(
             await self.achoose(
                 instruction=instruction,
                 choices=choices,
                 k=1,
                 **kwargs,
-            )
+            ),
         )[0]
 
     async def ajudge(
@@ -499,7 +531,7 @@ class EmbeddingUsage(LLMUsage):
         """
         # check seq length
         max_len = self.embedding_max_sequence_length or configs.embedding.max_sequence_length
-        if any(len(t) > max_len for t in input_text):
+        if max_len and any(len(t) > max_len for t in input_text):
             logger.error(err := f"Input text exceeds maximum sequence length {max_len}.")
             raise ValueError(err)
 
@@ -513,10 +545,10 @@ class EmbeddingUsage(LLMUsage):
             or configs.embedding.timeout
             or self.llm_timeout
             or configs.llm.timeout,
-            api_key=(
+            api_key=ok(
                 self.embedding_api_key or configs.embedding.api_key or self.llm_api_key or configs.llm.api_key
             ).get_secret_value(),
-            api_base=(
+            api_base=ok(
                 self.embedding_api_endpoint
                 or configs.embedding.api_endpoint
                 or self.llm_api_endpoint
@@ -565,7 +597,7 @@ class ToolBoxUsage(LLMUsage):
         self,
         task: Task,
         **kwargs: Unpack[ChooseKwargs[List[ToolBox]]],
-    ) -> List[ToolBox]:
+    ) -> Optional[List[ToolBox]]:
         """Asynchronously executes a multi-choice decision-making process to choose toolboxes.
 
         Args:
@@ -590,7 +622,7 @@ class ToolBoxUsage(LLMUsage):
         task: Task,
         toolbox: ToolBox,
         **kwargs: Unpack[ChooseKwargs[List[Tool]]],
-    ) -> List[Tool]:
+    ) -> Optional[List[Tool]]:
         """Asynchronously executes a multi-choice decision-making process to choose tools.
 
         Args:
@@ -630,11 +662,11 @@ class ToolBoxUsage(LLMUsage):
         tool_choose_kwargs = tool_choose_kwargs or {}
 
         # Choose the toolboxes
-        chosen_toolboxes = await self.choose_toolboxes(task, **box_choose_kwargs)
+        chosen_toolboxes = ok(await self.choose_toolboxes(task, **box_choose_kwargs))
         # Choose the tools
         chosen_tools = []
         for toolbox in chosen_toolboxes:
-            chosen_tools.extend(await self.choose_tools(task, toolbox, **tool_choose_kwargs))
+            chosen_tools.extend(ok(await self.choose_tools(task, toolbox, **tool_choose_kwargs)))
         return chosen_tools
 
     async def gather_tools(self, task: Task, **kwargs: Unpack[ChooseKwargs]) -> List[Tool]:

fabricatio/models/utils.py

@@ -165,3 +165,24 @@ async def ask_edit(
         if edited:
             res.append(edited)
     return res
+
+
+def override_kwargs[T](kwargs: Dict[str, T], **overrides) -> Dict[str, T]:
+    """Override the values in kwargs with the provided overrides."""
+    kwargs.update({k: v for k, v in overrides.items() if v is not None})
+    return kwargs
+
+
+def ok[T](val: Optional[T], msg:str="Value is None") -> T:
+    """Check if a value is None and raise a ValueError with the provided message if it is.
+
+    Args:
+        val: The value to check.
+        msg: The message to include in the ValueError if val is None.
+
+    Returns:
+        T: The value if it is not None.
+    """
+    if val is None:
+        raise ValueError(msg)
+    return val

fabricatio/parser.py

@@ -52,6 +52,7 @@ class Capture(BaseModel):
             case _:
                 return text
 
+
     def capture(self, text: str) -> Tuple[str, ...] | str | None:
         """Capture the first occurrence of the pattern in the given text.
 

{fabricatio-0.2.6.dev4.dist-info → fabricatio-0.2.6.dev6.dist-info}/METADATA

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

{fabricatio-0.2.6.dev4.dist-info → fabricatio-0.2.6.dev6.dist-info}/RECORD

@@ -1,33 +1,33 @@
-fabricatio-0.2.6.dev4.dist-info/METADATA,sha256=ubAfxfpUafH4ygWS6xMDBD80OX7Cull2_D0W8D30NAI,14085
-fabricatio-0.2.6.dev4.dist-info/WHEEL,sha256=SmPT9fUKPAPiE6hwAZ9_NHUVRjWSQ_RENTrzrvPx4p0,94
-fabricatio-0.2.6.dev4.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
-fabricatio/actions/article.py,sha256=d3i4i7h88yG8gvEW2SLDKM-FSsUv7qqiLgWpe6AJfSk,4463
+fabricatio-0.2.6.dev6.dist-info/METADATA,sha256=b28GiuNopBEWlnMn7RmUNnS5MbiuFIU_wGXEGuH6gCY,14085
+fabricatio-0.2.6.dev6.dist-info/WHEEL,sha256=mDFV3bKFgwlxLHvOsPqpR9up9dUKYzsUQNKBdkW5c08,94
+fabricatio-0.2.6.dev6.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio/actions/article.py,sha256=LfIWnbFYB9e3Bq2YDPk1geWDbJTq7zCitLtpFhAhYHM,4563
 fabricatio/actions/output.py,sha256=KSSLvEvXsA10ACN2mbqGo98QwKLVUAoMUJNKYk6HhGc,645
 fabricatio/actions/rag.py,sha256=GpT7YlqOYznZyaT-6Y84_33HtZGT-5s71ZK8iroQA9g,813
 fabricatio/capabilities/correct.py,sha256=0BYhjo9WrLwKsXQR8bTPvdQITbrMs7RX1xpzhuQt_yY,5222
 fabricatio/capabilities/propose.py,sha256=y3kge5g6bb8HYuV8e9h4MdqOMTlsfAIZpqE_cagWPTY,1593
-fabricatio/capabilities/rag.py,sha256=OebdGps8LGniN_HkRAOuwZd1ZQsyQe3WrduNAmBSxLM,15773
+fabricatio/capabilities/rag.py,sha256=VcFusFHb5Lz58kfd14JIrCh78uJkAs47SS6-bIGkwFo,15789
 fabricatio/capabilities/rating.py,sha256=R9otyZVE2E3kKxrOCTZMeesBCPbC-fSb7bXgZPMQzfU,14406
 fabricatio/capabilities/review.py,sha256=XYzpSnFCT9HS2XytQT8HDgV4SjXehexoJgucZFMx6P8,11102
-fabricatio/capabilities/task.py,sha256=nVsC8smZRM5kGnIDiQtgP9kiGkz5KB1S9NXhMvwY2CQ,4607
-fabricatio/config.py,sha256=bpj8i0KT8HQ9ka2kX3lcILBWh4S5_PenCas9wu_Ueg0,16302
+fabricatio/capabilities/task.py,sha256=MBiDyC3oHwTbTiLiGyqUEVfVGSN42lU03ndeapTpyjQ,4609
+fabricatio/config.py,sha256=f3B_Mwhc4mGEdECG4EqcxGww0Eu7KhCAwPXXJlHf1a8,16635
 fabricatio/core.py,sha256=VQ_JKgUGIy2gZ8xsTBZCdr_IP7wC5aPg0_bsOmjQ588,6458
 fabricatio/decorators.py,sha256=uzsP4tFKQNjDHBkofsjjoJA0IUAaYOtt6YVedoyOqlo,6551
 fabricatio/fs/curd.py,sha256=N6l2MncjrFfnXBRtteRouXp5Rjy8EAKC_i29_G-zz98,4618
 fabricatio/fs/readers.py,sha256=EZKN_AZdrp8DggJECP53QHw3uHeSDf-AwCAA_V7fNKU,1202
 fabricatio/fs/__init__.py,sha256=PCf0s_9KDjVfNw7AfPoJzGt3jMq4gJOfbcT4pb0D0ZY,588
 fabricatio/journal.py,sha256=stnEP88aUBA_GmU9gfTF2EZI8FS2OyMLGaMSTgK4QgA,476
-fabricatio/models/action.py,sha256=25kaph3csV0VQtxVPQCyRAusgwp6E1R1g4KBs7H9T2c,6448
+fabricatio/models/action.py,sha256=dSmwIrW68JhCrkhWENRgTLIQ-0grVA4408QAUy23HZo,8210
 fabricatio/models/events.py,sha256=QvlnS8FEELg6KNabcJMeh2GV_y0ZBzKOPphcteKYWYU,4183
-fabricatio/models/extra.py,sha256=FkNpctRWFE_BTfOmByWeOAXn8pbCauB7d68Ow_qUkqI,7322
+fabricatio/models/extra.py,sha256=nFB9WSqHVs6V7OVhLfRLnzFObaOJldRcrYdsC93ZCDY,13787
 fabricatio/models/generic.py,sha256=IdPJMf3qxZFq8yqd6OuAYKfCM0wBlJkozgxvxQZVEEc,14025
-fabricatio/models/kwargs_types.py,sha256=Dfmd18SABDeV9JsI1JfPNpoB8FtB6qVYgJshZBsN1P0,4593
-fabricatio/models/role.py,sha256=7S3HSjFLaSTZ5bzgTJLeZ3PpAQDEGBxPhou5Mp8ONpQ,1842
+fabricatio/models/kwargs_types.py,sha256=XiXuHLWttp8MjNqQr1WdMFYVKVZdsa5Vg0nHLhNKCyA,4627
+fabricatio/models/role.py,sha256=mmQbJ6GKr2Gx3wtjEz8d-vYoXs09ffcEkT_eCXaDd3E,2782
 fabricatio/models/task.py,sha256=8NaR7ojQWyM740EDTqt9stwHKdrD6axCRpLKo0QzS-I,10492
 fabricatio/models/tool.py,sha256=4b-v4WIC_LuLOKzzXL9bvKXr8vmGZ8O2uAFv5-1KRA0,7052
-fabricatio/models/usages.py,sha256=hR4OU4sjQ2jKaH5_kkN83vG58n3kcKnt9osND0BYi0Q,28634
-fabricatio/models/utils.py,sha256=1bCqeB6za7ecCAM3cU1raNWuN56732m45rXtlIlc3I4,5017
-fabricatio/parser.py,sha256=b1Em7zoEepQIrxgM51Damnbsx_AhPab-BefIWHGo1Ss,6249
+fabricatio/models/usages.py,sha256=-689ssQ5F1SmxDToDHbv0EH8YaPTjhkn14l_M6Aer-M,30859
+fabricatio/models/utils.py,sha256=3HW0tM6WwOK8g14tnIzVWTXzIRLHjMKPjjSl9pMRWkw,5668
+fabricatio/parser.py,sha256=9Jzw-yV6uKbFvf6sPna-XHdziVGVBZWvPctgX_6ODL8,6251
 fabricatio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fabricatio/toolboxes/arithmetic.py,sha256=WLqhY-Pikv11Y_0SGajwZx3WhsLNpHKf9drzAqOf_nY,1369
 fabricatio/toolboxes/fs.py,sha256=l4L1CVxJmjw9Ld2XUpIlWfV0_Fu_2Og6d3E13I-S4aE,736
@@ -37,6 +37,6 @@ fabricatio/workflows/rag.py,sha256=-YYp2tlE9Vtfgpg6ROpu6QVO8j8yVSPa6yDzlN3qVxs,5
 fabricatio/_rust.pyi,sha256=eawBfpyGrB-JtOh4I6RSbjFSq83SSl-0syBeZ-g8270,3491
 fabricatio/_rust_instances.py,sha256=2GwF8aVfYNemRI2feBzH1CZfBGno-XJJE5imJokGEYw,314
 fabricatio/__init__.py,sha256=SzBYsRhZeL77jLtfJEjmoHOSwHwUGyvMATX6xfndLDM,1135
-fabricatio/_rust.cp39-win_amd64.pyd,sha256=bkzJH6SS5nSFzAOx95RP-flNoBUsau_bk8S_AsKYZuU,1824768
-fabricatio-0.2.6.dev4.data/scripts/tdown.exe,sha256=pXfruD6ZBL0_05mWalUoeyLLqzpHRSiHKYcp6WwwDgU,3398144
-fabricatio-0.2.6.dev4.dist-info/RECORD,,
+fabricatio/_rust.cp39-win_amd64.pyd,sha256=0xarl48qmXpp_BFtTKkg0cm6aLNGDviWyY3gPKMOL9Y,1826304
+fabricatio-0.2.6.dev6.data/scripts/tdown.exe,sha256=sfJBs8p8BKKChg9vZPVR7PNnNgv9hqUm3uZ3558Zxqk,3397632
+fabricatio-0.2.6.dev6.dist-info/RECORD,,

{fabricatio-0.2.6.dev4.dist-info → fabricatio-0.2.6.dev6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.8.2)
+Generator: maturin (1.8.3)
 Root-Is-Purelib: false
 Tag: cp39-cp39-win_amd64