fabricatio 0.2.12.dev3__cp312-cp312-win_amd64.whl → 0.2.13.dev0__cp312-cp312-win_amd64.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,15 +1,15 @@
-fabricatio-0.2.12.dev3.dist-info/METADATA,sha256=iMt48rBNujWl2lSSwiAHtT22G-K7zpXLPwnV8K_32mw,5263
-fabricatio-0.2.12.dev3.dist-info/WHEEL,sha256=jABKVkLC9kJr8mi_er5jOqpiQUjARSLXDUIIxDqsS50,96
-fabricatio-0.2.12.dev3.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio-0.2.13.dev0.dist-info/METADATA,sha256=VF_2f3NYiTYQ_AT0DvnBy42fBBaDCjV-t1XzZn5ts2E,5263
+fabricatio-0.2.13.dev0.dist-info/WHEEL,sha256=jABKVkLC9kJr8mi_er5jOqpiQUjARSLXDUIIxDqsS50,96
+fabricatio-0.2.13.dev0.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
 fabricatio/actions/article.py,sha256=SFl1zc0hz9vW2sW4VJm9-w8E7kLEty-2LzXi9wgWMmE,10905
-fabricatio/actions/article_rag.py,sha256=dJJfPkfwnx8P4BebESOpPaeTfvER-1U68aPXpwMdDCQ,18723
+fabricatio/actions/article_rag.py,sha256=1VlTFLrtsNfIrfHLEiR0u7eAuZjnIMNtdcj4HbTYMy0,18960
 fabricatio/actions/fs.py,sha256=gJR14U4ln35nt8Z7OWLVAZpqGaLnED-r1Yi-lX22tkI,959
 fabricatio/actions/output.py,sha256=lX0HkDse3ypCzZgeF-8Dr-EnNFdBiE-WQ1iLPFlGM1g,8302
 fabricatio/actions/rag.py,sha256=KN-OWgcQjGmNgSZ-s5B8m4LpYKSGFJR8eq72mo2CP9k,3592
 fabricatio/actions/rules.py,sha256=dkvCgNDjt2KSO1VgPRsxT4YBmIIMeetZb5tiz-slYkU,3640
 fabricatio/actions/__init__.py,sha256=wVENCFtpVb1rLFxoOFJt9-8smLWXuJV7IwA8P3EfFz4,48
 fabricatio/capabilities/advanced_judge.py,sha256=selB0Gwf1F4gGJlwBiRo6gI4KOUROgh3WnzO3mZFEls,706
-fabricatio/capabilities/advanced_rag.py,sha256=gt4ccqyMSVwQLwsEyJrjPc-RXMZZBwObIjsh8A8ILbM,2386
+fabricatio/capabilities/advanced_rag.py,sha256=1LAAaCgVnZllNzLH3yW9MNwguUNPB7NMOJbD83VLdAo,2376
 fabricatio/capabilities/censor.py,sha256=bBT5qy-kp7fh8g4Lz3labSwxwJ60gGd_vrkc6k1cZ1U,4719
 fabricatio/capabilities/check.py,sha256=kYqzohhv2bZfl1aKSUt7a8snT8YEl2zgha_ZdAdMMfQ,8622
 fabricatio/capabilities/correct.py,sha256=W_cInqlciNEhyMK0YI53jk4EvW9uAdge90IO9OElUmA,10420
@@ -35,7 +35,7 @@ fabricatio/models/extra/advanced_judge.py,sha256=INUl_41C8jkausDekkjnEmTwNfLCJ23
 fabricatio/models/extra/aricle_rag.py,sha256=p91JI8FmFSrHVg5KbhJq4w8vQdx4VUW75SrtQUi9ju4,10987
 fabricatio/models/extra/article_base.py,sha256=R8EOlQBs7hadjP9cxG_uc24DJDpiVpJW9Wb9DA6XmXE,14516
 fabricatio/models/extra/article_essence.py,sha256=mlIkkRMR3I1RtqiiOnmIE3Vy623L4eECumkRzryE1pw,2749
