waldiez 0.3.12__tar.gz → 0.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.3.12
+Version: 0.4.0
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/python
 Project-URL: repository, https://github.com/waldiez/python.git
@@ -25,9 +25,10 @@ Requires-Dist: asyncer==0.0.8
 Requires-Dist: graphviz==0.20.3
 Requires-Dist: httpx<1
 Requires-Dist: jupytext
+Requires-Dist: numpy<2.2.0
 Requires-Dist: pandas>=2
 Requires-Dist: parso==0.8.4
-Requires-Dist: pyautogen==0.7.3
+Requires-Dist: pyautogen==0.7.4
 Requires-Dist: pydantic<3,>=2.6.1
 Requires-Dist: typer<0.16,>=0.9
 Provides-Extra: ag2-extras
@@ -44,36 +45,38 @@ 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[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: pydantic-ai==0.0.21; extra == 'ag2-extras'
+Requires-Dist: pyautogen[anthropic]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[bedrock]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[cohere]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[gemini]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[groq]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[interop-crewai]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[interop-langchain]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[lmm]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[mistral]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[neo4j]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[ollama]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[together]==0.7.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[websurfer]==0.7.4; 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'
+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'
 Requires-Dist: black[jupyter]==25.1.0; extra == 'dev'
 Requires-Dist: flake8==7.1.1; extra == 'dev'
 Requires-Dist: isort==6.0.0; extra == 'dev'
-Requires-Dist: mypy==1.14.1; extra == 'dev'
+Requires-Dist: mypy==1.15.0; extra == 'dev'
 Requires-Dist: pandas-stubs; extra == 'dev'
 Requires-Dist: pre-commit==4.1.0; extra == 'dev'
 Requires-Dist: pydocstyle==6.3.0; extra == 'dev'
 Requires-Dist: pylint==3.3.4; extra == 'dev'
 Requires-Dist: python-dotenv==1.0.1; extra == 'dev'
-Requires-Dist: ruff==0.9.4; extra == 'dev'
+Requires-Dist: ruff==0.9.6; extra == 'dev'
 Requires-Dist: toml; (python_version <= '3.10') and extra == 'dev'
 Requires-Dist: types-pyyaml==6.0.12.20241230; extra == 'dev'
 Requires-Dist: types-toml==0.10.8.20240310; extra == 'dev'
@@ -83,16 +86,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.2; extra == 'docs'
+Requires-Dist: mkdocs-material==9.6.4; 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.14.1; extra == 'docs'
+Requires-Dist: mkdocstrings-python==1.15.0; 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.12; extra == 'jupyter'
+Requires-Dist: waldiez-jupyter==0.4.0; extra == 'jupyter'
 Provides-Extra: studio
-Requires-Dist: waldiez-studio==0.3.12; extra == 'studio'
+Requires-Dist: waldiez-studio==0.4.0; 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.12 → waldiez-0.4.0}/pyproject.toml

