fabricatio 0.2.8.dev3__cp312-cp312-win_amd64.whl → 0.2.8.dev4__cp312-cp312-win_amd64.whl

fabricatio/models/usages.py

@@ -2,7 +2,7 @@
 
 import traceback
 from asyncio import gather
-from typing import Callable, Dict, Iterable, List, Optional, Self, Sequence, Set, Type, Union, Unpack, overload
+from typing import Callable, Dict, Iterable, List, Optional, Self, Sequence, Set, Union, Unpack, overload
 
 import asyncstdlib
 import litellm
@@ -53,10 +53,6 @@ class LLMUsage(ScopedConfig):
         self._added_deployment = ROUTER.upsert_deployment(deployment)
         return ROUTER
 
-    @classmethod
-    def _scoped_model(cls) -> Type["LLMUsage"]:
-        return LLMUsage
-
     # noinspection PyTypeChecker,PydanticTypeChecker
     async def aquery(
         self,
@@ -303,12 +299,11 @@ class LLMUsage(ScopedConfig):
         async def _inner(q: str) -> Optional[T]:
             for lap in range(max_validations):
                 try:
-                    if (
-                        (response := await self.aask(question=q, **kwargs))
-                        or (
-                            co_extractor
-                            and (
-                                response := await self.aask(
+                    if ((validated := validator(response := await self.aask(question=q, **kwargs))) is not None) or (
+                        co_extractor
+                        and (
+                            validated := validator(
+                                await self.aask(
                                     question=(
                                         TEMPLATE_MANAGER.render_template(
                                             configs.templates.co_validation_template,
@@ -319,7 +314,8 @@ class LLMUsage(ScopedConfig):
                                 )
                             )
                         )
-                    ) and (validated := validator(response)):
+                        is not None
+                    ):
                         logger.debug(f"Successfully validated the response at {lap}th attempt.")
                         return validated
 
@@ -361,7 +357,6 @@ class LLMUsage(ScopedConfig):
             **kwargs,
         )
 
-
     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.
 
@@ -552,7 +547,7 @@ class EmbeddingUsage(LLMUsage):
         """
         # check seq length
         max_len = self.embedding_max_sequence_length or configs.embedding.max_sequence_length
-        if max_len and any(length:=(token_counter(text=t)) > max_len for t in input_text):
+        if max_len and any(length := (token_counter(text=t)) > max_len for t in input_text):
             logger.error(err := f"Input text exceeds maximum sequence length {max_len}, got {length}.")
             raise ValueError(err)
 
@@ -714,7 +709,7 @@ class ToolBoxUsage(LLMUsage):
         """
         if isinstance(others, ToolBoxUsage):
             others = [others]
-        for other in others:
+        for other in (x for x in others if isinstance(x, ToolBoxUsage)):
             self.toolboxes.update(other.toolboxes)
         return self
 
@@ -730,6 +725,6 @@ class ToolBoxUsage(LLMUsage):
         """
         if isinstance(others, ToolBoxUsage):
             others = [others]
-        for other in others:
+        for other in (x for x in others if isinstance(x, ToolBoxUsage)):
             other.toolboxes.update(self.toolboxes)
         return self

fabricatio/parser.py

@@ -45,14 +45,14 @@ class Capture(BaseModel):
             str | List[str]: The fixed text with the same type as input.
         """
         match self.capture_type:
-            case "json":
+            case "json" if configs.general.use_json_repair:
+                logger.debug("Applying json repair to text.")
                 if isinstance(text, str):
                     return repair_json(text, ensure_ascii=False)
                 return [repair_json(item, ensure_ascii=False) for item in text]
             case _:
                 return text
 
-
     def capture(self, text: str) -> Tuple[str, ...] | str | None:
         """Capture the first occurrence of the pattern in the given text.
 
@@ -63,11 +63,10 @@ class Capture(BaseModel):
             str | None: The captured text if the pattern is found, otherwise None.
 
         """
-        match = self._compiled.search(text)
-        if match is None:
-            logger.debug(f"Capture Failed: \n{text}")
+        if (match :=self._compiled.match(text) or self._compiled.search(text) ) is None:
+            logger.debug(f"Capture Failed {type(text)}: \n{text}")
             return None
-        groups = self.fix(match.groups()) if configs.general.use_json_repair else match.groups()
+        groups = self.fix(match.groups())
         if self.target_groups:
             cap = tuple(groups[g - 1] for g in self.target_groups)
             logger.debug(f"Captured text: {'\n\n'.join(cap)}")
@@ -134,7 +133,7 @@ class Capture(BaseModel):
         Returns:
             Self: The instance of the class with the captured code block.
         """
-        return cls(pattern=f"```{language}\n(.*?)\n```", capture_type=language)
+        return cls(pattern=f"```{language}(.*?)```", capture_type=language)
 
     @classmethod
     def capture_generic_block(cls, language: str) -> Self:
@@ -143,7 +142,7 @@ class Capture(BaseModel):
         Returns:
             Self: The instance of the class with the captured code block.
         """
-        return cls(pattern=f"--- Start of {language} ---\n(.*?)\n--- end of {language} ---", capture_type=language)
+        return cls(pattern=f"--- Start of {language} ---(.*?)--- end of {language} ---", capture_type=language)
 
 
 JsonCapture = Capture.capture_code_block("json")

{fabricatio-0.2.8.dev3.dist-info → fabricatio-0.2.8.dev4.dist-info}/METADATA

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

{fabricatio-0.2.8.dev3.dist-info → fabricatio-0.2.8.dev4.dist-info}/RECORD

@@ -1,43 +1,46 @@
-fabricatio-0.2.8.dev3.dist-info/METADATA,sha256=dd-agw0ROR-UiBU9QvouJoQ2GCWKGev24EU51ddF1kc,5288
-fabricatio-0.2.8.dev3.dist-info/WHEEL,sha256=jABKVkLC9kJr8mi_er5jOqpiQUjARSLXDUIIxDqsS50,96
-fabricatio-0.2.8.dev3.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
-fabricatio/actions/article.py,sha256=cvUoP6a1iQklOmwPeBskJE6L5NdmF99rQEVvXOV-uR0,13733
-fabricatio/actions/article_rag.py,sha256=-nFpxn2Qg1MQE6yS97P_wnSrGxJWQWlz05OX3Cdr4XE,3852
+fabricatio-0.2.8.dev4.dist-info/METADATA,sha256=m8008QWQ2qtSzryx4jr2DpTqfNQDyhBUscJQgQzmM0I,5288
+fabricatio-0.2.8.dev4.dist-info/WHEEL,sha256=jABKVkLC9kJr8mi_er5jOqpiQUjARSLXDUIIxDqsS50,96
+fabricatio-0.2.8.dev4.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio/actions/article.py,sha256=i5-u5tCiJd7b_lQ4_vHjV57ZXDoUIAHmgD9QFoFaTuM,12787
+fabricatio/actions/article_rag.py,sha256=dkfskNqntVPi81Xm_NFdTQM8v2nR9FJIexzkK9rg-NU,4352
 fabricatio/actions/output.py,sha256=-FfTzXEHIb_zOT-j4T4b5ND96zHLDEGdjlmmPviIbiM,3754
 fabricatio/actions/rag.py,sha256=wb3vt-gS6fDHYJ57Yfu_OR0kpewT9vMqwtXsqXd42Kg,2735
 fabricatio/capabilities/advanced_judge.py,sha256=selB0Gwf1F4gGJlwBiRo6gI4KOUROgh3WnzO3mZFEls,706
-fabricatio/capabilities/check.py,sha256=XiA03x2lGcCzpTVICOHs-e7qzNODQwBwtjDxU8ucgdM,3915
-fabricatio/capabilities/correct.py,sha256=55Zk1AzeQfoD-8k58VruGUxAMQR7q68ffGniCu6aogM,7282
+fabricatio/capabilities/censor.py,sha256=-FZTDFfqlIwqMd4hkKzEHAknlp2pH5sawXDQ-7XJcXA,3784
+fabricatio/capabilities/check.py,sha256=_4FS0kTa37A3M8Cjl1oVxp1j971W5O58NxmtsU1TizA,8005
+fabricatio/capabilities/correct.py,sha256=8ax8oa9e4EIzho-cTXku-Sy7rC1zrOdlo23ooDZEyuM,9178
 fabricatio/capabilities/propose.py,sha256=hkBeSlmcTdfYWT-ph6nlbtHXBozi_JXqXlWcnBy3W78,2007
 fabricatio/capabilities/rag.py,sha256=7xDxDEvhlmb7Y-mEquSgvlVIYpHsM2YFxA9LjRpVajo,17720
-fabricatio/capabilities/rating.py,sha256=_PCJUeNA_1hwcP37r1GsWfHt6Gpwf8TuaAlKajUiyK8,14693
+fabricatio/capabilities/rating.py,sha256=3gBqmYpEpzKge4mpxclJ4f9Nl_MTnADjuj4uqxw2Ilo,17011
 fabricatio/capabilities/review.py,sha256=1MGyJudPxHVOQod_GYKJ7NyB3jOWuwZhqBP30hAZ5Z4,5061
 fabricatio/capabilities/task.py,sha256=JG9kD2n86FvZQIjqZq-aqw8j9jpuuDpEDKTJCB6HzX4,4416
-fabricatio/config.py,sha256=-K3_PXAnwEDRu6OvMwbghZWeZzHKWyswWHfBeRi7cDk,17066
+fabricatio/config.py,sha256=aA-wirVVfjRuk1AXj-l9UFQFaDEBtV3YnzQIwCPE_G0,17503
 fabricatio/core.py,sha256=VQ_JKgUGIy2gZ8xsTBZCdr_IP7wC5aPg0_bsOmjQ588,6458
 fabricatio/decorators.py,sha256=C0Gi7wcXC-0sWITqsSv3JdBGcgVJOlRvOt0FfO0aUsA,7554
 fabricatio/fs/curd.py,sha256=p8y0LGKgVDk-CWOlm37E6wg7RK6RCD6denKo-VsW28c,4763
 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=N5_j7u1sd-EzuQACwPAJNUWgg328xenJ-DfZ4DOkh_s,9132
+fabricatio/models/action.py,sha256=dZkPP-7DaJIOjsFYWnp6vcOObMgjvda1O2FjboSDYjo,9003
+fabricatio/models/adv_kwargs_types.py,sha256=dcYMLn6xcnWLZTLTBdtpgUZWi-VBeub721GzHRZFT1g,860
 fabricatio/models/events.py,sha256=QvlnS8FEELg6KNabcJMeh2GV_y0ZBzKOPphcteKYWYU,4183
-fabricatio/models/extra/advanced_judge.py,sha256=tmCD7mnPlpuykOxvXxWEk3bKzC7mUNSoOwSquT6fF7E,937
-fabricatio/models/extra/article_base.py,sha256=mpetbUlZ334YAd46sqd-pBaoelozIg0XJgPWHbSdZ6k,17531
+fabricatio/models/extra/advanced_judge.py,sha256=mi3KiB8FUuSYICzXPXKwVhCyRE1GL3gHLkwuc-4mh3c,999
+fabricatio/models/extra/article_base.py,sha256=1Fg3iWbod1TCU3nIJK9mOq_8K3oGBtSW03VUwi2I5tg,17058
 fabricatio/models/extra/article_essence.py,sha256=xd6j-PDqjhrMjgUmyfk6HqkyMLu-sS9feUo0sZ3QABY,2825
-fabricatio/models/extra/article_main.py,sha256=OYOnv09n8hB8ChtCSXO9V18tt3ouoSWnG_0MsRkRzJk,8206
+fabricatio/models/extra/article_main.py,sha256=0Xj54pRxUw5Iaj9npYmHKT-ZMvEIBlZ6G1ysNJRgceM,8225
 fabricatio/models/extra/article_outline.py,sha256=jFbVgiwlo7rnwCGS6ToVgeMUOoRe99Edgbx95THR6z8,1450
 fabricatio/models/extra/article_proposal.py,sha256=L2kPvH1XCCQSNcI1KQU3ULGq7C24Y88ssugX43LgbsE,2043
-fabricatio/models/extra/problem.py,sha256=CX93lMFl-UQDCO3JvD4nCMllXId_FlPwGiLpxOyO5Dc,4502
-fabricatio/models/extra/rule.py,sha256=OIyn_r1lwLa-lhFsl--PQHqY_Qi2LIaT24zQSBazf38,781
-fabricatio/models/generic.py,sha256=yHcYyM6NhK3tJCpPKG0lzb58y3KI3W8VtVH49FAynU0,19360
-fabricatio/models/kwargs_types.py,sha256=chJ-rHaeBVRUPuORHuGR3DdNxxTUrotz0eflPEh4l4w,5474
+fabricatio/models/extra/patches.py,sha256=_yyyDbaQ8wkj6QP-NU-3I74HehFgwD889vD0SlCjynU,303
+fabricatio/models/extra/problem.py,sha256=KwYkc7kjoEG7cwj9C8sWLoZgtBqJVuxlU_7KkvtSgO0,5828
+fabricatio/models/extra/rule.py,sha256=_ThlHOViuHcJdAhc6qdEUHaFOevvQYHvH89STzucUyM,719
+fabricatio/models/generic.py,sha256=uuCwpG4DS5DwnZ-2lRMBDufWbKp_5x4yuh1eAFwkFKY,20682
+fabricatio/models/kwargs_types.py,sha256=sMDA85SoC1AOJ5k6qC8qUiUv0Ne0_5ThU9FZITRNen4,5673
 fabricatio/models/role.py,sha256=-CRcj5_M3_ciLPzwiNn92grBmwoSLQ-n4koVZiCNTBM,2953
 fabricatio/models/task.py,sha256=8NaR7ojQWyM740EDTqt9stwHKdrD6axCRpLKo0QzS-I,10492
 fabricatio/models/tool.py,sha256=kD0eB7OxO9geZOxO6JIKvCBeG-KOpRAkfRZqK_WGfW4,7105
-fabricatio/models/usages.py,sha256=HuU9X_8o6-UilHEy1LlszVVs36OMRKTDL07YstMFk5I,31808
+fabricatio/models/usages.py,sha256=UC-igtnfW0scIkedb5leZuuR4XoSZYI7kf1S0L418CU,31813
 fabricatio/models/utils.py,sha256=Ac5g-8ic6q_w7dhNuh-iiofpL1sqOACxbjPPTljP2LY,4417
-fabricatio/parser.py,sha256=9Jzw-yV6uKbFvf6sPna-XHdziVGVBZWvPctgX_6ODL8,6251
+fabricatio/parser.py,sha256=UOSvXigEXK-eXsr3m3b7glOhbBWs4kDJTeTNyuqA9ic,6315
 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
@@ -48,6 +51,6 @@ fabricatio/workflows/rag.py,sha256=-YYp2tlE9Vtfgpg6ROpu6QVO8j8yVSPa6yDzlN3qVxs,5
 fabricatio/_rust.pyi,sha256=_N8Jw1DMOFAaoibSQolxkKZ07nCfJao7Z9qkojHtLy0,5104
 fabricatio/_rust_instances.py,sha256=2GwF8aVfYNemRI2feBzH1CZfBGno-XJJE5imJokGEYw,314
 fabricatio/__init__.py,sha256=SzBYsRhZeL77jLtfJEjmoHOSwHwUGyvMATX6xfndLDM,1135
-fabricatio/_rust.cp312-win_amd64.pyd,sha256=655GgiDLplHhewnAbEen77GKKxhllgjljHPx2q0cEps,1888256
-fabricatio-0.2.8.dev3.data/scripts/tdown.exe,sha256=giKHqYYYtXEQg7gdrGBRA93R0HkoKPUoFqdyFKP9ZQM,3402752
-fabricatio-0.2.8.dev3.dist-info/RECORD,,
+fabricatio/_rust.cp312-win_amd64.pyd,sha256=y_AwUxK1t-eJJnlDm9MowMbM8s_GzUXAPX5W9Ao_06U,1892352
+fabricatio-0.2.8.dev4.data/scripts/tdown.exe,sha256=OKVp-_Q3lDufrVIc_ZmFJRKukM6TGqWnMMs0YOXULQE,3402240
+fabricatio-0.2.8.dev4.dist-info/RECORD,,