swarmauri-standard 0.11.0.dev2__tar.gz → 0.11.0.dev6__tar.gz

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarmauri_standard
-Version: 0.11.0.dev2
+Version: 0.11.0.dev6
 Summary: First-party Swarmauri standard components for agents, tools, parsers, vectors, model adapters, and composable intelligence workflows.
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -27,15 +27,15 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing
 Requires-Dist: aiofiles
 Requires-Dist: h11 (>=0.16.0)
-Requires-Dist: httpx (>=0.27.0)
+Requires-Dist: httpx (>=0.27.0,<1)
 Requires-Dist: joblib (>=1.4.0)
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pillow (>=11.1.0)
 Requires-Dist: pydantic (>=2.9.2)
 Requires-Dist: rich
-Requires-Dist: swarmauri_base
-Requires-Dist: swarmauri_core
+Requires-Dist: swarmauri_base (>=0.11.0.dev5)
+Requires-Dist: swarmauri_core (>=0.11.0.dev5)
 Requires-Dist: toml (>=0.10.2)
 Requires-Dist: typing_extensions
 Description-Content-Type: text/markdown

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "swarmauri_standard"
-version = "0.11.0.dev2"
+version = "0.11.0.dev6"
 description = "First-party Swarmauri standard components for agents, tools, parsers, vectors, model adapters, and composable intelligence workflows."
 keywords = [
     "swarmauri",
@@ -53,7 +53,7 @@ dependencies = [
 "toml>=0.10.2",
 "pydantic>=2.9.2",
 "h11>=0.16.0",
-"httpx>=0.27.0",
+"httpx>=0.27.0,<1",
 "numpy",
 "pandas",
 "joblib>=1.4.0",
@@ -61,8 +61,8 @@ dependencies = [
 "aiofiles",
 "rich",
 "typing_extensions",
-"swarmauri_core",
-"swarmauri_base",
+"swarmauri_core>=0.11.0.dev5",
+"swarmauri_base>=0.11.0.dev5",
 ]
 
 
@@ -87,6 +87,41 @@ dev = [
 "pytest-benchmark>=4.0.0",
 ]
 
+
+[tool.ruff]
+extend = "../pyproject.toml"
+
+[tool.ruff.lint]
+# Legacy compatibility baseline. These rules conflict with public CamelCase
+# import paths, Pydantic model fields, provider boundary behavior, or tests
+# that intentionally exercise exceptional and dynamic execution paths.
+ignore = [
+    "ASYNC230",
+    "B017",
+    "B018",
+    "BLE001",
+    "DTZ001",
+    "DTZ003",
+    "DTZ005",
+    "DTZ006",
+    "E501",
+    "LOG015",
+    "N999",
+    "PERF402",
+    "RUF012",
+    "RUF034",
+    "S102",
+    "SIM102",
+    "SIM115",
+    "SIM117",
+    "TRY002",
+    "TRY004",
+    "TRY203",
+    "UP006",
+    "UP007",
+    "UP035",
+    "UP045",
+]
 [tool.pytest.ini_options]
 timeout = 5
 asyncio_mode = "auto"

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/__init__.py

@@ -54,10 +54,10 @@ Follow us at: https://github.com/swarmauri
 
 try:
     # For Python 3.8 and newer
-    from importlib.metadata import version, PackageNotFoundError
+    from importlib.metadata import PackageNotFoundError, version
 except ImportError:
     # For older Python versions, use the backport
-    from importlib_metadata import version, PackageNotFoundError
+    from importlib_metadata import PackageNotFoundError, version
 
 try:
     __version__ = version("swarmauri_standard")

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/agents/QAAgent.py

@@ -1,14 +1,14 @@
-from typing import Any, Optional, Dict, Literal
+from typing import Any, Dict, Literal, Optional
+
+from swarmauri_base.agents.AgentBase import AgentBase
+from swarmauri_base.ComponentBase import ComponentBase, SubclassUnion
+from swarmauri_base.conversations.ConversationBase import ConversationBase
 
 from swarmauri_standard.conversations.MaxSystemContextConversation import (
     MaxSystemContextConversation,
 )
 from swarmauri_standard.messages.HumanMessage import HumanMessage
 
-from swarmauri_base.agents.AgentBase import AgentBase
-from swarmauri_base.conversations.ConversationBase import ConversationBase
-from swarmauri_base.ComponentBase import SubclassUnion, ComponentBase
-
 
 @ComponentBase.register_type(AgentBase, "QAAgent")
 class QAAgent(AgentBase):
@@ -18,8 +18,10 @@ class QAAgent(AgentBase):
     type: Literal["QAAgent"] = "QAAgent"
 
     def exec(
-        self, input_str: Optional[str] = "", llm_kwargs: Optional[Dict] = {}
+        self, input_str: Optional[str] = "", llm_kwargs: Optional[Dict] = None
     ) -> Any:
+        if llm_kwargs is None:
+            llm_kwargs = {}
         llm_kwargs = llm_kwargs or self.llm_kwargs
 
         self.conversation.add_message(HumanMessage(content=input_str))
@@ -28,8 +30,10 @@ class QAAgent(AgentBase):
         return self.conversation.get_last().content
 
     async def aexec(
-        self, input_str: Optional[str] = "", llm_kwargs: Optional[Dict] = {}
+        self, input_str: Optional[str] = "", llm_kwargs: Optional[Dict] = None
     ) -> Any:
+        if llm_kwargs is None:
+            llm_kwargs = {}
         llm_kwargs = llm_kwargs or self.llm_kwargs
 
         self.conversation.add_message(HumanMessage(content=input_str))

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/agents/RagAgent.py

@@ -1,25 +1,25 @@
-from typing import Any, Optional, Union, Dict, Literal
+from typing import Any, Dict, Literal, Optional
 
-from swarmauri_standard.messages.HumanMessage import HumanMessage
-from swarmauri_standard.messages.SystemMessage import SystemMessage
-from swarmauri_standard.conversations.MaxSystemContextConversation import (
-    MaxSystemContextConversation,
-)
-from swarmauri_standard.conversations.SessionCacheConversation import (
-    SessionCacheConversation,
-)
-
-from swarmauri_base.llms.LLMBase import LLMBase
 from swarmauri_base.agents.AgentBase import AgentBase
-from swarmauri_base.agents.AgentRetrieveMixin import AgentRetrieveMixin
 from swarmauri_base.agents.AgentConversationMixin import AgentConversationMixin
-from swarmauri_base.agents.AgentVectorStoreMixin import AgentVectorStoreMixin
+from swarmauri_base.agents.AgentRetrieveMixin import AgentRetrieveMixin
 from swarmauri_base.agents.AgentSystemContextMixin import (
     AgentSystemContextMixin,
 )
+from swarmauri_base.agents.AgentVectorStoreMixin import AgentVectorStoreMixin
+from swarmauri_base.ComponentBase import ComponentBase, SubclassUnion
+from swarmauri_base.llms.LLMBase import LLMBase
 from swarmauri_base.vector_stores.VectorStoreBase import VectorStoreBase
 from swarmauri_core.messages import IMessage
-from swarmauri_base.ComponentBase import SubclassUnion, ComponentBase
+
+from swarmauri_standard.conversations.MaxSystemContextConversation import (
+    MaxSystemContextConversation,
+)
+from swarmauri_standard.conversations.SessionCacheConversation import (
+    SessionCacheConversation,
+)
+from swarmauri_standard.messages.HumanMessage import HumanMessage
+from swarmauri_standard.messages.SystemMessage import SystemMessage
 
 
 @ComponentBase.register_type(AgentBase, "RagAgent")
@@ -37,11 +37,11 @@ class RagAgent(
     """
 
     llm: SubclassUnion[LLMBase]
-    conversation: Union[
-        MaxSystemContextConversation, SessionCacheConversation
-    ] = MaxSystemContextConversation(system_context="")
+    conversation: MaxSystemContextConversation | SessionCacheConversation = (
+        MaxSystemContextConversation(system_context="")
+    )
     vector_store: SubclassUnion[VectorStoreBase]
-    system_context: Union[SystemMessage, str] = SystemMessage(content="")
+    system_context: SystemMessage | str = SystemMessage(content="")
     type: Literal["RagAgent"] = "RagAgent"
 
     def _create_preamble_context(self):
@@ -58,7 +58,7 @@ class RagAgent(
 
     def _prepare_context(
         self,
-        input_data: Union[str, IMessage],
+        input_data: str | IMessage,
         top_k: int,
         preamble: bool,
         fixed: bool,
@@ -98,12 +98,14 @@ class RagAgent(
 
     def exec(
         self,
-        input_data: Optional[Union[str, IMessage]] = "",
+        input_data: Optional[str | IMessage] = "",
         top_k: int = 5,
         preamble: bool = True,
         fixed: bool = False,
-        llm_kwargs: Optional[Dict] = {},
+        llm_kwargs: Optional[Dict] = None,
     ) -> Any:
+        if llm_kwargs is None:
+            llm_kwargs = {}
         llm_kwargs = llm_kwargs or self.llm_kwargs
 
         try:
@@ -115,16 +117,18 @@ class RagAgent(
             return self.conversation.get_last().content
         except Exception as e:
             print(f"RagAgent error: {e}")
-            raise e
+            raise
 
     async def aexec(
         self,
-        input_data: Optional[Union[str, IMessage]] = "",
+        input_data: Optional[str | IMessage] = "",
         top_k: int = 5,
         preamble: bool = True,
         fixed: bool = False,
-        llm_kwargs: Optional[Dict] = {},
+        llm_kwargs: Optional[Dict] = None,
     ) -> Any:
+        if llm_kwargs is None:
+            llm_kwargs = {}
         llm_kwargs = llm_kwargs or self.llm_kwargs
 
         try:
@@ -138,4 +142,4 @@ class RagAgent(
             return self.conversation.get_last().content
         except Exception as e:
             print(f"RagAgent error: {e}")
-            raise e
+            raise

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/agents/SimpleConversationAgent.py

@@ -1,12 +1,12 @@
-from typing import Any, Optional, Dict, Literal, List, Union
+from typing import Any, Dict, List, Literal, Optional
 
-from swarmauri_standard.messages.HumanMessage import contentItem
-from swarmauri_standard.messages.HumanMessage import HumanMessage
-from swarmauri_base.llms.LLMBase import LLMBase
 from swarmauri_base.agents.AgentBase import AgentBase
 from swarmauri_base.agents.AgentConversationMixin import AgentConversationMixin
+from swarmauri_base.ComponentBase import ComponentBase, SubclassUnion
 from swarmauri_base.conversations.ConversationBase import ConversationBase
-from swarmauri_base.ComponentBase import SubclassUnion, ComponentBase
+from swarmauri_base.llms.LLMBase import LLMBase
+
+from swarmauri_standard.messages.HumanMessage import HumanMessage, contentItem
 
 
 @ComponentBase.register_type(AgentBase, "SimpleConversationAgent")
@@ -17,9 +17,11 @@ class SimpleConversationAgent(AgentConversationMixin, AgentBase):
 
     def exec(
         self,
-        input_data: Optional[Union[str, List[contentItem]]] = "",
-        llm_kwargs: Optional[Dict] = {},
+        input_data: Optional[str | List[contentItem]] = "",
+        llm_kwargs: Optional[Dict] = None,
     ) -> Any:
+        if llm_kwargs is None:
+            llm_kwargs = {}
         if input_data:
             human_message = HumanMessage(content=input_data)
             self.conversation.add_message(human_message)
@@ -29,9 +31,11 @@ class SimpleConversationAgent(AgentConversationMixin, AgentBase):
 
     async def aexec(
         self,
-        input_data: Optional[Union[str, List[contentItem]]] = "",
-        llm_kwargs: Optional[Dict] = {},
+        input_data: Optional[str | List[contentItem]] = "",
+        llm_kwargs: Optional[Dict] = None,
     ) -> Any:
+        if llm_kwargs is None:
+            llm_kwargs = {}
         if input_data:
             human_message = HumanMessage(content=input_data)
             self.conversation.add_message(human_message)

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/agents/ToolAgent.py

@@ -1,18 +1,17 @@
 import logging
-from pydantic import ConfigDict
-from typing import Any, Optional, Union, Dict, Literal, List
+from typing import Any, Dict, List, Literal, Optional
 
-from swarmauri_standard.messages.HumanMessage import HumanMessage
+from pydantic import ConfigDict
 from swarmauri_base.agents.AgentBase import AgentBase
 from swarmauri_base.agents.AgentConversationMixin import AgentConversationMixin
 from swarmauri_base.agents.AgentToolMixin import AgentToolMixin
-from swarmauri_base.toolkits.ToolkitBase import ToolkitBase
+from swarmauri_base.ComponentBase import ComponentBase, SubclassUnion
 from swarmauri_base.conversations.ConversationBase import ConversationBase
 from swarmauri_base.tool_llms.ToolLLMBase import ToolLLMBase
-
-
+from swarmauri_base.toolkits.ToolkitBase import ToolkitBase
 from swarmauri_core.messages import IMessage
-from swarmauri_base.ComponentBase import SubclassUnion, ComponentBase
+
+from swarmauri_standard.messages.HumanMessage import HumanMessage
 
 
 @ComponentBase.register_type(AgentBase, "ToolAgent")
@@ -25,11 +24,13 @@ class ToolAgent(AgentToolMixin, AgentConversationMixin, AgentBase):
 
     def exec(
         self,
-        input_data: Optional[Union[str, IMessage]] = "",
+        input_data: Optional[str | IMessage] = "",
         multiturn: bool = True,
-        llm_kwargs: Optional[Dict] = {},
+        llm_kwargs: Optional[Dict] = None,
     ) -> Any:
         # Check if the input is a string, then wrap it in a HumanMessage
+        if llm_kwargs is None:
+            llm_kwargs = {}
         if isinstance(input_data, str):
             human_message = HumanMessage(content=input_data)
         elif isinstance(input_data, IMessage):
@@ -56,11 +57,13 @@ class ToolAgent(AgentToolMixin, AgentConversationMixin, AgentBase):
 
     async def aexec(
         self,
-        input_data: Optional[Union[str, IMessage]] = "",
+        input_data: Optional[str | IMessage] = "",
         multiturn: bool = True,
-        llm_kwargs: Optional[Dict] = {},
+        llm_kwargs: Optional[Dict] = None,
     ) -> Any:
         # Check if the input is a string, then wrap it in a HumanMessage
+        if llm_kwargs is None:
+            llm_kwargs = {}
         if isinstance(input_data, str):
             human_message = HumanMessage(content=input_data)
         elif isinstance(input_data, IMessage):

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chains/CallableChain.py

@@ -1,7 +1,8 @@
-from typing import Any, Callable, List, Dict, Optional
+from typing import Any, Callable, Dict, List, Optional
+
 from swarmauri_core.chains.ICallableChain import (
-    ICallableChain,
     CallableDefinition,
+    ICallableChain,
 )
 
 
@@ -22,8 +23,8 @@ class CallableChain(ICallableChain):
     def add_callable(
         self,
         func: Callable[[Any], Any],
-        args: List[Any] = None,
-        kwargs: Dict[str, Any] = None,
+        args: List[Any] | None = None,
+        kwargs: Dict[str, Any] | None = None,
     ) -> None:
         # Add a new callable to the chain
         self.callables.append((func, args or [], kwargs or {}))

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chains/ChainStep.py

@@ -1,4 +1,5 @@
 from typing import Literal
+
 from swarmauri_base.chains.ChainStepBase import ChainStepBase
 from swarmauri_base.ComponentBase import ComponentBase
 

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chains/ContextChain.py

@@ -1,10 +1,11 @@
-from typing import Any, Dict, Optional, Tuple, Literal
+from typing import Any, Dict, Literal, Optional, Tuple
 
-from swarmauri_base.tools.ToolBase import ToolBase
-from swarmauri_standard.chains.ChainStep import ChainStep
 from swarmauri_base.chains.ChainContextBase import ChainContextBase
-from swarmauri_core.chains.IChain import IChain
 from swarmauri_base.ComponentBase import ComponentBase, SubclassUnion
+from swarmauri_base.tools.ToolBase import ToolBase
+from swarmauri_core.chains.IChain import IChain
+
+from swarmauri_standard.chains.ChainStep import ChainStep
 
 
 @ComponentBase.register_type(ChainContextBase, "ContextChain")
@@ -23,11 +24,13 @@ class ContextChain(IChain, ChainContextBase):
         key: str,
         method: SubclassUnion[ToolBase],
         args: Tuple = (),
-        kwargs: Dict[str, Any] = {},
+        kwargs: Dict[str, Any] | None = None,
         ref: Optional[str] = None,
     ):
         # Directly store args, kwargs, and optionally a return_key without
         # resolving them
+        if kwargs is None:
+            kwargs = {}
         step = ChainStep(
             key=key, method=method, args=args, kwargs=kwargs, ref=ref
         )

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chains/PromptContextChain.py

@@ -1,4 +1,5 @@
 from typing import Literal
+
 from swarmauri_base.chains.PromptContextChainBase import PromptContextChainBase
 from swarmauri_base.ComponentBase import ComponentBase
 

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chunkers/DelimiterBasedChunker.py

@@ -1,5 +1,6 @@
-from typing import List, Union, Any, Literal
 import re
+from typing import Any, List, Literal
+
 from swarmauri_base.chunkers.ChunkerBase import ChunkerBase
 from swarmauri_base.ComponentBase import ComponentBase
 
@@ -15,7 +16,7 @@ class DelimiterBasedChunker(ChunkerBase):
     delimiters: List[str] = [".", "!", "?"]
     type: Literal["DelimiterBasedChunker"] = "DelimiterBasedChunker"
 
-    def chunk_text(self, text: Union[str, Any], *args, **kwargs) -> List[str]:
+    def chunk_text(self, text: str | Any, *args, **kwargs) -> List[str]:
         """
         Chunks the given text based on the delimiters specified during
         initialization.

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chunkers/FixedLengthChunker.py

@@ -1,4 +1,5 @@
-from typing import List, Union, Any, Literal
+from typing import Any, List, Literal
+
 from swarmauri_base.chunkers.ChunkerBase import ChunkerBase
 from swarmauri_base.ComponentBase import ComponentBase
 
@@ -19,7 +20,7 @@ class FixedLengthChunker(ChunkerBase):
     chunk_size: int = 256
     type: Literal["FixedLengthChunker"] = "FixedLengthChunker"
 
-    def chunk_text(self, text: Union[str, Any], *args, **kwargs) -> List[str]:
+    def chunk_text(self, text: str | Any, *args, **kwargs) -> List[str]:
         """
         Splits the input text into fixed-length chunks.
 

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chunkers/MdSnippetChunker.py

@@ -1,5 +1,6 @@
-from typing import List, Union, Any, Optional, Literal
 import re
+from typing import Any, List, Literal, Optional
+
 from swarmauri_base.chunkers.ChunkerBase import ChunkerBase
 from swarmauri_base.ComponentBase import ComponentBase
 
@@ -10,9 +11,7 @@ class MdSnippetChunker(ChunkerBase):
     language: Optional[str] = None
     type: Literal["MdSnippetChunker"] = "MdSnippetChunker"
 
-    def chunk_text(
-        self, text: Union[str, Any], *args, **kwargs
-    ) -> List[tuple]:
+    def chunk_text(self, text: str | Any, *args, **kwargs) -> List[tuple]:
         """
         Extracts paired comments and code blocks from Markdown content based on
         the

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chunkers/SentenceChunker.py

@@ -1,5 +1,6 @@
-from typing import Any, List, Literal
 import re
+from typing import Any, List, Literal
+
 from swarmauri_base.chunkers.ChunkerBase import ChunkerBase
 from swarmauri_base.ComponentBase import ComponentBase
 

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/chunkers/SlidingWindowChunker.py

@@ -1,4 +1,5 @@
 from typing import List, Literal
+
 from swarmauri_base.chunkers.ChunkerBase import ChunkerBase
 from swarmauri_base.ComponentBase import ComponentBase
 

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/conversations/Conversation.py

@@ -1,6 +1,7 @@
 from typing import Literal
-from swarmauri_base.conversations.ConversationBase import ConversationBase
+
 from swarmauri_base.ComponentBase import ComponentBase
+from swarmauri_base.conversations.ConversationBase import ConversationBase
 
 
 @ComponentBase.register_type(ConversationBase, "Conversation")

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/conversations/MaxSizeConversation.py

@@ -1,9 +1,10 @@
 from typing import Literal
+
 from pydantic import Field
+from swarmauri_base.ComponentBase import ComponentBase
 from swarmauri_base.conversations.ConversationBase import ConversationBase
-from swarmauri_core.messages.IMessage import IMessage
 from swarmauri_core.conversations.IMaxSize import IMaxSize
-from swarmauri_base.ComponentBase import ComponentBase
+from swarmauri_core.messages.IMessage import IMessage
 
 
 @ComponentBase.register_type(ConversationBase, "MaxSizeConversation")

{swarmauri_standard-0.11.0.dev2 → swarmauri_standard-0.11.0.dev6}/swarmauri_standard/conversations/MaxSystemContextConversation.py

@@ -1,18 +1,21 @@
-from typing import Optional, Union, List, Literal
-from pydantic import Field, ConfigDict, field_validator
-from swarmauri_standard.messages.SystemMessage import SystemMessage
-from swarmauri_standard.messages.HumanMessage import HumanMessage
-from swarmauri_standard.messages.AgentMessage import AgentMessage
-from swarmauri_standard.exceptions.IndexErrorWithContext import (
-    IndexErrorWithContext,
-)
+from typing import List, Literal, Optional
+
+from pydantic import ConfigDict, Field, field_validator
+from swarmauri_base.ComponentBase import ComponentBase
 from swarmauri_base.conversations.ConversationBase import ConversationBase
 from swarmauri_base.conversations.ConversationSystemContextMixin import (
     ConversationSystemContextMixin,
 )
 from swarmauri_core.conversations.IMaxSize import IMaxSize
 from swarmauri_core.messages.IMessage import IMessage
-from swarmauri_base.ComponentBase import ComponentBase
+
+from swarmauri_standard.exceptions.IndexErrorWithContext import (
+    IndexErrorWithContext,
+)
+from swarmauri_standard.messages.AgentMessage import AgentMessage
+from swarmauri_standard.messages.FunctionMessage import FunctionMessage
+from swarmauri_standard.messages.HumanMessage import HumanMessage
+from swarmauri_standard.messages.SystemMessage import SystemMessage
 
 
 @ComponentBase.register_type(ConversationBase, "MaxSystemContextConversation")
@@ -27,9 +30,7 @@ class MaxSystemContextConversation(
     )
 
     @field_validator("system_context", mode="before")
-    def set_system_context(
-        cls, value: Union[str, SystemMessage]
-    ) -> SystemMessage:
+    def set_system_context(cls, value: str | SystemMessage) -> SystemMessage:
         if isinstance(value, str):
             return SystemMessage(content=value)
         return value
@@ -60,16 +61,19 @@ class MaxSystemContextConversation(
         alternating = True
         count = 0
         for message in self._history[user_start_index:]:
+            if isinstance(message, FunctionMessage):
+                res.append(message)
+                continue
             if count > self.max_size:  # max size
                 break
-            if (
-                alternating
-                and isinstance(message, HumanMessage)
-                or not alternating
-                and isinstance(message, AgentMessage)
-            ):
+            if alternating and isinstance(message, HumanMessage):
+                res.append(message)
+                alternating = False
+                count += 1
+            elif not alternating and isinstance(message, AgentMessage):
                 res.append(message)
-                alternating = not alternating
+                if not message.tool_calls:
+                    alternating = True
                 count += 1
             elif not alternating and isinstance(message, HumanMessage):
                 # If we find two 'user' messages in a row when expecting an
@@ -89,10 +93,8 @@ class MaxSystemContextConversation(
         """
         if isinstance(message, SystemMessage):
             raise ValueError(
-                (
-                    f"System context cannot be set through this method on "
-                    f"{self.__class_name__}."
-                )
+                f"System context cannot be set through this method on "
+                f"{self.__class_name__}."
             )
         elif isinstance(message, IMessage):
             self._history.append(message)