fabricatio 0.2.6.dev3__cp39-cp39-win_amd64.whl → 0.2.6.dev4__cp39-cp39-win_amd64.whl

fabricatio/__init__.py

@@ -2,59 +2,42 @@
 
 from importlib.util import find_spec
 
+from fabricatio import actions, toolboxes, workflows
 from fabricatio._rust import BibManager
 from fabricatio._rust_instances import TEMPLATE_MANAGER
-from fabricatio.actions.article import ExtractArticleEssence, GenerateArticleProposal, GenerateOutline
-from fabricatio.actions.output import DumpFinalizedOutput
 from fabricatio.core import env
-from fabricatio.fs import MAGIKA, safe_json_read, safe_text_read
 from fabricatio.journal import logger
+from fabricatio.models import extra
 from fabricatio.models.action import Action, WorkFlow
 from fabricatio.models.events import Event
-from fabricatio.models.extra import ArticleEssence
 from fabricatio.models.role import Role
 from fabricatio.models.task import Task
 from fabricatio.models.tool import ToolBox
-from fabricatio.models.utils import Message, Messages
 from fabricatio.parser import Capture, GenericCapture, JsonCapture, PythonCapture
-from fabricatio.toolboxes import arithmetic_toolbox, basic_toolboxes, fs_toolbox
-from fabricatio.workflows.articles import WriteOutlineWorkFlow
 
 __all__ = [
-    "MAGIKA",
     "TEMPLATE_MANAGER",
     "Action",
-    "ArticleEssence",
     "BibManager",
     "Capture",
-    "DumpFinalizedOutput",
     "Event",
-    "ExtractArticleEssence",
-    "GenerateArticleProposal",
-    "GenerateOutline",
     "GenericCapture",
     "JsonCapture",
-    "Message",
-    "Messages",
     "PythonCapture",
     "Role",
     "Task",
     "ToolBox",
     "WorkFlow",
-    "WriteOutlineWorkFlow",
-    "arithmetic_toolbox",
-    "basic_toolboxes",
+    "actions",
     "env",
-    "fs_toolbox",
+    "extra",
     "logger",
-    "safe_json_read",
-    "safe_text_read",
+    "toolboxes",
+    "workflows",
 ]
 
 
 if find_spec("pymilvus"):
-    from fabricatio.actions.rag import InjectToDB
     from fabricatio.capabilities.rag import RAG
-    from fabricatio.workflows.rag import StoreArticle
 
-    __all__ += ["RAG", "InjectToDB", "StoreArticle"]
+    __all__ += ["RAG"]

fabricatio/_rust.pyi