-fabricatio/models/extra/article_main.py,sha256=zbWhXAvDPBfg3EHZRf7kVEChPZagqWbzeYFJdJtaDOY,11211
+fabricatio/models/extra/article_main.py,sha256=pwY2bTYlnz8nh8y3nb_8nnYcYCmoed7ejK-ZSD8ocYc,11584
 fabricatio/models/extra/article_outline.py,sha256=C9WNZNSz6gyuw9lDp29qidPvHBTENaeqcHfCoE_Y7F4,2793
 fabricatio/models/extra/article_proposal.py,sha256=NbyjW-7UiFPtnVD9nte75re4xL2pD4qL29PpNV4Cg_M,1870
 fabricatio/models/extra/patches.py,sha256=_WNCxtYzzsVfUxI16vu4IqsLahLYRHdbQN9er9tqhC0,997
@@ -51,7 +51,7 @@ fabricatio/models/tool.py,sha256=jQ51g4lwTPfsMF1nbreDJtBczbxIHoXcPuLSOqHliq8,125
 fabricatio/models/usages.py,sha256=0bzITf0vug9ZaN6qnjNfFB7T8BAvpXE0bvx0otFYLLA,33356
 fabricatio/parser.py,sha256=-RbW2yzfJiu2ARq-lZw4tfgsjY2rIZWtJpoUmaE6gJQ,6637
 fabricatio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fabricatio/rust.pyi,sha256=kU-I0PD-tG0RGTy5xUobneXY-E06Qopjp4v1awpYmGw,11339
+fabricatio/rust.pyi,sha256=HbdeWbVK7QL2Z3VHh2aMJ1sGUGZyYoOLzDtn5nQIv18,11591
 fabricatio/rust_instances.py,sha256=Byeo8KHW_dJiXujJq7YPGDLBX5bHNDYbBc4sY3uubVY,313
 fabricatio/toolboxes/arithmetic.py,sha256=WLqhY-Pikv11Y_0SGajwZx3WhsLNpHKf9drzAqOf_nY,1369
 fabricatio/toolboxes/fs.py,sha256=l4L1CVxJmjw9Ld2XUpIlWfV0_Fu_2Og6d3E13I-S4aE,736
@@ -61,6 +61,7 @@ fabricatio/workflows/articles.py,sha256=ObYTFUqLUk_CzdmmnX6S7APfxcGmPFqnFr9pdjU7
 fabricatio/workflows/rag.py,sha256=-YYp2tlE9Vtfgpg6ROpu6QVO8j8yVSPa6yDzlN3qVxs,520
 fabricatio/workflows/__init__.py,sha256=5ScFSTA-bvhCesj3U9Mnmi6Law6N1fmh5UKyh58L3u8,51
 fabricatio/__init__.py,sha256=Rmvq2VgdS2u68vnOi2i5RbeWbAwrJDbk8D8D883PJWE,1022
-fabricatio/rust.cp312-win_amd64.pyd,sha256=YARjZHId5jH51qUqMMIKn7RotIiwm8oT6UqBv8PotKI,4435456
-fabricatio-0.2.12.dev3.data/scripts/tdown.exe,sha256=rpmuLrxy-ZZiqVzrMYH_oFpanqkpE6dlI1aY9rCxCiA,3350016
-fabricatio-0.2.12.dev3.dist-info/RECORD,,
+fabricatio/rust.cp312-win_amd64.pyd,sha256=DiAJU6I8WeitBZaYiA5q_YL7VlxDGuQ4LcUgyGMuZ9s,4455936
+fabricatio-0.2.13.dev0.data/scripts/tdown.exe,sha256=8UDdHeKT5n45yYe5UsDmBVm-aPveFi-LNUjpx97DNGs,3350528
+fabricatio-0.2.13.dev0.data/scripts/ttm.exe,sha256=epNQ6JY5Rg2M1sR-Vei7OMthswpV1l2oyWr5TyY2aFw,2555392
+fabricatio-0.2.13.dev0.dist-info/RECORD,,