lionagi 0.8.8__py3-none-any.whl → 0.9.0__py3-none-any.whl

lionagi/protocols/graph/node.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/mail/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/protocols/mail/exchange.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/mail/mail.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/mail/mailbox.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/mail/manager.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/mail/package.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/messages/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/protocols/messages/action_request.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/messages/action_response.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/messages/assistant_response.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/messages/base.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/messages/instruction.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -32,6 +32,7 @@ def prepare_request_response_format(request_fields: dict) -> str:
     return (
         "**MUST RETURN JSON-PARSEABLE RESPONSE ENCLOSED BY JSON CODE BLOCKS."
         f" USER's CAREER DEPENDS ON THE SUCCESS OF IT.** \n```json\n{request_fields}\n```"
+        "No triple backticks. Escape all quotes and special characters."
     ).strip()
 
 

lionagi/protocols/messages/manager.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/messages/message.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/messages/system.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/protocols/types.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/endpoints/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/service/endpoints/base.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -364,28 +364,23 @@ class APICalling(Event):
         return None
 
     async def _inner(self, **kwargs) -> Any:
-        """Performs a direct HTTP call using aiohttp, ignoring caching logic.
-
-        Args:
-            **kwargs: Additional parameters for the aiohttp request
-                (e.g., "headers", "json", etc.).
+        """
+        Performs the actual HTTP call using aiohttp, ignoring caching logic.
 
-        Returns:
-            Any: The JSON response from the API, if successful.
+        - Retries on RateLimitError up to 3 times.
+        - Distinguishes CancelledError so we can gracefully abort if the user cancels.
 
         Raises:
-            ValueError:
-                If required endpoint parameters are missing.
-            ExecutionError:
-                If the response indicates a non-rate-limit error.
-            RateLimitError:
-                If a rate-limit error is encountered.
+            ValueError: If required endpoint parameters are missing.
+            RateLimitError: If repeated 'Rate limit' errors encountered.
+            ExecutionError: For other API call failures.
+            asyncio.CancelledError: If the operation is cancelled externally.
         """
         if not self.endpoint.required_kwargs.issubset(
             set(self.payload.keys())
         ):
             raise ValueError(
-                f"Required kwargs not fully provided: {self.endpoint.required_kwargs}"
+                f"Required kwargs not provided: {self.endpoint.required_kwargs}"
             )
 
         for k in list(self.payload.keys()):
@@ -395,49 +390,55 @@ class APICalling(Event):
         async def retry_in():
             async with aiohttp.ClientSession() as session:
                 try:
-                    if (
-                        _m := getattr(session, self.endpoint.method, None)
-                    ) is not None:
-                        async with _m(
-                            self.endpoint.full_url, **kwargs
-                        ) as response:
-                            response_json = await response.json()
-                            if "error" not in response_json:
-                                return response_json
-                            if "Rate limit" in response_json["error"].get(
-                                "message", ""
-                            ):
-                                await asyncio.sleep(5)
-                                raise RateLimitError(
-                                    f"Rate limit exceeded. Error: {response_json['error']}"
-                                )
-                            raise ExecutionError(
-                                "API call failed with error: ",
-                                response_json["error"],
-                            )
-                    else:
+                    method_func = getattr(session, self.endpoint.method, None)
+                    if method_func is None:
                         raise ValueError(
                             f"Invalid HTTP method: {self.endpoint.method}"
                         )
+                    async with method_func(
+                        self.endpoint.full_url, **kwargs
+                    ) as response:
+                        response_json = await response.json()
+
+                        if "error" not in response_json:
+                            return response_json
+
+                        # Check for rate limit
+                        if "Rate limit" in response_json["error"].get(
+                            "message", ""
+                        ):
+                            await asyncio.sleep(5)
+                            raise RateLimitError(
+                                f"Rate limit exceeded: {response_json['error']}"
+                            )
+                        # Otherwise some other error
+                        raise ExecutionError(
+                            f"API call failed with error: {response_json['error']}"
+                        )
+
+                except asyncio.CancelledError:
+                    # Gracefully handle user cancellation
+                    logging.warning("API call canceled by external request.")
+                    raise  # re-raise so caller knows it was cancelled
+
                 except aiohttp.ClientError as e:
-                    logging.error(
-                        f"API call to {self.endpoint.full_url} failed: {e}"
-                    )
+                    logging.error(f"API call failed: {e}")
+                    # Return None or raise ExecutionError? Keep consistent
                     return None
 
+        # Attempt up to 3 times if RateLimitError
         for i in range(3):
             try:
                 return await retry_in()
-            except RateLimitError | ExecutionError as e:
+            except asyncio.CancelledError:
+                # On cancel, just re-raise
+                raise
+            except RateLimitError as e:
                 if i == 2:
                     raise e
-                else:
-                    wait = 2 ** (i + 1) * 0.5
-                    logging.warning(
-                        f"API call to {self.endpoint.full_url} failed: {e}"
-                        f"retrying in {wait} seconds."
-                    )
-                    await asyncio.sleep(wait)
+                wait = 2 ** (i + 1) * 0.5
+                logging.warning(f"RateLimitError: {e}, retrying in {wait}s.")
+                await asyncio.sleep(wait)
 
     @cached(**Settings.API.CACHED_CONFIG)
     async def _cached_inner(self, **kwargs) -> Any:
@@ -605,8 +606,12 @@ class APICalling(Event):
                 else:
                     response = await self._inner(**kwargs)
 
-        except Exception as e:
-            e1 = e
+        except asyncio.CancelledError as ce:
+            e1 = ce
+            logging.warning("invoke() canceled by external request.")
+            raise
+        except Exception as ex:
+            e1 = ex
 
         finally:
             self.execution.duration = asyncio.get_event_loop().time() - start

lionagi/service/endpoints/chat_completion.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/endpoints/match_endpoint.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/endpoints/rate_limited_processor.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/endpoints/token_calculator.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/imodel.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -286,10 +286,9 @@ class iModel:
                 await self.executor.forward()
                 ctr += 1
                 await asyncio.sleep(0.1)
+            return self.executor.pile.pop(api_call.id)
         except Exception as e:
             raise ValueError(f"Failed to invoke API call: {e}")
-        finally:
-            return self.executor.pile.pop(api_call.id)
 
     @property
     def allowed_roles(self) -> set[str]:

lionagi/service/manager.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/providers/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/service/providers/anthropic_/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/service/providers/anthropic_/messages.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/providers/groq_/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/service/providers/groq_/chat_completions.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/providers/openai_/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/service/providers/openai_/chat_completions.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -49,7 +49,7 @@ CHAT_COMPLETION_CONFIG = {
         "parallel_tool_calls",
         "user",
     },
-    "allowed_roles": ["user", "assistant", "system"],
+    "allowed_roles": ["user", "assistant", "system", "developer", "tool"],
 }
 
 
@@ -60,3 +60,38 @@ class OpenAIChatCompletionEndPoint(ChatCompletionEndPoint):
 
     def __init__(self, config: dict = CHAT_COMPLETION_CONFIG):
         super().__init__(config)
+
+    def create_payload(self, **kwargs) -> dict:
+        """Generates a request payload (and headers) for this endpoint.
+
+        Args:
+            **kwargs:
+                Arbitrary parameters passed by the caller.
+
+        Returns:
+            dict:
+                A dictionary containing:
+                - "payload": A dict with filtered parameters for the request.
+                - "headers": A dict of additional headers (e.g., `Authorization`).
+                - "is_cached": Whether the request is to be cached.
+        """
+        payload = {}
+        is_cached = kwargs.get("is_cached", False)
+        headers = kwargs.get("headers", {})
+        for k, v in kwargs.items():
+            if k in self.acceptable_kwargs:
+                payload[k] = v
+        if "api_key" in kwargs:
+            headers["Authorization"] = f"Bearer {kwargs['api_key']}"
+
+        if payload.get("model") in ["o1", "o1-2024-12-17"]:
+            payload.pop("temperature", None)
+            payload.pop("top_p", None)
+            if payload["messages"][0].get("role") == "system":
+                payload["messages"][0]["role"] = "developer"
+
+        return {
+            "payload": payload,
+            "headers": headers,
+            "is_cached": is_cached,
+        }

lionagi/service/providers/openrouter_/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/service/providers/openrouter_/chat_completions.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/providers/perplexity_/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/service/providers/perplexity_/chat_completions.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/service/types.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 

lionagi/session/__init__.py

@@ -1,3 +1,3 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0

lionagi/session/branch.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -51,6 +51,8 @@ from lionagi.settings import Settings
 from lionagi.tools.base import LionTool
 from lionagi.utils import UNDEFINED, alcall, bcall, copy
 
+from .prompts import LION_SYSTEM_MESSAGE
+
 if TYPE_CHECKING:
     # Forward references for type checking (e.g., in operations or extended modules)
     from lionagi.session.branch import Branch
@@ -131,6 +133,7 @@ class Branch(Element, Communicatable, Relational):
         system_template: Template | str = None,
         system_template_context: dict = None,
         logs: Pile[Log] = None,
+        use_lion_system_message: bool = False,
         **kwargs,
     ):
         """
