waldiez 0.3.11__tar.gz → 0.3.12__tar.gz

{waldiez-0.3.11 → waldiez-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.3.11
+Version: 0.3.12
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/python
 Project-URL: repository, https://github.com/waldiez/python.git
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.10
 Requires-Dist: aiocsv==1.3.2
 Requires-Dist: aiofiles==24.1.0
-Requires-Dist: aiosqlite==0.20.0
+Requires-Dist: aiosqlite==0.21.0
 Requires-Dist: asyncer==0.0.8
 Requires-Dist: graphviz==0.20.3
 Requires-Dist: httpx<1
@@ -31,27 +31,36 @@ Requires-Dist: pyautogen==0.7.3
 Requires-Dist: pydantic<3,>=2.6.1
 Requires-Dist: typer<0.16,>=0.9
 Provides-Extra: ag2-extras
-Requires-Dist: autogen[captainagent]==0.7.3; (platform_system == 'Linux') and extra == 'ag2-extras'
-Requires-Dist: chromadb; (platform_system != 'Linux') and extra == 'ag2-extras'
-Requires-Dist: huggingface-hub; (platform_system != 'Linux') and extra == 'ag2-extras'
+Requires-Dist: beautifulsoup4; extra == 'ag2-extras'
+Requires-Dist: chromadb>=0.5.23; extra == 'ag2-extras'
+Requires-Dist: crewai-tools==0.33.0; extra == 'ag2-extras'
+Requires-Dist: crewai>0.98.0; extra == 'ag2-extras'
+Requires-Dist: embedchain==0.1.126; extra == 'ag2-extras'
+Requires-Dist: huggingface-hub; extra == 'ag2-extras'
+Requires-Dist: ipython; extra == 'ag2-extras'
+Requires-Dist: langchain-community<1,>=0.3.12; extra == 'ag2-extras'
+Requires-Dist: markdownify; extra == 'ag2-extras'
 Requires-Dist: pgvector>=0.3.6; extra == 'ag2-extras'
+Requires-Dist: protobuf>=4.25.3; extra == 'ag2-extras'
 Requires-Dist: psycopg[binary]>=3.2.3; extra == 'ag2-extras'
+Requires-Dist: psycopg[binary]>=3.2.4; extra == 'ag2-extras'
 Requires-Dist: pyautogen[anthropic]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[bedrock]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[cohere]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[gemini]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[groq]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[lmm]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[mistral]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[neo4j]==0.7.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-mongodb]==0.7.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-pgvector]==0.7.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-qdrant]==0.7.3; (python_version < '3.13') and extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[ollama]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[together]==0.7.3; extra == 'ag2-extras'
 Requires-Dist: pyautogen[websurfer]==0.7.3; extra == 'ag2-extras'
-Requires-Dist: pymongo>=4.10.1; extra == 'ag2-extras'
-Requires-Dist: qdrant-client[fastembed]; (python_version >= '3.13') and extra == 'ag2-extras'
-Requires-Dist: sentence-transformers; (platform_system != 'Linux') and extra == 'ag2-extras'
+Requires-Dist: pydantic-ai==0.0.21; extra == 'ag2-extras'
+Requires-Dist: pymongo>=4.11; extra == 'ag2-extras'
+Requires-Dist: pypdf; extra == 'ag2-extras'
+Requires-Dist: qdrant-client[fastembed]; extra == 'ag2-extras'
+Requires-Dist: sentence-transformers; extra == 'ag2-extras'
+Requires-Dist: weaviate-client==4.10.2; extra == 'ag2-extras'
 Provides-Extra: dev
 Requires-Dist: autoflake==2.3.1; extra == 'dev'
 Requires-Dist: bandit==1.8.2; extra == 'dev'
@@ -74,16 +83,16 @@ Requires-Dist: mdx-include==1.4.2; extra == 'docs'
 Requires-Dist: mdx-truly-sane-lists==1.3; extra == 'docs'
 Requires-Dist: mkdocs-jupyter==0.25.1; extra == 'docs'
 Requires-Dist: mkdocs-macros-plugin==1.3.7; extra == 'docs'
