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

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)
@@ -119,6 +120,7 @@ class HookRegistry:
                 None,
                 None,
                 event,
+                exit=exit,
                 **kw,
             )
             return (res, False, EventStatus.COMPLETED)
@@ -129,7 +131,7 @@ class HookRegistry:
 
     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 invocation or pass to continue (status: aborted).
         It cannot modify the event itself, and won't be able to access the event instance.
@@ -140,6 +142,7 @@ class HookRegistry:
                 None,
                 None,
                 event,
+                exit=exit,
                 **kw,
             )
             return (res, False, EventStatus.COMPLETED)
@@ -163,6 +166,7 @@ class HookRegistry:
                 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
+                    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_invocation(event_like, **kw), meta
+                    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_invocation(**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/version.py

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

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

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

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

@@ -5,7 +5,7 @@ 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=_9A_jQb7KUl9K8At8l-nfzMi9odK4IQSyRft9V3xoYs,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
@@ -173,9 +173,9 @@ lionagi/service/connections/providers/perplexity_.py,sha256=1GMmxAXsKGsB-xlqxO6h
 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=e1vmA24arGKweS45jEXK6pw8Ysk2NOvlBc6m1ABsKws,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=S6wYKKSHTUKRDN2P1opHKisdaYOXnttVIWYoMIlB_6c,7870
+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
@@ -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.7.dist-info/METADATA,sha256=RVhAS_0eXRZlzmyY3smI143cFOMZLge0KuLP-QsT-z0,23448
-lionagi-0.17.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lionagi-0.17.7.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
-lionagi-0.17.7.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,,