fabricatio 0.6.4__tar.gz → 0.6.5.dev1__tar.gz

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/Makefile

@@ -21,6 +21,10 @@ dev: dirs bins
 
 bdist: dirs bins
 
+	rm -f ./packages/*/python/*/*.so
+	rm -f ./packages/*/python/*/*.pyd
+	rm -f ./python/*/*.so
+	rm -f ./python/*/*.pyd
 	uvx -p $(PY) --project . maturin build --sdist -r -o $(DIST)
 	uv run subpackages.py --no-publish --pyversion $(PY)
 

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.6.4
+Version: 0.6.5.dev1
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/packages/fabricatio-yue/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fabricatio-yue"
-version = "0.2.0"
+version = "0.2.2-dev0"
 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" }

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/packages/fabricatio-yue/python/fabricatio_yue/actions/compose.py

@@ -2,10 +2,10 @@
 
 from pathlib import Path
 
-from fabricatio import Action
-from fabricatio.capabilities import Lyricize
+from fabricatio_core.models.action import Action
 from fabricatio_core.utils import ok
 
+from fabricatio_yue.capabilities.lyricize import Lyricize
 from fabricatio_yue.models.segment import Song
 
 

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/packages/fabricatio-yue/python/fabricatio_yue/cli.py

@@ -31,7 +31,7 @@ def compose(
     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 import Event, Role, Task, WorkFlow
     from fabricatio_core.utils import ok
     from questionary import text
 

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/packages/fabricatio-yue/python/fabricatio_yue/config.py

@@ -21,7 +21,7 @@ class YueConfig(BaseModel):
     )
     """List of valid segment types for music composition."""
 
-    genre: Dict[str, List[str]] = Field(default_factory=once(lambda: load(genres_path.open())))
+    genre: Dict[str, List[str]] = Field(default_factory=once(lambda: load(genres_path.open(encoding="utf-8"))))
     """Dictionary mapping genre categories to lists of specific genres."""
 
     lyricize_template: str = "lyricize"

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/packages/fabricatio-yue/python/fabricatio_yue/models/segment.py

@@ -104,7 +104,7 @@ 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)}"
+            f"## Section {i}. {seg.section_type.capitalize()}\n\n> Duration: {seg.duration} s.\n\n{self._wrapp(seg)}"
             for i, seg in enumerate(self.segments)
         )
 

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/pyproject.toml

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

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/subpackages.py

@@ -9,7 +9,7 @@ import argparse
 import logging
 import subprocess
 import tomllib  # Use tomllib for TOML parsing (Python 3.11+)
-from concurrent.futures import ThreadPoolExecutor, Future, as_completed
+from concurrent.futures import Future, ThreadPoolExecutor, as_completed
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -130,7 +130,14 @@ class Project:
         logger.info(f"Running {operation_description} for '{self.name}': {' '.join(command)}")
         try:
             # Run the command from the project's directory
-            process = subprocess.run(command, check=True, cwd=self.entry_path, capture_output=True, text=True, encoding="utf-8", )
+            process = subprocess.run(
+                command,
+                check=True,
+                cwd=self.entry_path,
+                capture_output=True,
+                text=True,
+                encoding="utf-8",
+            )
             if process.stdout:
                 logger.debug(f"Stdout for '{self.name}' ({operation_description}):\n{process.stdout}")
             if process.stderr:
@@ -174,25 +181,35 @@ class Project:
                 logger.error(f"Python version (--pyversion) is required for Maturin project '{self.name}'.")
                 return []
             develop_command = [
-                "uvx", "-p", self.pyversion, "--project", self.entry_path.as_posix(), "maturin", "develop", "--uv",
+                "uvx",
+                "-p",
+                self.pyversion,
+                "--project",
+                self.entry_path.as_posix(),
+                "maturin",
+                "develop",
+                "--uv",
                 "-r",
-
             ]
 
             # cargo build --workspace --bins -r -Z unstable-options --artifact-dir
             scripts_dir = self.entry_path / DEFAULT_DATA_DIR / "scripts"
             cargo_bins = [
-                "cargo", "build", "-p",self.name, "--bins", "-r", "-Z", "unstable-options", "--artifact-dir",
-                scripts_dir.as_posix()
-
+                "cargo",
+                "build",
+                "-p",
+                self.name,
+                "--bins",
+                "-r",
+                "-Z",
+                "unstable-options",
+                "--artifact-dir",
+                scripts_dir.as_posix(),
             ]
 
-            clean = [[
-                "rm", (scripts_dir / "*.pdb").as_posix(), "-f"
-            ], [
-                "rm", (scripts_dir / "*.dwarf").as_posix(), "-f"
-            ],
-                ["rm", r".\packages\*\python\*\*.pyd", "-f"]
+            clean = [
+                ["rm", (scripts_dir / "*.pdb").as_posix(), "-f"],
+                ["rm", (scripts_dir / "*.dwarf").as_posix(), "-f"],
             ]
 
             if self.dev_mode:
@@ -216,7 +233,8 @@ class Project:
         # This covers standard Python packages (setuptools, hatchling, etc.)
         if self.dev_mode:
             logger.info(
-                f"Dev mode enabled for non-Maturin project '{self.name}'. Build step will be skipped if publish is not enabled.")
+                f"Dev mode enabled for non-Maturin project '{self.name}'. Build step will be skipped if publish is not enabled."
+            )
             # For non-Maturin projects in dev mode, we might not want to build sdist/wheel
             # unless publishing is also intended. If only `build()` is called without `publish()`,
             # this could be an empty list or a specific dev install command if applicable.