@@ -1,7 +1,6 @@
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
-
 class TemplateManager:
     """Template rendering engine using Handlebars templates.
 

fabricatio/actions/article.py

@@ -2,13 +2,15 @@
 
 from os import PathLike
 from pathlib import Path
-from typing import Callable, List, Optional
+from typing import Any, Callable, List, Optional
 
 from fabricatio.fs import safe_text_read
 from fabricatio.journal import logger
 from fabricatio.models.action import Action
 from fabricatio.models.extra import ArticleEssence, ArticleOutline, ArticleProposal
 from fabricatio.models.task import Task
+from questionary import confirm, text
+from rich import print as rprint
 
 
 class ExtractArticleEssence(Action):
@@ -66,7 +68,7 @@ class GenerateArticleProposal(Action):
 class GenerateOutline(Action):
     """Generate the article based on the outline."""
 
-    output_key: str = "article"
+    output_key: str = "article_outline"
     """The key of the output data."""
 
     async def _execute(
@@ -79,3 +81,45 @@ class GenerateOutline(Action):
             article_proposal.display(),
             system_message=f"# your personal briefing: \n{self.briefing}",
         )
+
+
+class CorrectProposal(Action):
+    """Correct the proposal of the article."""
+
+    output_key: str = "corrected_proposal"
+
+    async def _execute(self, task_input: Task, article_proposal: ArticleProposal, **_) -> Any:
+        input_path = await self.awhich_pathstr(
+            f"{task_input.briefing}\nExtract the path of file, which contains the article briefing that I need to read."
+        )
+
+        rprint(article_proposal.display())
+        ret = None
+        while await confirm("Do you want to correct the Proposal?").ask_async():
+            topic = await text("What is the topic of the proposal?").ask_async()
+            ret = await self.correct_obj(
+                article_proposal,
+                safe_text_read(input_path),
+                topic=topic,
+            )
+        return ret or article_proposal
+
+
+class CorrectOutline(Action):
+    """Correct the outline of the article."""
+
+    output_key: str = "corrected_outline"
+    """The key of the output data."""
+
+    async def _execute(
+        self,
+        article_outline: ArticleOutline,
+        article_proposal: ArticleProposal,
+        **_,
+    ) -> Optional[str]:
+        rprint(article_outline.finalized_dump())
+        ret = None
+        while await confirm("Do you want to correct the outline?").ask_async():
+            topic = await text("What is the topic of the outline?").ask_async()
+            ret = await self.correct_obj(article_outline, article_proposal.display(), topic=topic)
+        return ret or article_outline

fabricatio/models/extra.py

@@ -126,7 +126,7 @@ class ArticleSectionOutline(Base):
     """The title of the section."""
     description: str = Field(...)
     """A brief description of the section's content should be, how it fits into the overall structure of the paper, and its significance in the context of the research."""
-    subsections: List[ArticleSubsectionOutline] = Field(default_factory=list)
+    subsections: List[ArticleSubsectionOutline]
     """The subsections of the section, outlining their content and significance."""
 
 
@@ -137,7 +137,7 @@ class ArticleChapterOutline(Base):
     """The title of the chapter."""
     description: str = Field(...)
     """A brief description of the chapter's content should be, how it fits into the overall structure of the paper, and its significance in the context of the research."""
-    sections: List[ArticleSectionOutline] = Field(default_factory=list)
+    sections: List[ArticleSectionOutline]
     """The sections of the chapter, outlining their content and significance."""
 
 
@@ -150,7 +150,7 @@ class ArticleOutline(ProposedAble, Display, FinalizedDumpAble):
     prospect: str = Field(...)
     """A brief description of the research problem or question that the paper aims to address manipulating methods or techniques"""
 
-    chapters: List[ArticleChapterOutline] = Field(default_factory=list)
+    chapters: List[ArticleChapterOutline]
     """The chapters of the paper, outlining their content and significance."""
 
     def finalized_dump(self) -> str:

fabricatio/models/kwargs_types.py

@@ -1,6 +1,6 @@
 """This module contains the types for the keyword arguments of the methods in the models module."""
 
-from typing import Any, TypedDict
+from typing import Any, Required, TypedDict
 
 from litellm.caching.caching import CacheMode
 from litellm.types.caching import CachingSupportedCallTypes
@@ -91,7 +91,7 @@ class ReviewKwargs[T](ValidateKwargs[T], total=False):
     specific topics and review criteria.
     """
 
-    topic: str
+    topic: Required[str]
     criteria: set[str]
 
 

fabricatio/parser.py

@@ -64,6 +64,7 @@ class Capture(BaseModel):
         """
         match = self._compiled.search(text)
         if match is None:
+            logger.debug(f"Capture Failed: \n{text}")
             return None
         groups = self.fix(match.groups()) if configs.general.use_json_repair else match.groups()
         if self.target_groups:

fabricatio/workflows/articles.py

@@ -1,6 +1,6 @@
 """Store article essence in the database."""
 
-from fabricatio.actions.article import GenerateArticleProposal, GenerateOutline
+from fabricatio.actions.article import CorrectOutline, CorrectProposal, GenerateArticleProposal, GenerateOutline
 from fabricatio.actions.output import DumpFinalizedOutput
 from fabricatio.models.action import WorkFlow
 
