fabricatio 0.2.12.dev3__cp312-cp312-manylinux_2_34_x86_64.whl → 0.2.13.dev0__cp312-cp312-manylinux_2_34_x86_64.whl

fabricatio/actions/article_rag.py

@@ -20,6 +20,7 @@ from fabricatio.models.extra.article_main import Article, ArticleChapter, Articl
 from fabricatio.models.extra.article_outline import ArticleOutline
 from fabricatio.models.extra.rule import RuleSet
 from fabricatio.models.kwargs_types import ChooseKwargs, LLMKwargs
+from fabricatio.rust import convert_to_block_formula, convert_to_inline_formula
 from fabricatio.utils import ask_retain, ok
 
 TYPST_CITE_USAGE = (
@@ -162,6 +163,7 @@ class WriteArticleContentRAG(Action, RAG, Extract):
         )
         for p in new_subsec.paragraphs:
             p.content = cm.apply(p.content)
+            p.description = cm.apply(p.description)
         subsec.update_from(new_subsec)
         logger.debug(f"{subsec.title}:rpl\n{subsec.display()}")
         return subsec
@@ -286,6 +288,10 @@ class ArticleConsultRAG(Action, AdvancedRAG):
         while (req := await text("User: ").ask_async()) is not None:
             if await confirm("Empty the cm?").ask_async():
                 cm.empty()
+
+            req = convert_to_block_formula(req)
+            req = convert_to_inline_formula(req)
+
             await self.clued_search(
                 req,
                 cm,

fabricatio/capabilities/advanced_rag.py

@@ -24,7 +24,7 @@ class AdvancedRAG(RAG):
         **kwargs: Unpack[FetchKwargs],
     ) -> CitationManager:
         """Asynchronously performs a clued search based on a given requirement and citation manager."""
