waldiez 0.4.7__py3-none-any.whl → 0.4.9__py3-none-any.whl

waldiez/models/agents/{swarm_agent → agent}/update_system_message.py

@@ -1,26 +1,28 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Update the agent's system message before they reply."""
 
-from typing import Optional, Tuple
+from typing import Optional
 
 from pydantic import Field, model_validator
 from typing_extensions import Annotated, Literal, Self
 
 from ...common import WaldiezBase, check_function, generate_function
 
-WaldiezSwarmUpdateFunctionType = Literal["string", "callable"]
+WaldiezAgentUpdateFunctionType = Literal["string", "callable"]
 """Possible types for the update function."""
 
 CUSTOM_UPDATE_SYSTEM_MESSAGE = "custom_update_system_message"
 CUSTOM_UPDATE_SYSTEM_MESSAGE_ARGS = ["agent", "messages"]
 CUSTOM_UPDATE_SYSTEM_MESSAGE_TYPES = (
-    ["ConversableAgent", "List[Dict[str, Any]]"],
+    ["ConversableAgent", "list[dict[str, Any]]"],
     "str",
 )
 
 
-class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
+class WaldiezAgentUpdateSystemMessage(WaldiezBase):
     """Update the agent's system message before they reply.
 
     Attributes
@@ -36,18 +38,17 @@ class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
         ```
         def custom_update_system_message(
             agent: ConversableAgent,
-            messages: List[Dict[str, Any]]
+            messages: list[dict[str, Any]]
         ) -> str:
 
         ```
     """
 
