lionagi 0.15.0__tar.gz → 0.15.1__tar.gz

{lionagi-0.15.0 → lionagi-0.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lionagi
-Version: 0.15.0
+Version: 0.15.1
 Summary: An Intelligence Operating System.
 Author-email: HaiyangLi <quantocean.li@gmail.com>
 License:            Apache License

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/ln/_async_call.py

@@ -1,6 +1,7 @@
 import asyncio
+from collections.abc import AsyncGenerator, Callable
 from dataclasses import dataclass
-from typing import Any, AsyncGenerator, Callable, ClassVar
+from typing import Any, ClassVar
 
 import anyio
 from pydantic import BaseModel

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/ln/_list_call.py

@@ -1,5 +1,6 @@
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
-from typing import Any, Callable, ClassVar, Iterable, TypeVar
+from typing import Any, ClassVar, TypeVar
 
 from ._models import Params
 from ._to_list import to_list

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/ln/_to_list.py

@@ -1,6 +1,7 @@
+from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
 from enum import Enum as _Enum
-from typing import Any, ClassVar, Iterable, Mapping
+from typing import Any, ClassVar
 
 from pydantic import BaseModel
 from pydantic_core import PydanticUndefinedType

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/ln/_types.py

@@ -31,7 +31,7 @@ class _SingletonMeta(type):
     allowing safe identity checks with 'is' operator.
     """
 
-    _cache: dict[type, "SingletonType"] = {}
+    _cache: dict[type, SingletonType] = {}
 
     def __call__(cls, *a, **kw):
         if cls not in cls._cache:

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/ln/concurrency/utils.py

@@ -1,6 +1,7 @@
 import asyncio
+from collections.abc import Callable
 from functools import lru_cache
-from typing import Any, Callable
+from typing import Any
 
 __all__ = ("is_coro_func",)
 

lionagi-0.15.1/lionagi/operations/manager.py

@@ -0,0 +1,23 @@
+from collections.abc import Callable
+
+from lionagi.protocols._concepts import Manager
+from lionagi.utils import is_coro_func
+
+"""
+experimental
+"""
+
+
+class OperationManager(Manager):
+    def __init__(self):
+        super().__init__()
+        self.registry: dict[str, Callable] = {}
+
+    def register(self, operation: str, func: Callable, update: bool = False):
+        if operation in self.registry and not update:
+            raise ValueError(f"Operation '{operation}' is already registered.")
+        if not is_coro_func(func):
+            raise ValueError(
+                f"Operation '{operation}' must be an async function."
+            )
+        self.registry[operation] = func

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/operations/node.py

@@ -26,7 +26,7 @@ logger = logging.getLogger("operation")
 
 
 class Operation(Node, Event):
-    operation: BranchOperations
+    operation: BranchOperations | str
     parameters: dict[str, Any] | BaseModel = Field(
         default_factory=dict,
         description="Parameters for the operation",
@@ -74,12 +74,11 @@ class Operation(Node, Event):
         return self.execution.response if self.execution else None
 
     async def invoke(self, branch: Branch):
-        meth = getattr(branch, self.operation, None)
+        meth = branch.get_operation(self.operation)
         if meth is None:
             raise ValueError(f"Unsupported operation type: {self.operation}")
 
         start = asyncio.get_event_loop().time()
-
         try:
             self.execution.status = EventStatus.PROCESSING
             self.branch_id = branch.id

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/protocols/generic/event.py

@@ -2,11 +2,16 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+import contextlib
+import json
 from enum import Enum
 from typing import Any
 
 from pydantic import Field, field_serializer
 
+from lionagi.ln import Unset
+from lionagi.utils import to_dict
+
 from .element import Element
 
 __all__ = (
@@ -16,6 +21,9 @@ __all__ = (
 )
 
 
+_SIMPLE_TYPE = (str, bytes, bytearray, int, float, type(None), Enum)
+
+
 class EventStatus(str, Enum):
     """Status states for tracking action execution progress.
 
@@ -79,6 +87,44 @@ class Execution:
             f"response={self.response}, error={self.error})"
         )
 
+    def to_dict(self) -> dict:
+        """Converts the execution state to a dictionary.
+
+        Returns:
+            dict: A dictionary representation of the execution state.
+        """
+        res_ = Unset
+        json_serializable = True
+
+        if not isinstance(self.response, _SIMPLE_TYPE):
+            json_serializable = False
+            try:
+                # check whether response is JSON serializable
+                json.dumps(self.response)
+                res_ = self.response
+                json_serializable = True
+            except Exception:
+                with contextlib.suppress(Exception):
+                    # attempt to convert to dict
+                    d_ = to_dict(
+                        self.response,
+                        recursive=True,
+                        recursive_python_only=False,
+                    )
+                    json.dumps(d_)
+                    res_ = d_
+                    json_serializable = True
+
+        if res_ is Unset and not json_serializable:
+            res_ = "<unserializable>"
+
+        return {
+            "status": self.status.value,
+            "duration": self.duration,
+            "response": res_ or self.response,
+            "error": self.error,
+        }
+
 
 class Event(Element):
     """Extends Element with an execution state.
@@ -101,12 +147,7 @@ class Event(Element):
             dict: The serialized data containing status, duration, response,
             and error fields.
         """
