fabricatio 0.3.14.dev5__tar.gz → 0.3.14.dev8__tar.gz

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/.gitignore

@@ -169,3 +169,4 @@ output/
 templates/customed
 *.typ
 /src/tei.rs
+.python-version

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.3.14.dev5
+Version: 0.3.14.dev8
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/build.rs

@@ -1,3 +1,6 @@
+use std::fs;
+use std::path::Path;
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     tonic_build::configure()
         .out_dir("src")
@@ -5,5 +8,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .build_server(false)
         .type_attribute(".", "#[derive(serde::Serialize,serde::Deserialize)]")
         .compile_protos(&["proto/tei.proto"], &["proto"])
+        .map(|_| {
+            if Path::new("src/tei.v1.rs").exists() {
+                fs::rename("src/tei.v1.rs", "src/tei.rs").expect("Failed to rename file")
+            }
+        })
         .map_err(|e| e.into())
 }

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/examples/write_article/write_article.py

@@ -5,7 +5,8 @@ from pathlib import Path
 from typing import Optional
 
 import typer
-from fabricatio import Event, Role, WorkFlow, logger
+from fabricatio import Event, WorkFlow, logger
+from fabricatio import Role as RoleBase
 from fabricatio.actions.article import (
     ExtractOutlineFromRaw,
     GenerateArticleProposal,
@@ -18,21 +19,27 @@ from fabricatio.fs import safe_text_read
 from fabricatio.models.extra.article_main import Article
 from fabricatio.models.extra.article_outline import ArticleOutline
 from fabricatio.models.task import Task
+from fabricatio.models.usages import LLMUsage
 from fabricatio.utils import ok
 from typer import Typer
 
 # from pydantic import HttpUrl
 
+
+class Role(RoleBase, LLMUsage):
+    """Role class for article writing."""
+
+
 Role(
     name="Undergraduate Researcher",
     description="Write an outline for an article in typst format.",
-    llm_model="openai/qwen3-235b-a22b",
-    # llm_api_endpoint=HttpUrl("https://dashscope.aliyuncs.com/compatible-mode/v1"),
+    llm_model="openai/qwen-plus",
+    llm_api_endpoint="https://dashscope.aliyuncs.com/compatible-mode/v1",
     llm_stream=True,
     llm_max_tokens=8191,
     llm_rpm=600,
     llm_tpm=900000,
-    llm_timeout=600,
+    llm_timeout=10,
     registry={
         Event.quick_instantiate(ns := "article"): WorkFlow(
             name="Generate Article",

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/proto/tei.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tei;
+package tei.v1;
 
 service Info {
     rpc Info (InfoRequest) returns (InfoResponse) {

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/pyproject.toml

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

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/python/fabricatio/actions/article_rag.py

@@ -21,10 +21,7 @@ from fabricatio.models.extra.rule import RuleSet
 from fabricatio.models.kwargs_types import ChooseKwargs, LLMKwargs
 from fabricatio.rust import (
     BibManager,
-    convert_all_block_tex,
-    convert_all_inline_tex,
-    convert_to_block_formula,
-    convert_to_inline_formula,
+    convert_all_tex_math,
     fix_misplaced_labels,
 )
 from fabricatio.utils import ok
@@ -129,8 +126,7 @@ class WriteArticleContentRAG(Action, Extract, AdvancedRAG):
                 raw_paras = edt
 
             raw_paras = fix_misplaced_labels(raw_paras)
-            raw_paras = convert_all_inline_tex(raw_paras)
-            raw_paras = convert_all_block_tex(raw_paras)
+            raw_paras = convert_all_tex_math(raw_paras)
 
             r_print(raw_paras)
 
@@ -153,8 +149,7 @@ class WriteArticleContentRAG(Action, Extract, AdvancedRAG):
         raw_paras = "\n".join(p for p in raw_paras.splitlines() if p and not p.endswith("**") and not p.startswith("#"))
 
         raw_paras = fix_misplaced_labels(raw_paras)
-        raw_paras = convert_all_inline_tex(raw_paras)
-        raw_paras = convert_all_block_tex(raw_paras)
+        raw_paras = convert_all_tex_math(raw_paras)
 
         return await self.extract_new_subsec(subsec, raw_paras, cm)
 
@@ -261,8 +256,6 @@ class ArticleConsultRAG(Action, AdvancedRAG):
         from questionary import confirm, text
         from rich import print as r_print
 
-        from fabricatio.rust import convert_all_block_tex, convert_all_inline_tex, fix_misplaced_labels
-
         self.target_collection = collection_name or self.safe_target_collection
 
         cm = CitationManager()
@@ -272,8 +265,7 @@ class ArticleConsultRAG(Action, AdvancedRAG):
             if await confirm("Empty the cm?").ask_async():
                 cm.empty()
 
-            req = convert_to_block_formula(req)
-            req = convert_to_inline_formula(req)
+            req = convert_all_tex_math(req)
 
             await self.clued_search(
                 req,
@@ -289,8 +281,7 @@ class ArticleConsultRAG(Action, AdvancedRAG):
             ret = await self.aask(f"{cm.as_prompt()}\n{self.req}\n{req}")
 
             ret = fix_misplaced_labels(ret)
-            ret = convert_all_inline_tex(ret)
-            ret = convert_all_block_tex(ret)
+            ret = convert_all_tex_math(ret)
             ret = cm.apply(ret)
 
             r_print(ret)

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/python/fabricatio/capabilities/rag.py

@@ -51,16 +51,16 @@ class RAG(EmbeddingUsage, ABC):
         return self._client
 
     def init_client(
-        self,
-        milvus_uri: Optional[str] = None,
-        milvus_token: Optional[str] = None,
-        milvus_timeout: Optional[float] = None,
+            self,
+            milvus_uri: Optional[str] = None,
+            milvus_token: Optional[str] = None,
+            milvus_timeout: Optional[float] = None,
     ) -> Self:
         """Initialize the Milvus client."""
         self._client = create_client(
             uri=milvus_uri or ok(self.milvus_uri or CONFIG.rag.milvus_uri),
             token=milvus_token
-            or (token.get_secret_value() if (token := (self.milvus_token or CONFIG.rag.milvus_token)) else ""),
+                  or (token.get_secret_value() if (token := (self.milvus_token or CONFIG.rag.milvus_token)) else ""),
             timeout=milvus_timeout or self.milvus_timeout or CONFIG.rag.milvus_timeout,
         )
         return self
@@ -74,7 +74,7 @@ class RAG(EmbeddingUsage, ABC):
         return self
 
     def view(
-        self, collection_name: Optional[str], create: bool = False, **kwargs: Unpack[CollectionConfigKwargs]
+            self, collection_name: Optional[str], create: bool = False, **kwargs: Unpack[CollectionConfigKwargs]
     ) -> Self:
         """View the specified collection.
 
@@ -116,7 +116,7 @@ class RAG(EmbeddingUsage, ABC):
         return ok(self.target_collection, "No collection is being viewed. Have you called `self.view()`?")
 
     async def add_document[D: MilvusDataBase](
-        self, data: List[D] | D, collection_name: Optional[str] = None, flush: bool = False
+            self, data: List[D] | D, collection_name: Optional[str] = None, flush: bool = False
     ) -> Self:
         """Adds a document to the specified collection.
 
@@ -143,15 +143,15 @@ class RAG(EmbeddingUsage, ABC):
         return self
 
     async def afetch_document[D: MilvusDataBase](
-        self,
-        query: List[str],
-        document_model: Type[D],
-        collection_name: Optional[str] = None,
-        similarity_threshold: float = 0.37,
-        result_per_query: int = 10,
-        tei_endpoint: Optional[str] = None,
-        reranker_threshold: float = 0.7,
-        filter_expr: str = "",
+            self,
+            query: List[str],
+            document_model: Type[D],
+            collection_name: Optional[str] = None,
+            similarity_threshold: float = 0.37,
+            result_per_query: int = 10,
+            tei_endpoint: Optional[str] = None,
+            reranker_threshold: float = 0.7,
+            filter_expr: str = "",
     ) -> List[D]:
         """Asynchronously fetches documents from a Milvus database based on input vectors.
 
@@ -192,7 +192,8 @@ class RAG(EmbeddingUsage, ABC):
                 retrieved_id.update(res["id"] for res in g)
                 if not models:
                     continue
-                rank_scores = await reranker.arerank(q, [m.prepare_vectorization() for m in models], truncate=True)
+                rank_scores = await reranker.arerank(q, [m.prepare_vectorization() for m in models], truncate=True,
+                                                     truncation_direction="Left")
                 raw_result.extend((models[idx], scr) for (idx, scr) in rank_scores if scr > reranker_threshold)
 
             raw_result_sorted = sorted(raw_result, key=lambda x: x[1], reverse=True)
@@ -214,11 +215,11 @@ class RAG(EmbeddingUsage, ABC):
         return document_model.from_sequence(resp)
 
     async def aretrieve[D: MilvusDataBase](
-        self,
-        query: List[str] | str,
-        document_model: Type[D],
-        max_accepted: int = 20,
-        **kwargs: Unpack[FetchKwargs],
+            self,
+            query: List[str] | str,
+            document_model: Type[D],
+            max_accepted: int = 20,
+            **kwargs: Unpack[FetchKwargs],
     ) -> List[D]:
         """Retrieve data from the collection.
 
@@ -235,15 +236,15 @@ class RAG(EmbeddingUsage, ABC):
             query = [query]
 
         return (
-            await self.afetch_document(
-                query=query,
-                document_model=document_model,
-                **kwargs,
-            )
-        )[:max_accepted]
+                   await self.afetch_document(
+                       query=query,
+                       document_model=document_model,
+                       **kwargs,
+                   )
+               )[:max_accepted]
 
     async def arefined_query(
-        self, question: List[str] | str, **kwargs: Unpack[ChooseKwargs[Optional[List[str]]]]
+            self, question: List[str] | str, **kwargs: Unpack[ChooseKwargs[Optional[List[str]]]]
     ) -> Optional[List[str]]:
         """Refines the given question using a template.
 

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/python/fabricatio/decorators.py

@@ -235,6 +235,7 @@ def logging_exec_time[**P, R](
         @wraps(func)
         async def _async_wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
             start_time = time()
+            logger.debug(f"Starting execution of {func.__name__}")
             result = await func(*args, **kwargs)
             logger.debug(f"Execution time of `{func.__name__}`: {time() - start_time:.2f} s")
             return result
@@ -244,6 +245,7 @@ def logging_exec_time[**P, R](
     @wraps(func)
     def _wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
         start_time = time()
+        logger.debug(f"Starting execution of {func.__name__}")
         result = func(*args, **kwargs)
         logger.debug(f"Execution time of {func.__name__}: {(time() - start_time) * 1000:.2f} ms")
         return result

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/python/fabricatio/models/extra/aricle_rag.py

@@ -1,6 +1,7 @@
 """A Module containing the article rag models."""
 
 import re
+from dataclasses import dataclass, field
 from itertools import groupby
 from pathlib import Path
 from typing import ClassVar, Dict, List, Optional, Self, Unpack
@@ -68,7 +69,7 @@ class ArticleChunk(MilvusDataBase):
 
     @classmethod
     def from_file[P: str | Path](
-        cls, path: P | List[P], bib_mgr: BibManager, **kwargs: Unpack[ChunkKwargs]
+            cls, path: P | List[P], bib_mgr: BibManager, **kwargs: Unpack[ChunkKwargs]
     ) -> List[Self]:
         """Load the article chunks from the file."""
         if isinstance(path, list):
@@ -85,9 +86,9 @@ class ArticleChunk(MilvusDataBase):
         title_seg = path.stem.split(" - ").pop()
 
         key = (
-            bib_mgr.get_cite_key_by_title(title_seg)
-            or bib_mgr.get_cite_key_by_title_fuzzy(title_seg)
-            or bib_mgr.get_cite_key_fuzzy(path.stem)
+                bib_mgr.get_cite_key_by_title(title_seg)
+                or bib_mgr.get_cite_key_by_title_fuzzy(title_seg)
+                or bib_mgr.get_cite_key_fuzzy(path.stem)
         )
         if key is None:
             logger.warning(f"no cite key found for {path.as_posix()}, skip.")
@@ -165,10 +166,11 @@ class ArticleChunk(MilvusDataBase):
         return self
 
 
+@dataclass
 class CitationManager(AsPrompt):
     """Citation manager."""
 
-    article_chunks: List[ArticleChunk] = Field(default_factory=list)
+    article_chunks: List[ArticleChunk] = field(default_factory=list)
     """Article chunks."""
 
     pat: str = r"(\[\[([\d\s,-]*)]])"
@@ -179,7 +181,7 @@ class CitationManager(AsPrompt):
     """Separator for abbreviated citation numbers."""
 
     def update_chunks(
-        self, article_chunks: List[ArticleChunk], set_cite_number: bool = True, dedup: bool = True
+            self, article_chunks: List[ArticleChunk], set_cite_number: bool = True, dedup: bool = True
     ) -> Self:
         """Update article chunks."""
         self.article_chunks.clear()

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/python/fabricatio/models/extra/article_base.py

@@ -2,9 +2,7 @@
 
 from abc import ABC
 from enum import StrEnum
-from fabricatio.rust import extract_body, replace_thesis_body, split_out_metadata, to_metadata, word_count
 from pathlib import Path
-from pydantic import Field
 from typing import ClassVar, Generator, List, Optional, Self, Tuple, Type
 
 from fabricatio.capabilities.persist import PersistentAble
@@ -23,7 +21,9 @@ from fabricatio.models.generic import (
     Titled,
     WordCount,
 )
+from fabricatio.rust import extract_body, replace_thesis_body, split_out_metadata, to_metadata, word_count
 from fabricatio.utils import fallback_kwargs, ok
+from pydantic import Field
 
 ARTICLE_WRAPPER = "// =-=-=-=-=-=-=-=-=-="
 
@@ -275,7 +275,7 @@ class ArticleBase[T: ChapterBase](FinalizedDumpAble, AsPrompt, FromTypstCode, To
         )
 
     def iter_dfs_rev(
-            self,
+        self,
     ) -> Generator[ArticleOutlineBase, None, None]:
         """Performs a depth-first search (DFS) through the article structure in reverse order.
 

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/python/fabricatio/models/extra/article_main.py

@@ -19,8 +19,7 @@ from fabricatio.models.extra.article_outline import (
 )
 from fabricatio.models.generic import Described, SequencePatch, SketchedAble, WithRef, WordCount
 from fabricatio.rust import (
-    convert_all_block_tex,
-    convert_all_inline_tex,
+    convert_all_tex_math,
     fix_misplaced_labels,
     split_out_metadata,
     word_count,
@@ -155,15 +154,13 @@ class Article(
         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)
+                a.description = convert_all_tex_math(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)
+                    p.content = convert_all_tex_math(p.content)
         return self
 
     @override

{fabricatio-0.3.14.dev5 → fabricatio-0.3.14.dev8}/python/fabricatio/models/role.py

@@ -1,7 +1,7 @@
 """Module that contains the Role class for managing workflows and their event registrations."""
 
 from functools import partial
-from typing import Any, Dict, Self
+from typing import Any, Callable, Dict, Self, Type
 
 from fabricatio.emitter import env
 from fabricatio.journal import logger
@@ -68,28 +68,32 @@ class Role(WithBriefing):
             workflow.inject_personality(self.briefing)
         return self
 
-    def _configure_scoped_config(self, workflow: WorkFlow) -> None:
-        """Configure scoped configuration for workflow and its actions."""
-        if not is_scoped_config(self.__class__):
+    def _propagate_config(
+        self,
+        workflow: WorkFlow,
+        has_capability: Callable[[Type], bool],
+        config_method_name: str,
+        capability_description: str,
+    ) -> None:
+        """Propagates configuration to workflow and its actions if they have a given capability."""
+        if not has_capability(self.__class__):
             return
 
-        fallback_target = self
-        if is_scoped_config(workflow):
-            workflow.fallback_to(self)
-            fallback_target = workflow
+        config_source_for_actions = self
+        if has_capability(workflow.__class__):
+            logger.debug(
+                f"Configuring {capability_description} inherited from `{self.name}` for workflow: `{workflow.name}`"
+            )
+            getattr(workflow, config_method_name)(self)
+            config_source_for_actions = workflow
 
-        for action in (a for a in workflow.iter_actions() if is_scoped_config(a)):
-            action.fallback_to(fallback_target)
+        for action in (act for act in workflow.iter_actions() if has_capability(act.__class__)):
+            getattr(action, config_method_name)(config_source_for_actions)
+
+    def _configure_scoped_config(self, workflow: WorkFlow) -> None:
+        """Configure scoped configuration for workflow and its actions."""
+        self._propagate_config(workflow, is_scoped_config, "fallback_to", "scoped config")
 
     def _configure_toolbox_usage(self, workflow: WorkFlow) -> None:
         """Configure toolbox usage for workflow and its actions."""
-        if not is_toolbox_usage(self.__class__):
-            return
-
-        supply_target = self
-        if is_toolbox_usage(workflow):
-            workflow.supply_tools_from(self)
-            supply_target = workflow
-
-        for action in (a for a in workflow.iter_actions() if is_toolbox_usage(a)):
-            action.supply_tools_from(supply_target)
+        self._propagate_config(workflow, is_toolbox_usage, "supply_tools_from", "toolbox usage")