@@ -244,7 +262,8 @@ class Project:
         if not build_commands:
             if self.dev_mode and self.build_backend != "maturin":
                 logger.info(
-                    f"Dev mode enabled for '{self.name}', and no explicit build commands for this mode (e.g. not publishing). Skipping build.")
+                    f"Dev mode enabled for '{self.name}', and no explicit build commands for this mode (e.g. not publishing). Skipping build."
+                )
                 return True  # Considered success in dev mode if no build commands are needed
             logger.error(f"No build commands generated for '{self.name}'. Build cannot proceed.")
             return False
@@ -281,7 +300,8 @@ class Project:
         # Ensure dist_dir exists before globbing
         if not self.dist_dir.exists():
             logger.warning(
-                f"Distribution directory '{self.dist_dir}' does not exist. Cannot find artifacts for '{self.name}'.")
+                f"Distribution directory '{self.dist_dir}' does not exist. Cannot find artifacts for '{self.name}'."
+            )
             return True  # No artifacts to publish because dist_dir doesn't exist.
 
         for package_file in self.dist_dir.glob(f"{normalized_name}*"):
@@ -329,8 +349,9 @@ class PackageManager:
         projects (List[Project]): A list of discovered and valid `Project` instances.
     """
 
-    def __init__(self, root_dir: Path, dist_dir: Path, pyversion: Optional[str], publish_enabled: bool,
-                 dev_mode: bool) -> None:
+    def __init__(
+        self, root_dir: Path, dist_dir: Path, pyversion: Optional[str], publish_enabled: bool, dev_mode: bool
+    ) -> None:
         """Initializes the PackageManager."""
         self.root_dir: Path = root_dir
         self.dist_dir: Path = dist_dir
@@ -400,19 +421,14 @@ class PackageManager:
         # We need to explicitly build sdist/wheel here before publishing.
         if self.dev_mode and project.build_backend != "maturin":
             logger.info(f"Dev mode: Explicitly building '{project_identifier}' for publishing.")
-            standard_build_cmd = [
-                "uvx", "uv", "build", "-o", self.dist_dir.resolve().as_posix(),
-                "--sdist", "--wheel"
-            ]
+            standard_build_cmd = ["uvx", "uv", "build", "-o", self.dist_dir.resolve().as_posix(), "--sdist", "--wheel"]
             # project._execute_subprocess is a method of the Project class, not one defined here.
             if not project._execute_subprocess(standard_build_cmd, "dev mode publish build"):
                 logger.error(f"Failed to build '{project_identifier}' for publishing in dev mode.")
                 return False
 
         if not project.name:  # Ensure project name is available for publishing
-            logger.error(
-                f"Cannot publish project from '{project.entry_path.name}' due to missing project name."
-            )
+            logger.error(f"Cannot publish project from '{project.entry_path.name}' due to missing project name.")
             return False
 
         logger.info(f"Publishing is enabled for '{project.name}'.")
@@ -479,14 +495,14 @@ class PackageManager:
                 except Exception as e:
                     # This case should ideally not be reached if process_one_project is robust.
                     logger.error(
-                        f"Unexpected error while processing project '{project_id_for_log}': {e}",
-                        exc_info=True
+                        f"Unexpected error while processing project '{project_id_for_log}': {e}", exc_info=True
                     )
                     failure_count += 1
                 finally:
                     processed_count += 1
                     logger.info(
-                        f"Finished processing for: {project_id_for_log}. ({processed_count}/{total_projects} completed)")
+                        f"Finished processing for: {project_id_for_log}. ({processed_count}/{total_projects} completed)"
+                    )
 
         self.log_processing_summary(total_projects, success_count, failure_count)
 
@@ -525,13 +541,13 @@ def main() -> None:
         type=str,
         default=None,
         help="Specify Python version (e.g., '3.12') for builders like Maturin that require it. "
-             "If not provided, Maturin projects may fail to build.",
+        "If not provided, Maturin projects may fail to build.",
     )
     parser.add_argument(
         "--dev",
         action="store_true",
         help="Enable development mode. For Maturin projects, this will only run 'maturin develop'. "
-             "For other projects, build steps might be altered or skipped if not publishing.",
+        "For other projects, build steps might be altered or skipped if not publishing.",
     )
 
     args = parser.parse_args()

fabricatio-0.6.5.dev1/templates/built-in/draft_tool_usage_code.hbs

@@ -0,0 +1,37 @@
+## Available Resources
+
+**Dependencies:**
+{{deps}}
+
+**Available Data:**
+{{#each data }}
+{{ block this @key }}
+{{/each }}
+
+**Available Tools:**
+{{ls tools}}
+
+**Task Briefing:**
+{{ task }}
+
+
+**ResultCollector:**
+{{collector_help}}
+
+
+## Constrain
+
+```python
+{{fn_header}}
+
+    # -----
+
+    #TODO: fill in the function body that can finish the task, submit all required result to the collector.
+
+    # -----
+
+    return None
+
+```
+Your response SHALL only contain the body of the function, no signature or return statement.
+Your code will be placed between `# -----`

{fabricatio-0.6.4 → fabricatio-0.6.5.dev1}/uv.lock

@@ -333,7 +333,7 @@ wheels = [
 
 [[package]]
 name = "fabricatio"
-version = "0.6.4"
+version = "0.6.5.dev1"
 source = { editable = "." }
 dependencies = [
     { name = "fabricatio-core" },
@@ -524,7 +524,7 @@ dev = [{ name = "pytest" }]
 
 [[package]]
 name = "fabricatio-capabilities"
-version = "0.1.7"
+version = "0.1.8.dev4"
 source = { editable = "packages/fabricatio-capabilities" }
 dependencies = [
     { name = "fabricatio-core" },
@@ -543,7 +543,7 @@ dev = [{ name = "pytest" }]
 
 [[package]]
 name = "fabricatio-core"
-version = "0.1.8"
+version = "0.1.9.dev2"
 source = { editable = "packages/fabricatio-core" }
 dependencies = [
     { name = "asyncio" },
@@ -663,7 +663,7 @@ dev = [{ name = "pytest" }]
 
 [[package]]
 name = "fabricatio-memory"
-version = "0.1.1"
+version = "0.1.1.dev0"
 source = { editable = "packages/fabricatio-memory" }
 dependencies = [
     { name = "fabricatio-core" },
@@ -705,7 +705,7 @@ dev = [{ name = "pytest" }]
 
 [[package]]
 name = "fabricatio-rag"
-version = "0.1.4"
+version = "0.1.5.dev0"
 source = { editable = "packages/fabricatio-rag" }
 dependencies = [
     { name = "fabricatio-core" },
@@ -804,7 +804,7 @@ provides-extras = ["full", "rag", "qa", "workflows"]
 
 [[package]]
 name = "fabricatio-yue"
-version = "0.2.0"
+version = "0.2.2.dev0"
 source = { editable = "packages/fabricatio-yue" }
 dependencies = [
     { name = "fabricatio-core" },

fabricatio-0.6.4/templates/built-in/draft_tool_usage_code.hbs

@@ -1,76 +0,0 @@
-# Task: Draft Python Code for Tool Integration
-
-You are tasked with writing Python code that effectively utilizes specific tools to accomplish a defined task. This template will guide you to produce high-quality, executable code.
-
-## CFER Framework
-Your code solution should follow these principles:
-- **Comprehensive**: Utilize all relevant tools necessary to fully accomplish the task
-- **Functional**: Ensure the code executes without errors and handles edge cases appropriately
-- **Efficient**: Optimize for performance and resource utilization where appropriate
-- **Reliable**: Include proper error handling and validation for robust execution
-
-## Available Resources
-
-**Dependencies:**
-{{deps}}
-
-**Available Data:**
-{{#each data }}
--------- Start of `{{ @key }}` --------
-{{ this }}
--------- End of `{{ @key }}` --------
-{{/each }}
-
-**Task Briefing:**
-{{ task }}
-
-**Available Tools:**
-{{#each tools }}
-- `{{ name }}`
-{{/each }}
-
-## Implementation Guidelines
-When developing your solution:
-- Begin with proper tool imports and initialization
-- Structure your code with logical function organization
-- Implement appropriate error handling
-- Document key sections with clear comments
-- Define output variables to capture results
-- Follow Python best practices for code style
-
-## Response Format
-Provide your solution in the following format:
-
-1. Python code implementation in a code block
-2. JSON array of output variable names that contain your solution results
-
-## Example Response:
-
----- Start of Response Example ----
-
-```python
-{{#if data}}# Import available data
-from {{data_module_name}} import ({{#each data }}{{@key}},{{/each }}){{/if}}
-# Import available tools
-from {{tool_module_name}} import ({{#each tools }}{{name}},{{/each }})
-
-output1 = # Create your output no.1 with `{{tool_module_name}}`{{#if data}} and `{{data_module_name}}`{{/if}} here, if needed
-another_output = # Create your output no.2 with `{{tool_module_name}}`{{#if data}} and `{{data_module_name}}`{{/if}} here, if needed
-yet_another_output = # Create your output no.3 with `{{tool_module_name}}`{{#if data}} and `{{data_module_name}}`{{/if}} ,here, if needed
-
-```
-
-```json
-[
-"output1",
-"another_output"
-"yet_another_output"
-]
-```
----- End of Response Example ----
-
-## Constraints
-- Your solution must use ONLY the provided tools and data
-- Do not import any third-party libraries not specified in the dependencies
-- Ensure all output variables contain JSON-serializable values
-- Your response must include both the Python code block and the JSON output array code block