-        return {
-            "status": val.status.value,
-            "duration": val.duration,
-            "response": val.response,
-            "error": val.error,
-        }
+        return val.to_dict()
 
     @property
     def response(self) -> Any:

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/session/branch.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from collections.abc import AsyncGenerator
+from collections.abc import AsyncGenerator, Callable
 from enum import Enum
 from typing import Any, Literal
 
@@ -14,6 +14,7 @@ from lionagi.config import settings
 from lionagi.fields import Instruct
 from lionagi.libs.schema.as_readable import as_readable
 from lionagi.models.field_model import FieldModel
+from lionagi.operations.manager import OperationManager
 from lionagi.protocols.action.tool import FuncTool, Tool, ToolRef
 from lionagi.protocols.types import (
     ID,
@@ -49,7 +50,7 @@ from lionagi.settings import Settings
 from lionagi.tools.base import LionTool
 from lionagi.utils import UNDEFINED
 from lionagi.utils import alcall as alcall_legacy
-from lionagi.utils import copy
+from lionagi.utils import copy, is_coro_func
 
 from .prompts import LION_SYSTEM_MESSAGE
 
@@ -111,6 +112,7 @@ class Branch(Element, Communicatable, Relational):
     _action_manager: ActionManager | None = PrivateAttr(None)
     _imodel_manager: iModelManager | None = PrivateAttr(None)
     _log_manager: LogManager | None = PrivateAttr(None)
+    _operation_manager: OperationManager | None = PrivateAttr(None)
 
     def __init__(
         self,
@@ -231,6 +233,8 @@ class Branch(Element, Communicatable, Relational):
         else:
             self._log_manager = LogManager(**Settings.Config.LOG, logs=logs)
 
+        self._operation_manager = OperationManager()
+
     # -------------------------------------------------------------------------
     # Properties to expose managers and core data
     # -------------------------------------------------------------------------
@@ -304,6 +308,11 @@ class Branch(Element, Communicatable, Relational):
         """
         return self._action_manager.registry
 
+    def get_operation(self, operation: str) -> Callable | None:
+        if hasattr(self, operation):
+            return getattr(self, operation)
+        return self._operation_manager.registry.get(operation)
+
     # -------------------------------------------------------------------------
     # Cloning
     # -------------------------------------------------------------------------

{lionagi-0.15.0 → lionagi-0.15.1}/lionagi/session/session.py

@@ -7,7 +7,7 @@ from collections.abc import Callable
 from typing import Any
 
 import pandas as pd
-from pydantic import Field, JsonValue, model_validator
+from pydantic import Field, JsonValue, PrivateAttr, model_validator
 from typing_extensions import Self
 
 from lionagi.protocols.types import (
@@ -31,9 +31,9 @@ from lionagi.protocols.types import (
 )
 
 from .._errors import ItemNotFoundError
+from ..ln import lcall
 from ..service.imodel import iModel
-from ..utils import lcall
-from .branch import Branch
+from .branch import Branch, OperationManager
 
 
 class Session(Node, Communicatable, Relational):
@@ -56,6 +56,35 @@ class Session(Node, Communicatable, Relational):
         default_factory=MailManager, exclude=True
     )
     name: str = Field(default="Session")
+    user: SenderRecipient | None = None
+    _operation_manager: OperationManager = PrivateAttr(
+        default_factory=OperationManager
+    )
+
+    async def ainclude_branches(self, branches: ID[Branch].ItemSeq):
+        async with self.branches:
+            self.include_branches(branches)
+
+    def include_branches(self, branches: ID[Branch].ItemSeq):
+        def _take_in_branch(branch: Branch):
+            if not branch in self.branches:
+                self.branches.include(branch)
+                self.mail_manager.add_sources(branch)
+
+            branch.user = self.id
+            branch._operation_manager = self._operation_manager
+            if self.default_branch is None:
+                self.default_branch = branch
+
+        branches = [branches] if isinstance(branches, Branch) else branches
+
+        for i in branches:
+            _take_in_branch(i)
+
+    def register_operation(
+        self, operation: str, func: Callable, *, update: bool = False
+    ):
+        self._operation_manager.register(operation, func, update=update)
 
     @model_validator(mode="after")
     def _add_mail_sources(self) -> Self:
@@ -64,7 +93,7 @@ class Session(Node, Communicatable, Relational):
         if self.default_branch not in self.branches:
             self.branches.include(self.default_branch)
         if self.branches:
-            self.mail_manager.add_sources(self.branches)
+            self.include_branches(self.branches)
         return self
 
     def _lookup_branch_by_name(self, name: str) -> Branch | None:
@@ -102,7 +131,8 @@ class Session(Node, Communicatable, Relational):
         progress: Progression = None,
         tool_manager: ActionManager = None,
         tools: Tool | Callable | list = None,
-        **kwargs,  # additional branch parameters
+        as_default_branch: bool = False,
+        **kwargs,
     ) -> Branch:
         kwargs["system"] = system
         kwargs["system_sender"] = system_sender
@@ -116,13 +146,9 @@ class Session(Node, Communicatable, Relational):
         kwargs["tools"] = tools
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
 
-        from .branch import Branch
-
         branch = Branch(**kwargs)  # type: ignore
-
-        self.branches.include(branch)
-        self.mail_manager.add_sources(branch)
-        if self.default_branch is None:
+        self.include_branches(branch)
+        if as_default_branch:
             self.default_branch = branch
         return branch
 
@@ -179,7 +205,7 @@ class Session(Node, Communicatable, Relational):
         """
         branch: Branch = self.branches[branch]
         branch_clone = branch.clone(sender=self.id)
-        self.branches.append(branch_clone)
+        self.include_branches(branch_clone)
         return branch_clone
 
     def change_default_branch(self, branch: ID.Ref):
@@ -230,10 +256,11 @@ class Session(Node, Communicatable, Relational):
             lambda x: [
                 i for i in self.branches[x].messages if i not in exclude_flag
             ],
-            sanitize_input=True,
-            flatten=True,
-            unique_input=True,
-            unique_output=True,
+            input_unique=True,
+            input_flatten=True,
+            input_dropna=True,
+            output_flatten=True,
+            output_unique=True,
         )
         return Pile(
             collections=messages, item_type={RoledMessage}, strict_type=False
@@ -269,14 +296,15 @@ class Session(Node, Communicatable, Relational):
                 lcall(
                     to_,
                     lambda x: self.mail_manager.send(ID.get_id(x)),
-                    sanitize_input=True,
-                    unique_input=True,
-                    use_input_values=True,
+                    input_unique=True,
+                    input_flatten=True,
+                    input_dropna=True,
+                    input_use_values=True,
                 )
             except Exception as e:
                 raise ValueError(f"Failed to send mail. Error: {e}")
 
-    async def acollect_send_all(self, receive_all: bool = False):
+    async def acollect_send_all(self, receive_all: bool = True):
         """
         Collect and send mail for all branches, optionally receiving all mail.
 
@@ -286,7 +314,7 @@ class Session(Node, Communicatable, Relational):
         async with self.mail_manager.sources:
             self.collect_send_all(receive_all)
 
-    def collect_send_all(self, receive_all: bool = False):
+    def collect_send_all(self, receive_all: bool = True):
         """
         Collect and send mail for all branches, optionally receiving all mail.
 
@@ -296,7 +324,8 @@ class Session(Node, Communicatable, Relational):
         self.collect()
         self.send()
         if receive_all:
-            lcall(self.branches, lambda x: x.receive_all())
+            for i in self.branches:
+                i.receive_all()
 
     def collect(self, from_: ID.RefSeq = None):
         """
@@ -316,9 +345,10 @@ class Session(Node, Communicatable, Relational):
                 lcall(
                     from_,
                     lambda x: self.mail_manager.collect(ID.get_id(x)),
-                    sanitize_input=True,
-                    unique_input=True,
-                    use_input_values=True,
+                    input_flatten=True,
+                    input_dropna=True,
+                    input_unique=True,
+                    input_use_values=True,
                 )
             except Exception as e:
                 raise ValueError(f"Failed to collect mail. Error: {e}")

lionagi-0.15.1/lionagi/version.py

@@ -0,0 +1 @@
+__version__ = "0.15.1"

{lionagi-0.15.0 → lionagi-0.15.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lionagi"
-version = "0.15.0"
+version = "0.15.1"
 description = "An Intelligence Operating System."
 authors = [
     { name = "HaiyangLi", email = "quantocean.li@gmail.com" },

{lionagi-0.15.0 → lionagi-0.15.1}/uv.lock

@@ -1933,7 +1933,7 @@ wheels = [
 
 [[package]]
 name = "lionagi"
-version = "0.15.0"
+version = "0.15.1"
 source = { editable = "." }
 dependencies = [
     { name = "aiocache" },

lionagi-0.15.0/lionagi/operations/manager.py

@@ -1,21 +0,0 @@
-from collections.abc import Callable
-
-from lionagi.protocols._concepts import Manager
-
-"""
-experimental
-"""
-
-
-class OperationManager(Manager):
-    def __init__(self, *args, **kwargs):
-        super().__init__()
-        self.registry: dict[str, Callable] = {}
-        self.register_operations(*args, **kwargs)
-
-    def register_operations(self, *args, **kwargs) -> None:
-        operations = {}
-        if args:
-            operations = {i.__name__ for i in args if hasattr(i, "__name__")}
-        operations.update(kwargs)
-        self.registry.update(operations)

lionagi-0.15.0/lionagi/version.py

@@ -1 +0,0 @@
-__version__ = "0.15.0"