@@ -26,9 +26,10 @@ dependencies =[
     "aiofiles==24.1.0",
     "aiosqlite==0.21.0",
     "asyncer==0.0.8",
+    "numpy<2.2.0",
     "graphviz==0.20.3",
     "pandas>=2",
-    "pyautogen==0.7.3",
+    "pyautogen==0.7.4",
     "jupytext",
     "parso==0.8.4",
     "pydantic>=2.6.1,<3",
@@ -50,10 +51,10 @@ exclude = [ "**/example.py" ]
 
 [project.optional-dependencies]
 studio = [
-    "waldiez_studio==0.3.12",
+    "waldiez_studio==0.4.0",
 ]
 jupyter = [
-    "waldiez_jupyter==0.3.12",
+    "waldiez_jupyter==0.4.0",
     "jupyterlab>=4.3.0",
 ]
 dev = [
@@ -62,13 +63,13 @@ dev = [
     'black[jupyter]==25.1.0',
     'flake8==7.1.1',
     'isort==6.0.0',
-    'mypy==1.14.1',
+    'mypy==1.15.0',
     "pandas-stubs",
     'pre-commit==4.1.0',
     'pydocstyle==6.3.0',
     'pylint==3.3.4',
     'python-dotenv==1.0.1',
-    'ruff==0.9.4',
+    'ruff==0.9.6',
     'types-PyYAML==6.0.12.20241230',
     'yamllint==1.35.1',
     'toml; python_version <= "3.10"',
@@ -76,18 +77,20 @@ dev = [
 ]
 ag2_extras =[
     # models
-    'pyautogen[anthropic]==0.7.3',
-    'pyautogen[bedrock]==0.7.3',
-    '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[ollama]==0.7.3',
-    'pyautogen[together]==0.7.3',
+    'pyautogen[anthropic]==0.7.4',
+    'pyautogen[bedrock]==0.7.4',
+    'pyautogen[cohere]==0.7.4',
+    'pyautogen[gemini]==0.7.4',
+    'pyautogen[groq]==0.7.4',
+    'pyautogen[lmm]==0.7.4',
+    'pyautogen[mistral]==0.7.4',
+    'pyautogen[ollama]==0.7.4',
+    'pyautogen[together]==0.7.4',
     # utils
-    'pyautogen[neo4j]==0.7.3',
-    'pyautogen[websurfer]==0.7.3',
+    'pyautogen[interop-crewai]==0.7.4',
+    'pyautogen[interop-langchain]==0.7.4',
+    'pyautogen[neo4j]==0.7.4',
+    'pyautogen[websurfer]==0.7.4',
     'chromadb>=0.5.23',
     'pgvector>=0.3.6',
     'psycopg[binary]>=3.2.3',
@@ -104,9 +107,9 @@ ag2_extras =[
     'crewai-tools==0.33.0',
     'embedchain==0.1.126',
     'crewai>0.98.0',
-    'weaviate-client==4.10.2',
+    'weaviate-client>=4.10.2',
     'langchain-community>=0.3.12,<1',
-    'pydantic-ai==0.0.21',
+    'pydantic-ai>=0.0.21',
     'pymongo>=4.11',
 ]
 test = [
@@ -124,10 +127,10 @@ docs = [
   'mkdocs==1.6.1',
   'mkdocs-jupyter==0.25.1',
   'mkdocs-macros-plugin==1.3.7',
-  'mkdocs-material==9.6.2',
+  'mkdocs-material==9.6.4',
   'mkdocs-minify-html-plugin==0.2.4',
   'mkdocstrings[crystal,python]==0.28.0',
-  'mkdocstrings-python==1.14.1'
+  'mkdocstrings-python==1.15.0'
 ]
 
 [project.scripts]

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

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

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/cli.py

@@ -86,10 +86,8 @@ def run(
     ),
 ) -> None:
     """Run a Waldiez flow."""
-    # a swarm chat without a user agent
-    # creates a new user (this has a default code execution with docker)
-    # temp (until we handle/detect docker setup)
     os.environ["AUTOGEN_USE_DOCKER"] = "0"
+    os.environ["NEP50_DISABLE_WARNING"] = "1"
     output_path = _get_output_path(output, force)
     with file.open("r", encoding="utf-8") as _file:
         try:

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

@@ -239,7 +239,11 @@ class AgentExporter(BaseExporter, ExporterMixin):
         extras = (
             f"{group_chat_arg}{retrieve_arg}{self._reasoning}{self._captain}"
         )
-        agent_str = f"""{agent_name} = {self.agent.ag2_class}(
+        ag2_class = self.agent.ag2_class
+        if agent.agent_type == "swarm":
+            # SwarmAgent is deprecated.
+            ag2_class = "ConversableAgent"
+        agent_str = f"""{agent_name} = {ag2_class}(
     name="{agent_name}",
     description="{agent.description}"{system_message_arg},
     human_input_mode="{agent.data.human_input_mode}",

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/agent/utils/captain_agent.py

@@ -47,7 +47,7 @@ def get_captain_agent_extras(
         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}",'
+    extra_args_content = "\n" + "    agent_config_save_path=os.getcwd(),"
     if agent.data.agent_lib:
         lib_dict = [
             lib.model_dump(by_alias=False) for lib in agent.data.agent_lib
@@ -56,7 +56,7 @@ def get_captain_agent_extras(
         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}",'
+        extra_args_content += "\n" + f'    agent_lib="{lib_json_name}",'
     if agent.data.tool_lib:
         extra_args_content += "\n" + f'    tool_lib="{agent.data.tool_lib}",'
     nested_config = generate_nested_config(
@@ -97,19 +97,15 @@ def generate_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}"'
+        json.dump([llm_config], f, ensure_ascii=False, indent=4)
     nested_config = {
         "autobuild_init_config": {
-            "config_file_or_env": config_file_or_env,
+            "config_file_or_env": config_file_or_env_name,
             "builder_model": llm_config["model"],
             "agent_model": llm_config["model"],
         },

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/agent/utils/swarm_agent.py

@@ -21,11 +21,11 @@ from waldiez.models import (
 # functions (List[Callable]):
 #   -A list of functions to register with the agent.
 # update_agent_state_before_reply (List[Callable]):
-# - A list of functions, including UPDATE_SYSTEM_MESSAGEs,
+# - A list of functions, including UpdateSystemMessage,
 #   called to update the agent before it replies.
 
 # Additional methods:
-# register_hand_off(hand_offs: List[AfterWork|OnCondition]):
+# register_hand_off(agent, hand_offs: List[AfterWork|OnCondition]):
 
 
 def get_swarm_extras(
@@ -173,14 +173,14 @@ def get_update_agent_state_before_reply_arg(
                     name_suffix=agent_names[agent.id],
                 )
                 arg_string += (
-                    "\n" + f"{tab}{tab}UPDATE_SYSTEM_MESSAGE({function_name}),"
+                    "\n" + f"{tab}{tab}UpdateSystemMessage({function_name}),"
                 )
                 before_agent += "\n" + function_content + "\n"
             else:
                 escaped_function = string_escape(function.update_function)
                 arg_string += (
                     "\n"
-                    + f'{tab}{tab}UPDATE_SYSTEM_MESSAGE("{escaped_function}"),'
+                    + f'{tab}{tab}UpdateSystemMessage("{escaped_function}"),'
                 )
         else:
             skill_name = skill_names.get(function, "")
@@ -233,7 +233,12 @@ def get_agent_handoff_registrations(
     if not agent.handoffs:
         return before_agent, after_agent
     tab = "    "
-    after_agent = f"{agent_name}.register_hand_off(" + "\n" + f"{tab}[" + "\n"
+    # change {agent}.register_hand_off([...
+    # to register_hand_off({agent}, [...
+    # after_agent = f"{agent_name}.register_hand_off(" + "\n" + f"{tab}[" + "\n"
+    after_agent = (
+        "register_hand_off(\n" + f"{tab}{agent_name}," + "\n" + f"{tab}[" + "\n"
+    )
     for hand_off in agent.handoffs:
         if isinstance(hand_off, WaldiezSwarmOnCondition):
             registration, before_handoff = get_agent_on_condition_handoff(
@@ -385,7 +390,7 @@ def _get_agent_on_condition_handoff_to_agent(
     before_agent = ""
     tab = "    "
     on_condition = (
-        f"{tab}{tab}ON_CONDITION(" + "\n"
+        f"{tab}{tab}OnCondition(" + "\n"
         f"{tab}{tab}{tab}target={recipient}," + "\n"
         f'{tab}{tab}{tab}condition="{condition}",' + "\n"
     )
@@ -431,7 +436,7 @@ def _get_agent_on_condition_handoff_to_nested_chat(
     before_agent += f"{chat_queue_var_name} = {chat_queue} " + "\n"
     condition_string = string_escape(condition)
     on_condition = (
-        f"{tab}{tab}ON_CONDITION(" + "\n"
+        f"{tab}{tab}OnCondition(" + "\n"
         f"{tab}{tab}{tab}target=" + "{\n"
         f'{tab}{tab}{tab}{tab}"chat_queue": {chat_queue_var_name},' + "\n"
         f'{tab}{tab}{tab}{tab}"config": None,' + "\n"

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/base/utils/comments.py

@@ -13,6 +13,7 @@ from typing_extensions import Literal
 CommentKey = Literal[
     "agents", "imports", "skills", "models", "nested", "run", "logging"
 ]
+"""Possible keys for comments."""
 
 
 def comment(for_notebook: bool, hashtags: int = 1) -> str:

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/chats/utils/swarm.py

@@ -196,7 +196,7 @@ def get_swarm_after_work_string(
         The after work string and the additional methods string.
     """
     if not chat.after_work:
-        return "AFTER_WORK(AfterWorkOption.TERMINATE)", ""
+        return "AfterWork(AfterWorkOption.TERMINATE)", ""
     additional_methods = ""
     after_work_string, function_content = chat.after_work.get_recipient(
         agent_names=agent_names,

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

@@ -52,6 +52,7 @@ from .utils import (
     get_after_run_content,
     get_def_main,
     get_ipynb_content_start,
+    get_np_no_nep50_handle,
     get_py_content_start,
     get_sqlite_out,
     get_start_logging,
@@ -210,6 +211,7 @@ class FlowExporter(BaseExporter, ExporterMixin):
         )
         content += self.get_comment("imports", self.for_notebook) + "\n"
         content += imports[0] + "\n"
+        content += get_np_no_nep50_handle() + "\n"
         content += self.get_comment("logging", self.for_notebook) + "\n"
         content += get_start_logging(tabs=0) + "\n"
         content += "start_logging()\n\n"

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/flow/utils/__init__.py

@@ -14,14 +14,11 @@ from .def_main import get_def_main
 from .flow_content import (
     get_after_run_content,
     get_ipynb_content_start,
+    get_np_no_nep50_handle,
     get_py_content_start,
 )
 from .flow_names import ensure_unique_names
-from .importing_utils import (
-    gather_imports,
-    get_standard_imports,
-    get_the_imports_string,
-)
+from .importing_utils import gather_imports, get_the_imports_string
 from .logging_utils import (
     get_sqlite_out,
     get_sqlite_out_call,
@@ -41,12 +38,12 @@ __all__ = [
     "gather_imports",
     "get_after_run_content",
     "get_def_main",
+    "get_np_no_nep50_handle",
     "get_py_content_start",
     "get_ipynb_content_start",
     "get_start_logging",
     "get_stop_logging",
     "get_sqlite_out",
     "get_sqlite_out_call",
-    "get_standard_imports",
     "get_the_imports_string",
 ]

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/flow/utils/flow_content.py

@@ -71,12 +71,14 @@ PYLINT_RULES = [
     "unknown-option-value",
     "unused-argument",
     "unused-import",
+    "unused-variable",
     "invalid-name",
     "import-error",
     "inconsistent-quotes",
     "missing-function-docstring",
     "missing-param-doc",
     "missing-return-doc",
+    "ungrouped-imports",
 ]
 
 
@@ -159,3 +161,39 @@ def get_after_run_content(
 {space}{tab}pass
 """
     return content
+
+
+def get_np_no_nep50_handle() -> str:
+    """Handle catching the "module numpy has no attribute _no_pep50_warning" error.
+
+    Returns
+    -------
+    str
+        The content to handle the error.
+    """
+    # https://github.com/numpy/numpy/blob/v2.2.2/\
+    #   doc/source/release/2.2.0-notes.rst#nep-50-promotion-state-option-removed
+    content = '''
+# try to make sure we don't get:
+# module 'numpy' has no attribute '_no_nep50_warning'"
+os.environ["NEP50_DEPRECATION_WARNING"] = "0"
+os.environ["NEP50_DISABLE_WARNING"] = "1"
+os.environ["NPY_PROMOTION_STATE"] = "weak"
+if not hasattr(np, "_no_pep50_warning"):
+
+    import contextlib
+    from typing import Generator
+
+    @contextlib.contextmanager
+    def _np_no_nep50_warning() -> Generator[None, None, None]:
+        """Dummy function to avoid the warning.
+
+        Yields
+        ------
+        None
+            Nothing.
+        """
+        yield
+    setattr(np, "_no_pep50_warning", _np_no_nep50_warning)  # noqa
+'''
+    return content

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/flow/utils/importing_utils.py

@@ -36,21 +36,6 @@ COMMON_AUTOGEN_IMPORTS = [
 ]
 
 
-def get_standard_imports() -> str:
-    """Get the standard imports.
-
-    Returns
-    -------
-    str
-        The standard imports.
-    """
-    builtin_imports = BUILTIN_IMPORTS.copy()
-    imports_string = "\n".join(builtin_imports) + "\n"
-    typing_imports = "from typing import " + ", ".join(TYPING_IMPORTS)
-    imports_string += typing_imports
-    return imports_string
-
-
 def sort_imports(
     all_imports: List[Tuple[str, ImportPosition]],
 ) -> Tuple[List[str], List[str], List[str], List[str], bool]:
@@ -66,10 +51,10 @@ def sort_imports(
     Tuple[List[str], List[str], List[str], List[str], bool]
         The sorted imports and a flag if we got `import autogen`.
     """
-    builtin_imports = []
-    third_party_imports = []
-    local_imports = []
-    autogen_imports = COMMON_AUTOGEN_IMPORTS.copy()
+    builtin_imports: List[str] = []
+    third_party_imports: List[str] = []
+    local_imports: List[str] = []
+    autogen_imports: List[str] = COMMON_AUTOGEN_IMPORTS.copy()
     got_import_autogen = False
     for import_string, position in all_imports:
         if "import autogen" in import_string:
@@ -85,11 +70,22 @@ def sort_imports(
         elif position == ImportPosition.LOCAL:
             local_imports.append(import_string)
     autogen_imports = list(set(autogen_imports))
+    third_party_imports = ensure_np_import(third_party_imports)
+    sorted_builtins = sorted(
+        [imp for imp in builtin_imports if imp.startswith("import ")]
+    ) + sorted([imp for imp in builtin_imports if imp.startswith("from ")])
+    sorted_third_party = sorted(
+        [imp for imp in third_party_imports if imp.startswith("import ")]
+    ) + sorted([imp for imp in third_party_imports if imp.startswith("from ")])
+    sorted_locals = sorted(
+        [imp for imp in local_imports if imp.startswith("import ")]
+    ) + sorted([imp for imp in local_imports if imp.startswith("from ")])
+
     return (
-        sorted(builtin_imports),
+        sorted_builtins,
         sorted(autogen_imports),
-        sorted(third_party_imports),
-        sorted(local_imports),
+        sorted_third_party,
+        sorted_locals,
         got_import_autogen,
     )
 
@@ -150,6 +146,27 @@ def get_the_imports_string(
     return final_string.replace("\n\n\n", "\n\n")  # avoid too many newlines
 
 
+def ensure_np_import(third_party_imports: List[str]) -> List[str]:
+    """Ensure numpy is imported.
+
+    Parameters
+    ----------
+    third_party_imports : List[str]
+        The third party imports.
+
+    Returns
+    -------
+    List[str]
+        The third party imports with numpy.
+    """
+    if (
+        not third_party_imports
+        or "import numpy as np" not in third_party_imports
+    ):
+        third_party_imports.append("import numpy as np")
+    return third_party_imports
+
+
 def gather_imports(
     model_imports: Optional[List[Tuple[str, ImportPosition]]],
     skill_imports: Optional[List[Tuple[str, ImportPosition]]],
@@ -174,13 +191,14 @@ def gather_imports(
     Tuple[str, ImportPosition]
         The gathered imports.
     """
-    imports_string = get_standard_imports()
-    all_imports: List[Tuple[str, ImportPosition]] = [
-        (
-            imports_string,
-            ImportPosition.BUILTINS,
+    all_imports: List[Tuple[str, ImportPosition]] = []
+    for import_statement in BUILTIN_IMPORTS:
+        all_imports.append(
+            (
+                import_statement,
+                ImportPosition.BUILTINS,
+            )
         )
-    ]
     if model_imports:
         all_imports.extend(model_imports)
     if skill_imports:
@@ -189,4 +207,21 @@ def gather_imports(
         all_imports.extend(chat_imports)
     if agent_imports:
         all_imports.extend(agent_imports)
-    return list(set(all_imports))
+    # let's try to avoid this:
+    # from typing import Annotated
+    # from typing import Annotated, Any, Callable, Dict, ...Union
+    all_typing_imports = TYPING_IMPORTS.copy()
+    final_imports: List[Tuple[str, ImportPosition]] = []
+    for import_statement, import_position in all_imports:
+        if import_statement.startswith("from typing"):
+            to_import = import_statement.split("import")[1].strip()
+            if to_import:
+                all_typing_imports.append(to_import)
+        else:
+            final_imports.append((import_statement, import_position))
+    unique_typing_imports = list(set(all_typing_imports))
+    one_typing_import = "from typing import " + ", ".join(
+        sorted(unique_typing_imports)
+    )
+    final_imports.insert(1, (one_typing_import, ImportPosition.BUILTINS))
+    return list(set(final_imports))

{waldiez-0.3.12 → waldiez-0.4.0}/waldiez/exporting/skills/skills_exporter.py

@@ -89,12 +89,18 @@ class SkillsExporter(BaseExporter, ExporterMixin):
         Tuple[str, int]
             The exported imports and the position of the imports.
         """
-        if not self.skill_imports:
-            return []
         imports: List[Tuple[str, ImportPosition]] = []
-        for skill_import in self.skill_imports:
-            if (skill_import, ImportPosition.LOCAL) not in imports:
-                imports.append((skill_import, ImportPosition.LOCAL))
+        if not self.skill_imports:
+            return imports
+        # standard imports
+        for import_statement in self.skill_imports[0]:
+            imports.append((import_statement, ImportPosition.BUILTINS))
+        # third party imports
+        for import_statement in self.skill_imports[1]:
+            imports.append((import_statement, ImportPosition.THIRD_PARTY))
+        # secrets/local imports
+        for import_statement in self.skill_imports[2]:
+            imports.append((import_statement, ImportPosition.LOCAL))
         return imports
 
     def get_before_export(
@@ -156,11 +162,12 @@ class SkillsExporter(BaseExporter, ExporterMixin):
             the before export strings, the after export strings,
             and the environment variables.
         """
+        content = self.generate()
         imports = self.get_imports()
         after_export = self.get_after_export()
         environment_variables = self.get_environment_variables()
         result: ExporterReturnType = {
-            "content": self.generate(),
+            "content": content,
             "imports": imports,
             "before_export": None,
             "after_export": after_export,