waldiez 0.3.12__py3-none-any.whl → 0.4.1__py3-none-any.whl

waldiez/models/skill/skill.py

@@ -2,13 +2,23 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez Skill model."""
 
-from typing import Dict, List
+import json
+import re
+from pathlib import Path
+from typing import Any, Dict, List, Tuple, Union
 
 from pydantic import Field, model_validator
 from typing_extensions import Annotated, Literal, Self
 
-from ..common import WaldiezBase, get_function, now, parse_code_string
+from ..common import (
+    WaldiezBase,
+    gather_code_imports,
+    get_function,
+    now,
+    parse_code_string,
+)
 from .skill_data import WaldiezSkillData
+from .skill_type import WaldiezSkillType
 
 SHARED_SKILL_NAME = "waldiez_shared"
 
@@ -97,6 +107,66 @@ class WaldiezSkill(WaldiezBase):
         ),
     ]
 
+    @staticmethod
+    def load(data_or_path: Union[str, Path, Dict[str, Any]]) -> "WaldiezSkill":
+        """Load a skill from a read-only file.
+
+        Parameters
+        ----------
+        data_or_path : Union[str, Path, Dict[str, Any]]
+            The path to the read-only file or the loaded data.
+
+        Returns
+        -------
+        WaldiezSkill
+            The skill.
+
+        Raises
+        ------
+        FileNotFoundError
+            If the file is not found.
+        ValueError
+            If the JSON is invalid or the data is invalid.
+        """
+        if isinstance(data_or_path, dict):
+            return WaldiezSkill.model_validate(data_or_path)
+        if not isinstance(data_or_path, Path):
+            data_or_path = Path(data_or_path)
+        resolved = data_or_path.resolve()
+        if not resolved.is_file():
+            raise FileNotFoundError(f"File not found: {resolved}")
+        with resolved.open("r", encoding="utf-8") as file:
+            data_string = file.read()
+            try:
+                data_dict = json.loads(data_string)
+            except BaseException as exc:  # pylint: disable=broad-except
+                raise ValueError(f"Invalid WaldiezSkill/JSON: {exc}") from exc
+            return WaldiezSkill.model_validate(data_dict)
+
+    @property
+    def skill_type(self) -> WaldiezSkillType:
+        """Get the skill type.
+
+        Returns
+        -------
+        WaldiezSkillType
+            The type of the skill:
+            [shared, custom, langchain, crewai].
+        """
+        return self.data.skill_type
+
+    _skill_imports: Tuple[List[str], List[str]] = ([], [])
+
+    def get_imports(self) -> Tuple[List[str], List[str]]:
+        """Get the skill imports.
+
+        Returns
+        -------
+        Tuple[List[str], List[str]]
+            The builtin and external imports.
+        """
+        return self._skill_imports
+
     @property
     def is_shared(self) -> bool:
         """Check if the skill is shared.
@@ -106,7 +176,18 @@ class WaldiezSkill(WaldiezBase):
         bool
             True if the skill is shared, False otherwise.
         """
-        return self.name == SHARED_SKILL_NAME
+        return self.skill_type == "shared" or self.name == SHARED_SKILL_NAME
+
+    @property
+    def is_interop(self) -> bool:
+        """Check if the skill is interoperability.
+
+        Returns
+        -------
+        bool
+            True if the skill is interoperability, False otherwise.
+        """
+        return self.skill_type in ("langchain", "crewai")
 
     def get_content(self) -> str:
         """Get the content of the skill.