-    update_function_type: Annotated[
-        WaldiezSwarmUpdateFunctionType,
+    type: Annotated[
+        WaldiezAgentUpdateFunctionType,
         Field(
             "string",
             title="Function Type",
-            alias="updateFunctionType",
             description=(
                 "The type of the update function. "
                 "Can be either 'string' or 'callable'."
@@ -55,12 +56,11 @@ class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
         ),
     ]
 
-    update_function: Annotated[
+    content: Annotated[
         str,
         Field(
             ...,
-            title="Update Function",
-            alias="updateFunction",
+            title="Function Content",
             description=(
                 "The string template or function definition to update "
                 "the agent's system message. Can be a string or a Callable.  "
@@ -70,20 +70,20 @@ class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
                 "is 'callable', it should have signature: "
                 "def custom_update_system_message("
                 "   agent: ConversableAgent, "
-                "   messages: List[Dict[str, Any]] "
+                "   messages: list[dict[str, Any]] "
                 ") -> str"
             ),
         ),
     ]
 
-    _update_function: str = ""
+    _content: str = ""
 
-    def get_update_function(
+    def get_content(
         self,
         name_prefix: Optional[str] = None,
         name_suffix: Optional[str] = None,
-    ) -> Tuple[str, str]:
-        """Get the update function.
+    ) -> tuple[str, str]:
+        """Get the update function content.
 
         Parameters
         ----------
@@ -94,7 +94,7 @@ class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
 
         Returns
         -------
-        Tuple[str, str]
+        tuple[str, str]
             The update function and the function name.
 
         """
@@ -108,7 +108,7 @@ class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
                 function_name=function_name,
                 function_args=CUSTOM_UPDATE_SYSTEM_MESSAGE_ARGS,
                 function_types=CUSTOM_UPDATE_SYSTEM_MESSAGE_TYPES,
-                function_body=self._update_function,
+                function_body=self._content,
             ),
             function_name,
         )
@@ -129,10 +129,10 @@ class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
             or if the function type is not 'string' or 'callable'.
 
         """
-        self._update_function = self.update_function
-        if self.update_function_type == "callable":
+        self._content = self.content
+        if self.type == "callable":
             valid, error_or_body = check_function(
-                code_string=self.update_function,
+                code_string=self._content,
                 function_name=CUSTOM_UPDATE_SYSTEM_MESSAGE,
                 function_args=CUSTOM_UPDATE_SYSTEM_MESSAGE_ARGS,
             )
@@ -141,5 +141,5 @@ class WaldiezSwarmUpdateSystemMessage(WaldiezBase):
                 raise ValueError(
                     f"Invalid custom method: {error_or_body or 'no content'}"
                 )
-            self._update_function = error_or_body
+            self._content = error_or_body
         return self

waldiez/models/agents/agents.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez agents model."""
 
-from typing import Iterator, List
+from typing import Iterator
 
 from pydantic import Field, model_validator
 from typing_extensions import Annotated, Self
@@ -10,11 +10,10 @@ from typing_extensions import Annotated, Self
 from ..common import WaldiezBase
 from .agent import WaldiezAgent
 from .assistant import WaldiezAssistant
-from .captain_agent import WaldiezCaptainAgent
+from .captain import WaldiezCaptainAgent
 from .group_manager import WaldiezGroupManager
-from .rag_user import WaldiezRagUser
+from .rag_user_proxy import WaldiezRagUserProxy
 from .reasoning import WaldiezReasoningAgent
-from .swarm_agent import WaldiezSwarmAgent
 from .user_proxy import WaldiezUserProxy
 
 
@@ -23,72 +22,68 @@ class WaldiezAgents(WaldiezBase):
 
     Attributes
     ----------
-    users : List[WaldiezUserProxy]
+    userProxyAgents : list[WaldiezUserProxy]
         User proxy agents.
-    assistants : List[WaldiezAssistant]
+    assistantAgents : list[WaldiezAssistant]
         Assistant agents.
-    managers : List[WaldiezGroupManager]
-        Group chat managers.
-    rag_users : List[WaldiezRagUser]
-        RAG user agents.
+    ragUserProxyAgents : list[WaldiezRagUserProxy]
+        RAG user proxy agents.
+    reasoningAgents : list[WaldiezReasoningAgent]
+        Reasoning agents.
+    captainAgents : list[WaldiezCaptainAgent]
+        Captain agents.
+    groupManagerAgents : list[WaldiezGroupManager]
+        Group manager agents.
     """
 
-    users: Annotated[
-        List[WaldiezUserProxy],
+    userProxyAgents: Annotated[
+        list[WaldiezUserProxy],
         Field(
-            title="Users.",
-            description="User proxy agents",
+            title="User Proxy Agents.",
+            description="The User proxy agents in the flow.",
             default_factory=list,
         ),
-    ]
-    assistants: Annotated[
-        List[WaldiezAssistant],
+    ] = []
+    assistantAgents: Annotated[
+        list[WaldiezAssistant],
         Field(
-            title="Assistants.",
-            description="Assistant agents",
+            title="Assistant Agents.",
+            description="The assistant agents in the flow.",
             default_factory=list,
         ),
-    ]
-    managers: Annotated[
-        List[WaldiezGroupManager],
+    ] = []
+    ragUserProxyAgents: Annotated[
+        list[WaldiezRagUserProxy],
         Field(
-            title="Managers.",
-            description="Group chat managers",
+            title="RAG Users Proxy agents.",
+            description="The RAG user proxy agents in the flow.",
             default_factory=list,
         ),
-    ]
-    rag_users: Annotated[
-        List[WaldiezRagUser],
+    ] = []
+    reasoningAgents: Annotated[
+        list[WaldiezReasoningAgent],
         Field(
-            title="RAG Users.",
-            description="RAG user agents",
-            default_factory=list,
-        ),
-    ]
-    swarm_agents: Annotated[
-        List[WaldiezSwarmAgent],
-        Field(
-            title="Swarm Agents.",
-            description="Swarm agents",
+            title="Reasoning Agents.",
+            description="The Reasoning agents in the flow.",
             default_factory=list,
         ),
-    ]
-    reasoning_agents: Annotated[
-        List[WaldiezReasoningAgent],
+    ] = []
+    captainAgents: Annotated[
+        list[WaldiezCaptainAgent],
         Field(
-            title="Reasoning Agents.",
-            description="Reasoning agents",
+            title="Captain Agents.",
+            description="The Captain agents in the flow.",
             default_factory=list,
         ),
-    ]
-    captain_agents: Annotated[
-        List[WaldiezCaptainAgent],
+    ] = []
+    groupManagerAgents: Annotated[
+        list[WaldiezGroupManager],
         Field(
-            title="Captain Agents.",
-            description="Captain agents",
+            title="Group Manager Agents.",
+            description="The Group manager agents in the flow.",
             default_factory=list,
         ),
-    ]
+    ] = []
 
     @property
     def members(self) -> Iterator[WaldiezAgent]:
@@ -99,13 +94,12 @@ class WaldiezAgents(WaldiezBase):
         WaldiezAgent
             The agents.
         """
-        yield from self.users
-        yield from self.assistants
-        yield from self.rag_users
-        yield from self.reasoning_agents
-        yield from self.swarm_agents
-        yield from self.managers
-        yield from self.captain_agents
+        yield from self.userProxyAgents
+        yield from self.assistantAgents
+        yield from self.ragUserProxyAgents
+        yield from self.reasoningAgents
+        yield from self.captainAgents
+        yield from self.groupManagerAgents
 
     @model_validator(mode="after")
     def validate_agents(self) -> Self:
@@ -131,19 +125,19 @@ class WaldiezAgents(WaldiezBase):
             raise ValueError("Agent IDs must be unique.")
         return self
 
-    def validate_flow(self, model_ids: List[str], skill_ids: List[str]) -> None:
+    def validate_flow(self, model_ids: list[str], tool_ids: list[str]) -> None:
         """Validate the flow of the agents.
 
         - Validate the linked models (the referenced model ids must exist).
-        - Validate the linked skills (the referenced skill ids must exist).
+        - Validate the linked tools (the referenced tool ids must exist).
         - Validate the code execution (the referenced functions must exist).
 
         Parameters
         ----------
-        model_ids : List[str]
+        model_ids : list[str]
             The list of model IDs.
-        skill_ids : List[str]
-            The list of skill IDs.
+        tool_ids : list[str]
+            The list of tool IDs.
 
         Raises
         ------
@@ -153,9 +147,10 @@ class WaldiezAgents(WaldiezBase):
         all_agent_ids = [agent.id for agent in self.members]
         for agent in self.members:
             agent.validate_linked_models(model_ids)
-            agent.validate_linked_skills(skill_ids, agent_ids=all_agent_ids)
-            agent.validate_code_execution(skill_ids=skill_ids)
-            if agent.agent_type == "manager" and isinstance(
+            agent.validate_linked_tools(tool_ids, agent_ids=all_agent_ids)
+            agent.validate_code_execution(tool_ids=tool_ids)
+            if agent.is_group_manager and isinstance(
                 agent, WaldiezGroupManager
             ):
+                agent.validate_initial_agent_id(all_agent_ids)
                 agent.validate_transitions(agent_ids=all_agent_ids)

waldiez/models/agents/assistant/assistant.py

@@ -24,7 +24,7 @@ class WaldiezAssistant(WaldiezAgent):
         The assistant agent's data
     """
 
-    agent_type: Annotated[
+    agent_type: Annotated[  # pyright: ignore
         Literal["assistant"],
         Field(
             "assistant",
@@ -32,12 +32,12 @@ class WaldiezAssistant(WaldiezAgent):
             description="The agent type in a graph: 'assistant'",
             alias="agentType",
         ),
-    ]
-    data: Annotated[
+    ] = "assistant"
+    data: Annotated[  # pyright: ignore
         WaldiezAssistantData,
         Field(
             title="Data",
             description="The assistant agent's data",
-            default_factory=WaldiezAssistantData,
+            default_factory=WaldiezAssistantData,  # pyright: ignore
         ),
     ]

waldiez/models/agents/assistant/assistant_data.py

@@ -18,6 +18,9 @@ class WaldiezAssistantData(WaldiezAgentData):
     ----------
     human_input_mode : Literal["ALWAYS", "NEVER", "TERMINATE"]
         The human input mode, Defaults to `NEVER`
+    is_multimodal : bool
+        A flag to indicate if the agent is multimodal.
+        Defaults to `False`.
     """
 
     human_input_mode: Annotated[
@@ -28,4 +31,13 @@ class WaldiezAssistantData(WaldiezAgentData):
             description="The human input mode, Defaults to `NEVER`",
             alias="humanInputMode",
         ),
-    ]
+    ] = "NEVER"
+    is_multimodal: Annotated[
+        bool,
+        Field(
+            False,
+            title="Is multimodal",
+            description="A flag to indicate if the agent is multimodal.",
+            alias="isMultimodal",
+        ),
+    ] = False

waldiez/models/agents/{captain_agent → captain}/captain_agent.py

@@ -26,20 +26,20 @@ class WaldiezCaptainAgent(WaldiezAgent):
         The captain agent's data.
     """
 
-    agent_type: Annotated[
+    agent_type: Annotated[  # pyright: ignore
         Literal["captain"],
         Field(
-            "captain",
+            default="captain",
             title="Agent type",
             description="The agent type: 'captain' for a captain agent",
             alias="agentType",
         ),
-    ]
-    data: Annotated[
+    ] = "captain"
+    data: Annotated[  # pyright: ignore
         WaldiezCaptainAgentData,
         Field(
             title="Data",
             description="The captain agent's data",
-            default_factory=WaldiezCaptainAgentData,
+            default_factory=WaldiezCaptainAgentData,  # pyright: ignore
         ),
     ]

waldiez/models/agents/{captain_agent → captain}/captain_agent_data.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez captain agent data."""
 
-from typing import List, Optional
+from typing import Optional
 
 from pydantic import Field
 from typing_extensions import Annotated, Literal
@@ -25,7 +25,7 @@ class WaldiezCaptainAgentData(WaldiezAgentData):
     """
 
     agent_lib: Annotated[
-        List[WaldiezCaptainAgentLibEntry],
+        list[WaldiezCaptainAgentLibEntry],
         Field(
             default_factory=list,
             title="Agent lib",
@@ -36,7 +36,7 @@ class WaldiezCaptainAgentData(WaldiezAgentData):
     tool_lib: Annotated[
         Optional[Literal["default"]],
         Field(
-            None,
+            default=None,
             title="Tool lib",
             description="Whether to use the default tool lib",
             alias="toolLib",
@@ -45,7 +45,7 @@ class WaldiezCaptainAgentData(WaldiezAgentData):
     max_round: Annotated[
         int,
         Field(
-            10,
+            default=10,
             title="Max round",
             description="The maximum number of rounds in a group chat",
             alias="maxRound",
@@ -54,7 +54,7 @@ class WaldiezCaptainAgentData(WaldiezAgentData):
     max_turns: Annotated[
         int,
         Field(
-            5,
+            default=5,
             title="Max turns",
             description="The maximum number of turns for a chat",
             alias="maxTurns",

waldiez/models/agents/extra_requirements.py

@@ -3,11 +3,10 @@
 """Extra requirements for agents."""
 
 # pylint: disable=line-too-long
-import platform
-from typing import Iterator, List, Set
+from typing import Iterator, Set
 
 from .agent import WaldiezAgent
-from .rag_user import WaldiezRagUser
+from .rag_user_proxy import WaldiezRagUserProxy
 
 
 def get_retrievechat_extra_requirements(
@@ -17,7 +16,7 @@ def get_retrievechat_extra_requirements(
 
     Parameters
     ----------
-    agents : List[WaldiezAgent]
+    agents : list[WaldiezAgent]
         The flow agents.
 
     Returns
@@ -26,10 +25,9 @@ def get_retrievechat_extra_requirements(
         The retrievechat extra requirements.
     """
     # https://github.com/ag2ai/ag2/blob/main/pyproject.toml
-    # with chromadb relaxed
-    # to avoid conflicts with other extras and (later) allow py3.13
+    # with chromadb and sentence_transdormers relaxed
     rag_requirements: Set[str] = {
-        "protobuf==4.25.3",
+        "protobuf==5.29.3",
         "chromadb>=0.5.23",
         "sentence_transformers",
         "pypdf",
@@ -38,7 +36,7 @@ def get_retrievechat_extra_requirements(
         "markdownify",
     }
     for agent in agents:
-        if agent.agent_type == "rag_user" and isinstance(agent, WaldiezRagUser):
+        if agent.is_rag_user and isinstance(agent, WaldiezRagUserProxy):
             # if not chroma, get the relevant db requirements
             db_type = agent.data.retrieve_config.vector_db
             if db_type == "pgvector":
@@ -55,12 +53,12 @@ def get_retrievechat_extra_requirements(
     return rag_requirements
 
 
-def get_captain_agent_extra_requirements() -> List[str]:
+def get_captain_agent_extra_requirements() -> list[str]:
     """Get the captain agent extra requirements.
 
     Returns
     -------
-    List[str]
+    list[str]
         The captain agent extra requirements.
     """
     # https://github.com/ag2ai/ag2/blob/main/autogen/agentchat/contrib/captainagent/tools/requirements.txt  # noqa: E501
@@ -72,17 +70,14 @@ def get_captain_agent_extra_requirements() -> List[str]:
         "easyocr",
         "python-pptx",
         "openai-whisper",
-        "pandas",
         "scipy",
-        # "sentence-transformers", also in agent_requirements
+        # "pandas", also in agent_requirements below
+        # "sentence-transformers", also in agent_requirements below
     ]
     agent_requirements = [
+        "pandas",
         "chromadb",
         "sentence-transformers",
         "huggingface-hub",
     ]
-    if platform.system() == "Linux":
-        agent_requirements.append("pysqlite3-binary")
-    # on windows and OSX, installing pysqlite3-binary seem to fail in some cases
-    # we can handle/install if needed in waldiez.utils.pysqlite3_checker
     return tool_requirements + agent_requirements