fabricatio 0.2.9.dev4__cp312-cp312-win_amd64.whl → 0.2.10__cp312-cp312-win_amd64.whl

fabricatio/models/extra/aricle_rag.py

@@ -0,0 +1,170 @@
+"""A Module containing the article rag models."""
+
+from pathlib import Path
+from typing import ClassVar, Dict, List, Optional, Self, Unpack
+
+from fabricatio.rust import BibManager, split_into_chunks, is_chinese
+from more_itertools.recipes import flatten
+from pydantic import Field
+
+from fabricatio.fs import safe_text_read
+from fabricatio.journal import logger
+from fabricatio.models.extra.article_main import ArticleSubsection
+from fabricatio.models.extra.rag import MilvusDataBase
+from fabricatio.models.generic import AsPrompt
+from fabricatio.models.kwargs_types import ChunkKwargs
+from fabricatio.utils import ok, wrapp_in_block
+
+
+class ArticleChunk(MilvusDataBase, AsPrompt):
+    """The chunk of an article."""
+
+    etc_word: ClassVar[str] = "等"
+    and_word: ClassVar[str] = "与"
+    _cite_number: Optional[int] = None
+
+    head_split: ClassVar[List[str]] = [
+        "引 言",
+        "引言",
+        "绪 论",
+        "绪论",
+        "前言",
+        "INTRODUCTION",
+        "Introduction",
+    ]
+    tail_split: ClassVar[List[str]] = [
+        "参 考 文 献",
+        "参  考  文  献",
+        "参考文献",
+        "REFERENCES",
+        "References",
+        "Bibliography",
+        "Reference",
+    ]
+    chunk: str
+    """The segment of the article"""
+    year: int
+    """The year of the article"""
+    authors: List[str] = Field(default_factory=list)
+    """The authors of the article"""
+    article_title: str
+    """The title of the article"""
+    bibtex_cite_key: str
+    """The bibtex cite key of the article"""
+
+    def _as_prompt_inner(self) -> Dict[str, str]:
+        return {
+            f"{ok(self._cite_number, 'You need to update cite number first.')}th reference `{self.article_title}`": f"{wrapp_in_block(self.chunk, 'Referring Content')}\n"
+                                                                                                                    f"Authors: {';'.join(self.authors)}\n"
+                                                                                                                    f"Published Year: {self.year}\n"
+        }
+
+    def _prepare_vectorization_inner(self) -> str:
+        return self.chunk
+
+    @classmethod
+    def from_file[P: str | Path](
+            cls, path: P | List[P], bib_mgr: BibManager, **kwargs: Unpack[ChunkKwargs]
+    ) -> List[Self]:
+        """Load the article chunks from the file."""
+        if isinstance(path, list):
+            result = list(flatten(cls._from_file_inner(p, bib_mgr, **kwargs) for p in path))
+            logger.debug(f"Number of chunks created from list of files: {len(result)}")
+            return result
+
+        return cls._from_file_inner(path, bib_mgr, **kwargs)
+
+    @classmethod
+    def _from_file_inner(cls, path: str | Path, bib_mgr: BibManager, **kwargs: Unpack[ChunkKwargs]) -> List[Self]:
+        path = Path(path)
+
+        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)
+        )
+        if key is None:
+            logger.warning(f"no cite key found for {path.as_posix()}, skip.")
+            return []
+        authors = ok(bib_mgr.get_author_by_key(key), f"no author found for {key}")
+        year = ok(bib_mgr.get_year_by_key(key), f"no year found for {key}")
+        article_title = ok(bib_mgr.get_title_by_key(key), f"no title found for {key}")
+
+        result = [
+            cls(chunk=c, year=year, authors=authors, article_title=article_title, bibtex_cite_key=key)
+            for c in split_into_chunks(cls.strip(safe_text_read(path)), **kwargs)
+        ]
+        logger.debug(f"Number of chunks created from file {path.as_posix()}: {len(result)}")
+        return result
+
+    @classmethod
+    def strip(cls, string: str) -> str:
+        """Strip the head and tail of the string."""
+        logger.debug(f"String length before strip: {(original := len(string))}")
+        for split in (s for s in cls.head_split if s in string):
+            logger.debug(f"Strip head using {split}")
+            parts = string.split(split)
+            string = split.join(parts[1:]) if len(parts) > 1 else parts[0]
+            break
+        logger.debug(
+            f"String length after head strip: {(stripped_len := len(string))}, decreased by {(d := original - stripped_len)}"
+        )
+        if not d:
+            logger.warning("No decrease at head strip, which is might be abnormal.")
+        for split in (s for s in cls.tail_split if s in string):
+            logger.debug(f"Strip tail using {split}")
+            parts = string.split(split)
+            string = split.join(parts[:-1]) if len(parts) > 1 else parts[0]
+            break
+        logger.debug(f"String length after tail strip: {len(string)}, decreased by {(d := stripped_len - len(string))}")
+        if not d:
+            logger.warning("No decrease at tail strip, which is might be abnormal.")
+
+        return string
+
+    def as_typst_cite(self) -> str:
+        """As typst cite."""
+        return f"#cite(<{self.bibtex_cite_key}>)"
+
+    @property
+    def auther_firstnames(self) -> List[str]:
+        """Get the first name of the authors."""
+        ret = []
+        for n in self.authors:
+            if is_chinese(n):
+                ret.append(n[0])
+            else:
+                ret.append(n.split()[-1])
+        return ret
+
+    def as_auther_seq(self) -> str:
+        """Get the auther sequence."""
+        match len(self.authors):
+            case 0:
+                raise ValueError("No authors found")
+            case 1:
+                return f"（{self.auther_firstnames[0]}，{self.year}）{self.as_typst_cite()}"
+            case 2:
+                return f"（{self.auther_firstnames[0]}{self.and_word}{self.auther_firstnames[1]}，{self.year}）{self.as_typst_cite()}"
+            case 3:
+                return f"（{self.auther_firstnames[0]}，{self.auther_firstnames[1]}{self.and_word}{self.auther_firstnames[2]}，{self.year}）{self.as_typst_cite()}"
+            case _:
+                return f"（{self.auther_firstnames[0]}，{self.auther_firstnames[1]}{self.and_word}{self.auther_firstnames[2]}{self.etc_word}，{self.year}）{self.as_typst_cite()}"
+
+    def update_cite_number(self, cite_number: int) -> Self:
+        """Update the cite number."""
+        self._cite_number = cite_number
+        return self
+
+    def replace_cite(self, string: str, left_char: str = "[[", right_char: str = "]]") -> str:
+        """Replace the cite number in the string."""
+        return string.replace(f"{left_char}{ok(self._cite_number)}{right_char}", self.as_auther_seq())
+
+    def apply(self, article_subsection: ArticleSubsection) -> ArticleSubsection:
+        """Apply the patch to the article subsection."""
+        for p in article_subsection.paragraphs:
+            p.content = self.replace_cite(p.content)
+
+        return article_subsection

