fabricatio 0.5.0.dev1__tar.gz → 0.5.1.dev0__tar.gz

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.5.0.dev1
+Version: 0.5.1.dev0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12
@@ -119,35 +119,32 @@ make bdist
 ### Basic Example
 
 ```python
-import asyncio
-from fabricatio import Action, Role, Task, logger, WorkFlow, Event
+"""Example of a simple hello world program using fabricatio."""
+
 from typing import Any
 
+from fabricatio import Action, Event, Role, Task, WorkFlow, logger
+
 
 class Hello(Action):
-    name: str = "hello"
+    """Action that says hello."""
+
     output_key: str = "task_output"
 
-    async def _execute(self, task_input: Task[str], **_) -> Any:
+    async def _execute(self, **_) -> Any:
         ret = "Hello fabricatio!"
         logger.info("executing talk action")
         return ret
 
+    """Main function."""
 
-async def main() -> None:
-    Role(
-        name="talker",
-        description="talker role",
-        registry={Event.quick_instantiate("talk"): WorkFlow(name="talk", steps=(Hello,))}
-    )
 
-    task = Task(name="say hello", goals=["say hello"], description="say hello to the world")
-    result = await task.delegate("talk")
-    logger.success(f"Result: {result}")
+(Role()
+ .register_workflow(Event.quick_instantiate("talk"), WorkFlow(name="talk", steps=(Hello,)))
+ .dispatch())
 
+assert Task(name="say hello").delegate_blocking("talk") == "Hello fabricatio!"
 
-if __name__ == "__main__":
-    asyncio.run(main())
 ```
 
 ### Examples

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/README.md

@@ -67,35 +67,32 @@ make bdist
 ### Basic Example
 
 ```python
-import asyncio
-from fabricatio import Action, Role, Task, logger, WorkFlow, Event
+"""Example of a simple hello world program using fabricatio."""
+
 from typing import Any
 
+from fabricatio import Action, Event, Role, Task, WorkFlow, logger
+
 
 class Hello(Action):
-    name: str = "hello"
+    """Action that says hello."""
+
     output_key: str = "task_output"
 
-    async def _execute(self, task_input: Task[str], **_) -> Any:
+    async def _execute(self, **_) -> Any:
         ret = "Hello fabricatio!"
         logger.info("executing talk action")
         return ret
 
+    """Main function."""
 
-async def main() -> None:
-    Role(
-        name="talker",
-        description="talker role",
-        registry={Event.quick_instantiate("talk"): WorkFlow(name="talk", steps=(Hello,))}
-    )
 
-    task = Task(name="say hello", goals=["say hello"], description="say hello to the world")
-    result = await task.delegate("talk")
-    logger.success(f"Result: {result}")
+(Role()
+ .register_workflow(Event.quick_instantiate("talk"), WorkFlow(name="talk", steps=(Hello,)))
+ .dispatch())
 
+assert Task(name="say hello").delegate_blocking("talk") == "Hello fabricatio!"
 
-if __name__ == "__main__":
-    asyncio.run(main())
 ```
 
 ### Examples

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/examples/minor/hello_fabricatio.py

@@ -20,12 +20,6 @@ class Hello(Action):
     """Main function."""
 
 
-Role(
-    name="talker",
-    description="talker role",
-    registry={Event.quick_instantiate("talk"): WorkFlow(name="talk", steps=(Hello,))},
-)
+(Role().register_workflow(Event.quick_instantiate("talk"), WorkFlow(name="talk", steps=(Hello,))).dispatch())
 
-
-if __name__ == "__main__":
-    task.delegate_blocking("talk")
+logger.success(task.delegate_blocking("talk"))

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/examples/yue/compose.py

@@ -1,19 +1,9 @@
 """Example of using the library."""
 
-from pathlib import Path
-
-from fabricatio import Action, Event, Role, Task, WorkFlow
-from fabricatio.capabilities import Lyricize
+from fabricatio import Event, Role, Task, WorkFlow
+from fabricatio.actions import Compose
+from fabricatio.models import Song
 from fabricatio_core.utils import ok