@@ -13,3 +13,14 @@ WriteOutlineWorkFlow = WorkFlow(
         DumpFinalizedOutput(output_key="task_output"),
     ),
 )
+WriteOutlineCorrectedWorkFlow = WorkFlow(
+    name="Generate Article Outline",
+    description="Generate an outline for an article. dump the outline to the given path. in typst format.",
+    steps=(
+        GenerateArticleProposal,
+        CorrectProposal(output_key="article_proposal"),
+        GenerateOutline,
+        CorrectOutline(output_key="to_dump"),
+        DumpFinalizedOutput(output_key="task_output"),
+    ),
+)

{fabricatio-0.2.6.dev3.dist-info → fabricatio-0.2.6.dev4.dist-info}/METADATA

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

{fabricatio-0.2.6.dev3.dist-info → fabricatio-0.2.6.dev4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-fabricatio-0.2.6.dev3.dist-info/METADATA,sha256=KJbkh6wKtq_I4DU82JI7ZNWDKL6lCV3bz1yFcEr1gX4,14085
-fabricatio-0.2.6.dev3.dist-info/WHEEL,sha256=SmPT9fUKPAPiE6hwAZ9_NHUVRjWSQ_RENTrzrvPx4p0,94
-fabricatio-0.2.6.dev3.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
-fabricatio/actions/article.py,sha256=yzRwgc203vI3MW_oWyFybDxTz6kaBBvUgN2zOJJ9Amc,2825
+fabricatio-0.2.6.dev4.dist-info/METADATA,sha256=ubAfxfpUafH4ygWS6xMDBD80OX7Cull2_D0W8D30NAI,14085
+fabricatio-0.2.6.dev4.dist-info/WHEEL,sha256=SmPT9fUKPAPiE6hwAZ9_NHUVRjWSQ_RENTrzrvPx4p0,94
+fabricatio-0.2.6.dev4.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio/actions/article.py,sha256=d3i4i7h88yG8gvEW2SLDKM-FSsUv7qqiLgWpe6AJfSk,4463
 fabricatio/actions/output.py,sha256=KSSLvEvXsA10ACN2mbqGo98QwKLVUAoMUJNKYk6HhGc,645
 fabricatio/actions/rag.py,sha256=GpT7YlqOYznZyaT-6Y84_33HtZGT-5s71ZK8iroQA9g,813
 fabricatio/capabilities/correct.py,sha256=0BYhjo9WrLwKsXQR8bTPvdQITbrMs7RX1xpzhuQt_yY,5222
@@ -19,24 +19,24 @@ fabricatio/fs/__init__.py,sha256=PCf0s_9KDjVfNw7AfPoJzGt3jMq4gJOfbcT4pb0D0ZY,588
 fabricatio/journal.py,sha256=stnEP88aUBA_GmU9gfTF2EZI8FS2OyMLGaMSTgK4QgA,476
 fabricatio/models/action.py,sha256=25kaph3csV0VQtxVPQCyRAusgwp6E1R1g4KBs7H9T2c,6448
 fabricatio/models/events.py,sha256=QvlnS8FEELg6KNabcJMeh2GV_y0ZBzKOPphcteKYWYU,4183
-fabricatio/models/extra.py,sha256=O8ncZVsaNmlR5f8c_b2HJc-yVZQ2YhB6ddDbfT0Ysh4,7412
+fabricatio/models/extra.py,sha256=FkNpctRWFE_BTfOmByWeOAXn8pbCauB7d68Ow_qUkqI,7322
 fabricatio/models/generic.py,sha256=IdPJMf3qxZFq8yqd6OuAYKfCM0wBlJkozgxvxQZVEEc,14025
-fabricatio/models/kwargs_types.py,sha256=Q-dTKfh-_FddyVCI13FzLBlgVjYrRtzXpZoQdy-G9I4,4573
+fabricatio/models/kwargs_types.py,sha256=Dfmd18SABDeV9JsI1JfPNpoB8FtB6qVYgJshZBsN1P0,4593
 fabricatio/models/role.py,sha256=7S3HSjFLaSTZ5bzgTJLeZ3PpAQDEGBxPhou5Mp8ONpQ,1842
 fabricatio/models/task.py,sha256=8NaR7ojQWyM740EDTqt9stwHKdrD6axCRpLKo0QzS-I,10492
 fabricatio/models/tool.py,sha256=4b-v4WIC_LuLOKzzXL9bvKXr8vmGZ8O2uAFv5-1KRA0,7052
 fabricatio/models/usages.py,sha256=hR4OU4sjQ2jKaH5_kkN83vG58n3kcKnt9osND0BYi0Q,28634
 fabricatio/models/utils.py,sha256=1bCqeB6za7ecCAM3cU1raNWuN56732m45rXtlIlc3I4,5017
-fabricatio/parser.py,sha256=SzyVzbKj5L_0IcI5Z5ILpopJxE-1hGhmomskTWdcc68,6194
+fabricatio/parser.py,sha256=b1Em7zoEepQIrxgM51Damnbsx_AhPab-BefIWHGo1Ss,6249
 fabricatio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fabricatio/toolboxes/arithmetic.py,sha256=WLqhY-Pikv11Y_0SGajwZx3WhsLNpHKf9drzAqOf_nY,1369
 fabricatio/toolboxes/fs.py,sha256=l4L1CVxJmjw9Ld2XUpIlWfV0_Fu_2Og6d3E13I-S4aE,736
 fabricatio/toolboxes/__init__.py,sha256=KBJi5OG_pExscdlM7Bnt_UF43j4I3Lv6G71kPVu4KQU,395
-fabricatio/workflows/articles.py,sha256=RebdC_BzSXC-xsck5I9ccC_XIgfhtoeM8FZuhtVDn3U,580
+fabricatio/workflows/articles.py,sha256=G5HGRr-DHuYuEcfhFdFAuDvTTJ9aSU_UQ2yYXEjTMtM,1047
 fabricatio/workflows/rag.py,sha256=-YYp2tlE9Vtfgpg6ROpu6QVO8j8yVSPa6yDzlN3qVxs,520
-fabricatio/_rust.pyi,sha256=xWLrjRw4mOxehy61IkaSXCAPoAT6XSZPg99RgRk12vw,3493
+fabricatio/_rust.pyi,sha256=eawBfpyGrB-JtOh4I6RSbjFSq83SSl-0syBeZ-g8270,3491
 fabricatio/_rust_instances.py,sha256=2GwF8aVfYNemRI2feBzH1CZfBGno-XJJE5imJokGEYw,314
-fabricatio/__init__.py,sha256=wTPzKLGztMr7orV-KizHRXJFhPGncvAHE7BPeSmBVDU,1926
-fabricatio/_rust.cp39-win_amd64.pyd,sha256=i5KBa8RtgD5i6c2eHDoevqClBvzDbYmg22FFSJ2w4UA,1824768
-fabricatio-0.2.6.dev3.data/scripts/tdown.exe,sha256=gEr6Y6FaEEAjGcO1mehImF99ygg07XumvGFOqa52Cvs,3398144
-fabricatio-0.2.6.dev3.dist-info/RECORD,,
+fabricatio/__init__.py,sha256=SzBYsRhZeL77jLtfJEjmoHOSwHwUGyvMATX6xfndLDM,1135
+fabricatio/_rust.cp39-win_amd64.pyd,sha256=bkzJH6SS5nSFzAOx95RP-flNoBUsau_bk8S_AsKYZuU,1824768
+fabricatio-0.2.6.dev4.data/scripts/tdown.exe,sha256=pXfruD6ZBL0_05mWalUoeyLLqzpHRSiHKYcp6WwwDgU,3398144
+fabricatio-0.2.6.dev4.dist-info/RECORD,,