lionagi 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

lionagi/core/action/action_manager.py

@@ -253,6 +253,8 @@ class ActionManager:
             ValueError: If a specified tool is not registered.
             TypeError: If an unsupported tool type is provided.
         """
+        if isinstance(tools, list | tuple) and len(tools) == 1:
+            tools = tools[0]
         if isinstance(tools, bool):
             if tools:
                 tool_kwarg = {"tools": self.schema_list}

lionagi/core/communication/assistant_response.py

@@ -146,6 +146,16 @@ class AssistantResponse(RoledMessage):
         """
         return copy(self.content["assistant_response"])
 
+    @response.setter
+    def response(self, value: str) -> None:
+        """
+        Set the assistant response content.
+
+        Args:
+            value: The new response content
+        """
+        self.content["assistant_response"] = value
+
     @property
     def model_response(self) -> dict | list[dict]:
         """

lionagi/core/communication/message.py

@@ -68,7 +68,7 @@ class MessageField(str, Enum):
     LION_CLASS = "lion_class"
     ROLE = "role"
     CONTENT = "content"
-    id = "id"
+    LN_ID = "ln_id"
     SENDER = "sender"
     RECIPIENT = "recipient"
     METADATA = "metadata"

lionagi/core/communication/message_manager.py

@@ -498,6 +498,19 @@ class MessageManager:
             ]
         )
 
+    def remove_last_instruction_tool_schemas(self) -> None:
+        id_ = self.last_instruction.ln_id
+        self.messages[id_].tool_schemas = None
+
+    def concat_recent_action_responses_to_instruction(
+        self, instruction: Instruction
+    ) -> None:
+        for i in reversed(self.messages.progress):
+            if isinstance(self.messages[i], ActionResponse):
+                instruction.context.append(self.messages[i].content.to_dict())
+            else:
+                break
+
     def to_chat_msgs(self, progress=None) -> list[dict]:
         """
         Convert messages to chat format.

lionagi/core/communication/utils.py

@@ -92,9 +92,11 @@ def format_text_item(item: Any) -> str:
     for j in item:
         if isinstance(j, dict):
             for k, v in j.items():
-                msg += f"- {k}: {v} \n\n"
+                if v is not None:
+                    msg += f"- {k}: {v} \n\n"
         else:
-            msg += f"{j}\n"
+            if j is not None:
+                msg += f"{j}\n"
     return msg
 
 

lionagi/core/session/branch_mixins.py

@@ -33,6 +33,7 @@ from ..communication.types import (
     ActionResponse,
     AssistantResponse,
     Instruction,
+    RoledMessage,
 )
 
 
@@ -149,6 +150,8 @@ class BranchOperationMixin(ABC):
         if auto_retry_parse is True:
             operative.auto_retry_parse = True
 
+        if actions:
+            tools = tools or True
         if invoke_actions and tools:
             tool_schemas = self.get_tool_schema(tools)
 
@@ -275,7 +278,7 @@ class BranchOperationMixin(ABC):
         **kwargs,
     ) -> tuple[Instruction, AssistantResponse]:
 
