lionagi 0.17.6__py3-none-any.whl → 0.17.8__py3-none-any.whl

lionagi/__init__.py

@@ -5,17 +5,20 @@
 import logging
 from typing import TYPE_CHECKING
 
-from . import ln as ln  # Lightweight concurrency utilities
+from . import ln as ln
 from .version import __version__
 
 if TYPE_CHECKING:
-    # Type hints only - not imported at runtime
     from pydantic import BaseModel, Field
 
+    from . import _types as types
+    from .operations.builder import OperationGraphBuilder as Builder
     from .operations.node import Operation
+    from .protocols.action.manager import load_mcp_tools
     from .service.imodel import iModel
     from .session.session import Branch, Session
 
+
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 

lionagi/service/__init__.py

@@ -1,12 +1,26 @@
 # Eager imports for core functionality
-from .connections.api_calling import APICalling
-from .connections.endpoint import Endpoint, EndpointConfig
-from .hooks import *
-from .imodel import iModel
-from .manager import iModelManager
-from .rate_limited_processor import RateLimitedAPIExecutor
-
-# Lazy loading cache
+from typing import TYPE_CHECKING
+
+from .hooks import (
+    AssosiatedEventInfo,
+    HookDict,
+    HookedEvent,
+    HookEvent,
+    HookEventTypes,
+    HookRegistry,
+    global_hook_logger,
+)
+
+if TYPE_CHECKING:
+    from .broadcaster import Broadcaster
+    from .connections.api_calling import APICalling
+    from .connections.endpoint import Endpoint, EndpointConfig
+    from .imodel import iModel
+    from .manager import iModelManager
+    from .rate_limited_processor import RateLimitedAPIExecutor
+    from .token_calculator import TokenCalculator
+
+
 _lazy_imports = {}
 
 
@@ -15,12 +29,49 @@ def __getattr__(name: str):
     if name in _lazy_imports:
         return _lazy_imports[name]
 
+    if name == "RateLimitedAPIExecutor":
+        from .rate_limited_processor import RateLimitedAPIExecutor
+
+        _lazy_imports["RateLimitedAPIExecutor"] = RateLimitedAPIExecutor
+        return RateLimitedAPIExecutor
+
+    if name in ("Endpoint", "EndpointConfig"):
+        from .connections.endpoint import Endpoint, EndpointConfig
+
+        _lazy_imports["Endpoint"] = Endpoint
+        _lazy_imports["EndpointConfig"] = EndpointConfig
+        return Endpoint if name == "Endpoint" else EndpointConfig
+
+    if name == "iModelManager":
+        from .manager import iModelManager
+
+        _lazy_imports["iModelManager"] = iModelManager
+        return iModelManager
+
+    if name == "iModel":
+        from .imodel import iModel
+
+        _lazy_imports["iModel"] = iModel
+        return iModel
+
+    if name == "APICalling":
+        from .connections.api_calling import APICalling
+
+        _lazy_imports["APICalling"] = APICalling
+        return APICalling
+
     if name == "TokenCalculator":
         from .token_calculator import TokenCalculator
 
         _lazy_imports["TokenCalculator"] = TokenCalculator
         return TokenCalculator
 
+    if name == "Broadcaster":
+        from .broadcaster import Broadcaster
+
+        _lazy_imports["Broadcaster"] = Broadcaster
+        return Broadcaster
+
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 
 
@@ -37,4 +88,12 @@ __all__ = (
     "AssosiatedEventInfo",
     "HookEvent",
     "HookRegistry",
+    "Broadcaster",
+    "HookEventTypes",
+    "HookDict",
+    "AssosiatedEventInfo",
+    "HookEvent",
+    "HookRegistry",
+    "global_hook_logger",
+    "HookedEvent",
 )

lionagi/service/hooks/_types.py