-from fabricatio_yue.models.segment import Song
-
-
-class Compose(Action, Lyricize):
-    """Compose a song."""
-
-    async def _execute(self, req: str, output: Path, **cxt) -> Song:
-        return ok(await self.lyricize(req)).save_to(output)
-
 
 (
     Role()

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/packages/fabricatio-yue/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fabricatio-yue"
-version = "0.1.0-dev10"
+version = "0.2.0-dev1"
 description = "An extension of fabricatio, provide capability to compose lyrics that can be used in music generation with YuE."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -29,6 +29,12 @@ dev = [
     "pytest",
 ]
 
+[project.optional-dependencies]
+cli = [
+    "questionary>=2.1.0",
+    "typer-slim[standard]>=0.15.2",
+]
+
 
 [build-system]
 requires = ["hatchling"]
@@ -41,16 +47,23 @@ sources = ["python"]
 url = "https://mirrors.bfsu.edu.cn/pypi/web/simple"
 default = true
 
-[[tool.uv.index]]
-url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
-
-[[tool.uv.index]]
-url = "https://mirrors.huaweicloud.com/repository/pypi/simple"
+[tool.uv.sources]
+fabricatio = { workspace = true }
 
 [project.urls]
 Homepage = "https://github.com/Whth/fabricatio"
 Repository = "https://github.com/Whth/fabricatio"
 Issues = "https://github.com/Whth/fabricatio/issues"
 
+[[tool.uv.index]]
+url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
+
+[[tool.uv.index]]
+url = "https://mirrors.huaweicloud.com/repository/pypi/simple"
+
 [[tool.uv.index]]
 url = "https://mirrors.aliyun.com/pypi/simple/"
+
+
+[project.scripts]
+yuek = "fabricatio_yue.cli:main"

fabricatio-0.5.1.dev0/packages/fabricatio-yue/python/fabricatio_yue/actions/compose.py

@@ -0,0 +1,16 @@
+"""Compose action for creating songs."""
+
+from pathlib import Path
+
+from fabricatio import Action
+from fabricatio.capabilities import Lyricize
+from fabricatio_core.utils import ok
+
+from fabricatio_yue.models.segment import Song
+
+
+class Compose(Action, Lyricize):
+    """Compose a song."""
+
+    async def _execute(self, req: str, output: Path, **cxt) -> Song:
+        return ok(await self.lyricize(req)).save_to(output)

fabricatio-0.5.1.dev0/packages/fabricatio-yue/python/fabricatio_yue/cli.py

@@ -0,0 +1,60 @@
+"""Command-line interface for Fabricatio Yue song composition."""
+
+from importlib.util import find_spec
+
+from fabricatio_core.decorators import precheck_package
+
+if not find_spec("typer"):
+    raise ModuleNotFoundError(
+        "Please install fabricatio-yue with 'pip install fabricatio-yue[cli]' or 'uv tool install fabricatio-yue[cli]'"
+    )
+
+from pathlib import Path
+
+from typer import Option, Typer
+
+app = Typer(
+    name="yuek",
+    help="Compose lyrics with Fabricatio!",
+    epilog="For more information, visit: https://github.com/Whth/fabricatio",
+    short_help="Fabricatio Yue CLI for song composition",
+)
+
+
+@app.command()
+@precheck_package(
+    "questionary",
+    "Please install fabricatio-yue with 'pip install fabricatio-yue[cli]' or 'uv tool install fabricatio-yue[cli]'",
+)
+def compose(
+    requirement: str = Option(None, "-r", "--requirement", help="Song requirement/prompt"),
+    output: Path = Option(Path("song"), "-o", "--output", help="Output file folder"),
+) -> None:
+    """Compose a song based on your requirements."""
+    from fabricatio import Event, Role, Task, WorkFlow
+    from fabricatio_core.utils import ok
+    from questionary import text
+
+    from fabricatio_yue.actions.compose import Compose
+
+    Role().register_workflow(
+        Event.quick_instantiate(ns := "compose"), WorkFlow(steps=(Compose().to_task_output(),))
+    ).dispatch()
+
+    ok(
+        Task(name="compose song")
+        .update_init_context(
+            req=(
+                requirement
+                or ok(text("What kind of song would you like to compose?").ask(), "No requirement provided!")
+            ),
+            output=output,
+        )
+        .delegate_blocking(ns),
+        "Failed to compose song!",
+    )
+
+
+def main() -> None:
+    """Entry point for the CLI application."""
+    app()

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/packages/fabricatio-yue/python/fabricatio_yue/models/segment.py

@@ -87,7 +87,7 @@ class Song(SketchedAble, WithBriefing):
     @property
     def briefing(self) -> str:
         """Generate a briefing of the song including its genre tags and duration."""
-        return f"# {self.name}\n>{self.description}\n\nDuration: {self.duration} s.\n\n{self.block(" ".join(self.genres), 'genres')} \n\n---\n"
+        return f"# {self.name}\n>{self.description}\n\nDuration: {self.duration} s.\n\n{self.block(' '.join(self.genres), 'genres')} \n\n---\n"
 
     def save_to(self, parent_dir: str | Path) -> Self:
         """Save the song to a directory.
@@ -103,7 +103,10 @@ class Song(SketchedAble, WithBriefing):
 
         logger.info(f"Saving song to {file_path.as_posix()}")
 
-        out = f"{self.briefing}\n" + "\n".join(f'## Section {i}. {seg.section_type.capitalize()}\n\n{self._wrapp(seg)}' for i,seg in enumerate(self.segments))
+        out = f"{self.briefing}\n" + "\n".join(
+            f"## Section {i}. {seg.section_type.capitalize()}\n\n{self._wrapp(seg)}"
+            for i, seg in enumerate(self.segments)
+        )
 
         file_path.write_text(out, encoding="utf-8")
 
@@ -112,12 +115,12 @@ class Song(SketchedAble, WithBriefing):
     def _wrapp(self, segment: Segment) -> str:
         return (
             f"Duration: {segment.duration} s.\n\n"
-            
-            +
-            (f"Extra Genres: {self.block(' '.join(segment.extra_genres), 'genres')}\n"
-            f"Assembled Genres: {self.block(' '.join(self.genres + segment.extra_genres), 'genres')}") if segment.extra_genres else ""
-            +
-            f"Lyrics:{self.block(segment.assemble, 'lyrics')}"
+            + (
+                f"Extra Genres: {self.block(' '.join(segment.extra_genres), 'genres')}\n"
+                f"Assembled Genres: {self.block(' '.join(self.genres + segment.extra_genres), 'genres')}"
+            )
+            if segment.extra_genres
+            else "" + f"Lyrics:{self.block(segment.assemble, 'lyrics')}"
         )
 
     @staticmethod

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/pyproject.toml

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

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/python/fabricatio/actions/__init__.py

@@ -67,3 +67,8 @@ if find_spec("fabricatio_actions"):
         "RetrieveFromLatest",
         "RetrieveFromPersistent",
     ]
+
+if find_spec("fabricatio_yue"):
+    from fabricatio_yue.actions.compose import Compose
+
+    __all__ += ["Compose"]

{fabricatio-0.5.0.dev1 → fabricatio-0.5.1.dev0}/uv.lock

@@ -322,7 +322,7 @@ wheels = [
 
 [[package]]
 name = "fabricatio"
-version = "0.5.0.dev1"
+version = "0.5.1.dev0"
 source = { editable = "." }
 dependencies = [
     { name = "fabricatio-core" },
@@ -534,7 +534,7 @@ dev = [{ name = "pytest" }]
 
 [[package]]
 name = "fabricatio-core"
-version = "0.1.6.dev1"
+version = "0.1.6"
 source = { editable = "packages/fabricatio-core" }
 dependencies = [
     { name = "asyncio" },
@@ -795,7 +795,7 @@ provides-extras = ["full", "rag", "qa", "workflows"]
 
 [[package]]
 name = "fabricatio-yue"
-version = "0.1.0.dev10"
+version = "0.2.0.dev1"
 source = { editable = "packages/fabricatio-yue" }
 dependencies = [
     { name = "fabricatio-core" },
@@ -804,6 +804,12 @@ dependencies = [
     { name = "ujson" },
 ]
 
+[package.optional-dependencies]
+cli = [
+    { name = "questionary" },
+    { name = "typer-slim", extra = ["standard"] },
+]
+
 [package.dev-dependencies]
 dev = [
     { name = "pytest" },
@@ -814,8 +820,11 @@ requires-dist = [
     { name = "fabricatio-core", editable = "packages/fabricatio-core" },
     { name = "more-itertools", specifier = ">=10.7.0" },
     { name = "pydantic", specifier = ">=2.11.5" },
+    { name = "questionary", marker = "extra == 'cli'", specifier = ">=2.1.0" },
+    { name = "typer-slim", extras = ["standard"], marker = "extra == 'cli'", specifier = ">=0.15.2" },
     { name = "ujson", specifier = ">=5.10.0" },
 ]
+provides-extras = ["cli"]
 
 [package.metadata.requires-dev]
 dev = [{ name = "pytest" }]