@@ -116,11 +197,61 @@ class WaldiezSkill(WaldiezBase):
         str
             The content of the skill.
         """
-        if self.name == SHARED_SKILL_NAME:
-            # the whole content (globals)
+        if self.is_shared or self.is_interop:
             return self.data.content
+        # if custom, only the function content
         return get_function(self.data.content, self.name)
 
+    def _validate_interop_skill(self) -> None:
+        """Validate the interoperability skill.
+
+        Raises
+        ------
+        ValueError
+            If the skill name is not in the content.
+        """
+        if self.is_interop:
+            # we expect sth like:
+            # with single or double quotes for type={skill_type}
+            # {skill_name} = *.convert_tool(..., type="{skill_type}", ...)
+            if f"{self.name} = " not in self.data.content:
+                raise ValueError(
+                    f"The skill name '{self.name}' is not in the content."
+                )
+            # we don't want the conversion to ag2 tool (we do it internally)
+            # or the skill registration (we do it after having the agent names)
+            # so no" .convert_tool(... type="...")
+            # or .register_for_llm(...), .register_for_execution(...)
+            to_exclude = [
+                r".convert_tool\(.+?type=",
+                rf"{self.name}.register_for_llm\(",
+                rf"{self.name}.register_for_execution\(",
+            ]
+            for exclude in to_exclude:
+                if re.search(exclude, self.data.content):
+                    raise ValueError(
+                        f"Invalid skill content: '{exclude}' is not allowed."
+                    )
+
+    def _validate_custom_skill(self) -> None:
+        """Validate a custom skill.
+
+        Raises
+        ------
+        ValueError
+            If the skill name is not in the content.
+            If the skill content is invalid.
+        """
+        search = f"def {self.name}("
+        if self.skill_type == "custom" and not self.is_shared:
+            if search not in self.data.content:
+                raise ValueError(
+                    f"The skill name '{self.name}' is not in the content."
+                )
+            error, tree = parse_code_string(self.data.content)
+            if error is not None or tree is None:
+                raise ValueError(f"Invalid skill content: {error}")
+
     @model_validator(mode="after")
     def validate_data(self) -> Self:
         """Validate the data.
@@ -136,14 +267,27 @@ class WaldiezSkill(WaldiezBase):
             If the skill name is not in the content.
             If the skill content is invalid.
         """
-        search = f"def {self.name}("
-        if self.name != SHARED_SKILL_NAME and search not in self.data.content:
-            raise ValueError(
-                f"The skill name '{self.name}' is not in the content."
-            )
-        error, tree = parse_code_string(self.data.content)
-        if error is not None or tree is None:
-            raise ValueError(f"Invalid skill content: {error}")
+        self._validate_custom_skill()
+        self._validate_interop_skill()
+        self._skill_imports = gather_code_imports(
+            self.data.content, self.is_interop
+        )
+        # remove the imports from the content
+        # we 'll place them at the top of the file
+        all_imports = self._skill_imports[0] + self._skill_imports[1]
+        code_lines = self.data.content.splitlines()
+        valid_lines = [
+            line
+            for line in code_lines
+            if not any(line.startswith(imp) for imp in all_imports)
+        ]
+        # remove empty lines at the beginning and end
+        # of the content
+        while valid_lines and not valid_lines[0].strip():
+            valid_lines.pop(0)
+        while valid_lines and not valid_lines[-1].strip():
+            valid_lines.pop()
+        self.data.content = "\n".join(valid_lines)
         return self
 
     @property

waldiez/models/skill/skill_data.py

@@ -8,6 +8,7 @@ from pydantic import Field
 from typing_extensions import Annotated
 
 from ..common import WaldiezBase
+from .skill_type import WaldiezSkillType
 
 
 class WaldiezSkillData(WaldiezBase):
@@ -15,12 +16,25 @@ class WaldiezSkillData(WaldiezBase):
 
     Attributes
     ----------
+    skill_type : WaldiezSkillType
+        The type of the skill: shared, custom, langchain, crewai.
     content : str
         The content (source code) of the skill.
     secrets : Dict[str, str]
         The secrets (environment variables) of the skill.
     """
 