@@ -23,8 +23,8 @@ __all__ = (
 
 class HookEventTypes(str, Enum):
     PreEventCreate = "pre_event_create"
-    PreInvokation = "pre_invokation"
-    PostInvokation = "post_invokation"
+    PreInvocation = "pre_invocation"
+    PostInvocation = "post_invocation"
 
 
 ALLOWED_HOOKS_TYPES = HookEventTypes.allowed()
@@ -32,8 +32,8 @@ ALLOWED_HOOKS_TYPES = HookEventTypes.allowed()
 
 class HookDict(TypedDict):
     pre_event_create: Callable | None
-    pre_invokation: Callable | None
-    post_invokation: Callable | None
+    pre_invocation: Callable | None
+    post_invocation: Callable | None
 
 
 StreamHandlers = dict[str, Callable[[SC], Awaitable[None]]]

lionagi/service/hooks/_utils.py

@@ -25,16 +25,16 @@ def get_handler(d_: dict, k: str | type, get: bool = False, /):
     if handler is not None:
         if not is_coro_func(handler):
 
-            async def _func(x):
+            async def _func(*args, **kwargs):
                 await sleep(0)
-                return handler(x)
+                return handler(*args, **kwargs)
 
             return _func
         return handler
 
-    async def _func(x):
+    async def _func(*args, **_kwargs):
         await sleep(0)
-        return x
+        return args[0] if args else None
 
     return _func
 

lionagi/service/hooks/hook_event.py

@@ -3,16 +3,21 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import anyio
-from pydantic import Field, PrivateAttr
+from pydantic import Field, PrivateAttr, field_validator
 
 from lionagi.ln.concurrency import fail_after, get_cancelled_exc_class
 from lionagi.protocols.types import Event, EventStatus
 
 from ._types import AssosiatedEventInfo, HookEventTypes
-from .hook_registry import HookRegistry
+
+if TYPE_CHECKING:
+    from .hook_registry import HookRegistry
+else:
+    # Import at runtime for Pydantic
+    from .hook_registry import HookRegistry
 
 
 class HookEvent(Event):
@@ -27,6 +32,12 @@ class HookEvent(Event):
 
     assosiated_event_info: AssosiatedEventInfo | None = None
 
+    @field_validator("exit", mode="before")
+    def _validate_exit(cls, v: Any) -> bool:
+        if v is None:
+            return False
+        return v
+
     async def invoke(self):
         start = anyio.current_time()
         self.execution.status = EventStatus.PROCESSING
@@ -61,7 +72,9 @@ class HookEvent(Event):
             self.execution.status = EventStatus.FAILED
             self.execution.response = None
             self.execution.error = str(e)
-            self._should_exit = True
+            # Registry/wiring failures should obey the configured policy
+            self._exit_cause = e
+            self._should_exit = bool(self.exit)
 
         finally:
             self.execution.duration = anyio.current_time() - start

lionagi/service/hooks/hook_registry.py

@@ -10,7 +10,7 @@ from lionagi.protocols.types import Event, EventStatus
 from lionagi.utils import UNDEFINED
 
 from ._types import HookDict, HookEventTypes, StreamHandlers
-from ._utils import validate_hooks, validate_stream_handlers
+from ._utils import get_handler, validate_hooks, validate_stream_handlers
 
 E = TypeVar("E", bound=Event)
 
@@ -48,17 +48,17 @@ class HookRegistry:
             raise RuntimeError(
                 "Either hook_type or chunk_type must be provided"
             )
-        if ht_ and (h := self._hooks.get(ht_)):
-            validate_hooks({ht_: h})
+        if ht_ and (self._hooks.get(ht_)):
+            validate_hooks({ht_: self._hooks[ht_]})
+            h = get_handler(self._hooks, ht_, True)
             return await h(ev_, **kw)
         elif not ct_:
             raise RuntimeError(
                 "Hook type is required when chunk_type is not provided"
             )
         else:
-            validate_stream_handlers(
-                {ct_: (h := self._stream_handlers.get(ct_))}
-            )
+            validate_stream_handlers({ct_: self._stream_handlers.get(ct_)})
+            h = get_handler(self._stream_handlers, ct_, True)
             return await h(ev_, ct_, ch_, **kw)
 
     async def _call_stream_handler(
@@ -69,8 +69,8 @@ class HookRegistry:
         /,
         **kw,
     ):
-        handler = self._stream_handlers.get(ct_)
-        validate_stream_handlers({ct_: handler})
+        validate_stream_handlers({ct_: self._stream_handlers.get(ct_)})
+        handler = get_handler(self._stream_handlers, ct_, True)
         return await handler(ev_, ct_, ch_, **kw)
 
     async def pre_event_create(
@@ -94,6 +94,7 @@ class HookRegistry:
                 None,
                 None,
                 event_type,
+                exit=exit,
                 **kw,
             )
             return (res, False, EventStatus.COMPLETED)
@@ -102,7 +103,7 @@ class HookRegistry:
         except Exception as e:
             return (e, exit, EventStatus.CANCELLED)
 
-    async def pre_invokation(
+    async def pre_invocation(
         self, event: E, /, exit: bool = False, **kw
     ) -> tuple[Any, bool, EventStatus]:
         """Hook to be called when an event is dequeued and right before it is invoked.
@@ -110,15 +111,16 @@ class HookRegistry:
         Typically used to check permissions.
 
         The hook function takes the content of the event as a dictionary.
-        It can either raise an exception to abort the event invokation or pass to continue (status: cancelled).
+        It can either raise an exception to abort the event invocation or pass to continue (status: cancelled).
         It cannot modify the event itself, and won't be able to access the event instance.
         """
         try:
             res = await self._call(
-                HookEventTypes.PreInvokation,
+                HookEventTypes.PreInvocation,
                 None,
                 None,
                 event,
+                exit=exit,
                 **kw,
             )
             return (res, False, EventStatus.COMPLETED)
@@ -127,19 +129,20 @@ class HookRegistry:
         except Exception as e:
             return (e, exit, EventStatus.CANCELLED)
 
-    async def post_invokation(
+    async def post_invocation(
         self, event: E, /, exit: bool = False, **kw
-    ) -> tuple[None | Exception, bool, EventStatus, EventStatus]:
+    ) -> tuple[None | Exception, bool, EventStatus]:
         """Hook to be called right after event finished its execution.
-        It can either raise an exception to abort the event invokation or pass to continue (status: aborted).
+        It can either raise an exception to abort the event invocation or pass to continue (status: aborted).
         It cannot modify the event itself, and won't be able to access the event instance.
         """
         try:
             res = await self._call(
-                HookEventTypes.PostInvokation,
+                HookEventTypes.PostInvocation,
                 None,
                 None,
                 event,
+                exit=exit,
                 **kw,
             )
             return (res, False, EventStatus.COMPLETED)
@@ -156,13 +159,14 @@ class HookRegistry:
         Typically used for logging or stream event abortion.
 
         The handler function signature should be: `async def handler(chunk: Any) -> None`
-        It can either raise an exception to mark the event invokation as "failed" or pass to continue (status: aborted).
+        It can either raise an exception to mark the event invocation as "failed" or pass to continue (status: aborted).
         """
         try:
             res = await self._call_stream_handler(
                 chunk_type,
                 chunk,
                 None,
+                exit=exit,
                 **kw,
             )
             return (res, False, None)
@@ -191,20 +195,35 @@ class HookRegistry:
         if hook_type is None and chunk_type is None:
             raise ValueError("Either method or chunk_type must be provided")
         if hook_type:
-            meta = {}
-            meta["event_type"] = event_like.class_name(full=True)
+            # Align with AssosiatedEventInfo
+            meta = {"lion_class": event_like.class_name(full=True)}
             match hook_type:
                 case HookEventTypes.PreEventCreate:
-                    return await self.pre_event_create(event_like, **kw), meta
-                case HookEventTypes.PreInvokation:
+                    return (
+                        await self.pre_event_create(
+                            event_like, exit=exit, **kw
+                        ),
+                        meta,
+                    )
+                case HookEventTypes.PreInvocation:
                     meta["event_id"] = str(event_like.id)
                     meta["event_created_at"] = event_like.created_at
-                    return await self.pre_invokation(event_like, **kw), meta
-                case HookEventTypes.PostInvokation:
+                    return (
+                        await self.pre_invocation(event_like, exit=exit, **kw),
+                        meta,
+                    )
+                case HookEventTypes.PostInvocation:
                     meta["event_id"] = str(event_like.id)
                     meta["event_created_at"] = event_like.created_at
-                    return await self.post_invokation(**kw), meta
-        return await self.handle_streaming_chunk(chunk_type, chunk, exit, **kw)
+                    return (
+                        await self.post_invocation(
+                            event_like, exit=exit, **kw
+                        ),
+                        meta,
+                    )
+        return await self.handle_streaming_chunk(
+            chunk_type, chunk, exit=exit, **kw
+        )
 
     def _can_handle(
         self,

lionagi/service/hooks/hooked_event.py

@@ -115,7 +115,7 @@ class HookedEvent(Event):
         hook_params: dict = None,
     ):
         h_ev = HookEvent(
-            hook_type=HookEventTypes.PreInvokation,
+            hook_type=HookEventTypes.PreInvocation,
             event_like=self,
             registry=hook_registry,
             exit=exit_hook,
@@ -132,7 +132,7 @@ class HookedEvent(Event):
         hook_params: dict = None,
     ):
         h_ev = HookEvent(
-            hook_type=HookEventTypes.PostInvokation,
+            hook_type=HookEventTypes.PostInvocation,
             event_like=self,
             registry=hook_registry,
             exit=exit_hook,

lionagi/service/imodel.py

@@ -11,6 +11,7 @@ from lionagi.ln import is_coro_func, now_utc
 from lionagi.protocols.generic.log import Log
 from lionagi.protocols.types import ID, Event, EventStatus, IDType
 from lionagi.service.hooks.hook_event import HookEventTypes
+from lionagi.service.hooks.hooked_event import HookedEvent
 
 from .connections.api_calling import APICalling
 from .connections.endpoint import Endpoint
@@ -186,8 +187,12 @@ class iModel:
                     "PreEventCreate hook requested exit without a cause"
                 )
 
-        if create_event_type is APICalling:
-            api_call = self.create_api_calling(**kwargs)
+        if issubclass(create_event_type, HookedEvent):
+            api_call = None
+            if create_event_type is APICalling:
+                api_call = self.create_api_calling(**kwargs)
+            else:
+                api_call = create_event_type(**kwargs)
             if h_ev:
                 h_ev.assosiated_event_info["event_id"] = str(api_call.id)
                 h_ev.assosiated_event_info["event_created_at"] = (
@@ -196,7 +201,7 @@ class iModel:
                 await global_hook_logger.alog(Log(content=h_ev.to_dict()))
 
             if self.hook_registry._can_handle(
-                ht_=HookEventTypes.PreInvokation
+                ht_=HookEventTypes.PreInvocation
             ):
                 api_call.create_pre_invoke_hook(
                     hook_registry=self.hook_registry,
@@ -210,7 +215,7 @@ class iModel:
                 )
 
             if self.hook_registry._can_handle(
-                ht_=HookEventTypes.PostInvokation
+                ht_=HookEventTypes.PostInvocation
             ):
                 api_call.create_post_invoke_hook(
                     hook_registry=self.hook_registry,

lionagi/version.py

@@ -1 +1 @@
-__version__ = "0.17.6"
+__version__ = "0.17.8"

{lionagi-0.17.6.dist-info → lionagi-0.17.8.dist-info}/METADATA

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

{lionagi-0.17.6.dist-info → lionagi-0.17.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
-lionagi/__init__.py,sha256=MeFKg1esCCVXzKG_ZSS68dg-q2W26sVzRSju_prw37w,2398
+lionagi/__init__.py,sha256=iS8Y4ZSsP2EPwEsqeodelqdoL1BdiK1bCAYJHak1AUM,2474
 lionagi/_class_registry.py,sha256=pfUO1DjFZIqr3OwnNMkFqL_fiEBrrf8-swkGmP_KDLE,3112
 lionagi/_errors.py,sha256=ia_VWhPSyr5FIJLSdPpl04SrNOLI2skN40VC8ePmzeQ,3748
 lionagi/_types.py,sha256=COWRrmstmABGKKn-h_cKiAREGsMp_Ik49OdR4lSS3P8,1263
 lionagi/config.py,sha256=yGnzj5D14B2TBhqVeyp1uccvAK6mk4hm0QA8dAEJUeQ,4776
 lionagi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/utils.py,sha256=yRHKN_v9xRnUa-nYg1lTpCCK2wNDg4pCpicUEIyFwKg,7084
-lionagi/version.py,sha256=mmrB6n6zH1c3iHQ4iJcecY24GV6KoBQ8Vbb5t5vYe3E,23
+lionagi/version.py,sha256=H2Y9686JbmOVItv-s7YNC6eYseSRZPwHCIXOoDgBIEM,23
 lionagi/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/adapters/_utils.py,sha256=sniMG1LDDkwJNzUF2K32jv7rA6Y1QcohgyNclYsptzI,453
 lionagi/adapters/async_postgres_adapter.py,sha256=2XlxYNPow78dFHIQs8W1oJ2zkVD5Udn3aynMBF9Nf3k,3498
@@ -146,9 +146,9 @@ lionagi/protocols/messages/templates/tool_schemas.jinja2,sha256=ozIaSDCRjIAhLyA8
 lionagi/protocols/operatives/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/protocols/operatives/operative.py,sha256=V7SvjQf9nT9GT3Ft36atrBSOKLfylGvwS2oeykbTCfk,13368
 lionagi/protocols/operatives/step.py,sha256=uF92QO2KZiY3YR1cxhrbD844VFidOKfmeQn2Fv637iY,9280
-lionagi/service/__init__.py,sha256=qcscXOKVQtDDQ7YV-_D9jcIABDkGaxAEsCKsBBtf4XE,992
+lionagi/service/__init__.py,sha256=MYcfEFFLSdRS4blwYdx883T8Px2bn81JAeqSIPW9SFs,2545
 lionagi/service/broadcaster.py,sha256=XvaUaBb6awcq-DJGVNJnnAIZUrrtOPnhWcgVgZTnGq8,1941
-lionagi/service/imodel.py,sha256=kdoV3X_hwZ-PuHCtE3vDP-nfHr6pp-A4ilo_gwmDcaA,16386
+lionagi/service/imodel.py,sha256=k-G7dowF7JOyy5qoXLgq9wjW5DYTe-pI4Gjf4nTOj7w,16609
 lionagi/service/manager.py,sha256=tN3p0kM7pg_CEs6wXK62_B_h49Q3nrU-9qniFhw2ABE,1164
 lionagi/service/rate_limited_processor.py,sha256=h2_F71aVeBrgZ0a7ARS8-8NDaAHvfWrLykI5QcNuYbk,6099
 lionagi/service/resilience.py,sha256=91RPFtQY4QyNga_nuSNLsbzNE26pXJMTAfLaQqVdvmg,18714
@@ -172,11 +172,11 @@ lionagi/service/connections/providers/ollama_.py,sha256=oqYLWn81KrWoQgId4e4GD_bg
 lionagi/service/connections/providers/perplexity_.py,sha256=1GMmxAXsKGsB-xlqxO6hW-QdqoqkU2705NLyejetFSw,1646
 lionagi/service/connections/providers/types.py,sha256=omKWbmJYu_ozK_qJLcxQezVcauXTqhp4ClOWAyENEFU,807
 lionagi/service/hooks/__init__.py,sha256=WCfzc-Aco5PkKufDMvSYxbrLqlEvmOsaZELlWKAuG2w,464
-lionagi/service/hooks/_types.py,sha256=piByW73lJ9sSfPFOO9NWhQ9aogyDBS6936jvvVXqMZw,1255
-lionagi/service/hooks/_utils.py,sha256=51dqdRrln2aJCkCz8g4L6Ik_v9atdFHPzjm9ASu6OvA,2560
-lionagi/service/hooks/hook_event.py,sha256=NH3PdoWwAt96GQQi99TjqAu-zU-zTgWz6pDdIaKureE,2418
-lionagi/service/hooks/hook_registry.py,sha256=IEJF3UpLCmTXkd-7daFIo_p0CVTuAoA6Z8gzXkMIGsg,7870
-lionagi/service/hooks/hooked_event.py,sha256=GBM-d8OdSoB59pmmH7oFyO-bLxpJjzKuJLpVKgKLNkM,4339
+lionagi/service/hooks/_types.py,sha256=e1vmA24arGKweS45jEXK6pw8Ysk2NOvlBc6m1ABsKws,1255
+lionagi/service/hooks/_utils.py,sha256=VVPWL7HE61xc4UPYF0DIuMeFhVb3gSzPNJTNZK7ssqA,2627
+lionagi/service/hooks/hook_event.py,sha256=cJCnE3dQnOvjPj9wptBvPGGJx2LQqtXgwPMU8JLQSkM,2831
+lionagi/service/hooks/hook_registry.py,sha256=V25UwTVoOixL1CKfRAyR0__fggCvF5pBK5fF4PzcZd8,8527
+lionagi/service/hooks/hooked_event.py,sha256=D_1HtWCH3CriNlmsksi5lerXuF_LV2lbktcEdhZqXw0,4339
 lionagi/service/third_party/README.md,sha256=qFjWnI8rmLivIyr6Tc-hRZh-rQwntROp76af4MBNJJc,2214
 lionagi/service/third_party/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/service/third_party/anthropic_models.py,sha256=oqSPSlcayYG-fS5BLiLeTtkrpaxgkPhEK_YgneumrOo,4004
@@ -193,7 +193,7 @@ lionagi/tools/base.py,sha256=hEGnE4MD0CM4UqnF0xsDRKB0aM-pyrTFHl8utHhyJLU,1897
 lionagi/tools/types.py,sha256=XtJLY0m-Yi_ZLWhm0KycayvqMCZd--HxfQ0x9vFUYDE,230
 lionagi/tools/file/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/tools/file/reader.py,sha256=Q9x1UP7YmBqN53e1kUN68OmIs-D1m9EM9VVbWfM35js,9658
-lionagi-0.17.6.dist-info/METADATA,sha256=yH4RA6fcmW5nqU8Y4rbA7OIUsdUfRJEU_cly2QsMj1U,23448
-lionagi-0.17.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lionagi-0.17.6.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
-lionagi-0.17.6.dist-info/RECORD,,
+lionagi-0.17.8.dist-info/METADATA,sha256=d_5YV53ajCQjD7HDhICy31gl4NjaJlDCt2n6pXHF4wg,23448
+lionagi-0.17.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lionagi-0.17.8.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
+lionagi-0.17.8.dist-info/RECORD,,