-        ins = self.msgs.create_instruction(
+        ins: Instruction = self.msgs.create_instruction(
             instruction=instruction,
             guidance=guidance,
             context=context,
@@ -289,7 +292,57 @@ class BranchOperationMixin(ABC):
         )
 
         progress = progress or self.msgs.progress
-        messages = [self.msgs.messages[i] for i in progress]
+        messages: list[RoledMessage] = [
+            self.msgs.messages[i] for i in progress
+        ]
+
+        use_ins = None
+        if imodel.sequential_exchange:
+            _to_use = []
+            _action_responses: set[ActionResponse] = set()
+
+            for i in messages:
+                if isinstance(i, ActionResponse):
+                    _action_responses.add(i)
+                if isinstance(i, AssistantResponse):
+                    _to_use.append(i.model_copy())
+                if isinstance(i, Instruction):
+                    if _action_responses:
+                        j = i.model_copy()
+                        d_ = [k.content.to_dict() for k in _action_responses]
+                        for z in d_:
+                            if z not in j.context:
+                                j.context.append(z)
+
+                        _to_use.append(j)
+                        _action_responses = set()
+                    else:
+                        _to_use.append(i)
+
+            messages = _to_use
+            if _action_responses:
+                j = ins.model_copy()
+                d_ = [k.content.to_dict() for k in _action_responses]
+                for z in d_:
+                    if z not in j.context:
+                        j.context.append(z)
+                use_ins = j
+
+            if messages and len(messages) > 1:
+                _msgs = [messages[0]]
+
+                for i in messages[1:]:
+                    if isinstance(i, AssistantResponse):
+                        if isinstance(_msgs[-1], AssistantResponse):
+                            _msgs[-1].response = (
+                                f"{_msgs[-1].response}\n\n{i.response}"
+                            )
+                        else:
+                            _msgs.append(i)
+                    else:
+                        if isinstance(_msgs[-1], AssistantResponse):
+                            _msgs.append(i)
+                messages = _msgs
 
         if self.msgs.system and "system" not in imodel.allowed_roles:
             messages = [msg for msg in messages if msg.role != "system"]
@@ -312,9 +365,10 @@ class BranchOperationMixin(ABC):
                     first_instruction.guidance or ""
                 )
                 messages[0] = first_instruction
+                messages.append(use_ins or ins)
 
         else:
-            messages.append(ins)
+            messages.append(use_ins or ins)
 
         kwargs["messages"] = [i.chat_msg for i in messages]
         imodel = imodel or self.imodel
@@ -331,6 +385,7 @@ class BranchOperationMixin(ABC):
             sender=self,
             recipient=self.user,
         )
+
         return ins, res
 
     async def communicate(
@@ -346,7 +401,6 @@ class BranchOperationMixin(ABC):
         imodel: iModel = None,
         images: list = None,
         image_detail: Literal["low", "high", "auto"] = None,
-        tools: str | FUNCTOOL | list[FUNCTOOL | str] | bool = None,
         num_parse_retries: int = 0,
         retry_imodel: iModel = None,
         retry_kwargs: dict = {},
@@ -355,7 +409,6 @@ class BranchOperationMixin(ABC):
         ] = "return_value",
         skip_validation: bool = False,
         clear_messages: bool = False,
-        invoke_action: bool = True,
         response_format: (
             type[BaseModel] | BaseModel
         ) = None,  # alias of request_model
@@ -380,10 +433,6 @@ class BranchOperationMixin(ABC):
             )
             num_parse_retries = 5
 
-        tool_schemas = None
-        if invoke_action and tools:
-            tool_schemas = self.get_tool_schema(tools)
-
         ins, res = await self._invoke_imodel(
             instruction=instruction,
             guidance=guidance,
@@ -395,36 +444,14 @@ class BranchOperationMixin(ABC):
             imodel=imodel,
             images=images,
             image_detail=image_detail,
-            tool_schemas=tool_schemas,
             **kwargs,
         )
-        await self.msgs.a_add_message(instruction=ins)
-        await self.msgs.a_add_message(assistant_response=res)
-
-        action_request_models = None
-        action_response_models = None
+        self.msgs.add_message(instruction=ins)
+        self.msgs.add_message(assistant_response=res)
 
         if skip_validation:
             return res.response
 
-        if invoke_action and tools:
-            action_request_models = ActionRequestModel.create(res.response)
-
-        if action_request_models and invoke_action:
-            action_response_models = await alcall(
-                action_request_models,
-                self.invoke_action,
-                suppress_errors=True,
-            )
-
-        if action_request_models and not action_response_models:
-            for i in action_request_models:
-                await self.msgs.a_add_message(
-                    action_request_model=i,
-                    sender=self,
-                    recipient=None,
-                )
-
         _d = None
         if request_fields is not None or request_model is not None:
             parse_success = None
@@ -475,9 +502,12 @@ class BranchOperationMixin(ABC):
                     if _d and isinstance(_d, dict):
                         parse_success = True
                         if res not in self.msgs.messages:
-                            await self.msgs.a_add_message(
-                                assistant_response=res
-                            )
+                            if isinstance(
+                                self.msgs.messages[-1], AssistantResponse
+                            ):
+                                self.msgs.messages[-1].response = res.response
+                            else:
+                                self.msgs.add_message(assistant_response=res)
                         return _d
 
                 elif request_model:
@@ -495,9 +525,16 @@ class BranchOperationMixin(ABC):
                             _d = request_model.model_validate(_d)
                             parse_success = True
                             if res not in self.msgs.messages:
-                                await self.msgs.a_add_message(
-                                    assistant_response=res
-                                )
+                                if isinstance(
+                                    self.msgs.messages[-1], AssistantResponse
+                                ):
+                                    self.msgs.messages[-1].response = (
+                                        res.response
+                                    )
+                                else:
+                                    self.msgs.add_message(
+                                        assistant_response=res
+                                    )
                             return _d
                         except Exception as e:
                             logging.warning(

lionagi/core/session/session.py

@@ -128,9 +128,9 @@ class Session(Component):
             branch: The branch to set as default or its identifier.
         """
         branch = self.branches[branch]
-        if branch and len(branch) == 1:
-            self.default_branch = branch
-        raise ValueError("Session can only have one default branch.")
+        if not isinstance(branch, Branch):
+            raise ValueError("Input value for branch is not a valid branch.")
+        self.default_branch = branch
 
     def to_df(self, branches: ID.RefSeq = None) -> pd.DataFrame:
         out = self.concat_messages(branches=branches)

lionagi/integrations/anthropic_/AnthropicModel.py

@@ -4,6 +4,7 @@
 
 from pathlib import Path
 
+import yaml
 from dotenv import load_dotenv
 from pydantic import (
     BaseModel,
@@ -33,12 +34,6 @@ price_config_file_name = path / "anthropic_price_data.yaml"
 max_output_token_file_name = path / "anthropic_max_output_token_data.yaml"
 
 
-class _ModuleImportClass:
-    from lionagi.libs.package.imports import check_import
-
-    yaml = check_import("yaml", pip_name="pyyaml")
-
-
 class AnthropicModel(BaseModel):
     model: str = Field(description="ID of the model to use.")
 
@@ -239,7 +234,7 @@ class AnthropicModel(BaseModel):
         )
         if estimated_output_len == 0:
             with open(max_output_token_file_name) as file:
-                output_token_config = _ModuleImportClass.yaml.safe_load(file)
+                output_token_config = yaml.safe_load(file)
                 estimated_output_len = output_token_config.get(self.model, 0)
                 self.estimated_output_len = estimated_output_len
 
@@ -261,13 +256,13 @@ class AnthropicModel(BaseModel):
         num_of_input_tokens = self.text_token_calculator.calculate(input_text)
 
         with open(price_config_file_name) as file:
-            price_config = _ModuleImportClass.yaml.safe_load(file)
+            price_config = yaml.safe_load(file)
 
         model_price_info_dict = price_config["model"][self.model]
         estimated_price = (
             model_price_info_dict["input_tokens"] * num_of_input_tokens
             + model_price_info_dict["output_tokens"]
             * estimated_num_of_output_tokens
-        )
+        ) / 1_000_000
 
         return estimated_price

lionagi/integrations/anthropic_/AnthropicService.py

@@ -51,6 +51,11 @@ class AnthropicService(Service):
         # Map model versions to their base models for shared rate limiting
         shared_models = {
             "claude-3-opus-20240229": "claude-3-opus",
+            "claude-3-sonnet-20241022": "claude-3-sonnet",
+            "claude-3-haiku-20241022": "claude-3-haiku",
+            "claude-3-opus-latest": "claude-3-opus",
+            "claude-3-sonnet-latest": "claude-3-sonnet",
+            "claude-3-haiku-latest": "claude-3-haiku",
             "claude-3-sonnet-20240229": "claude-3-sonnet",
             "claude-3-haiku-20240307": "claude-3-haiku",
         }
@@ -115,3 +120,8 @@ class AnthropicService(Service):
     @property
     def allowed_roles(self):
         return ["user", "assistant"]
+
+    @property
+    def sequential_exchange(self):
+        """whether the service requires user/assistant exchange"""
+        return True

lionagi/integrations/anthropic_/anthropic_max_output_token_data.yaml

@@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+claude-3-5-sonnet-20241022: 8192  # Latest model
+claude-3-5-haiku-20241022: 8192   # Latest model
 claude-3-opus-20240229: 4096
 claude-3-sonnet-20240229: 4096
 claude-3-haiku-20240307: 4096
+claude-2.1: 4096
+claude-2.0: 4096
+claude-instant-1.2: 4096

lionagi/integrations/anthropic_/anthropic_price_data.yaml

@@ -3,12 +3,32 @@
 # SPDX-License-Identifier: Apache-2.0
 
 model:
+  # Latest Models (3.5 series)
+  claude-3-5-sonnet-20241022:
+    input_tokens: 3.0
+    output_tokens: 15.0
+  claude-3-5-haiku-20241022:
+    input_tokens: 0.80
+    output_tokens: 4.0
+    
+  # Claude 3 Models
   claude-3-opus-20240229:
-    input_tokens: 0.000015
-    output_tokens: 0.000075
+    input_tokens: 15.0
+    output_tokens: 75.0
   claude-3-sonnet-20240229:
-    input_tokens: 0.000003
-    output_tokens: 0.000015
+    input_tokens: 3.0
+    output_tokens: 15.0
   claude-3-haiku-20240307:
-    input_tokens: 0.0000005
-    output_tokens: 0.0000025
+    input_tokens: 0.25
+    output_tokens: 1.25
+  
+  # Legacy Models
+  claude-2.1:
+    input_tokens: 8.0
+    output_tokens: 24.0
+  claude-2.0:
+    input_tokens: 8.0
+    output_tokens: 24.0
+  claude-instant-1.2:
+    input_tokens: 0.8
+    output_tokens: 2.4

lionagi/integrations/anthropic_/version.py

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"

lionagi/integrations/groq_/GroqService.py

@@ -149,3 +149,8 @@ class GroqService(Service):
     @property
     def allowed_roles(self):
         return ["user", "assistant", "system"]
+
+    @property
+    def sequential_exchange(self):
+        """whether the service requires user/assistant exchange"""
+        return True

lionagi/integrations/groq_/version.py

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"

lionagi/integrations/litellm_/imodel.py

@@ -69,3 +69,8 @@ class LiteiModel:
     @property
     def allowed_roles(self):
         return ["user", "assistant", "system"]
+
+    @property
+    def sequential_exchange(self):
+        """whether the service requires user/assistant exchange"""
+        return False

lionagi/integrations/openai_/OpenAIModel.py

@@ -417,7 +417,3 @@ class OpenAIModel(BaseModel):
                 "Estimating price currently only supports chat/completions endpoint"
             )
         return estimated_price
-
-    @property
-    def allowed_roles(self):
-        return ["user", "assistant", "system"]

lionagi/integrations/openai_/OpenAIService.py

@@ -424,3 +424,12 @@ class OpenAIService(Service):
             method="POST",
             content_type="application/json",
         )
+
+    @property
+    def allowed_roles(self):
+        return ["user", "assistant", "system"]
+
+    @property
+    def sequential_exchange(self):
+        """whether the service requires user/assistant exchange"""
+        return False

lionagi/integrations/openai_/version.py

@@ -1 +1 @@
-__version__ = "1.0.2"
+__version__ = "1.0.3"

lionagi/integrations/perplexity_/PerplexityService.py

@@ -111,3 +111,8 @@ class PerplexityService(Service):
     @property
     def allowed_roles(self):
         return ["user", "assistant", "system"]
+
+    @property
+    def sequential_exchange(self):
+        """whether the service requires user/assistant exchange"""
+        return True

lionagi/integrations/perplexity_/version.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"

lionagi/libs/func/async_calls/alcall.py

@@ -148,6 +148,13 @@ async def alcall(
                         ucall(func, i, **kwargs), retry_timeout
                     )
                     return index, result
+
+            except InterruptedError:
+                return index, None
+
+            except asyncio.CancelledError:
+                return index, None
+
             except TimeoutError as e:
                 raise TimeoutError(
                     f"{error_msg or ''} Timeout {retry_timeout} seconds "