-Requires-Dist: mkdocs-material==9.6.1; extra == 'docs'
-Requires-Dist: mkdocs-minify-html-plugin==0.2.3; extra == 'docs'
+Requires-Dist: mkdocs-material==9.6.2; extra == 'docs'
+Requires-Dist: mkdocs-minify-html-plugin==0.2.4; extra == 'docs'
 Requires-Dist: mkdocs==1.6.1; extra == 'docs'
-Requires-Dist: mkdocstrings-python==1.13.0; extra == 'docs'
-Requires-Dist: mkdocstrings[crystal,python]==0.27.0; extra == 'docs'
+Requires-Dist: mkdocstrings-python==1.14.1; extra == 'docs'
+Requires-Dist: mkdocstrings[crystal,python]==0.28.0; extra == 'docs'
 Provides-Extra: jupyter
 Requires-Dist: jupyterlab>=4.3.0; extra == 'jupyter'
-Requires-Dist: waldiez-jupyter==0.3.11; extra == 'jupyter'
+Requires-Dist: waldiez-jupyter==0.3.12; extra == 'jupyter'
 Provides-Extra: studio
-Requires-Dist: waldiez-studio==0.3.11; extra == 'studio'
+Requires-Dist: waldiez-studio==0.3.12; extra == 'studio'
 Provides-Extra: test
 Requires-Dist: pytest-asyncio==0.25.3; extra == 'test'
 Requires-Dist: pytest-cov==6.0.0; extra == 'test'

