lionagi 0.9.9__tar.gz → 0.9.11__tar.gz

{lionagi-0.9.9 → lionagi-0.9.11}/PKG-INFO

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

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/libs/schema/function_to_schema.py

@@ -137,8 +137,9 @@ def function_to_schema(
             # Default type to string and update if type hint is available
             param_type = "string"
             if param.annotation is not inspect.Parameter.empty:
-                param_type = py_json_msp[param.annotation.__name__]
-
+                param_type = py_json_msp.get(
+                    param.annotation.__name__, param.annotation.__name__
+                )
             # Extract parameter description from docstring, if available
             param_description = parametert_description.get(name)
 

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/operations/brainstorm/brainstorm.py

@@ -87,7 +87,7 @@ async def run_instruct(
     # Prepare config for the branch operation
     config = {**ins.model_dump(), **kwargs}
     result = await branch.operate(**config)
-    branch._log_manager.dump()
+    branch.dump_logs()
 
     # Extract any newly generated instructions
     instructs = []

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/operations/plan/plan.py

@@ -93,7 +93,7 @@ async def run_step(
 
     # Run the step
     result = await branch.operate(**config)
-    branch.msgs.logger.dump()  # Dump logs if needed
+    branch.dump_logs()  # Dump logs if needed
     return result
 
 

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/operatives/action/tool.py

@@ -92,11 +92,9 @@ class Tool(Element):
     @model_validator(mode="after")
     def _validate_tool_schema(self) -> Self:
         if self.tool_schema is None:
-            self.tool_schema = function_to_schema(self.func_callable)
-        if self.request_options is not None:
-            schema_ = self.request_options.model_json_schema()
-            schema_.pop("title", None)
-            self.tool_schema["function"]["parameters"] = schema_
+            self.tool_schema = function_to_schema(
+                self.func_callable, request_options=self.request_options
+            )
 
         return self
 

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/protocols/messages/action_request.py

@@ -80,7 +80,7 @@ class ActionRequest(RoledMessage):
 
     @action_response_id.setter
     def action_response_id(self, action_response_id: IDType) -> None:
-        self.content["action_response_id"] = action_response_id
+        self.content["action_response_id"] = str(action_response_id)
 
     @property
     def request(self) -> dict[str, Any]:

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/protocols/messages/assistant_response.py

@@ -10,7 +10,7 @@ from typing import Any
 
 from pydantic import BaseModel
 
-from lionagi.utils import copy, is_same_dtype
+from lionagi.utils import copy
 
 from .base import MessageRole, SenderRecipient
 from .message import MessageRole, RoledMessage, Template, jinja_env
@@ -19,57 +19,60 @@ from .message import MessageRole, RoledMessage, Template, jinja_env
 def prepare_assistant_response(
     assistant_response: BaseModel | list[BaseModel] | dict | str | Any, /
 ) -> dict:
-    if assistant_response:
-        content = {}
-        # Handle model.choices[0].message.content format
-        if isinstance(assistant_response, BaseModel):
-            content["assistant_response"] = (
-                assistant_response.choices[0].message.content or ""
-            )
-            content["model_response"] = assistant_response.model_dump(
-                exclude_none=True, exclude_unset=True
-            )
-        # Handle streaming response[i].choices[0].delta.content format
-        elif isinstance(assistant_response, list):
-            if is_same_dtype(assistant_response, BaseModel):
-                msg = "".join(
-                    [
-                        i.choices[0].delta.content or ""
-                        for i in assistant_response
-                    ]
+
+    assistant_response = (
+        [assistant_response]
+        if not isinstance(assistant_response, list)
+        else assistant_response
+    )
+
+    text_contents = []
+    model_responses = []
+
+    for i in assistant_response:
+
+        if isinstance(i, BaseModel):
+            i = i.model_dump(exclude_none=True, exclude_unset=True)
+
+        model_responses.append(i)
+
+        if isinstance(i, dict):
+            # anthropic standard
+            if "content" in i:
+                content = i["content"]
+                content = (
+                    [content] if not isinstance(content, list) else content
                 )
-                content["assistant_response"] = msg
-                content["model_response"] = [
-                    i.model_dump(
-                        exclude_none=True,
-                        exclude_unset=True,
-                    )
-                    for i in assistant_response
-                ]
-            elif is_same_dtype(assistant_response, dict):
-                msg = "".join(
-                    [
-                        i["choices"][0]["delta"]["content"] or ""
-                        for i in assistant_response
-                    ]
+                for j in content:
+                    if isinstance(j, dict):
+                        if j.get("type") == "text":
+                            text_contents.append(j["text"])
+                    elif isinstance(j, str):
+                        text_contents.append(j)
+
+            # openai standard
+            elif "choices" in i:
+                choices = i["choices"]
+                choices = (
+                    [choices] if not isinstance(choices, list) else choices
                 )
-                content["assistant_response"] = msg
-                content["model_response"] = assistant_response
-        elif isinstance(assistant_response, dict):
-            if "content" in assistant_response:
-                content["assistant_response"] = assistant_response["content"]
-            elif "choices" in assistant_response:
-                content["assistant_response"] = assistant_response["choices"][
-                    0
-                ]["message"]["content"]
-            content["model_response"] = assistant_response
-        elif isinstance(assistant_response, str):
-            content["assistant_response"] = assistant_response
-        else:
-            content["assistant_response"] = str(assistant_response)
-        return content
-    else:
-        return {"assistant_response": ""}
+                for j in choices:
+                    if "message" in j:
+                        text_contents.append(j["message"]["content"] or "")
+                    elif "delta" in j:
+                        text_contents.append(j["delta"]["content"] or "")
+
+        elif isinstance(i, str):
+            text_contents.append(i)
+
+    text_contents = "".join(text_contents)
+    model_responses = (
+        model_responses[0] if len(model_responses) == 1 else model_responses
+    )
+    return {
+        "assistant_response": text_contents,
+        "model_response": model_responses,
+    }
 
 
 class AssistantResponse(RoledMessage):

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/service/endpoints/base.py

@@ -371,25 +371,43 @@ class APICalling(Event):
         if self.payload.get("stream") is True:
             self.streaming = True
 
-        if self.include_token_usage_to_model:
+        if self.include_token_usage_to_model and self.endpoint.requires_tokens:
             if isinstance(self.payload["messages"][-1], dict):
                 required_tokens = self.required_tokens
-                self.payload["messages"][-1][
-                    "content"
-                ] += f"\n\nEstimated Current Token Usage: {required_tokens}"
+                content = self.payload["messages"][-1]["content"]
+                token_msg = (
+                    f"\n\nEstimated Current Token Usage: {required_tokens}"
+                )
+
                 if "model" in self.payload:
                     if (
                         self.payload["model"].startswith("gpt-4")
                         or "o1mini" in self.payload["model"]
                         or "o1-preview" in self.payload["model"]
                     ):
-                        self.payload["messages"][-1]["content"] += "/128_000"
+                        token_msg += "/128_000"
                     elif "o1" in self.payload["model"]:
-                        self.payload["messages"][-1]["content"] += "/200_000"
+                        token_msg += "/200_000"
                     elif "sonnet" in self.payload["model"]:
-                        self.payload["messages"][-1]["content"] += "/200_000"
+                        token_msg += "/200_000"
                     elif "haiku" in self.payload["model"]:
-                        self.payload["messages"][-1]["content"] += "/200_000"
+                        token_msg += "/200_000"
+                    elif "gemini" in self.payload["model"]:
+                        token_msg += "/1_000_000"
+                    elif "qwen-turbo" in self.payload["model"]:
+                        token_msg += "/1_000_000"
+
+                if isinstance(content, str):
+                    content += token_msg
+                elif isinstance(content, dict):
+                    if "text" in content:
+                        content["text"] += token_msg
+                elif isinstance(content, list):
+                    for i in reversed(content):
+                        if "text" in i:
+                            i["text"] += token_msg
+                            break
+                self.payload["messages"][-1]["content"] = content
 
         return self
 

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/service/imodel.py

@@ -9,9 +9,9 @@ from collections.abc import AsyncGenerator, Callable
 from pydantic import BaseModel
 
 from lionagi.protocols.generic.event import EventStatus
-from lionagi.utils import is_coro_func
+from lionagi.utils import is_coro_func, to_dict
 
-from .endpoints.base import APICalling, EndPoint
+from .endpoints.base import APICalling, EndPoint, EndpointConfig
 from .endpoints.match_endpoint import match_endpoint
 from .endpoints.rate_limited_processor import RateLimitedAPIExecutor
 
@@ -352,9 +352,10 @@ class iModel:
         kwargs = self.kwargs
         if "kwargs" in self.kwargs:
             kwargs = self.kwargs["kwargs"]
+
         return {
             "provider": self.endpoint.config.provider,
-            "endpoint": self.endpoint.config.model_dump(),
+            "endpoint": self.endpoint.config.model_dump_json(),
             "api_key": (
                 self.api_key_scheme
                 if hasattr(self, "api_key_scheme")
@@ -370,18 +371,20 @@ class iModel:
         provider = data.pop("provider", None)
         base_url = data.pop("base_url", None)
         api_key = data.pop("api_key", None)
-        processor_config = data.pop("processor_config", {})
 
+        processor_config = data.pop("processor_config", {})
         endpoint_config_params = data.pop("endpoint", {})
-        endpoint_ = endpoint_config_params.pop("endpoint", None)
-        endpoint_params = endpoint_config_params.get("endpoint_params", None)
+        endpoint_config_params = to_dict(endpoint_config_params)
 
-        endpoint = match_endpoint(
-            provider=provider,
-            base_url=base_url,
-            endpoint=endpoint_,
-            endpoint_params=endpoint_params,
+        endpoint_config_params["endpoint"] = endpoint_config_params.get(
+            "endpoint", "chat"
         )
+        match_params = {}
+
+        for i in ("provider", "base_url", "endpoint", "endpoint_params"):
+            if endpoint_config_params.get(i):
+                match_params[i] = endpoint_config_params.pop(i)
+        endpoint = match_endpoint(**match_params)
         endpoint.update_config(**endpoint_config_params)
         return cls(
             provider=provider,

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/service/providers/anthropic_/messages.py

@@ -50,10 +50,15 @@ class AnthropicChatCompletionEndPoint(ChatCompletionEndPoint):
         for k, v in kwargs.items():
             if k in self.acceptable_kwargs:
                 payload[k] = v
+
+        for i in self.required_kwargs:
+            if i not in payload:
+                raise ValueError(f"Missing required argument: {i}")
+
         if "cache_control" in payload:
             cache_control = payload.pop("cache_control")
             if cache_control:
-                cache_control = "ephemeral"
+                cache_control = {"type": "ephemeral"}
                 last_message = payload["messages"][-1]["content"]
                 if isinstance(last_message, str):
                     last_message = {
@@ -65,6 +70,20 @@ class AnthropicChatCompletionEndPoint(ChatCompletionEndPoint):
                     last_message[-1], dict
                 ):
                     last_message[-1]["cache_control"] = cache_control
+                payload["messages"][-1]["content"] = (
+                    [last_message]
+                    if not isinstance(last_message, list)
+                    else last_message
+                )
+
+        first_message = payload["messages"][0]
+        system = None
+        if first_message.get("role") == "system":
+            system = first_message["content"]
+            system = [{"type": "text", "text": system}]
+            payload["messages"] = payload["messages"][1:]
+            payload["system"] = system
+
         if "api_key" in kwargs:
             headers["x-api-key"] = kwargs["api_key"]
         headers["anthropic-version"] = kwargs.pop(

{lionagi-0.9.9 → lionagi-0.9.11}/lionagi/service/providers/perplexity_/models.py

@@ -33,8 +33,8 @@ class PerplexityChatCompletionRequest(BaseModel):
     """
 
     model: str = Field(
-        ...,
-        description="The model name, e.g. 'llama-3.1-sonar-small-128k-online'.",
+        "sonar",
+        description="The model name, e.g. 'sonar', (the only model available at the time when this request model was updated, check doc for latest info).",
     )
     messages: list[PerplexityMessage] = Field(
         ..., description="A list of messages forming the conversation so far."

lionagi-0.9.11/lionagi/version.py

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

{lionagi-0.9.9 → lionagi-0.9.11}/pyproject.toml

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

{lionagi-0.9.9 → lionagi-0.9.11}/uv.lock

@@ -1208,7 +1208,7 @@ wheels = [
 
 [[package]]
 name = "lionagi"
-version = "0.9.9"
+version = "0.9.11"
 source = { editable = "." }
 dependencies = [
     { name = "aiocache" },

lionagi-0.9.9/lionagi/version.py

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