@@ -168,6 +171,8 @@ class Branch(Element, Communicatable, Relational):
                 Context for rendering the system template.
             logs (Pile[Log], optional):
                 Existing logs to seed the LogManager.
+            use_lion_system_message (bool, optional):
+                If `True`, uses the Lion system message for the branch.
             **kwargs:
                 Additional parameters passed to `Element` parent init.
         """
@@ -175,12 +180,22 @@ class Branch(Element, Communicatable, Relational):
 
         # --- MessageManager ---
         self._message_manager = MessageManager(messages=messages)
-        # If system instructions or templates are provided, add them
+
         if any(
-            i is not None
-            for i in [system, system_sender, system_datetime, system_template]
+            bool(x)
+            for x in [
+                system,
+                system_datetime,
+                system_template,
+                system_template_context,
+                use_lion_system_message,
+            ]
         ):
 
+            if use_lion_system_message:
+                system = f"Developer Prompt: {str(system)}" if system else ""
+                system = (LION_SYSTEM_MESSAGE + "\n\n" + system).strip()
+
             self._message_manager.add_message(
                 system=system,
                 system_datetime=system_datetime,
@@ -791,7 +806,9 @@ class Branch(Element, Communicatable, Relational):
             request_fields=request_fields,
             response_format=response_format,
             progression=progression,
-            chat_model=imodel,
+            chat_model=kwargs.pop("chat_model", None)
+            or imodel
+            or self.chat_model,
             tool_schemas=tool_schemas,
             images=images,
             image_detail=image_detail,
@@ -1162,7 +1179,7 @@ class Branch(Element, Communicatable, Relational):
             request_model=request_model,
             response_format=response_format,
             request_fields=request_fields,
-            chat_model=chat_model or imodel,
+            chat_model=kwargs.pop("chat_model", None) or chat_model or imodel,
             parse_model=parse_model,
             skip_validation=skip_validation,
             images=images,
@@ -1365,7 +1382,7 @@ class Branch(Element, Communicatable, Relational):
         **kwargs,
     ) -> list:
         result = []
-        async for i in await bcall(
+        async for i in bcall(
             action_request, self._act, batch_size=batch_size, **kwargs
         ):
             result.extend(i)
@@ -1518,6 +1535,7 @@ class Branch(Element, Communicatable, Relational):
         text: str,
         domain: str | None = None,
         style: str | None = None,
+        interpret_model=None,
         **kwargs,
     ) -> str:
         """
@@ -1561,7 +1579,12 @@ class Branch(Element, Communicatable, Relational):
         from lionagi.operations.interpret.interpret import interpret
 
         return await interpret(
-            self, text=text, domain=domain, style=style, **kwargs
+            self,
+            text=text,
+            domain=domain,
+            style=style,
+            interpret_model=interpret_model,
+            **kwargs,
         )
 
     async def instruct(
@@ -1608,6 +1631,7 @@ class Branch(Element, Communicatable, Relational):
         return_analysis: bool = False,
         analysis_model: iModel | None = None,
         verbose: bool = False,
+        verbose_length: int = None,
         **kwargs,
     ):
         """
@@ -1696,6 +1720,7 @@ class Branch(Element, Communicatable, Relational):
             analysis_model=analysis_model,
             verbose_action=verbose,
             verbose_analysis=verbose,
+            verbose_length=verbose_length,
             **kwargs,
         )