fabricatio/models/extra/article_base.py

@@ -2,8 +2,7 @@
 
 from abc import ABC, abstractmethod
 from enum import StrEnum
-from itertools import chain
-from typing import Generator, List, Optional, Self, Tuple, overload
+from typing import Generator, List, Optional, Self, Tuple
 
 from fabricatio.models.generic import (
     AsPrompt,
@@ -15,7 +14,6 @@ from fabricatio.models.generic import (
     PersistentAble,
     ProposedUpdateAble,
     ResolveUpdateConflict,
-    SequencePatch,
     SketchedAble,
     Titled,
     WordCount,
@@ -31,81 +29,9 @@ class ReferringType(StrEnum):
     SUBSECTION = "subsection"
 
 
-type RefKey = Tuple[str, Optional[str], Optional[str]]
-
-
-class ArticleRef(ProposedUpdateAble):
-    """Reference to a specific chapter, section or subsection within the article. You SHALL not refer to an article component that is external and not present within our own article.
-
-    Examples:
-        - Referring to a chapter titled `Introduction`:
-            Using Python
-            ```python
-            ArticleRef(chap="Introduction")
-            ```
-            Using JSON
-            ```json
-            {chap="Introduction"}
-            ```
-        - Referring to a section titled `Background` under the `Introduction` chapter:
-            Using Python
-            ```python
-            ArticleRef(chap="Introduction", sec="Background")
-            ```
-            Using JSON
-            ```json
-            {chap="Introduction", sec="Background"}
-            ```
-        - Referring to a subsection titled `Related Work` under the `Background` section of the `Introduction` chapter:
-            Using Python
-            ```python
-            ArticleRef(chap="Introduction", sec="Background", subsec="Related Work")
-            ```
-            Using JSON
-            ```json
-            {chap="Introduction", sec="Background", subsec="Related Work"}
-            ```
-    """
-
-    chap: str
-    """`title` Field of the referenced chapter"""
-    sec: Optional[str] = None
-    """`title` Field of the referenced section."""
-    subsec: Optional[str] = None
-    """`title` Field of the referenced subsection."""
-
-    def update_from_inner(self, other: Self) -> Self:
-        """Updates the current instance with the attributes of another instance."""
-        self.chap = other.chap
-        self.sec = other.sec
-        self.subsec = other.subsec
-        return self
-
-    def deref(self, article: "ArticleBase") -> Optional["ArticleOutlineBase"]:
-        """Dereference the reference to the actual section or subsection within the provided article.
-
-        Args:
-            article (ArticleOutline | Article): The article to dereference the reference from.
 
-        Returns:
-            ArticleMainBase | ArticleOutline | None: The dereferenced section or subsection, or None if not found.
-        """
-        chap = next((chap for chap in article.chapters if chap.title == self.chap), None)
-        if self.sec is None or chap is None:
-            return chap
-        sec = next((sec for sec in chap.sections if sec.title == self.sec), None)
-        if self.subsec is None or sec is None:
-            return sec
-        return next((subsec for subsec in sec.subsections if subsec.title == self.subsec), None)
+type RefKey = Tuple[str, Optional[str], Optional[str]]
 
-    @property
-    def referring_type(self) -> ReferringType:
-        """Determine the type of reference based on the presence of specific attributes."""
-        if self.subsec is not None:
-            return ReferringType.SUBSECTION
-        if self.sec is not None:
-            return ReferringType.SECTION
-        return ReferringType.CHAPTER
 
 
 class ArticleMetaData(SketchedAble, Described, WordCount, Titled, Language):
@@ -121,15 +47,8 @@ class ArticleMetaData(SketchedAble, Described, WordCount, Titled, Language):
     aims: List[str]
     """List of writing aims of the research component in academic style."""
 
-    support_to: List[ArticleRef]
-    """List of references to other future components in this article that this component supports to."""
-    depend_on: List[ArticleRef]
-    """List of references to other previous components in this article that this component depends on."""
 
 
-class ArticleRefSequencePatch(SequencePatch[ArticleRef]):
-    """Patch for article refs."""
-
 
 class ArticleOutlineBase(
     ArticleMetaData,
@@ -148,10 +67,6 @@ class ArticleOutlineBase(
 
     def update_metadata(self, other: ArticleMetaData) -> Self:
         """Updates the metadata of the current instance with the attributes of another instance."""
-        self.support_to.clear()
-        self.support_to.extend(other.support_to)
-        self.depend_on.clear()
-        self.depend_on.extend(other.depend_on)
         self.aims.clear()
         self.aims.extend(other.aims)
         self.description = other.description
@@ -319,34 +234,6 @@ class ArticleBase[T: ChapterBase](FinalizedDumpAble, AsPrompt, WordCount, Descri
                 yield sec
                 yield from sec.subsections
 
-    def iter_support_on(self, rev: bool = False) -> Generator[ArticleRef, None, None]:
-        """Iterates over all references that the article components support.
-
-        Args:
-            rev (bool): If True, iterate in reverse order.
-
-        Yields:
-            ArticleRef: Each reference that the article components support.
-        """
-        if rev:
-            yield from chain(*[a.support_to for a in self.iter_dfs_rev()])
-            return
-        yield from chain(*[a.support_to for a in self.iter_dfs()])
-
-    def iter_depend_on(self, rev: bool = False) -> Generator[ArticleRef, None, None]:
-        """Iterates over all references that the article components depend on.
-
-        Args:
-            rev (bool): If True, iterate in reverse order.
-
-        Yields:
-            ArticleRef: Each reference that the article components depend on.
-        """
-        if rev:
-            yield from chain(*[a.depend_on for a in self.iter_dfs_rev()])
-            return
-        yield from chain(*[a.depend_on for a in self.iter_dfs()])
-
     def iter_sections(self) -> Generator[Tuple[ChapterBase, SectionBase], None, None]:
         """Iterates through all sections in the article.
 
@@ -380,12 +267,6 @@ class ArticleBase[T: ChapterBase](FinalizedDumpAble, AsPrompt, WordCount, Descri
         """Gathers all introspected components in the article structure."""
         return "\n".join([i for component in self.chapters if (i := component.introspect())])
 
-    @overload
-    def find_illegal_ref(self, gather_identical: bool) -> Optional[Tuple[ArticleRef | List[ArticleRef], str]]: ...
-
-    @overload
-    def find_illegal_ref(self) -> Optional[Tuple[ArticleRef, str]]: ...
-
     def iter_chap_title(self) -> Generator[str, None, None]:
         """Iterates through all chapter titles in the article."""
         for chap in self.chapters:
@@ -401,71 +282,6 @@ class ArticleBase[T: ChapterBase](FinalizedDumpAble, AsPrompt, WordCount, Descri
         for _, _, subsec in self.iter_subsections():
             yield subsec.title
 
-    def find_illegal_ref(self, gather_identical: bool = False) -> Optional[Tuple[ArticleRef | List[ArticleRef], str]]:
-        """Finds the first illegal component in the outline.
-
-        Returns:
-            Tuple[ArticleOutlineBase, str]: A tuple containing the illegal component and an error message.
-        """
-        summary = ""
-        chap_titles_set = set(self.iter_chap_title())
-        sec_titles_set = set(self.iter_section_title())
-        subsec_titles_set = set(self.iter_subsection_title())
-
-        for component in self.iter_dfs_rev():
-            for ref in chain(component.depend_on, component.support_to):
-                if not ref.deref(self):
-                    summary += f"Invalid internal reference in `{component.__class__.__name__}` titled `{component.title}`, because the referred {ref.referring_type} is not exists within the article, see the original obj dump: {ref.model_dump()}\n"
-
-                    if ref.chap not in (chap_titles_set):
-                        summary += f"Chapter titled `{ref.chap}` is not any of {chap_titles_set}\n"
-                    if ref.sec and ref.sec not in (sec_titles_set):
-                        summary += f"Section Titled `{ref.sec}` is not any of {sec_titles_set}\n"
-                    if ref.subsec and ref.subsec not in (subsec_titles_set):
-                        summary += f"Subsection Titled `{ref.subsec}` is not any of {subsec_titles_set}"
-
-                if summary:
-                    return (
-                        (
-                            [
-                                identical_ref
-                                for identical_ref in chain(self.iter_depend_on(), self.iter_support_on())
-                                if identical_ref == ref
-                            ],
-                            summary,
-                        )
-                        if gather_identical
-                        else (ref, summary)
-                    )
-
-        return None
-
-    def gather_illegal_ref(self) -> Tuple[List[ArticleRef], str]:
-        """Gathers all illegal references in the article."""
-        summary = []
-        chap_titles_set = set(self.iter_chap_title())
-        sec_titles_set = set(self.iter_section_title())
-        subsec_titles_set = set(self.iter_subsection_title())
-        res_seq = []
-
-        for component in self.iter_dfs():
-            for ref in (
-                r for r in chain(component.depend_on, component.support_to) if not r.deref(self) and r not in res_seq
-            ):
-                res_seq.append(ref)
-                if ref.chap not in chap_titles_set:
-                    summary.append(
-                        f"Chapter titled `{ref.chap}` is not exist, since it is not any of {chap_titles_set}."
-                    )
-                if ref.sec and (ref.sec not in sec_titles_set):
-                    summary.append(f"Section Titled `{ref.sec}` is not exist, since it is not any of {sec_titles_set}")
-                if ref.subsec and (ref.subsec not in subsec_titles_set):
-                    summary.append(
-                        f"Subsection Titled `{ref.subsec}` is not exist, since it is not any of {subsec_titles_set}"
-                    )
-
-        return res_seq, "\n".join(summary)
-
     def finalized_dump(self) -> str:
         """Generates standardized hierarchical markup for academic publishing systems.
 

fabricatio/models/extra/article_essence.py

@@ -1,8 +1,9 @@
 """ArticleEssence: Semantic fingerprint of academic paper for structured analysis."""
 
-from typing import List, Self
+from typing import List
 
-from fabricatio.models.generic import Display, PersistentAble, ProposedAble, Vectorizable
+from fabricatio.models.extra.rag import MilvusDataBase
+from fabricatio.models.generic import PersistentAble, SketchedAble
 from pydantic import BaseModel
 
 
@@ -54,7 +55,7 @@ class Highlightings(BaseModel):
     """
 
 
-class ArticleEssence(ProposedAble, Display, PersistentAble, Vectorizable):
+class ArticleEssence(SketchedAble, PersistentAble, MilvusDataBase):
     """Structured representation of a scientific article's core elements in its original language."""
 
     language: str
@@ -93,7 +94,7 @@ class ArticleEssence(ProposedAble, Display, PersistentAble, Vectorizable):
     bibtex_cite_key: str
     """Bibtex cite key of the original article."""
 
-    def update_cite_key(self, new_cite_key: str) -> Self:
-        """Update the bibtex_cite_key of the article."""
-        self.bibtex_cite_key = new_cite_key
-        return self
+    def _prepare_vectorization_inner(self) -> str:
+        return self.compact()
+
+

fabricatio/models/extra/article_main.py

@@ -1,13 +1,14 @@
 """ArticleBase and ArticleSubsection classes for managing hierarchical document components."""
 
-from itertools import chain
 from typing import Dict, Generator, List, Self, Tuple, override
 
+from fabricatio.rust import word_count, convert_all_block_tex, convert_all_inline_tex
+from pydantic import Field
+
 from fabricatio.fs.readers import extract_sections
 from fabricatio.journal import logger
 from fabricatio.models.extra.article_base import (
     ArticleBase,
-    ArticleOutlineBase,
     ChapterBase,
     SectionBase,
     SubSectionBase,
@@ -16,9 +17,6 @@ from fabricatio.models.extra.article_outline import (
     ArticleOutline,
 )
 from fabricatio.models.generic import Described, PersistentAble, SequencePatch, SketchedAble, WithRef, WordCount
-from fabricatio.rust import detect_language, word_count
-from fabricatio.utils import ok
-from pydantic import Field
 
 PARAGRAPH_SEP = "// - - -"
 
@@ -66,10 +64,11 @@ class ArticleSubsection(SubSectionBase):
         summary = ""
         if len(self.paragraphs) == 0:
             summary += f"`{self.__class__.__name__}` titled `{self.title}` have no paragraphs, You should add some!\n"
-        if abs((wc := self.word_count) - self.expected_word_count) / self.expected_word_count > self._max_word_count_deviation:
-            summary += (
-                f"`{self.__class__.__name__}` titled `{self.title}` have {wc} words, expected {self.word_count} words!"
-            )
+        if (
+                abs((wc := self.word_count) - self.expected_word_count) / self.expected_word_count
+                > self._max_word_count_deviation
+        ):
+            summary += f"`{self.__class__.__name__}` titled `{self.title}` have {wc} words, expected {self.expected_word_count} words!"
 
         return summary
 
@@ -90,17 +89,14 @@ class ArticleSubsection(SubSectionBase):
         return f"=== {self.title}\n" + f"\n{PARAGRAPH_SEP}\n".join(p.content for p in self.paragraphs)
 
     @classmethod
-    def from_typst_code(cls, title: str, body: str, language: str) -> Self:
+    def from_typst_code(cls, title: str, body: str) -> Self:
         """Creates an Article object from the given Typst code."""
         return cls(
             heading=title,
             elaboration="",
             paragraphs=[Paragraph.from_content(p) for p in body.split(PARAGRAPH_SEP)],
             expected_word_count=word_count(body),
-            language=language,
             aims=[],
-            support_to=[],
-            depend_on=[],
         )
 
 
@@ -108,20 +104,16 @@ class ArticleSection(SectionBase[ArticleSubsection]):
     """Atomic argumentative unit with high-level specificity."""
 
     @classmethod
-    def from_typst_code(cls, title: str, body: str, language: str) -> Self:
+    def from_typst_code(cls, title: str, body: str) -> Self:
         """Creates an Article object from the given Typst code."""
         return cls(
             subsections=[
-                ArticleSubsection.from_typst_code(*pack, language=language)
-                for pack in extract_sections(body, level=3, section_char="=")
+                ArticleSubsection.from_typst_code(*pack) for pack in extract_sections(body, level=3, section_char="=")
             ],
             heading=title,
             elaboration="",
             expected_word_count=word_count(body),
-            language=language,
             aims=[],
-            support_to=[],
-            depend_on=[],
         )
 
 
@@ -129,20 +121,16 @@ class ArticleChapter(ChapterBase[ArticleSection]):
     """Thematic progression implementing research function."""
 
     @classmethod
-    def from_typst_code(cls, title: str, body: str, language: str) -> Self:
+    def from_typst_code(cls, title: str, body: str) -> Self:
         """Creates an Article object from the given Typst code."""
         return cls(
             sections=[
-                ArticleSection.from_typst_code(*pack, language=language)
-                for pack in extract_sections(body, level=2, section_char="=")
+                ArticleSection.from_typst_code(*pack) for pack in extract_sections(body, level=2, section_char="=")
             ],
             heading=title,
             elaboration="",
             expected_word_count=word_count(body),
-            language=language,
             aims=[],
-            support_to=[],
-            depend_on=[],
         )
 
 
@@ -166,6 +154,22 @@ class Article(
             "Original Article": self.display(),
         }
 
+    def convert_tex(self) -> Self:
+        """Convert tex to typst code"""
+        for _, _, subsec in self.iter_subsections():
+            for p in subsec.paragraphs:
+                p.content = convert_all_inline_tex(p.content)
+                p.content = convert_all_block_tex(p.content)
+        return self
+
+    def fix_wrapper(self) -> Self:
+        """Fix wrapper"""
+        for _, _, subsec in self.iter_subsections():
+            for p in subsec.paragraphs:
+                p.content = p.content.replace(r" \( ", "$").replace(r" \) ", "$").replace("\\[\n", "$$\n").replace(
+                    "\n\\]", "\n$$")
+        return self
+
     @override
     def iter_subsections(self) -> Generator[Tuple[ArticleChapter, ArticleSection, ArticleSubsection], None, None]:
         return super().iter_subsections()  # pyright: ignore [reportReturnType]
@@ -210,92 +214,20 @@ class Article(
     def from_typst_code(cls, title: str, body: str) -> Self:
         """Generates an article from the given Typst code."""
         return cls(
-            language=(lang := detect_language(body)),
             chapters=[
-                ArticleChapter.from_typst_code(*pack, language=lang)
-                for pack in extract_sections(body, level=1, section_char="=")
+                ArticleChapter.from_typst_code(*pack) for pack in extract_sections(body, level=1, section_char="=")
             ],
             heading=title,
             expected_word_count=word_count(body),
             abstract="",
         )
 
-    def gather_dependencies(self, article: ArticleOutlineBase) -> List[ArticleOutlineBase]:
-        """Gathers dependencies for all sections and subsections in the article.
-
-        This method should be called after the article is fully constructed.
-        """
-        depends = [ok(a.deref(self)) for a in article.depend_on]
-
-        supports = []
-        for a in self.iter_dfs_rev():
-            if article in {ok(b.deref(self)) for b in a.support_to}:
-                supports.append(a)
-
-        return list(set(depends + supports))
-
-    def gather_dependencies_recursive(self, article: ArticleOutlineBase) -> List[ArticleOutlineBase]:
-        """Gathers all dependencies recursively for the given article.
-
-        Args:
-            article (ArticleOutlineBase): The article to gather dependencies for.
-
-        Returns:
-            List[ArticleBase]: A list of all dependencies for the given article.
-        """
-        q = self.gather_dependencies(article)
-
-        deps = []
-        while q:
-            a = q.pop()
-            deps.extend(self.gather_dependencies(a))
-
-        deps = list(
-            chain(
-                filter(lambda x: isinstance(x, ArticleChapter), deps),
-                filter(lambda x: isinstance(x, ArticleSection), deps),
-                filter(lambda x: isinstance(x, ArticleSubsection), deps),
-            )
-        )
-
-        # Initialize result containers
-        formatted_code = ""
-        processed_components = []
-
-        # Process all dependencies
-        while deps:
-            component = deps.pop()
-            # Skip duplicates
-            if (component_code := component.to_typst_code()) in formatted_code:
-                continue
-
-            # Add this component
-            formatted_code += component_code
-            processed_components.append(component)
-
-        return processed_components
-
-    def iter_dfs_with_deps(
-        self, chapter: bool = True, section: bool = True, subsection: bool = True
-    ) -> Generator[Tuple[ArticleOutlineBase, List[ArticleOutlineBase]], None, None]:
-        """Iterates through the article in a depth-first manner, yielding each component and its dependencies.
-
-        Args:
-            chapter (bool, optional): Whether to include chapter components. Defaults to True.
-            section (bool, optional): Whether to include section components. Defaults to True.
-            subsection (bool, optional): Whether to include subsection components. Defaults to True.
-
-        Yields:
-            Tuple[ArticleBase, List[ArticleBase]]: Each component and its dependencies.
-        """
-        if all((not chapter, not section, not subsection)):
-            raise ValueError("At least one of chapter, section, or subsection must be True.")
-
-        for component in self.iter_dfs_rev():
-            if not chapter and isinstance(component, ArticleChapter):
-                continue
-            if not section and isinstance(component, ArticleSection):
-                continue
-            if not subsection and isinstance(component, ArticleSubsection):
-                continue
-            yield component, (self.gather_dependencies_recursive(component))
+    @classmethod
+    def from_mixed_source(cls, article_outline: ArticleOutline, typst_code: str) -> Self:
+        """Generates an article from the given outline and Typst code."""
+        self = cls.from_typst_code(article_outline.title, typst_code)
+        self.expected_word_count = article_outline.expected_word_count
+        self.description = article_outline.description
+        for a, o in zip(self.iter_dfs(), article_outline.iter_dfs(), strict=True):
+            a.update_metadata(o)
+        return self.update_ref(article_outline)