-        if max_round<=0:
+        if max_round <= 0:
             raise ValueError("max_round should be greater than 0")
         if max_round == 1:
             logger.warning(
@@ -33,21 +33,21 @@ class AdvancedRAG(RAG):
 
         refinery_kwargs = refinery_kwargs or {}
 
-        for i in range(max_round + 1, 1):
-            logger.info(f"Round [{i + 1}/{max_round}] search started.")
+        for i in range(1, max_round + 1):
+            logger.info(f"Round [{i}/{max_round}] search started.")
             ref_q = await self.arefined_query(
                 f"{cm.as_prompt()}\n\nAbove is the retrieved references in the {i - 1}th RAG, now we need to perform the {i}th RAG."
                 f"\n\n{requirement}",
                 **refinery_kwargs,
             )
             if ref_q is None:
-                logger.error(f"At round [{i + 1}/{max_round}] search, failed to refine the query, exit.")
+                logger.error(f"At round [{i}/{max_round}] search, failed to refine the query, exit.")
                 return cm
             refs = await self.aretrieve(ref_q, ArticleChunk, base_accepted, **kwargs)
 
             if (max_capacity := max_capacity - len(refs)) < 0:
                 cm.add_chunks(refs[0:max_capacity])
-                logger.debug(f"At round [{i + 1}/{max_round}] search, the capacity is not enough, exit.")
+                logger.debug(f"At round [{i}/{max_round}] search, the capacity is not enough, exit.")
                 return cm
 
             cm.add_chunks(refs)

fabricatio/models/extra/article_main.py

@@ -161,13 +161,20 @@ class Article(
             "Original Article": self.display(),
         }
 
-    def convert_tex(self) -> Self:
+    def convert_tex(self, paragraphs: bool = True, descriptions: bool = True) -> Self:
         """Convert tex to typst code."""
-        for _, _, subsec in self.iter_subsections():
-            for p in subsec.paragraphs:
-                p.content = fix_misplaced_labels(p.content)
-                p.content = convert_all_inline_tex(p.content)
-                p.content = convert_all_block_tex(p.content)
+        if descriptions:
+            for a in self.iter_dfs():
+                a.description = fix_misplaced_labels(a.description)
+                a.description = convert_all_inline_tex(a.description)
+                a.description = convert_all_block_tex(a.description)
+
+        if paragraphs:
+            for _, _, subsec in self.iter_subsections():
+                for p in subsec.paragraphs:
+                    p.content = fix_misplaced_labels(p.content)
+                    p.content = convert_all_inline_tex(p.content)
+                    p.content = convert_all_block_tex(p.content)
         return self
 
     @override

fabricatio/rust.pyi

@@ -377,3 +377,8 @@ def to_metadata(data: JsonValue) -> str:
         The YAML string representation of the input data.
     """
 
+def convert_to_inline_formula(string: str) -> str:
+    r"""Convert `$...$` to inline formula `\(...\)` and trim spaces."""
+
+def convert_to_block_formula(string: str) -> str:
+    r"""Convert `$$...$$` to block formula `\[...\]` and trim spaces."""

{fabricatio-0.2.12.dev3.dist-info → fabricatio-0.2.13.dev0.dist-info}/METADATA

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

{fabricatio-0.2.12.dev3.dist-info → fabricatio-0.2.13.dev0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fabricatio-0.2.12.dev3.dist-info/METADATA,sha256=YCdvNpYywNbwF7ZX4_mBS-A5yhGbYTvoiOyihr24qzo,5120
-fabricatio-0.2.12.dev3.dist-info/WHEEL,sha256=7FgAcpQES0h1xhfN9Ugve9FTUilU6sRAr1WJ5ph2cuw,108
-fabricatio-0.2.12.dev3.dist-info/licenses/LICENSE,sha256=yDZaTLnOi03bi3Dk6f5IjhLUc5old2yOsihHWU0z-i0,1067
+fabricatio-0.2.13.dev0.dist-info/METADATA,sha256=Spzd95aTVAVcyTqZFNv0zJOA02o-rpSGFmJFlZvuA2o,5120
+fabricatio-0.2.13.dev0.dist-info/WHEEL,sha256=7FgAcpQES0h1xhfN9Ugve9FTUilU6sRAr1WJ5ph2cuw,108
+fabricatio-0.2.13.dev0.dist-info/licenses/LICENSE,sha256=yDZaTLnOi03bi3Dk6f5IjhLUc5old2yOsihHWU0z-i0,1067
 fabricatio/decorators.py,sha256=iuFCTtZ4VXwxJpM_z-CtrEpTaVZsv_eBFe5mOhe4wlo,8715
 fabricatio/constants.py,sha256=JxtaKGTf0IQhM-MNCHtr6x85Ejg8FWYcie-Z_RupCBg,557
 fabricatio/core.py,sha256=MaEKZ6DDmbdScAY-7F1gwGA6fr7ADX6Mz5rNVi2msFA,6277
@@ -10,7 +10,7 @@ fabricatio/models/role.py,sha256=5SJ1Vm6H3FwOVEk5Z-4GBJWABI3OKAKwkz5t170osi8,285
 fabricatio/models/kwargs_types.py,sha256=aI844DNQXLbSBC3P0bZQLJpuJxwwF66WTDbbYQTftaE,4618
 fabricatio/models/extra/article_proposal.py,sha256=4G2qLkMxtK54G1ANgPW0G3w4Pahxgk2lhGPU5KMxuzw,1818
 fabricatio/models/extra/advanced_judge.py,sha256=CKPP4Lseb_Ey8Y7i2V9HJfB-mZgCknFdqq7Zo41o6s4,1060
-fabricatio/models/extra/article_main.py,sha256=PVFfTNDSWMGVSkrQqKXkZafHoKygD_3czeri-aCRM2M,10924
+fabricatio/models/extra/article_main.py,sha256=HxqmMleOId2EXPAGBZIYyR1ufwUnll0ASFkHSRKN0qI,11290
 fabricatio/models/extra/problem.py,sha256=1Sd8hsThQK6pXMXhErRhP1ft58z4PvqeB8AV8VcXiaI,7051
 fabricatio/models/extra/article_essence.py,sha256=zUfZ2_bX3h__RaVPwJlxQ-tkFyfSV8SdX8DsmFX6v_w,2649
 fabricatio/models/extra/rag.py,sha256=RWv_YJhDX6UL4t3sRtQt-LYMtxN-K-t931nmyiJXkKM,3857
@@ -36,11 +36,11 @@ fabricatio/rust_instances.py,sha256=i5fIt6XkE8UwUU4JarmPt50AZs8aJW6efaypSLGLl0I,
 fabricatio/config.py,sha256=Zc2UG1Jf8u0XfwHR7yrApgynzdX_uC6jInMw8PDm64o,17526
 fabricatio/utils.py,sha256=DZDOsJN1FxTVqq-i1fAJZdLfDYxyVoMAJFQURuYt1rY,3004
 fabricatio/journal.py,sha256=Op0wC-JlZumnAc_aDmYM4ljnSNLoKEEMfcIRbCF69ow,455
-fabricatio/rust.pyi,sha256=UhQY1bEB6RrCo8Yv3mq6NRtzEWOSsZzeeYtxSGagGWc,10960
+fabricatio/rust.pyi,sha256=9GXuLBMTmRfea9PUBZgycYACly02kCaGzDb1YGgg0g8,11207
 fabricatio/__init__.py,sha256=OXoMMHJKHEB_vN97_34U4I5QpAKL9xnVQEVcBCvwBCg,986
 fabricatio/actions/fs.py,sha256=nlTmk-tYDW158nz_fzlsNfuYJwj7j4BHn_MFY5hxdqs,934
 fabricatio/actions/output.py,sha256=lTvMgXzY-fwA_kNrivdFZkk3kT8DMpjBSIWLyav2B1k,8089
-fabricatio/actions/article_rag.py,sha256=XcPSHJzODKUGJHjY_3Mj6la7hwZmTeWLECeATq8iRfk,18297
+fabricatio/actions/article_rag.py,sha256=CndhcKrYLIEuwKakU4CaLrpNsiRfT3GxuQoxhRpEE_c,18528
 fabricatio/actions/rag.py,sha256=-bA7KkZEFfWEanAPHzYwRHG7zRlTZcNDI7HL3n-lDuE,3496
 fabricatio/actions/__init__.py,sha256=ZMa1LeM5BNeqp-J-D32W-f5bD53-kdXGyt0zuueJofM,47
 fabricatio/actions/article.py,sha256=syUjEyKppdT72Xd1LSXKR3Djo1aybRPeFRHRzifNhm0,10632
@@ -52,7 +52,7 @@ fabricatio/parser.py,sha256=rMXd9Lo5TjxUkI0rocYigF9d1kC0rSySenuMW8uqXm8,6483
 fabricatio/capabilities/censor.py,sha256=j6vyjKpR1CfLzC-XrOZSZePjJz3jsoM104gqqsWwi1Q,4615
 fabricatio/capabilities/advanced_judge.py,sha256=bvb8fYoiKoGlBwMZVMflVE9R2MoS1VtmZAo65jMJFew,683
 fabricatio/capabilities/check.py,sha256=TLtkUIR6tX73qR_V5TkXpdmplrmqFt4dZj32PBy81H0,8409
-fabricatio/capabilities/advanced_rag.py,sha256=gv2qHqPQpiCmIPHhbibdBeWVhrKB4Xm3kqERCg7HEAw,2330
+fabricatio/capabilities/advanced_rag.py,sha256=y1XMENFdGGr0AcXZHgloRM9jX2yJpPEM-q0Y9Z-EI1k,2320
 fabricatio/capabilities/correct.py,sha256=Et3Ud-oLZlwTVSy2XyT5UX2shT_OJ9j4HWP9b5Hntvk,10192
 fabricatio/capabilities/rag.py,sha256=f7d3y6ZmjkbGZL_KyK9d-DAFE-yJFBck-NBrTPTVF8c,9387
 fabricatio/capabilities/__init__.py,sha256=skaJ43CqAQaZMH-mCRzF4Fps3x99P2SwJ8vSM9pInX8,56
@@ -61,6 +61,7 @@ fabricatio/capabilities/review.py,sha256=EPL8IlxSKO0XStBkXdW7FJMbPztDQMv9w7tHgu6
 fabricatio/capabilities/propose.py,sha256=vOJvmmnMBHUQB6N1AmZNFw42jf7Bl2mBRNlBK15TpNI,1942
 fabricatio/capabilities/task.py,sha256=_BAQonNy5JH3JxhLmPGfn0nDvn_ENKXyOdql8EVXRLE,4362
 fabricatio/capabilities/extract.py,sha256=b4_Tuc9O6Pe71y4Tj-JHMb4simdhduVR-rcfD9yW8RA,2425
-fabricatio/rust.cpython-312-x86_64-linux-gnu.so,sha256=k-zgqY_boW8AjnkndawuMWVuPt1QuWKufO2zzpdeG4U,4727424
-fabricatio-0.2.12.dev3.data/scripts/tdown,sha256=VYqmPnlR2_DvwJGkX9lP45fBgPl7MLVJGD2rVt73okg,4585400
-fabricatio-0.2.12.dev3.dist-info/RECORD,,
+fabricatio/rust.cpython-312-x86_64-linux-gnu.so,sha256=TgEpq7LO6uoApCF8YVb74HiDGMSIsdpCfxEkMgOpgG0,4734664
+fabricatio-0.2.13.dev0.data/scripts/tdown,sha256=f-_G7qusdwSJDsD1OaUT321lmJeZxRKnNOT19mnrVy4,4583280
+fabricatio-0.2.13.dev0.data/scripts/ttm,sha256=bO9U2GB_zBq4YFZmFiD7TZ2ld8Nnq3EPD7n3RCcEl2s,3926464
+fabricatio-0.2.13.dev0.dist-info/RECORD,,