fabricatio 0.3.14.dev2__tar.gz → 0.3.14.dev5__tar.gz

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/.github/workflows/build-package.yaml

@@ -14,6 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
+        python-version: [ "3.12", "3.13" ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -65,7 +66,7 @@ jobs:
           uv sync --no-install-project  --all-extras --index https://pypi.org/simple
       - name: Build
         run: |
-          make
+          make PY=${{ matrix.python-version }}
 
       - name: Packing templates
         if: ${{ steps.check_version_change.outputs.VERSION_CHANGED == 'true' }}
@@ -90,7 +91,7 @@ jobs:
       - name: Upload to PyPI
         if: ${{ steps.check_version_change.outputs.VERSION_CHANGED == 'true' }}
         run: |
-          make publish
+          make publish PY=${{ matrix.python-version }}
         env:
           MATURIN_USERNAME: __token__
           MATURIN_PASSWORD: ${{ secrets.PYPI_TOKEN }}

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/Cargo.lock

@@ -607,6 +607,7 @@ dependencies = [
  "tex2typst-rs",
  "tonic",
  "tonic-build",
+ "typst_conversion",
  "unicode-segmentation",
  "validator",
  "walkdir",
@@ -2578,11 +2579,11 @@ dependencies = [
  "clap",
  "dirs",
  "flate2",
- "regex",
  "reqwest",
  "serde_json",
  "tar",
  "tex2typst-rs",
+ "typst_conversion",
 ]
 
 [[package]]
@@ -2659,6 +2660,15 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
+[[package]]
+name = "typst_conversion"
+version = "0.1.0"
+dependencies = [
+ "log",
+ "regex",
+ "tex2typst-rs",
+]
+
 [[package]]
 name = "ucd-trie"
 version = "0.1.7"

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/Cargo.toml

@@ -27,13 +27,15 @@ dotenvy = "0.15.7"
 directories-next = "2.0.0"
 log = "0.4.27"
 pyo3-log = "0.12.3"
-macro_utils = { path = "src/macro_utils" }
 strum = { version = "0.27.1", features = ["derive"] }
 bincode = { version = "2.0.1", features = ["serde"] }
 
 tonic = "0.13.0"
 prost = "0.13.5"
 pyo3-async-runtimes = { version = "0.24.0", features = ["tokio-runtime"] }
+macro_utils = { path = "src/macro_utils" }
+typst_conversion = { path = "src/typst_conversion" }
+
 
 
 [build-dependencies]
@@ -43,3 +45,4 @@ tonic-build = "0.13.0"
 [workspace.package]
 authors = ["Whth <zettainspector@foxmail.com>"]
 license-file = "LICENSE"
+

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/Makefile

@@ -1,6 +1,6 @@
 DIST:=dist
 DATA:=extra
-PY:=3.12
+PY:=3.13
 
 
 all:bdist

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.3.14.dev2
+Version: 0.3.14.dev5
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12
@@ -18,17 +18,13 @@ Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pymitter>=1.0.0
 Requires-Dist: rich>=13.9.4
 Requires-Dist: ujson>=5.10.0
-Requires-Dist: fabricatio[calc,ftd,plot,qa,rag,cli] ; extra == 'full'
+Requires-Dist: fabricatio[ftd,qa,rag,cli] ; extra == 'full'
 Requires-Dist: pymilvus>=2.5.4 ; extra == 'rag'
-Requires-Dist: sympy>=1.13.3 ; extra == 'calc'
-Requires-Dist: matplotlib>=3.10.1 ; extra == 'plot'
 Requires-Dist: questionary>=2.1.0 ; extra == 'qa'
 Requires-Dist: magika>=0.6.1 ; extra == 'ftd'
 Requires-Dist: typer-slim[standard]>=0.15.2 ; extra == 'cli'
 Provides-Extra: full
 Provides-Extra: rag
-Provides-Extra: calc
-Provides-Extra: plot
 Provides-Extra: qa
 Provides-Extra: ftd
 Provides-Extra: cli
@@ -36,7 +32,7 @@ License-File: LICENSE
 Summary: A LLM multi-agent framework.
 Keywords: ai,agents,multi-agent,llm,pyo3
 Author-email: Whth <zettainspector@foxmail.com>
-Requires-Python: >=3.12, <3.13
+Requires-Python: >=3.12, <3.14
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Homepage, https://github.com/Whth/fabricatio
 Project-URL: Repository, https://github.com/Whth/fabricatio

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

@@ -1,6 +1,6 @@
 [project]
 name = "fabricatio"
-version = "0.3.14-dev2"
+version = "0.3.14-dev5"
 description = "A LLM multi-agent framework."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -25,7 +25,7 @@ keywords = [
 ]
 
 
-requires-python = ">=3.12,<3.13"
+requires-python = ">=3.12,<3.14"
 dependencies = [
     "asyncio>=3.4.3",
     "asyncstdlib>=3.13.0",
@@ -72,18 +72,12 @@ dev = [
 
 [project.optional-dependencies]
 full = [
-    "fabricatio[calc,ftd,plot,qa,rag,cli]",
+    "fabricatio[ftd,qa,rag,cli]",
 ]
 rag = [
     "pymilvus>=2.5.4",
 ]
 
-calc = [
-    "sympy>=1.13.3",
-]
-plot = [
-    "matplotlib>=3.10.1",
-]
 qa = [
     "questionary>=2.1.0",
 ]

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/python/fabricatio/__init__.py

@@ -1,19 +1,17 @@
 """Fabricatio is a Python library for building llm app using event-based agent structure."""
 
-from fabricatio import actions, capabilities, parser, toolboxes, workflows
+from fabricatio import actions, capabilities, fs, models, parser, toolboxes, utils, workflows
 from fabricatio.journal import logger
-from fabricatio.models import extra
 from fabricatio.models.action import Action, WorkFlow
 from fabricatio.models.role import Role
 from fabricatio.models.task import Task
 from fabricatio.models.tool import ToolBox
-from fabricatio.rust import CONFIG, TEMPLATE_MANAGER, BibManager, Event
+from fabricatio.rust import CONFIG, TEMPLATE_MANAGER, Event
 
 __all__ = [
     "CONFIG",
     "TEMPLATE_MANAGER",
     "Action",
-    "BibManager",
     "Event",
     "Role",
     "Task",
@@ -21,9 +19,11 @@ __all__ = [
     "WorkFlow",
     "actions",
     "capabilities",
-    "extra",
+    "fs",
     "logger",
+    "models",
     "parser",
     "toolboxes",
+    "utils",
     "workflows",
 ]

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/python/fabricatio/models/action.py

@@ -125,10 +125,10 @@ class WorkFlow(WithBriefing):
     steps: Sequence[Union[Type[Action], Action]] = Field(frozen=True)
     """The sequence of actions to be executed, can be action classes or instances."""
 
-    task_input_key: ClassVar[str] = Field(default=INPUT_KEY)
+    task_input_key: ClassVar[str] = INPUT_KEY
     """Key used to store the input task in the context dictionary."""
 
-    task_output_key: ClassVar[str] = Field(default=OUTPUT_KEY)
+    task_output_key: ClassVar[str] = OUTPUT_KEY
     """Key used to extract the final result from the context dictionary."""
 
     extra_init_context: Dict[str, Any] = Field(default_factory=dict, frozen=True)

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

@@ -2,7 +2,9 @@
 
 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
@@ -21,9 +23,7 @@ from fabricatio.models.generic import (
     Titled,
     WordCount,
 )
-from fabricatio.rust import extract_body, inplace_update, 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.
 
@@ -405,7 +405,7 @@ class ArticleBase[T: ChapterBase](FinalizedDumpAble, AsPrompt, FromTypstCode, To
         """Update the article file."""
         file = Path(file)
         string = safe_text_read(file)
-        if updated := inplace_update(string, ARTICLE_WRAPPER, self.to_typst_code()):
+        if updated := replace_thesis_body(string, ARTICLE_WRAPPER, self.to_typst_code()):
             dump_text(file, updated)
             logger.success(f"Successfully updated {file.as_posix()}.")
         else:

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

@@ -27,7 +27,7 @@ from fabricatio.rust import (
 )
 from pydantic import Field, NonNegativeInt
 
-PARAGRAPH_SEP = "\n\n// - - -\n\n"
+PARAGRAPH_SEP = "// - - -"
 
 
 class Paragraph(SketchedAble, WordCount, Described):
@@ -50,7 +50,7 @@ class Paragraph(SketchedAble, WordCount, Described):
     @classmethod
     def from_content(cls, content: str) -> Self:
         """Create a Paragraph object from the given content."""
-        return cls(elaboration="", aims=[], expected_word_count=word_count(content), content=content)
+        return cls(elaboration="", aims=[], expected_word_count=word_count(content), content=content.strip())
 
     @property
     def exact_wordcount(self) -> int:
@@ -103,7 +103,7 @@ class ArticleSubsection(SubSectionBase):
         Returns:
             str: Typst code snippet for rendering.
         """
-        return super().to_typst_code() + PARAGRAPH_SEP.join(p.content for p in self.paragraphs)
+        return super().to_typst_code() + f"\n\n{PARAGRAPH_SEP}\n\n".join(p.content for p in self.paragraphs)
 
     @classmethod
     def from_typst_code(cls, title: str, body: str, **kwargs) -> Self:

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/python/fabricatio/models/tool.py

@@ -12,9 +12,9 @@ from typing import Any, Callable, Dict, List, Optional, Self, cast, overload
 
 from fabricatio.decorators import logging_execution_info, use_temp_module
 from fabricatio.journal import logger
-from fabricatio.models.generic import WithBriefing
+from fabricatio.models.generic import Base, WithBriefing
 from fabricatio.rust import CONFIG
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import Field
 
 
 class Tool[**P, R](WithBriefing):
@@ -181,7 +181,7 @@ class ToolBox(WithBriefing):
         return hash(self.briefing)
 
 
-class ToolExecutor(BaseModel):
+class ToolExecutor(Base):
     """A class representing a tool executor with a sequence of tools to execute.
 
     This class manages a sequence of tools and provides methods to inject tools and data into a module, execute the tools,
@@ -192,7 +192,6 @@ class ToolExecutor(BaseModel):
         data (Dict[str, Any]): The data that could be used when invoking the tools.
     """
 
-    model_config = ConfigDict(use_attribute_docstrings=True)
     candidates: List[Tool] = Field(default_factory=list, frozen=True)
     """The sequence of tools to execute."""
 

{fabricatio-0.3.14.dev2 → fabricatio-0.3.14.dev5}/python/fabricatio/models/usages.py

@@ -6,7 +6,6 @@ from asyncio import gather
 from typing import Callable, Dict, Iterable, List, Literal, Optional, Self, Sequence, Set, Union, Unpack, overload
 
 import asyncstdlib
-import litellm
 from fabricatio.decorators import logging_exec_time
 from fabricatio.journal import logger
 from fabricatio.models.generic import ScopedConfig, WithBriefing
@@ -15,7 +14,12 @@ from fabricatio.models.task import Task
 from fabricatio.models.tool import Tool, ToolBox
 from fabricatio.rust import CONFIG, TEMPLATE_MANAGER
 from fabricatio.utils import first_available, ok
-from litellm import RateLimitError, Router, stream_chunk_builder  # pyright: ignore [reportPrivateImportUsage]
+from litellm import (  # pyright: ignore [reportPrivateImportUsage]
+    RateLimitError,
+    Router,
+    aembedding,
+    stream_chunk_builder,
+)
 from litellm.types.router import Deployment, LiteLLM_Params, ModelInfo
 from litellm.types.utils import (
     Choices,
@@ -534,7 +538,7 @@ class EmbeddingUsage(LLMUsage, ABC):
             logger.error(err := f"Input text exceeds maximum sequence length {max_len}, got {length}.")
             raise ValueError(err)
 
-        return await litellm.aembedding(
+        return await aembedding(
             input=input_text,
             caching=caching or self.embedding_caching or CONFIG.embedding.caching,
             dimensions=dimensions or self.embedding_dimensions or CONFIG.embedding.dimensions,