+    skill_type: Annotated[
+        WaldiezSkillType,
+        Field(
+            "custom",
+            alias="skillType",
+            title="Skill Type",
+            description=(
+                "The type of the skill: shared, custom, langchain, crewai."
+            ),
+        ),
+    ] = "custom"
     content: Annotated[
         str,
         Field(

waldiez/models/skill/skill_type.py

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+"""Waldiez Skill types."""
+
+from typing_extensions import Literal
+
+WaldiezSkillType = Literal["shared", "custom", "langchain", "crewai"]
+"""Possible types of a Waldiez Skill."""

waldiez/models/waldiez.py

@@ -12,15 +12,12 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
 
-from .agents import (
-    WaldiezAgent,
-    get_retrievechat_extra_requirements,
-)
+from .agents import WaldiezAgent, get_retrievechat_extra_requirements
 from .chat import WaldiezChat
 from .common import get_autogen_version
 from .flow import WaldiezFlow, get_flow_data
 from .model import WaldiezModel, get_models_extra_requirements
-from .skill import WaldiezSkill
+from .skill import WaldiezSkill, get_skills_extra_requirements
 
 
 @dataclass(frozen=True, slots=True)
@@ -155,6 +152,11 @@ class Waldiez:
         """Check if the flow has multimodal agents."""
         return any(agent.data.is_multimodal for agent in self.agents)
 
+    @property
+    def has_captain_agents(self) -> bool:
+        """Check if the flow has captain agents."""
+        return any(agent.agent_type == "captain" for agent in self.agents)
+
     @property
     def chats(self) -> List[Tuple[WaldiezChat, WaldiezAgent, WaldiezAgent]]:
         """Get the chats."""
@@ -243,8 +245,36 @@ class Waldiez:
             requirements.update(rag_extras)
         if self.has_multimodal_agents:
             requirements.add(f"pyautogen[lmm]=={autogen_version}")
+        if self.has_captain_agents:
+            # pysqlite3-binary might not get installed on windows
+            captain_extras = [
+                "chromadb",
+                "sentence-transformers",
+                "huggingface-hub",
+                # tools:
+                "pillow",
+                "markdownify",
+                "arxiv",
+                "pymupdf",
+                "wikipedia-api",
+                "easyocr",
+                "python-pptx",
+                "openai-whisper",
+                "pandas",
+                "scipy",
+            ]
+            requirements.update(captain_extras)
+        requirements.update(
+            get_models_extra_requirements(
+                self.models,
+                autogen_version=autogen_version,
+            )
+        )
         requirements.update(
-            get_models_extra_requirements(self.models, autogen_version)
+            get_skills_extra_requirements(
+                self.skills,
+                autogen_version=autogen_version,
+            )
         )
         return sorted(list(requirements))
 

waldiez/runner.py

@@ -14,7 +14,7 @@ import sys
 import tempfile
 from pathlib import Path
 from types import TracebackType
-from typing import TYPE_CHECKING, Dict, List, Optional, Type, Union
+from typing import TYPE_CHECKING, Dict, List, Optional, Set, Type, Union
 
 from .exporter import WaldiezExporter
 from .models.waldiez import Waldiez
@@ -30,6 +30,7 @@ from .running import (
     reset_env_vars,
     set_env_vars,
 )
+from .utils import check_pysqlite3
 
 if TYPE_CHECKING:
     from autogen import ChatResult  # type: ignore
@@ -135,13 +136,26 @@ class WaldiezRunner:
         """Get the running status."""
         return self._running
 
+    def gather_requirements(self) -> Set[str]:
+        """Gather extra requirements to install before running the flow.
+
+        Returns
+        -------
+        Set[str]
+            The extra requirements.
+        """
+        extra_requirements = set(
+            req for req in self.waldiez.requirements if req not in sys.modules
+        )
+        if self.waldiez.has_captain_agents:
+            check_pysqlite3()
+        return extra_requirements
+
     def install_requirements(self) -> None:
         """Install the requirements for the flow."""
         self._called_install_requirements = True
         printer = get_printer()
-        extra_requirements = set(
-            req for req in self.waldiez.requirements if req not in sys.modules
-        )
+        extra_requirements = self.gather_requirements()
         if extra_requirements:
             install_requirements(extra_requirements, printer)
             refresh_environment()
@@ -150,9 +164,7 @@ class WaldiezRunner:
         """Install the requirements for the flow asynchronously."""
         self._called_install_requirements = True
         printer = get_printer()
-        extra_requirements = set(
-            req for req in self.waldiez.requirements if req not in sys.modules
-        )
+        extra_requirements = self.gather_requirements()
         if extra_requirements:
             await a_install_requirements(extra_requirements, printer)
             refresh_environment()

waldiez/running/environment.py

@@ -8,7 +8,7 @@ import os
 import site
 import sys
 import warnings
-from typing import Dict, List, Tuple
+from typing import Dict, Generator, List, Tuple
 
 
 def in_virtualenv() -> bool:
@@ -50,6 +50,35 @@ def refresh_environment() -> None:
         for mod in modules_to_reload:
             if mod not in sys.modules:
                 importlib.import_module(mod)
+        # a swarm chat without a user agent
+        # creates a new user (this has a default code execution with docker)
+        # captain also generates new agents that also have
+        # default code execution with docker
+        # temp (until we handle/detect docker setup)
+        os.environ["AUTOGEN_USE_DOCKER"] = "0"
+        # we might get:
+        # module 'numpy' has no attribute '_no_nep50_warning'
+        # in autogen/agentchat/contrib/captainagent/tool_retriever.py
+        os.environ["NEP50_DEPRECATION_WARNING"] = "0"
+        os.environ["NEP50_DISABLE_WARNING"] = "1"
+        os.environ["NPY_PROMOTION_STATE"] = "weak"
+        import numpy as np
+
+        if not hasattr(np, "_no_pep50_warning"):
+            import contextlib
+
+            @contextlib.contextmanager
+            def _np_no_nep50_warning() -> Generator[None, None, None]:
+                """Dummy function to avoid the warning.
+
+                Yields
+                ------
+                None
+                    Dummy value.
+                """
+                yield
+
+            setattr(np, "_no_pep50_warning", _np_no_nep50_warning)  # noqa
 
 
 def set_env_vars(flow_env_vars: List[Tuple[str, str]]) -> Dict[str, str]:

waldiez/running/running.py

@@ -91,12 +91,6 @@ def before_run(
     str
         The file name.
     """
-    printer = get_printer()
-    printer(
-        "Requirements installed.\n"
-        "NOTE: If new packages were added and you are using Jupyter, "
-        "you might need to restart the kernel."
-    )
     if not uploads_root:
         uploads_root = Path(tempfile.mkdtemp())
     else:

waldiez/utils/pysqlite3_checker.py

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+# pylint: disable=import-error
 # flake8: noqa: E501
 """Try to install pysqlite3-binary.
 
@@ -205,18 +206,30 @@ def check_pysqlite3() -> None:
         import pysqlite3  # type: ignore[unused-ignore, import-untyped, import-not-found]  # noqa
     except ImportError:
         print("pysqlite3 not found or cannot be imported.")
-        # Uninstall pysqlite3-binary if it is already installed
-        pip_uninstall("pysqlite3", "pysqlite3-binary")
-        source_path = download_sqlite_amalgamation()
-        install_pysqlite3(source_path)
+        if sys.platform.lower() == "linux":
+            pip_install("pysqlite3-binary")
+        else:
+            # Uninstall pysqlite3-binary if it is already installed
+            pip_uninstall("pysqlite3", "pysqlite3-binary")
+            cwd = os.getcwd()
+            tmpdir = tempfile.mkdtemp()
+            os.chdir(tmpdir)
+            source_path = download_sqlite_amalgamation()
+            install_pysqlite3(source_path)
+            os.chdir(cwd)
+            shutil.rmtree(tmpdir)
         site.main()
         # Re-import pysqlite3 as sqlite3
         import pysqlite3  # type: ignore[unused-ignore, import-untyped, import-not-found]  # noqa
 
+        sys.modules["sqlite3"] = sys.modules["pysqlite3"]
+
 
 def test_sqlite_usage() -> None:
     """Test the usage of the sqlite3 module."""
-    # pylint: disable=import-outside-toplevel
+    # pylint: disable=import-outside-toplevel, unused-import, line-too-long
+    import pysqlite3  # type: ignore[unused-ignore, import-untyped, import-not-found]  # noqa
+
     sys.modules["sqlite3"] = sys.modules.pop("pysqlite3")
     import sqlite3  # noqa
 

{waldiez-0.3.12.dist-info → waldiez-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.3.12
+Version: 0.4.1
 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[crystal,python]==0.28.0; extra == 'docs'
+Requires-Dist: mkdocstrings-python==1.15.0; extra == 'docs'
+Requires-Dist: mkdocstrings[crystal,python]==0.28.1; 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.1; extra == 'jupyter'
 Provides-Extra: studio
-Requires-Dist: waldiez-studio==0.3.12; extra == 'studio'
+Requires-Dist: waldiez-studio==0.4.1; extra == 'studio'
 Provides-Extra: test
 Requires-Dist: pytest-asyncio==0.25.3; extra == 'test'
 Requires-Dist: pytest-cov==6.0.0; extra == 'test'