{waldiez-0.3.11 → waldiez-0.3.12}/pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
 dependencies =[
     "aiocsv==1.3.2",
     "aiofiles==24.1.0",
-    "aiosqlite==0.20.0",
+    "aiosqlite==0.21.0",
     "asyncer==0.0.8",
     "graphviz==0.20.3",
     "pandas>=2",
@@ -32,7 +32,6 @@ dependencies =[
     "jupytext",
     "parso==0.8.4",
     "pydantic>=2.6.1,<3",
-    # together(ag2 extra) 1.2.0 depends on typer<0.13 and >=0.9
     "typer>=0.9,<0.16",
     "httpx<1",
 ]
@@ -51,10 +50,10 @@ exclude = [ "**/example.py" ]
 
 [project.optional-dependencies]
 studio = [
-    "waldiez_studio==0.3.11",
+    "waldiez_studio==0.3.12",
 ]
 jupyter = [
-    "waldiez_jupyter==0.3.11",
+    "waldiez_jupyter==0.3.12",
     "jupyterlab>=4.3.0",
 ]
 dev = [
@@ -75,52 +74,40 @@ dev = [
     'toml; python_version <= "3.10"',
     'types-toml== 0.10.8.20240310',
 ]
-# let's stay with <3.13 for now
-####
-# fastembed and fastembed-gpu are not available, yet for python 3.13
-# ref: https://github.com/qdrant/qdrant-client/blob/master/pyproject.toml
-# fastembed = [
-#     { version = "0.3.6", optional = true, python = "<3.13" }
-# ]
-# fastembed-gpu = [
-#     { version = "0.3.6", optional = true, python = "<3.13" }
-# ]
-####
-# the pinned chromadb version (pyautogen[retrievechat]) (0.5.3)
-# needs numpy <2.0.0
-# but pyautogen wants numpy >=1.21.0 for python 3.13
-#
-# refs:
-# https://github.com/chroma-core/chroma/blob/0.5.3/pyproject.toml#L24C3-L24C30
-#
-# https://github.com/ag2ai/ag2/blob/main/setup.py#L33
-#
-# captainagent(ag2 extra) depends on pysqlite3-binary,
-# but the wheels are only for linux (not checked every py version)
-# on windows with py 3.12, it seems to not work.
 ag2_extras =[
-    'pgvector>=0.3.6',
-    'psycopg[binary]>=3.2.3',
+    # models
     'pyautogen[anthropic]==0.7.3',
     'pyautogen[bedrock]==0.7.3',
-    'autogen[captainagent]==0.7.3; platform_system == "Linux"',
-    'chromadb; platform_system != "Linux"',
-    'sentence-transformers; platform_system != "Linux"',
-    'huggingface-hub; platform_system != "Linux"',
+    'pyautogen[cohere]==0.7.3',
     'pyautogen[gemini]==0.7.3',
     'pyautogen[groq]==0.7.3',
     'pyautogen[lmm]==0.7.3',
     'pyautogen[mistral]==0.7.3',
-    'pyautogen[neo4j]==0.7.3',
-    'pyautogen[retrievechat-mongodb]==0.7.3',
-    'pyautogen[retrievechat-pgvector]==0.7.3',
-    'pyautogen[retrievechat-qdrant]==0.7.3; python_version < "3.13"',
-    'qdrant-client[fastembed]; python_version >= "3.13"',
-    'pyautogen[retrievechat]==0.7.3',
-    'pyautogen[together]==0.7.3',
+    'pyautogen[ollama]==0.7.3',
     'pyautogen[together]==0.7.3',
+    # utils
+    'pyautogen[neo4j]==0.7.3',
     'pyautogen[websurfer]==0.7.3',
-    'pymongo>=4.10.1',
+    'chromadb>=0.5.23',
+    'pgvector>=0.3.6',
+    'psycopg[binary]>=3.2.3',
+    'protobuf>=4.25.3',
+    'pypdf',
+    'ipython',
+    'markdownify',
+    'beautifulsoup4',
+    'sentence-transformers',
+    'huggingface-hub',
+    'qdrant-client[fastembed]',
+    'pgvector>=0.3.6',
+    'psycopg[binary]>=3.2.4',
+    'crewai-tools==0.33.0',
+    'embedchain==0.1.126',
+    'crewai>0.98.0',
+    'weaviate-client==4.10.2',
+    'langchain-community>=0.3.12,<1',
+    'pydantic-ai==0.0.21',
+    'pymongo>=4.11',
 ]
 test = [
     'pytest==8.3.4',
@@ -137,10 +124,10 @@ docs = [
   'mkdocs==1.6.1',
   'mkdocs-jupyter==0.25.1',
   'mkdocs-macros-plugin==1.3.7',
-  'mkdocs-material==9.6.1',
-  'mkdocs-minify-html-plugin==0.2.3',
-  'mkdocstrings[crystal,python]==0.27.0',
-  'mkdocstrings-python==1.13.0'
+  'mkdocs-material==9.6.2',
+  'mkdocs-minify-html-plugin==0.2.4',
+  'mkdocstrings[crystal,python]==0.28.0',
+  'mkdocstrings-python==1.14.1'
 ]
 
 [project.scripts]

{waldiez-0.3.11 → waldiez-0.3.12}/waldiez/_version.py

@@ -2,4 +2,4 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Version information for Waldiez."""
 
-__version__ = "0.3.11"
+__version__ = "0.3.12"

{waldiez-0.3.11 → waldiez-0.3.12}/waldiez/exporting/agent/agent_exporter.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Optional, Tuple, Union
 
-from waldiez.models import WaldiezAgent, WaldiezChat
+from waldiez.models import WaldiezAgent, WaldiezChat, WaldiezModel
 
 from ..base import (
     AgentPosition,
@@ -18,9 +18,8 @@ from ..base import (
     ImportPosition,
 )
 from .utils import (
-    get_agent_class_name,
     get_agent_code_execution_config,
-    get_agent_imports,
+    get_captain_agent_extras,
     get_group_manager_extras,
     get_is_termination_message,
     get_rag_user_extras,
@@ -36,9 +35,9 @@ class AgentExporter(BaseExporter, ExporterMixin):
         self,
         agent: WaldiezAgent,
         agent_names: Dict[str, str],
-        model_names: Dict[str, str],
-        skill_names: Dict[str, str],
+        models: Tuple[List[WaldiezModel], Dict[str, str]],
         chats: Tuple[List[WaldiezChat], Dict[str, str]],
+        skill_names: Dict[str, str],
         is_async: bool,
         group_chat_members: List[WaldiezAgent],
         for_notebook: bool,
@@ -53,12 +52,12 @@ class AgentExporter(BaseExporter, ExporterMixin):
             The agent to export.
         agent_names : Dict[str, str]
             The agent ids to names mapping.
-        model_names : Dict[str, str]
-            The model ids to names mapping.
-        skill_names : Dict[str, str]
-            The skill ids to names mapping.
+        models : Tuple[List[WaldiezModel], Dict[str, str]]
+            All the models and the model ids to names mapping.
         chats : Tuple[List[WaldiezChat], Dict[str, str]]
             All the chats and the chat ids to names mapping.
+        skill_names : Dict[str, str]
+            The skill ids to names mapping.
         is_async : bool
             Whether the whole flow is async.
         for_notebook : bool
@@ -72,14 +71,14 @@ class AgentExporter(BaseExporter, ExporterMixin):
         if output_dir is not None and not isinstance(output_dir, Path):
             output_dir = Path(output_dir)
         self.output_dir = output_dir
-        self.model_names = model_names
+        self.models = models[0]
+        self.model_names = models[1]
         self.skill_names = skill_names
         self.arguments_resolver = arguments_resolver
         self.group_chat_members = group_chat_members
         self.chats = chats
         self.is_async = is_async
         self._agent_name = agent_names[agent.id]
-        self._agent_class = get_agent_class_name(self.agent)
         # content, argument, import
         self._code_execution = get_agent_code_execution_config(
             agent=self.agent,
@@ -119,6 +118,13 @@ class AgentExporter(BaseExporter, ExporterMixin):
             agent=self.agent,
             serializer=self.serializer,
         )
+        self._captain = get_captain_agent_extras(
+            agent=self.agent,
+            agent_names=self.agent_names,
+            all_models=self.models,
+            serializer=self.serializer,
+            output_dir=self.output_dir,
+        )
 
     def get_imports(self) -> Optional[List[Tuple[str, ImportPosition]]]:
         """Get the imports.
@@ -130,7 +136,7 @@ class AgentExporter(BaseExporter, ExporterMixin):
         """
         position = ImportPosition.THIRD_PARTY
         # default imports based on the agent class.
-        agent_imports = get_agent_imports(self._agent_class)
+        agent_imports = self.agent.ag2_imports
         # if code execution is enabled, update the imports.
         if self._code_execution[2]:
             agent_imports.add(self._code_execution[2])
@@ -220,7 +226,6 @@ class AgentExporter(BaseExporter, ExporterMixin):
         """
         agent = self.agent
         agent_name = self._agent_name
-        agent_class = self._agent_class
         retrieve_arg = self._rag[1]
         group_chat_arg = self._group_chat[1]
         is_termination = self._termination[0]
@@ -231,8 +236,10 @@ class AgentExporter(BaseExporter, ExporterMixin):
             default_auto_reply = (
                 f'"{self.string_escape(agent.data.agent_default_auto_reply)}"'
             )
-        extras = f"{group_chat_arg}{retrieve_arg}{self._reasoning}"
-        agent_str = f"""{agent_name} = {agent_class}(
+        extras = (
+            f"{group_chat_arg}{retrieve_arg}{self._reasoning}{self._captain}"
+        )
+        agent_str = f"""{agent_name} = {self.agent.ag2_class}(
     name="{agent_name}",
     description="{agent.description}"{system_message_arg},
     human_input_mode="{agent.data.human_input_mode}",

{waldiez-0.3.11 → waldiez-0.3.12}/waldiez/exporting/agent/utils/__init__.py

@@ -2,8 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Utility functions for generating agent related strings."""
 
-from .agent_class_name import get_agent_class_name
-from .agent_imports import get_agent_imports
+from .captain_agent import get_captain_agent_extras
 from .code_execution import get_agent_code_execution_config
 from .group_manager import get_group_manager_extras
 from .rag_user import get_rag_user_extras
@@ -13,10 +12,9 @@ from .teachability import get_agent_teachability_string
 from .termination_message import get_is_termination_message
 
 __all__ = [
-    "get_agent_class_name",
-    "get_agent_imports",
     "get_agent_code_execution_config",
     "get_agent_teachability_string",
+    "get_captain_agent_extras",
     "get_group_manager_extras",
     "get_is_termination_message",
     "get_rag_user_extras",

waldiez-0.3.12/waldiez/exporting/agent/utils/captain_agent.py

@@ -0,0 +1,254 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+""" "Extras for exporting a captain agent."""
+
+import json
+import os
+from datetime import datetime, timezone
+from pathlib import Path
+from typing import Any, Callable, Dict, List, Optional, Union
+
+from waldiez.models import (
+    WaldiezAgent,
+    WaldiezCaptainAgent,
+    WaldiezModel,
+    WaldiezModelData,
+)
+
+
+def get_captain_agent_extras(
+    agent: WaldiezAgent,
+    agent_names: Dict[str, str],
+    all_models: List[WaldiezModel],
+    serializer: Callable[..., str],
+    output_dir: Optional[Union[str, Path]],
+) -> str:
+    """Get the extra args for the captain agent.
+
+    Parameters
+    ----------
+    agent : WaldiezAgent
+        The agent.
+    agent_names : Dict[str, str]
+        A mapping of agent ids to agent names.
+    all_models : List[WaldiezModel]
+        All the models in the flow.
+    serializer : Callable[..., str]
+        The serializer to use.
+    output_dir : Optional[Union[str, Path]]
+        The output directory to save the agent lib and nested config.
+    Returns
+    -------
+    str
+        The extra args to use in the captain agent.
+    """
+    # extra args: nested_config, agent_lib, tool_lib
+    if not isinstance(agent, WaldiezCaptainAgent):
+        return ""
+    agent_name = agent_names[agent.id]
+    save_path = str(output_dir) if output_dir else "."
+    extra_args_content = "\n" + f'    agent_config_save_path=r"{save_path}",'
+    if agent.data.agent_lib:
+        lib_dict = [
+            lib.model_dump(by_alias=False) for lib in agent.data.agent_lib
+        ]
+        lib_json_name = f"{agent_name}_agent_lib.json"
+        agent_lib_path = os.path.join(save_path, lib_json_name)
+        with open(agent_lib_path, "w", encoding="utf-8", newline="\n") as f:
+            json.dump(lib_dict, f, ensure_ascii=False, indent=4)
+        extra_args_content += "\n" + f'    agent_lib=r"{agent_lib_path}",'
+    if agent.data.tool_lib:
+        extra_args_content += "\n" + f'    tool_lib="{agent.data.tool_lib}",'
+    nested_config = generate_nested_config(
+        agent,
+        agent_name,
+        all_models,
+        save_path,
+    )
+    serialized_nested_config = serializer(nested_config)
+    extra_args_content += (
+        "\n" + f"    nested_config={serialized_nested_config},"
+    )
+    return extra_args_content
+
+
+def generate_nested_config(
+    agent: WaldiezCaptainAgent,
+    agent_name: str,
+    all_models: List[WaldiezModel],
+    save_path: str,
+) -> Dict[str, Any]:
+    """Generate the nested config for the captain agent.
+
+    Parameters
+    ----------
+    agent : WaldiezCaptainAgent
+        The captain agent.
+    agent_name : str
+        The agent name.
+    all_models : List[WaldiezModel]
+        All the models in the flow.
+    save_path : str
+        The path to save the nested config.
+    Returns
+    -------
+    Dict[str, Any]
+        The nested config.
+    """
+    config_file_or_env_name = f"{agent_name}_llm_config.json"
+    llm_config = get_llm_config(agent, all_models)
+    to_serialize = {
+        "config_list": [llm_config],
+    }
+    os.makedirs(save_path, exist_ok=True)
+    config_file_or_env_path = os.path.join(save_path, config_file_or_env_name)
+    with open(
+        config_file_or_env_path, "w", encoding="utf-8", newline="\n"
+    ) as f:
+        json.dump(to_serialize, f, ensure_ascii=False, indent=4)
+    config_file_or_env = f'r"{config_file_or_env_path}"'
+    nested_config = {
+        "autobuild_init_config": {
+            "config_file_or_env": config_file_or_env,
+            "builder_model": llm_config["model"],
+            "agent_model": llm_config["model"],
+        },
+        "autobuild_build_config": get_auto_build_build_config(
+            agent, llm_config
+        ),
+        "group_chat_config": {"max_round": agent.data.max_round},
+        "group_chat_llm_config": None,
+        "max_turns": agent.data.max_turns,
+    }
+    return nested_config
+
+
+def get_llm_config(
+    agent: WaldiezAgent,
+    all_models: List[WaldiezModel],
+) -> Dict[str, Any]:
+    """Get the config list environment variable name and its dict value.
+
+    Parameters
+    ----------
+    agent : WaldiezAgent
+        The agent.
+    all_models : List[WaldiezModel]
+        All the models in the flow.
+    Returns
+    -------
+    Dict[str, str]
+        The llm config dict.
+    """
+    model_name = "gpt-4o"
+    temperature: Optional[float] = 1
+    top_p: Optional[float] = 0.95
+    max_tokens: Optional[int] = 2048
+    if agent.data.model_ids:
+        waldiez_model = get_waldiez_model(agent.data.model_ids[0], all_models)
+        model_name = waldiez_model.name
+        temperature = waldiez_model.data.temperature
+        top_p = waldiez_model.data.top_p
+        max_tokens = waldiez_model.data.max_tokens
+    config_dict = {
+        "model": model_name,
+        "temperature": temperature,
+        "top_p": top_p,
+        "max_tokens": max_tokens,
+    }
+    return config_dict
+
+
+def get_auto_build_build_config(
+    agent: WaldiezAgent,
+    llm_config: Dict[str, Any],
+) -> Dict[str, Any]:
+    """Get the auto build build config.
+
+    Parameters
+    ----------
+    agent : WaldiezAgent
+        The agent.
+    llm_config : Dict[str, Any]
+        The llm config.
+
+    Returns
+    -------
+    Dict[str, Any]
+        The auto build build config.
+    """
+    coding = False
+    code_execution_config = {
+        "timeout": 300,
+        "work_dir": "groupchat",
+        "last_n_messages": 1,
+        "use_docker": False,
+    }
+    if agent.data.code_execution_config is not False:
+        coding = True
+        code_execution_config["work_dir"] = (
+            agent.data.code_execution_config.work_dir or "groupchat"
+        )
+        code_execution_config["last_n_messages"] = (
+            agent.data.code_execution_config.last_n_messages or 1
+        )
+        code_execution_config["timeout"] = (
+            agent.data.code_execution_config.timeout or 300
+        )
+    return {
+        "default_llm_config": {
+            "temperature": llm_config["temperature"],
+            "top_p": llm_config["top_p"],
+            "max_tokens": llm_config["max_tokens"],
+        },
+        "code_execution_config": code_execution_config,
+        "coding": coding,
+    }
+
+
+def get_waldiez_model(
+    model_id: str, all_models: List[WaldiezModel]
+) -> WaldiezModel:
+    """Get the model name from the model id.
+
+    Parameters
+    ----------
+    model_id : str
+        The model id.
+    all_models : List[WaldiezModel]
+        All the models in the flow.
+
+    Returns
+    -------
+    str
+        The model name.
+    """
+    for model in all_models:
+        if model.id == model_id:
+            return model
+    now = (
+        datetime.now(tz=timezone.utc)
+        .isoformat(timespec="milliseconds")
+        .replace("+00:00", "Z")
+    )
+    return WaldiezModel(
+        id=model_id,
+        type="model",
+        name="gpt-4o",
+        description="The GPT-4o model.",
+        tags=["gpt-4o"],
+        requirements=[],
+        created_at=now,
+        updated_at=now,
+        data=WaldiezModelData(
+            api_type="openai",
+            temperature=1,
+            top_p=0.95,
+            max_tokens=2048,
+            base_url=None,
+            api_key=os.environ.get("OPENAI_API_KEY", "REPLACE_ME"),
+            api_version=None,
+            default_headers={},
+            price=None,
+        ),
+    )

{waldiez-0.3.11 → waldiez-0.3.12}/waldiez/exporting/flow/flow_exporter.py

@@ -240,13 +240,10 @@ class FlowExporter(BaseExporter, ExporterMixin):
                 cache_seed=cache_seed,
             )
         else:
-            # content += f"    with Cache.disk(cache_seed={cache_seed}" + "):\n"
-            # content += f"{flow_chats}" + "\n"
-            # content += "\n" + chats_content + "\n"
             if chats_content.startswith("\n"):
                 chats_content = chats_content[1:]
             content += (
-                "\n" + f"with Cache.disk(cache_seed={cache_seed}):"
+                "\n" + f"with Cache.disk(cache_seed={cache_seed}) as cache:"
                 "\n" + chats_content + "\n"
             )
             if is_async:
@@ -431,9 +428,9 @@ class FlowExporter(BaseExporter, ExporterMixin):
             exporter = AgentExporter(
                 agent=agent,
                 agent_names=self.agent_names,
-                model_names=self.model_names,
-                skill_names=self.skill_names,
+                models=(self.models, self.model_names),
                 chats=(self.chats, self.chat_names),
+                skill_names=self.skill_names,
                 is_async=self.waldiez.is_async,
                 for_notebook=self.for_notebook,
                 output_dir=self.output_dir,

{waldiez-0.3.11 → waldiez-0.3.12}/waldiez/exporting/flow/utils/def_main.py

@@ -53,7 +53,7 @@ def get_def_main(
     else:
         content += "def call_main() -> None:\n"
     content += '    """Run the main function and print the results."""\n'
-    content += "    results = "
+    content += "    results: Union[ChatResult, List[ChatResult], Dict[int, ChatResult]] = "
     if is_async:
         content += "await "
     content += "main()\n"
@@ -62,11 +62,12 @@ def get_def_main(
     content += "        ordered_results = dict(sorted(results.items()))\n"
     content += "        for _, result in ordered_results.items():\n"
     content += "            pprint(asdict(result))\n"
-    content += "    elif isinstance(results, list):\n"
+    content += "    else:\n"
+    content += "        if not isinstance(results, list):\n"
+    content += "            results = [results]\n"
     content += "        for result in results:\n"
     content += "            pprint(asdict(result))\n"
-    content += "    else:\n"
-    content += "        pprint(asdict(results))\n\n\n"
+    content += "\n\n"
     content += 'if __name__ == "__main__":\n'
     if is_async:
         content += "    anyio.run(call_main)\n"

{waldiez-0.3.11 → waldiez-0.3.12}/waldiez/models/__init__.py

@@ -23,6 +23,9 @@ from .agents import (
     WaldiezAgentType,
     WaldiezAssistant,
     WaldiezAssistantData,
+    WaldiezCaptainAgent,
+    WaldiezCaptainAgentData,
+    WaldiezCaptainAgentLibEntry,
     WaldiezGroupManager,
     WaldiezGroupManagerData,
     WaldiezGroupManagerSpeakers,
@@ -87,6 +90,9 @@ __all__ = [
     "WaldiezAgentType",
     "WaldiezAssistant",
     "WaldiezAssistantData",
+    "WaldiezCaptainAgent",
+    "WaldiezCaptainAgentData",
+    "WaldiezCaptainAgentLibEntry",
     "WaldiezChat",
     "WaldiezChatData",
     "WaldiezChatSummary",