fabricatio 0.2.12.dev3__tar.gz → 0.2.13.dev0__tar.gz

{fabricatio-0.2.12.dev3 → fabricatio-0.2.13.dev0}/Cargo.lock

@@ -1982,9 +1982,11 @@ dependencies = [
  "clap",
  "dirs",
  "flate2",
+ "regex",
  "reqwest",
  "serde_json",
  "tar",
+ "tex2typst-rs",
 ]
 
 [[package]]

{fabricatio-0.2.12.dev3 → fabricatio-0.2.13.dev0}/PKG-INFO

@@ -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 → fabricatio-0.2.13.dev0}/pyproject.toml

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

{fabricatio-0.2.12.dev3 → fabricatio-0.2.13.dev0}/python/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-0.2.12.dev3 → fabricatio-0.2.13.dev0}/python/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-0.2.12.dev3 → fabricatio-0.2.13.dev0}/python/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-0.2.12.dev3 → fabricatio-0.2.13.dev0}/python/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 → fabricatio-0.2.13.dev0}/src/typst_tools.rs

@@ -63,14 +63,14 @@ fn convert_tex_with_pattern(pattern: &str, string: &str, block: bool) -> PyResul
         match tex2typst(tex_code) {
             Ok(converted) => {
                 if block {
-                    format!("$\n{}\n{}\n$", comment(tex_code.trim()), converted)
+                    format!("$\n{}\n$", converted)
                 } else {
                     format!(" ${}$ ", converted)
                 }
             }
 
             Err(e) => if block {
-                format!("$\n{}\n\"{}\"\n$", comment(tex_code), e)
+                format!("$\n{}\n\"{}\"\n$", comment(tex_code.trim()), e)
             } else {
                 format!(" ${}$ ", tex_code)
             },
@@ -83,7 +83,7 @@ fn convert_tex_with_pattern(pattern: &str, string: &str, block: bool) -> PyResul
 
 #[pyfunction]
 fn convert_all_inline_tex(string: &str) -> PyResult<String> {
-    convert_tex_with_pattern(r"\\\((.*?)\\\)", string, false)
+    convert_tex_with_pattern(r"(?s)\\\((.*?)\\\)", string, false)
 }
 
 
@@ -92,6 +92,26 @@ fn convert_all_block_tex(string: &str) -> PyResult<String> {
     convert_tex_with_pattern(r"(?s)\\\[(.*?)\\]", string, true)
 }
 
+#[pyfunction]
+
+/// Convert `$...$` to inline formula `\(...\)` and trim spaces
+pub fn convert_to_inline_formula(string: &str) -> String {
+    let re = Regex::new(r#"\$(.*?)\$"#).unwrap();
+    re.replace_all(string, |caps: &regex::Captures| {
+        format!("\\({}\\)", caps[1].trim())
+    }).into_owned()
+}
+#[pyfunction]
+
+/// Convert `$$...$$` to block formula `\[...\]` and trim spaces
+pub fn convert_to_block_formula(string: &str) -> String {
+    let re = Regex::new(r#"(?s)\$\$(.*?)\$\$"#).unwrap();
+    re.replace_all(string, |caps: &regex::Captures| {
+        format!("\\[{}\\]", caps[1].trim())
+    }).into_owned()
+}
+
+
 #[pyfunction]
 /// A func to fix labels in a string.
 pub fn fix_misplaced_labels(string: &str) -> String {
@@ -154,6 +174,9 @@ pub(crate) fn register(_: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(fix_misplaced_labels, m)?)?;
     m.add_function(wrap_pyfunction!(split_out_metadata, m)?)?;
     m.add_function(wrap_pyfunction!(to_metadata, m)?)?;
+
+    m.add_function(wrap_pyfunction!(convert_to_inline_formula, m)?)?;
+    m.add_function(wrap_pyfunction!(convert_to_block_formula, m)?)?;
     Ok(())
 }