fabricatio 0.3.14.dev0__tar.gz → 0.3.14.dev1__tar.gz

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.3.14.dev0
+Version: 0.3.14.dev1
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12
@@ -86,7 +86,7 @@ make bdist
 
 ```python
 import asyncio
-from fabricatio import Action, Role, Task, logger, WorkFlow
+from fabricatio import Action, Role, Task, logger, WorkFlow, Event
 from typing import Any
 
 
@@ -101,14 +101,14 @@ class Hello(Action):
 
 
 async def main() -> None:
-    role = Role(
+    Role(
         name="talker",
         description="talker role",
-        registry={Task.pending_label: WorkFlow(name="talk", steps=(Hello,))}
+        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()
+    task = Task(name="say hello", goals=["say hello"], description="say hello to the world")
+    result = await task.delegate("talk")
     logger.success(f"Result: {result}")
 
 
@@ -163,11 +163,11 @@ max_tokens = 8192
     ```bash
     make test
     ```
+
 ## TODO
 
 - Add an element based format strategy
 
-
 ## Contributing
 
 Contributions are welcome! Follow these steps:

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/README.md

@@ -42,7 +42,7 @@ make bdist
 
 ```python
 import asyncio
-from fabricatio import Action, Role, Task, logger, WorkFlow
+from fabricatio import Action, Role, Task, logger, WorkFlow, Event
 from typing import Any
 
 
@@ -57,14 +57,14 @@ class Hello(Action):
 
 
 async def main() -> None:
-    role = Role(
+    Role(
         name="talker",
         description="talker role",
-        registry={Task.pending_label: WorkFlow(name="talk", steps=(Hello,))}
+        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()
+    task = Task(name="say hello", goals=["say hello"], description="say hello to the world")
+    result = await task.delegate("talk")
     logger.success(f"Result: {result}")
 
 
@@ -119,11 +119,11 @@ max_tokens = 8192
     ```bash
     make test
     ```
+
 ## TODO
 
 - Add an element based format strategy
 
-
 ## Contributing
 
 Contributions are welcome! Follow these steps:

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/examples/llm_usages/llm_usage.py

@@ -2,9 +2,8 @@
 
 import asyncio
 
-from fabricatio import Action, Role, Task, WorkFlow
+from fabricatio import Action, Event, Role, Task, WorkFlow
 from fabricatio.journal import logger
-from fabricatio.models.events import Event
 from fabricatio.parser import PythonCapture
 
 

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

@@ -3,7 +3,7 @@
 import asyncio
 from typing import Any
 
-from fabricatio import Action, Role, Task, WorkFlow, logger, Event
+from fabricatio import Action, Event, Role, Task, WorkFlow, logger
 
 task = Task(name="say hello")
 

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/examples/minor/write_a_poem.py

@@ -3,15 +3,17 @@
 import asyncio
 from typing import Any
 
-from fabricatio import Action, Role, Task, WorkFlow, logger
+from fabricatio import Action, Event, Role, Task, WorkFlow, logger
+from fabricatio.models.usages import LLMUsage
 
 task = Task(name="write poem")
 
 
-class WritePoem(Action):
+class WritePoem(Action, LLMUsage):
     """Action that generates a poem."""
 
     output_key: str = "task_output"
+    llm_stream: bool = False
 
     async def _execute(self, **_) -> Any:
         logger.info("Generating poem about the sea")
@@ -25,10 +27,10 @@ async def main() -> None:
     Role(
         name="poet",
         description="A role that creates poetic content",
-        registry={task.pending_label: WorkFlow(name="poetry_creation", steps=(WritePoem,))},
+        registry={Event.quick_instantiate(ns := 'poem'): WorkFlow(name="poetry_creation", steps=(WritePoem,))},
     )
 
-    poem = await task.delegate()
+    poem = await task.delegate(ns)
     logger.success(f"Poem:\n\n{poem}")
 
 

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/pyproject.toml

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

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/__init__.py

@@ -2,8 +2,7 @@
 
 from fabricatio.rust import CONFIG, TEMPLATE_MANAGER, BibManager, Event
 
-from fabricatio import actions, capabilities, toolboxes, workflows
-from fabricatio import parser
+from fabricatio import actions, capabilities, parser, toolboxes, workflows
 from fabricatio.journal import logger
 from fabricatio.models import extra
 from fabricatio.models.action import Action, WorkFlow
@@ -16,7 +15,6 @@ __all__ = [
     "TEMPLATE_MANAGER",
     "Action",
     "BibManager",
-    "parser",
     "Event",
     "Role",
     "Task",
@@ -26,6 +24,7 @@ __all__ = [
     "capabilities",
     "extra",
     "logger",
+    "parser",
     "toolboxes",
     "workflows",
 ]

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/journal.py

@@ -4,10 +4,7 @@ import sys
 
 from fabricatio.rust import CONFIG
 from loguru import logger
-from rich import pretty, traceback
 
-pretty.install()
-traceback.install()
 logger.remove()
 logger.add(sys.stderr, level=CONFIG.debug.log_level)
 

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/models/action.py

@@ -12,7 +12,7 @@ Classes:
 import traceback
 from abc import abstractmethod
 from asyncio import Queue, create_task
-from typing import Any, ClassVar, Dict, Self, Sequence, Tuple, Type, Union, final, Generator
+from typing import Any, ClassVar, Dict, Generator, Self, Sequence, Tuple, Type, Union, final
 
 from pydantic import Field, PrivateAttr
 

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/models/generic.py

@@ -11,7 +11,6 @@ from pydantic import (
     BaseModel,
     ConfigDict,
     Field,
-    HttpUrl,
     NonNegativeFloat,
     PositiveFloat,
     PositiveInt,
@@ -23,7 +22,6 @@ from pydantic.json_schema import GenerateJsonSchema, JsonSchemaValue
 from fabricatio.fs import dump_text
 from fabricatio.fs.readers import safe_text_read
 from fabricatio.journal import logger
-from fabricatio.parser import JsonCapture
 from fabricatio.utils import ok
 
 
@@ -496,6 +494,8 @@ class InstantiateFromString(Base):
         Returns:
             Self | None: The instance of the class or None if the string is not valid.
         """
+        from fabricatio.parser import JsonCapture
+
         obj = JsonCapture.convert_with(string, cls.model_validate_json)
         logger.debug(f"Instantiate `{cls.__name__}` from string, {'Failed' if obj is None else 'Success'}.")
         return obj
@@ -682,7 +682,7 @@ class ScopedConfig(Base):
     Allows configuration values to be overridden in a hierarchical manner.
     """
 
-    llm_api_endpoint: Optional[HttpUrl] = None
+    llm_api_endpoint: Optional[str] = None
     """The OpenAI API endpoint."""
 
     llm_api_key: Optional[SecretStr] = None
@@ -727,7 +727,7 @@ class ScopedConfig(Base):
     llm_frequency_penalty: Optional[PositiveFloat] = None
     """The frequency penalty of the LLM model."""
 
-    embedding_api_endpoint: Optional[HttpUrl] = None
+    embedding_api_endpoint: Optional[str] = None
     """The OpenAI API endpoint."""
 
     embedding_api_key: Optional[SecretStr] = None
@@ -748,7 +748,7 @@ class ScopedConfig(Base):
     embedding_caching: Optional[bool] = False
     """Whether to cache the embedding result."""
 
-    milvus_uri: Optional[HttpUrl] = Field(default=None)
+    milvus_uri: Optional[str] = Field(default=None)
     """The URI of the Milvus server."""
 
     milvus_token: Optional[SecretStr] = Field(default=None)

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/models/role.py

@@ -1,9 +1,9 @@
 """Module that contains the Role class for managing workflows and their event registrations."""
 from functools import partial
-from typing import Any, Self, Dict
+from typing import Any, Dict, Self
 
 from fabricatio.rust import Event
-from pydantic import Field, ConfigDict
+from pydantic import ConfigDict, Field
 
 from fabricatio.core import env
 from fabricatio.journal import logger
@@ -69,7 +69,6 @@ class Role(WithBriefing):
 
     def _configure_scoped_config(self, workflow) -> None:
         """Configure scoped configuration for workflow and its actions."""
-
         if not is_scoped_config(self.__class__):
             return
 
@@ -83,7 +82,6 @@ class Role(WithBriefing):
 
     def _configure_toolbox_usage(self, workflow) -> None:
         """Configure toolbox usage for workflow and its actions."""
-
         if not is_toolbox_usage(self.__class__):
             return
 

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/models/usages.py

@@ -26,8 +26,7 @@ from fabricatio.models.generic import ScopedConfig, WithBriefing
 from fabricatio.models.kwargs_types import ChooseKwargs, EmbeddingKwargs, GenerateKwargs, LLMKwargs, ValidateKwargs
 from fabricatio.models.task import Task
 from fabricatio.models.tool import Tool, ToolBox
-from fabricatio.parser import GenericCapture, JsonCapture
-from fabricatio.utils import ok
+from fabricatio.utils import first_available, ok
 
 ROUTER = Router(
     routing_strategy="usage-based-routing-v2",
@@ -91,7 +90,7 @@ class LLMUsage(ScopedConfig):
                         api_base=ok(
                             self.llm_api_endpoint or CONFIG.llm.api_endpoint,
                             "llm api endpoint is not set at any place",
-                        ).unicode_string(),
+                        ),
                         model=m_name,
                         tpm=self.llm_tpm or CONFIG.llm.tpm,
                         rpm=self.llm_rpm or CONFIG.llm.rpm,
@@ -109,7 +108,8 @@ class LLMUsage(ScopedConfig):
             stop=kwargs.get("stop") or self.llm_stop_sign or CONFIG.llm.stop_sign,
             top_p=kwargs.get("top_p") or self.llm_top_p or CONFIG.llm.top_p,
             max_tokens=kwargs.get("max_tokens") or self.llm_max_tokens or CONFIG.llm.max_tokens,
-            stream=ok(kwargs.get("stream") or self.llm_stream or CONFIG.llm.stream, "stream is not set at any place"),
+            stream=first_available((kwargs.get("stream"), self.llm_stream, CONFIG.llm.stream),
+                                   "stream is not set at any place"),
             cache={
                 "no-cache": kwargs.get("no_cache"),
                 "no-store": kwargs.get("no_store"),
@@ -337,6 +337,8 @@ class LLMUsage(ScopedConfig):
         Returns:
             Optional[List[str]]: The validated response as a list of strings.
         """
+        from fabricatio.parser import JsonCapture
+
         return await self.aask_validate(
             TEMPLATE_MANAGER.render_template(
                 CONFIG.templates.liststr_template,
@@ -393,6 +395,8 @@ class LLMUsage(ScopedConfig):
         Returns:
             Optional[str]: The generated string.
         """
+        from fabricatio.parser import GenericCapture
+
         return await self.aask_validate(  # pyright: ignore [reportReturnType]
             TEMPLATE_MANAGER.render_template(
                 CONFIG.templates.generic_string_template,
@@ -420,6 +424,8 @@ class LLMUsage(ScopedConfig):
         Returns:
             Optional[List[T]]: The final validated selection result list, with element types matching the input `choices`.
         """
+        from fabricatio.parser import JsonCapture
+
         if dup := duplicates_everseen(choices, key=lambda x: x.name):
             logger.error(err := f"Redundant choices: {dup}")
             raise ValueError(err)
@@ -495,6 +501,8 @@ class LLMUsage(ScopedConfig):
         Returns:
             bool: The judgment result (True or False) based on the AI's response.
         """
+        from fabricatio.parser import JsonCapture
+
         return await self.aask_validate(
             question=TEMPLATE_MANAGER.render_template(
                 CONFIG.templates.make_judgment_template,
@@ -556,7 +564,6 @@ class EmbeddingUsage(LLMUsage):
                 or self.llm_api_endpoint
                 or CONFIG.llm.api_endpoint
             )
-            .unicode_string()
             .rstrip("/"),
             # seems embedding function takes no base_url end with a slash
         )

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/rust.pyi

@@ -11,7 +11,7 @@ Key Features:
 - Text utilities: Word boundary splitting and word counting.
 """
 from enum import StrEnum
-from typing import Any, Dict, List, Optional, Self, Tuple, overload, Union
+from typing import Any, Dict, List, Optional, Self, Tuple, Union, overload
 
 from pydantic import JsonValue
 
@@ -724,7 +724,7 @@ class SecretStr:
 
     def __init__(self, source: str) -> None: ...
 
-    def expose(self) -> str:
+    def get_secret_value(self) -> str:
         """Expose the secret string."""
 
 

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/python/fabricatio/utils.py

@@ -1,6 +1,6 @@
 """A collection of utility functions for the fabricatio package."""
 
-from typing import Any, Dict, List, Mapping, Optional, TypedDict, Unpack, overload, Type, Tuple
+from typing import Any, Dict, Iterable, List, Mapping, Optional, Tuple, Type, TypedDict, Unpack, overload
 
 from fabricatio.decorators import precheck_package
 from fabricatio.journal import logger
@@ -116,6 +116,37 @@ def ok[T](val: Optional[T], msg: str = "Value is None") -> T:
     return val
 
 
+def first_available[T](iterable: Iterable[T], msg: str = "No available item found in the iterable.") -> T:
+    """Return the first available item in the iterable that's not None.
+
+    This function searches through the provided iterable and returns the first
+    item that is not None. If all items are None or the iterable is empty,
+    it raises a ValueError.
+
+    Args:
+        iterable: The iterable collection to search through.
+        msg: The message to include in the ValueError if no non-None item is found.
+
+    Returns:
+        T: The first non-None item found in the iterable.
+        If no non-None item is found, it raises a ValueError.
+
+    Raises:
+        ValueError: If no non-None item is found in the iterable.
+
+    Examples:
+        >>> first_available([None, None, "value", "another"])
+        'value'
+        >>> first_available([1, 2, 3])
+        1
+        >>> assert (first_available([None, None]))
+        ValueError: No available item found in the iterable.
+    """
+    if (first := next((item for item in iterable if item is not None), None)) is not None:
+        return first
+    raise ValueError(msg)
+
+
 def wrapp_in_block(string: str, title: str, style: str = "-") -> str:
     """Wraps a string in a block with a title.
 

{fabricatio-0.3.14.dev0 → fabricatio-0.3.14.dev1}/src/config.rs

@@ -82,7 +82,7 @@ impl SecretStr {
     pub fn new(source: &str) -> Self {
         source.into()
     }
-    fn expose(&self) -> &str {
+    fn get_secret_value(&self) -> &str {
         self.source.as_str()
     }