fabricatio 0.3.13__cp312-cp312-win_amd64.whl → 0.3.14.dev0__cp312-cp312-win_amd64.whl

fabricatio/__init__.py

@@ -3,32 +3,27 @@
 from fabricatio.rust import CONFIG, TEMPLATE_MANAGER, BibManager, Event
 
 from fabricatio import actions, capabilities, toolboxes, workflows
-from fabricatio.core import env
+from fabricatio import parser
 from fabricatio.journal import logger
 from fabricatio.models import extra
 from fabricatio.models.action import Action, WorkFlow
 from fabricatio.models.role import Role
 from fabricatio.models.task import Task
 from fabricatio.models.tool import ToolBox
-from fabricatio.parser import Capture, GenericCapture, JsonCapture, PythonCapture
 
 __all__ = [
     "CONFIG",
     "TEMPLATE_MANAGER",
     "Action",
     "BibManager",
-    "Capture",
+    "parser",
     "Event",
-    "GenericCapture",
-    "JsonCapture",
-    "PythonCapture",
     "Role",
     "Task",
     "ToolBox",
     "WorkFlow",
     "actions",
     "capabilities",
-    "env",
     "extra",
     "logger",
     "toolboxes",

fabricatio/models/action.py

@@ -12,14 +12,13 @@ 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
+from typing import Any, ClassVar, Dict, Self, Sequence, Tuple, Type, Union, final, Generator
 
 from pydantic import Field, PrivateAttr
 
 from fabricatio.journal import logger
 from fabricatio.models.generic import WithBriefing
 from fabricatio.models.task import Task
-from fabricatio.models.usages import ToolBoxUsage
 from fabricatio.utils import override_kwargs
 
 OUTPUT_KEY = "task_output"
@@ -106,7 +105,7 @@ class Action(WithBriefing):
         return self
 
 
-class WorkFlow(WithBriefing, ToolBoxUsage):
+class WorkFlow(WithBriefing):
     """Manages sequences of actions to fulfill tasks.
 
     Handles context propagation between actions, error handling, and task lifecycle
@@ -148,6 +147,10 @@ class WorkFlow(WithBriefing, ToolBoxUsage):
         # Convert any action classes to instances
         self._instances = tuple(step if isinstance(step, Action) else step() for step in self.steps)
 
+    def iter_actions(self) -> Generator[Action, None, None]:
+        """Iterate over action instances."""
+        yield from self._instances
+
     def inject_personality(self, personality: str) -> Self:
         """Set personality for actions without existing personality.
 
@@ -249,24 +252,6 @@ class WorkFlow(WithBriefing, ToolBoxUsage):
 
         await self._context.put({self.task_input_key: task, **ctx})
 
-    def steps_fallback_to_self(self) -> Self:
-        """Configure all steps to use this workflow's configuration as fallback.
-
-        Returns:
-            Self: The workflow instance for method chaining.
-        """
-        self.hold_to(self._instances)
-        return self
-
-    def steps_supply_tools_from_self(self) -> Self:
-        """Provide this workflow's tools to all steps in the workflow.
-
-        Returns:
-            Self: The workflow instance for method chaining.
-        """
-        self.provide_tools_to(i for i in self._instances if isinstance(i, ToolBoxUsage))
-        return self
-
     def update_init_context(self, /, **kwargs) -> Self:
         """Update the initial context with additional key-value pairs.
 

fabricatio/models/generic.py

@@ -7,7 +7,6 @@ from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional, Self,
 
 import ujson
 from fabricatio.rust import CONFIG, TEMPLATE_MANAGER, blake3_hash, detect_language
-from litellm.utils import token_counter
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -666,6 +665,8 @@ class Vectorizable:
         Raises:
             ValueError: If the chunk exceeds the maximum sequence length.
         """
+        from litellm.utils import token_counter
+
         max_length = max_length or CONFIG.embedding.max_sequence_length
         chunk = self._prepare_vectorization_inner()
         if max_length and (length := token_counter(text=chunk)) > max_length:

fabricatio/models/kwargs_types.py

@@ -1,9 +1,6 @@
 """This module contains the types for the keyword arguments of the methods in the models module."""
 
-from typing import Any, Dict, List, Literal, NotRequired, Optional, Required, TypedDict
-
-from litellm.caching.caching import CacheMode
-from litellm.types.caching import CachingSupportedCallTypes
+from typing import Dict, List, Literal, NotRequired, Optional, Required, TypedDict
 
 
 class ChunkKwargs(TypedDict):
@@ -70,7 +67,6 @@ class ValidateKwargs[T](GenerateKwargs, total=False):
     max_validations: int
 
 
-
 class CompositeScoreKwargs(ValidateKwargs[List[Dict[str, float]]], total=False):
     """Arguments for composite score generation operations.
 
@@ -125,47 +121,6 @@ class ChooseKwargs[T](ValidateKwargs[T], total=False):
     k: int
 
 
-class CacheKwargs(TypedDict, total=False):
-    """Configuration parameters for the caching system.
-
-    These arguments control the behavior of various caching backends,
-    including in-memory, Redis, S3, and vector database caching options.
-    """
-
-    mode: CacheMode  # when default_on cache is always on, when default_off cache is opt in
-    host: str
-    port: str
-    password: str
-    namespace: str
-    ttl: float
-    default_in_memory_ttl: float
-    default_in_redis_ttl: float
-    similarity_threshold: float
-    supported_call_types: list[CachingSupportedCallTypes]
-    # s3 Bucket, boto3 configuration
-    s3_bucket_name: str
-    s3_region_name: str
-    s3_api_version: str
-    s3_use_ssl: bool
-    s3_verify: bool | str
-    s3_endpoint_url: str
-    s3_aws_access_key_id: str
-    s3_aws_secret_access_key: str
-    s3_aws_session_token: str
-    s3_config: Any
-    s3_path: str
-    redis_semantic_cache_use_async: bool
-    redis_semantic_cache_embedding_model: str
-    redis_flush_size: int
-    redis_startup_nodes: list
-    disk_cache_dir: Any
-    qdrant_api_base: str
-    qdrant_api_key: str
-    qdrant_collection_name: str
-    qdrant_quantization_config: str
-    qdrant_semantic_cache_embedding_model: str
-
-
 class RerankOptions(TypedDict, total=False):
     """Optional keyword arguments for the rerank method."""
 

fabricatio/models/role.py

@@ -1,40 +1,35 @@
 """Module that contains the Role class for managing workflows and their event registrations."""
-
-from typing import Any, Self, Set
+from functools import partial
+from typing import Any, Self, Dict
 
 from fabricatio.rust import Event
 from pydantic import Field, ConfigDict
 
-from fabricatio.capabilities.propose import Propose
 from fabricatio.core import env
 from fabricatio.journal import logger
 from fabricatio.models.action import WorkFlow
 from fabricatio.models.generic import WithBriefing
-from fabricatio.models.tool import ToolBox
-from fabricatio.models.usages import ToolBoxUsage
+from fabricatio.utils import is_subclass_of_base
+
+is_toolbox_usage = partial(is_subclass_of_base, base_module="fabricatio.models.usages",
+                           base_name="ToolBoxUsage")
+is_scoped_config = partial(is_subclass_of_base, base_module="fabricatio.models.generic",
+                           base_name="ScopedConfig")
 
 
-class Role(WithBriefing, Propose, ToolBoxUsage):
+class Role(WithBriefing):
     """Class that represents a role with a registry of events and workflows.
 
     A Role serves as a container for workflows, managing their registration to events
     and providing them with shared configuration like tools and personality.
-
-    Attributes:
-        registry: Mapping of events to workflows that handle them
-        toolboxes: Set of toolboxes available to this role and its workflows
     """
-    # fixme: not use arbitrary_types_allowed
     model_config = ConfigDict(use_attribute_docstrings=True, arbitrary_types_allowed=True)
     description: str = ""
     """A brief description of the role's responsibilities and capabilities."""
 
-    registry: dict[Event | str, WorkFlow] = Field(default_factory=dict)
+    registry: Dict[Event, WorkFlow] = Field(default_factory=dict)
     """The registry of events and workflows."""
 
-    toolboxes: Set[ToolBox] = Field(default_factory=set)
-    """Collection of tools available to this role."""
-
     def model_post_init(self, __context: Any) -> None:
         """Initialize the role by resolving configurations and registering workflows.
 
@@ -51,7 +46,7 @@ class Role(WithBriefing, Propose, ToolBoxUsage):
         """
         for event, workflow in self.registry.items():
             logger.debug(
-                f"Registering workflow: `{workflow.name}` for event: `{Event.instantiate_from(event).collapse()}`"
+                f"Registering workflow: `{workflow.name}` for event: `{event.collapse()}`"
             )
             env.on(event, workflow.serve)
         return self
@@ -67,12 +62,35 @@ class Role(WithBriefing, Propose, ToolBoxUsage):
         """
         for workflow in self.registry.values():
             logger.debug(f"Resolving config for workflow: `{workflow.name}`")
-            (
-                workflow.fallback_to(self)
-                .steps_fallback_to_self()
-                .inject_personality(self.briefing)
-                .supply_tools_from(self)
-                .steps_supply_tools_from_self()
-            )
-
+            self._configure_scoped_config(workflow)
+            self._configure_toolbox_usage(workflow)
+            workflow.inject_personality(self.briefing)
         return self
+
+    def _configure_scoped_config(self, workflow) -> None:
+        """Configure scoped configuration for workflow and its actions."""
+
+        if not is_scoped_config(self.__class__):
+            return
+
+        fallback_target = self
+        if is_scoped_config(workflow):
+            workflow.fallback_to(self)
+            fallback_target = workflow
+
+        for action in (a for a in workflow.iter_actions() if is_scoped_config(a)):
+            action.fallback_to(fallback_target)
+
+    def _configure_toolbox_usage(self, workflow) -> None:
+        """Configure toolbox usage for workflow and its actions."""
+
+        if not is_toolbox_usage(self.__class__):
+            return
+
+        supply_target = self
+        if is_toolbox_usage(workflow):
+            workflow.supply_tools_from(self)
+            supply_target = workflow
+
+        for action in (a for a in workflow.iter_actions() if is_toolbox_usage(a)):
+            action.supply_tools_from(supply_target)

fabricatio/utils.py

@@ -1,15 +1,46 @@
 """A collection of utility functions for the fabricatio package."""
 
-from typing import Any, Dict, List, Mapping, Optional, TypedDict, Unpack, overload
-
-import aiohttp
-import requests
+from typing import Any, Dict, List, Mapping, Optional, TypedDict, Unpack, overload, Type, Tuple
 
 from fabricatio.decorators import precheck_package
 from fabricatio.journal import logger
 from fabricatio.models.kwargs_types import RerankOptions
 
 
+def is_subclass_of_base(cls: Type, base_module: str, base_name: str) -> bool:
+    """Determines if the given class is a subclass of an unimported base class.
+    
+    Args:
+        cls: The class to check
+        base_module: The module name of the base class
+        base_name: The class name of the base class
+        
+    Returns:
+        bool: True if cls is a subclass of the specified base class, False otherwise
+    """
+    for ancestor in cls.__mro__:
+        if ancestor.__module__ == base_module and ancestor.__name__ == base_name:
+            return True
+    return False
+
+
+def is_subclass_of_any_base(cls: Type, bases: List[Tuple[str, str]]) -> bool:
+    """Determines if the given class is a subclass of the candidate base classes.
+    
+    Args:
+        cls: The class to check
+        bases: A list of tuples where each tuple contains (module_name, class_name)
+        
+    Returns:
+        bool: True if cls is a subclass of the specified base classes, False otherwise
+    """
+    for ancestor in cls.__mro__:
+        for base_module, base_name in bases:
+            if ancestor.__module__ == base_module and ancestor.__name__ == base_name:
+                return True
+    return False
+
+
 @precheck_package(
     "questionary", "'questionary' is required to run this function. Have you installed `fabricatio[qa]`?."
 )
@@ -164,6 +195,7 @@ class RerankerAPI:
             ValueError: If input parameters are invalid or the API returns a client-side error.
             RuntimeError: If the API call fails or returns a server-side error.
         """
+        import requests
         # Validate inputs
         if not isinstance(query, str) or not query.strip():
             raise ValueError("Query must be a non-empty string.")
@@ -219,6 +251,8 @@ class RerankerAPI:
             ValueError: If input parameters are invalid or the API returns a client-side error.
             RuntimeError: If the API call fails or returns a server-side error.
         """
+        import aiohttp
+
         # Validate inputs
         if not isinstance(query, str) or not query.strip():
             raise ValueError("Query must be a non-empty string.")

{fabricatio-0.3.13.dist-info → fabricatio-0.3.14.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fabricatio
-Version: 0.3.13
+Version: 0.3.14.dev0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.12

{fabricatio-0.3.13.dist-info → fabricatio-0.3.14.dev0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fabricatio-0.3.13.dist-info/METADATA,sha256=x8-6ILA6zUw7fVZQ9ENH_KSspPWqd6R90e2fflasNBg,5241
-fabricatio-0.3.13.dist-info/WHEEL,sha256=jABKVkLC9kJr8mi_er5jOqpiQUjARSLXDUIIxDqsS50,96
-fabricatio-0.3.13.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
+fabricatio-0.3.14.dev0.dist-info/METADATA,sha256=wYdyUN-54xDS1x4TkCPzO8tQ8XZKmMOz5O33vlSWGSg,5246
+fabricatio-0.3.14.dev0.dist-info/WHEEL,sha256=jABKVkLC9kJr8mi_er5jOqpiQUjARSLXDUIIxDqsS50,96
+fabricatio-0.3.14.dev0.dist-info/licenses/LICENSE,sha256=do7J7EiCGbq0QPbMAL_FqLYufXpHnCnXBOuqVPwSV8Y,1088
 fabricatio/actions/article.py,sha256=vkYbzRy4SSJL73SFdgdsMfUy3nbjNFc44mu1-uPjqBo,12627
 fabricatio/actions/article_rag.py,sha256=Ahij8TSNvE5T1rHhJM5zNj57SaORldNj1YEHFTj0xm8,18631
 fabricatio/actions/fs.py,sha256=gJR14U4ln35nt8Z7OWLVAZpqGaLnED-r1Yi-lX22tkI,959
@@ -26,7 +26,7 @@ fabricatio/fs/curd.py,sha256=652nHulbJ3gwt0Z3nywtPMmjhEyglDvEfc3p7ieJNNA,4777
 fabricatio/fs/readers.py,sha256=UXvcJO3UCsxHu9PPkg34Yh55Zi-miv61jD_wZQJgKRs,1751
 fabricatio/fs/__init__.py,sha256=USoMI_HcIr3Yc77_JQYYsXrsplYPXtFTaNB9YgFfC4s,713
 fabricatio/journal.py,sha256=I02_ntN7_WyI_m1RsHB1gEv8LfWtcVGmOqppEV8XjKI,289
-fabricatio/models/action.py,sha256=X29OWzMTLUkcRmFWFgcMG3SDj7l7OlRSObviMYeXUIM,10611
+fabricatio/models/action.py,sha256=-XIzuE-LE38GWuj_0WdSGSQ7kVUMzXUUnfqJ-XcA20o,10084
 fabricatio/models/adv_kwargs_types.py,sha256=IBV3ZcsNLvvEjO_2hBpYg_wLSpNKaMx6Ndam3qXJCw8,2097
 fabricatio/models/extra/advanced_judge.py,sha256=INUl_41C8jkausDekkjnEmTwNfLCJ23TwFjq2cM23Cw,1092
 fabricatio/models/extra/aricle_rag.py,sha256=2dHQOz7Br8xpf3PTtdZmrIw49kC4_YGa89evta67LYg,11707
@@ -40,9 +40,9 @@ fabricatio/models/extra/problem.py,sha256=8tTU-3giFHOi5j7NJsvH__JJyYcaGrcfsRnkzQ
 fabricatio/models/extra/rag.py,sha256=RMi8vhEPB0I5mVmjRLRLxYHUnm9pFhvVwysaIwmW2s0,3955
 fabricatio/models/extra/rule.py,sha256=KQQELVhCLUXhEZ35jU3WGYqKHuCYEAkn0p6pxAE-hOU,2625
 fabricatio/models/extra/__init__.py,sha256=XlYnS_2B9nhLhtQkjE7rvvfPmAAtXVdNi9bSDAR-Ge8,54
-fabricatio/models/generic.py,sha256=qqMJBckUdWqGv5iegLtYamfIATePoTlywadNa3JEZy8,30414
-fabricatio/models/kwargs_types.py,sha256=gIvLSof3XE-B0cGE5d1BrOQB1HO8Pd666_scd-9JaF4,5000
-fabricatio/models/role.py,sha256=UlEtpeBBqF4_uXhloqeevLS17aOtAeg2Q0vmd45vQpk,3072
+fabricatio/models/generic.py,sha256=c-_VogsBUbNaU11KZizCI4AzLgg5_FCRLbNYcQKHyks,30424
+fabricatio/models/kwargs_types.py,sha256=tDeF0B_TnumYGCKU58f-llAApn6ng_Joz8CcGq5GiLk,3619
+fabricatio/models/role.py,sha256=Uukgh3Nxk5N2QEnyg9CMfsngW9GSgKV_Z7nnvafUYfc,3810
 fabricatio/models/task.py,sha256=vOL8mzwBRMWC8R_59zh4SDXkjWuAL6WTtsAGfcxp_eE,11032
 fabricatio/models/tool.py,sha256=uNYVCNr9KUBWQ_KAtekGECdNPZREGJ9Aioyk4lrvtTE,12503
 fabricatio/models/usages.py,sha256=FyWdKAce2Am10zByISBuf_Tdd4hRnhkAxcXIzyV77LU,33474
@@ -52,12 +52,12 @@ fabricatio/rust.pyi,sha256=fWK5q3b-TEDfSYQh9vlZq-kTpA9NBXttGszPMVEnODs,25221
 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/utils.py,sha256=IBKfs2Rg3bJnazzvj1-Fz1rMWNKhiuQG5_rZ1nxQeMI,10299
+fabricatio/utils.py,sha256=_kNYzLzBudhjZ3RwgeIPKSxKbOVMgCwoj-BzjYPB0G8,11566
 fabricatio/workflows/articles.py,sha256=ObYTFUqLUk_CzdmmnX6S7APfxcGmPFqnFr9pdjU7Z4Y,969
 fabricatio/workflows/rag.py,sha256=-YYp2tlE9Vtfgpg6ROpu6QVO8j8yVSPa6yDzlN3qVxs,520
 fabricatio/workflows/__init__.py,sha256=5ScFSTA-bvhCesj3U9Mnmi6Law6N1fmh5UKyh58L3u8,51
-fabricatio/__init__.py,sha256=pNEikVxeJF3KD1z8U4Z9U7NVL8-2RE6WNOKIH9c83mY,972
-fabricatio/rust.cp312-win_amd64.pyd,sha256=5x-26VvrnKgGHbYpirikKS5ZqA7bDc8xGNODnPru1aQ,6016512
-fabricatio-0.3.13.data/scripts/tdown.exe,sha256=9maLvPkwy5oQsA7fvEcJy_7U1l43wSubMB-MudebYus,3357184
-fabricatio-0.3.13.data/scripts/ttm.exe,sha256=_cFlVm0Xz6eo1v_rz7swwZ6ghOZ4BGj9pg9Hvn0Hig8,2553856
-fabricatio-0.3.13.dist-info/RECORD,,
+fabricatio/__init__.py,sha256=QoZ1WNvK5UVaMGed2GOE781TvF76om3LHe5eVEBSSUE,809
+fabricatio/rust.cp312-win_amd64.pyd,sha256=lvRcjPuXO8XglnZ9J7QX4AJx1z7Zfj13Msia4orfs-A,6022144
+fabricatio-0.3.14.dev0.data/scripts/tdown.exe,sha256=dNcSMR1zfpD8t_QYEP0xfqCfEZZ1P1EBWYOxroxTWSU,3356160
+fabricatio-0.3.14.dev0.data/scripts/ttm.exe,sha256=Q4kRd27t8Fv--kYuoHqhK0NyvFt2jCY8Q11vrWDa2z0,2554880
+fabricatio-0.3.14.dev0.dist-info/RECORD,,