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

waldiez/models/__init__.py

@@ -3,9 +3,9 @@
 """Waldiez models.
 
 - Agents (Users, Assistants, Group Managers, etc.).
-- Chat (Messages, Summaries, etc.).
-- Model (LLM config, API type, etc.).
-- Skill (Skills/Tools to be registered).
+- Chats (Messages, Summaries, etc.).
+- Models (LLM config, API type, etc.).
+- Tools (Tools to be registered).
 - Flow (Flow of the conversation).
 - Methods (Method names, arguments, hints, etc.).
 - Waldiez (Main class to hold the flow).
@@ -15,13 +15,15 @@ from .agents import (
     WaldiezAgent,
     WaldiezAgentCodeExecutionConfig,
     WaldiezAgentData,
-    WaldiezAgentLinkedSkill,
+    WaldiezAgentHumanInputMode,
+    WaldiezAgentLinkedTool,
     WaldiezAgentNestedChat,
     WaldiezAgentNestedChatMessage,
     WaldiezAgents,
-    WaldiezAgentTeachability,
     WaldiezAgentTerminationMessage,
     WaldiezAgentType,
+    WaldiezAgentUpdateFunctionType,
+    WaldiezAgentUpdateSystemMessage,
     WaldiezAssistant,
     WaldiezAssistantData,
     WaldiezCaptainAgent,
@@ -33,27 +35,17 @@ from .agents import (
     WaldiezGroupManagerSpeakersSelectionMethod,
     WaldiezGroupManagerSpeakersSelectionMode,
     WaldiezGroupManagerSpeakersTransitionsType,
-    WaldiezRagUser,
-    WaldiezRagUserChunkMode,
-    WaldiezRagUserData,
-    WaldiezRagUserModels,
-    WaldiezRagUserRetrieveConfig,
-    WaldiezRagUserTask,
-    WaldiezRagUserVectorDb,
-    WaldiezRagUserVectorDbConfig,
+    WaldiezRagUserProxy,
+    WaldiezRagUserProxyChunkMode,
+    WaldiezRagUserProxyData,
+    WaldiezRagUserProxyModels,
+    WaldiezRagUserProxyRetrieveConfig,
+    WaldiezRagUserProxyTask,
+    WaldiezRagUserProxyVectorDb,
+    WaldiezRagUserProxyVectorDbConfig,
     WaldiezReasoningAgent,
     WaldiezReasoningAgentData,
     WaldiezReasoningAgentReasonConfig,
-    WaldiezSwarmAfterWork,
-    WaldiezSwarmAfterWorkOption,
-    WaldiezSwarmAfterWorkRecipientType,
-    WaldiezSwarmAgent,
-    WaldiezSwarmAgentData,
-    WaldiezSwarmHandoff,
-    WaldiezSwarmOnCondition,
-    WaldiezSwarmOnConditionAvailable,
-    WaldiezSwarmOnConditionTarget,
-    WaldiezSwarmUpdateSystemMessage,
     WaldiezUserProxy,
     WaldiezUserProxyData,
 )
@@ -61,34 +53,86 @@ from .chat import (
     WaldiezChat,
     WaldiezChatData,
     WaldiezChatMessage,
+    WaldiezChatMessageType,
     WaldiezChatNested,
     WaldiezChatSummary,
     WaldiezChatSummaryMethod,
+    WaldiezChatType,
+)
+from .common import (
+    MAX_VARIABLE_LENGTH,
+    WaldiezAgentTarget,
+    WaldiezContextBasedCondition,
+    WaldiezContextBasedTransition,
+    WaldiezContextStrLLMCondition,
+    WaldiezDefaultCondition,
+    WaldiezExpressionContextCondition,
+    WaldiezGroupOrNestedTarget,
+    WaldiezHandoff,
+    WaldiezHandoffCondition,
+    WaldiezHandoffTransition,
+    WaldiezLLMBasedCondition,
+    WaldiezLLMBasedTransition,
+    WaldiezRandomAgentTarget,
+    WaldiezSimpleTarget,
+    WaldiezStringContextCondition,
+    WaldiezStringLLMCondition,
+    WaldiezTransitionAvailability,
+    WaldiezTransitionTarget,
+    get_autogen_version,
+    get_valid_instance_name,
+    get_valid_python_variable_name,
+)
+from .flow import (
+    WaldiezAgentConnection,
+    WaldiezAgentInfo,
+    WaldiezFlow,
+    WaldiezFlowData,
+    WaldiezFlowInfo,
+    WaldiezUniqueNames,
+    ensure_unique_names,
 )
-from .flow import WaldiezFlow, WaldiezFlowData
 from .model import (
+    DEFAULT_BASE_URLS,
     WaldiezModel,
     WaldiezModelAPIType,
+    WaldiezModelAWS,
     WaldiezModelData,
     WaldiezModelPrice,
 )
-from .skill import SHARED_SKILL_NAME, WaldiezSkill, WaldiezSkillData
+from .tool import (
+    SHARED_TOOL_NAME,
+    WaldiezTool,
+    WaldiezToolData,
+    WaldiezToolType,
+)
 from .waldiez import Waldiez
 
 # pylint: disable=duplicate-code
 __all__ = [
-    "SHARED_SKILL_NAME",
+    "MAX_VARIABLE_LENGTH",
+    "SHARED_TOOL_NAME",
+    "DEFAULT_BASE_URLS",
+    "ensure_unique_names",
+    "get_autogen_version",
+    "get_valid_instance_name",
+    "get_valid_python_variable_name",
     "Waldiez",
     "WaldiezAgent",
     "WaldiezAgentCodeExecutionConfig",
+    "WaldiezAgentConnection",
     "WaldiezAgentData",
-    "WaldiezAgentLinkedSkill",
+    "WaldiezAgentHumanInputMode",
+    "WaldiezAgentInfo",
+    "WaldiezAgentLinkedTool",
     "WaldiezAgentNestedChat",
     "WaldiezAgentNestedChatMessage",
-    "WaldiezAgents",
-    "WaldiezAgentTeachability",
+    "WaldiezAgentTarget",
     "WaldiezAgentTerminationMessage",
     "WaldiezAgentType",
+    "WaldiezAgentUpdateFunctionType",
+    "WaldiezAgentUpdateSystemMessage",
+    "WaldiezAgents",
     "WaldiezAssistant",
     "WaldiezAssistantData",
     "WaldiezCaptainAgent",
@@ -96,45 +140,58 @@ __all__ = [
     "WaldiezCaptainAgentLibEntry",
     "WaldiezChat",
     "WaldiezChatData",
-    "WaldiezChatSummary",
+    "WaldiezChatMessage",
+    "WaldiezChatMessageType",
     "WaldiezChatNested",
+    "WaldiezChatSummary",
     "WaldiezChatSummaryMethod",
+    "WaldiezChatType",
+    "WaldiezContextBasedCondition",
+    "WaldiezContextBasedTransition",
+    "WaldiezContextStrLLMCondition",
+    "WaldiezDefaultCondition",
+    "WaldiezExpressionContextCondition",
     "WaldiezFlow",
     "WaldiezFlowData",
+    "WaldiezFlowInfo",
     "WaldiezGroupManager",
     "WaldiezGroupManagerData",
     "WaldiezGroupManagerSpeakers",
     "WaldiezGroupManagerSpeakersSelectionMethod",
     "WaldiezGroupManagerSpeakersSelectionMode",
     "WaldiezGroupManagerSpeakersTransitionsType",
-    "WaldiezChatMessage",
+    "WaldiezGroupOrNestedTarget",
+    "WaldiezHandoff",
+    "WaldiezHandoffCondition",
+    "WaldiezHandoffTransition",
+    "WaldiezLLMBasedCondition",
+    "WaldiezLLMBasedTransition",
     "WaldiezModel",
     "WaldiezModelAPIType",
+    "WaldiezModelAWS",
     "WaldiezModelData",
     "WaldiezModelPrice",
-    "WaldiezRagUser",
-    "WaldiezRagUserData",
+    "WaldiezRagUserProxy",
+    "WaldiezRagUserProxyChunkMode",
+    "WaldiezRagUserProxyData",
+    "WaldiezRagUserProxyModels",
+    "WaldiezRagUserProxyRetrieveConfig",
+    "WaldiezRagUserProxyTask",
+    "WaldiezRagUserProxyVectorDb",
+    "WaldiezRagUserProxyVectorDbConfig",
+    "WaldiezRandomAgentTarget",
     "WaldiezReasoningAgent",
     "WaldiezReasoningAgentData",
     "WaldiezReasoningAgentReasonConfig",
-    "WaldiezSkill",
-    "WaldiezSkillData",
+    "WaldiezSimpleTarget",
+    "WaldiezStringContextCondition",
+    "WaldiezStringLLMCondition",
+    "WaldiezTool",
+    "WaldiezToolData",
+    "WaldiezToolType",
+    "WaldiezTransitionAvailability",
+    "WaldiezTransitionTarget",
+    "WaldiezUniqueNames",
     "WaldiezUserProxy",
     "WaldiezUserProxyData",
-    "WaldiezRagUserRetrieveConfig",
-    "WaldiezRagUserTask",
-    "WaldiezRagUserChunkMode",
-    "WaldiezRagUserVectorDb",
-    "WaldiezRagUserVectorDbConfig",
-    "WaldiezRagUserModels",
-    "WaldiezSwarmAgent",
-    "WaldiezSwarmAfterWork",
-    "WaldiezSwarmAfterWorkOption",
-    "WaldiezSwarmAfterWorkRecipientType",
-    "WaldiezSwarmAgentData",
-    "WaldiezSwarmHandoff",
-    "WaldiezSwarmOnCondition",
-    "WaldiezSwarmOnConditionTarget",
-    "WaldiezSwarmOnConditionAvailable",
-    "WaldiezSwarmUpdateSystemMessage",
 ]

waldiez/models/agents/__init__.py

@@ -9,16 +9,18 @@ from .agent import (
     WaldiezAgent,
     WaldiezAgentCodeExecutionConfig,
     WaldiezAgentData,
-    WaldiezAgentLinkedSkill,
+    WaldiezAgentHumanInputMode,
+    WaldiezAgentLinkedTool,
     WaldiezAgentNestedChat,
     WaldiezAgentNestedChatMessage,
-    WaldiezAgentTeachability,
     WaldiezAgentTerminationMessage,
     WaldiezAgentType,
+    WaldiezAgentUpdateFunctionType,
+    WaldiezAgentUpdateSystemMessage,
 )
 from .agents import WaldiezAgents
 from .assistant import WaldiezAssistant, WaldiezAssistantData
-from .captain_agent import (
+from .captain import (
     WaldiezCaptainAgent,
     WaldiezCaptainAgentData,
     WaldiezCaptainAgentLibEntry,
@@ -38,7 +40,7 @@ from .group_manager import (
     WaldiezGroupManagerSpeakersSelectionMode,
     WaldiezGroupManagerSpeakersTransitionsType,
 )
-from .rag_user import (
+from .rag_user_proxy import (
     CUSTOM_EMBEDDING_FUNCTION,
     CUSTOM_EMBEDDING_FUNCTION_ARGS,
     CUSTOM_EMBEDDING_FUNCTION_TYPES,
@@ -48,41 +50,20 @@ from .rag_user import (
     CUSTOM_TOKEN_COUNT_FUNCTION,
     CUSTOM_TOKEN_COUNT_FUNCTION_ARGS,
     CUSTOM_TOKEN_COUNT_FUNCTION_TYPES,
-    WaldiezRagUser,
-    WaldiezRagUserChunkMode,
-    WaldiezRagUserData,
-    WaldiezRagUserModels,
-    WaldiezRagUserRetrieveConfig,
-    WaldiezRagUserTask,
-    WaldiezRagUserVectorDb,
-    WaldiezRagUserVectorDbConfig,
+    WaldiezRagUserProxy,
+    WaldiezRagUserProxyChunkMode,
+    WaldiezRagUserProxyData,
+    WaldiezRagUserProxyModels,
+    WaldiezRagUserProxyRetrieveConfig,
+    WaldiezRagUserProxyTask,
+    WaldiezRagUserProxyVectorDb,
+    WaldiezRagUserProxyVectorDbConfig,
 )
 from .reasoning import (
     WaldiezReasoningAgent,
     WaldiezReasoningAgentData,
     WaldiezReasoningAgentReasonConfig,
 )
-from .swarm_agent import (
-    CUSTOM_AFTER_WORK,
-    CUSTOM_AFTER_WORK_ARGS,
-    CUSTOM_AFTER_WORK_TYPES,
-    CUSTOM_ON_CONDITION_AVAILABLE,
-    CUSTOM_ON_CONDITION_AVAILABLE_ARGS,
-    CUSTOM_ON_CONDITION_AVAILABLE_TYPES,
-    CUSTOM_UPDATE_SYSTEM_MESSAGE,
-    CUSTOM_UPDATE_SYSTEM_MESSAGE_ARGS,
-    CUSTOM_UPDATE_SYSTEM_MESSAGE_TYPES,
-    WaldiezSwarmAfterWork,
-    WaldiezSwarmAfterWorkOption,
-    WaldiezSwarmAfterWorkRecipientType,
-    WaldiezSwarmAgent,
-    WaldiezSwarmAgentData,
-    WaldiezSwarmHandoff,
-    WaldiezSwarmOnCondition,
-    WaldiezSwarmOnConditionAvailable,
-    WaldiezSwarmOnConditionTarget,
-    WaldiezSwarmUpdateSystemMessage,
-)
 from .user_proxy import WaldiezUserProxy, WaldiezUserProxyData
 
 __all__ = [
@@ -91,27 +72,18 @@ __all__ = [
     "IS_TERMINATION_MESSAGE",
     "IS_TERMINATION_MESSAGE_ARGS",
     "IS_TERMINATION_MESSAGE_TYPES",
-    "CUSTOM_AFTER_WORK",
-    "CUSTOM_AFTER_WORK_ARGS",
-    "CUSTOM_AFTER_WORK_TYPES",
     "CUSTOM_EMBEDDING_FUNCTION",
     "CUSTOM_EMBEDDING_FUNCTION_ARGS",
     "CUSTOM_EMBEDDING_FUNCTION_TYPES",
-    "CUSTOM_ON_CONDITION_AVAILABLE",
-    "CUSTOM_ON_CONDITION_AVAILABLE_ARGS",
-    "CUSTOM_ON_CONDITION_AVAILABLE_TYPES",
-    "CUSTOM_SPEAKER_SELECTION",
-    "CUSTOM_SPEAKER_SELECTION_ARGS",
-    "CUSTOM_SPEAKER_SELECTION_TYPES",
     "CUSTOM_TEXT_SPLIT_FUNCTION",
     "CUSTOM_TEXT_SPLIT_FUNCTION_ARGS",
     "CUSTOM_TEXT_SPLIT_FUNCTION_TYPES",
     "CUSTOM_TOKEN_COUNT_FUNCTION",
     "CUSTOM_TOKEN_COUNT_FUNCTION_ARGS",
     "CUSTOM_TOKEN_COUNT_FUNCTION_TYPES",
-    "CUSTOM_UPDATE_SYSTEM_MESSAGE",
-    "CUSTOM_UPDATE_SYSTEM_MESSAGE_ARGS",
-    "CUSTOM_UPDATE_SYSTEM_MESSAGE_TYPES",
+    "CUSTOM_SPEAKER_SELECTION",
+    "CUSTOM_SPEAKER_SELECTION_ARGS",
+    "CUSTOM_SPEAKER_SELECTION_TYPES",
     "WaldiezAgent",
     "WaldiezAgentType",
     "WaldiezAgents",
@@ -119,41 +91,33 @@ __all__ = [
     "WaldiezAssistantData",
     "WaldiezAgentCodeExecutionConfig",
     "WaldiezAgentData",
-    "WaldiezAgentLinkedSkill",
+    "WaldiezAgentHumanInputMode",
+    "WaldiezAgentLinkedTool",
     "WaldiezAgentNestedChat",
     "WaldiezAgentNestedChatMessage",
-    "WaldiezAgentTeachability",
     "WaldiezAgentTerminationMessage",
     "WaldiezCaptainAgent",
     "WaldiezCaptainAgentData",
     "WaldiezCaptainAgentLibEntry",
+    "WaldiezRagUserProxy",
+    "WaldiezRagUserProxyData",
+    "WaldiezRagUserProxyModels",
+    "WaldiezReasoningAgent",
+    "WaldiezReasoningAgentData",
+    "WaldiezReasoningAgentReasonConfig",
+    "WaldiezUserProxy",
+    "WaldiezUserProxyData",
+    "WaldiezRagUserProxyRetrieveConfig",
+    "WaldiezRagUserProxyTask",
+    "WaldiezRagUserProxyChunkMode",
+    "WaldiezRagUserProxyVectorDb",
+    "WaldiezRagUserProxyVectorDbConfig",
     "WaldiezGroupManager",
     "WaldiezGroupManagerData",
     "WaldiezGroupManagerSpeakers",
     "WaldiezGroupManagerSpeakersSelectionMethod",
     "WaldiezGroupManagerSpeakersSelectionMode",
     "WaldiezGroupManagerSpeakersTransitionsType",
-    "WaldiezRagUser",
-    "WaldiezRagUserData",
-    "WaldiezRagUserModels",
-    "WaldiezReasoningAgent",
-    "WaldiezReasoningAgentData",
-    "WaldiezReasoningAgentReasonConfig",
-    "WaldiezUserProxy",
-    "WaldiezUserProxyData",
-    "WaldiezRagUserRetrieveConfig",
-    "WaldiezRagUserTask",
-    "WaldiezRagUserChunkMode",
-    "WaldiezRagUserVectorDb",
-    "WaldiezRagUserVectorDbConfig",
-    "WaldiezSwarmAgent",
-    "WaldiezSwarmAgentData",
-    "WaldiezSwarmAfterWork",
-    "WaldiezSwarmAfterWorkOption",
-    "WaldiezSwarmAfterWorkRecipientType",
-    "WaldiezSwarmHandoff",
-    "WaldiezSwarmOnCondition",
-    "WaldiezSwarmOnConditionTarget",
-    "WaldiezSwarmOnConditionAvailable",
-    "WaldiezSwarmUpdateSystemMessage",
+    "WaldiezAgentUpdateSystemMessage",
+    "WaldiezAgentUpdateFunctionType",
 ]

waldiez/models/agents/agent/__init__.py

@@ -6,15 +6,19 @@ from .agent import WaldiezAgent
 from .agent_data import WaldiezAgentData
 from .agent_type import WaldiezAgentType
 from .code_execution import WaldiezAgentCodeExecutionConfig
-from .linked_skill import WaldiezAgentLinkedSkill
+from .human_input_mode import WaldiezAgentHumanInputMode
+from .linked_tool import WaldiezAgentLinkedTool
 from .nested_chat import WaldiezAgentNestedChat, WaldiezAgentNestedChatMessage
-from .teachability import WaldiezAgentTeachability
 from .termination_message import (
     IS_TERMINATION_MESSAGE,
     IS_TERMINATION_MESSAGE_ARGS,
     IS_TERMINATION_MESSAGE_TYPES,
     WaldiezAgentTerminationMessage,
 )
+from .update_system_message import (
+    WaldiezAgentUpdateFunctionType,
+    WaldiezAgentUpdateSystemMessage,
+)
 
 __all__ = [
     "IS_TERMINATION_MESSAGE",
@@ -23,10 +27,12 @@ __all__ = [
     "WaldiezAgent",
     "WaldiezAgentCodeExecutionConfig",
     "WaldiezAgentData",
-    "WaldiezAgentLinkedSkill",
+    "WaldiezAgentLinkedTool",
     "WaldiezAgentNestedChat",
     "WaldiezAgentNestedChatMessage",
-    "WaldiezAgentTeachability",
     "WaldiezAgentTerminationMessage",
     "WaldiezAgentType",
+    "WaldiezAgentUpdateSystemMessage",
+    "WaldiezAgentUpdateFunctionType",
+    "WaldiezAgentHumanInputMode",
 ]