diff --git a/autogen/interoperability/__init__.py b/autogen/interop/__init__.py similarity index 100% rename from autogen/interoperability/__init__.py rename to autogen/interop/__init__.py diff --git a/autogen/interoperability/crewai/__init__.py b/autogen/interop/crewai/__init__.py similarity index 100% rename from autogen/interoperability/crewai/__init__.py rename to autogen/interop/crewai/__init__.py diff --git a/autogen/interoperability/crewai/crewai.py b/autogen/interop/crewai/crewai.py similarity index 100% rename from autogen/interoperability/crewai/crewai.py rename to autogen/interop/crewai/crewai.py diff --git a/autogen/interoperability/interoperability.py b/autogen/interop/interoperability.py similarity index 100% rename from autogen/interoperability/interoperability.py rename to autogen/interop/interoperability.py diff --git a/autogen/interoperability/langchain/__init__.py b/autogen/interop/langchain/__init__.py similarity index 100% rename from autogen/interoperability/langchain/__init__.py rename to autogen/interop/langchain/__init__.py diff --git a/autogen/interoperability/langchain/langchain.py b/autogen/interop/langchain/langchain.py similarity index 100% rename from autogen/interoperability/langchain/langchain.py rename to autogen/interop/langchain/langchain.py diff --git a/pyproject.toml b/pyproject.toml index 66b4bb2b56..74a6d04c1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,12 +61,12 @@ files = [ "autogen/function_utils.py", "autogen/io", "autogen/tools", - "autogen/interoperability", + "autogen/interop", "test/test_pydantic.py", "test/test_function_utils.py", "test/io", "test/tools", - "test/interoperability", + "test/interop", ] exclude = [ "autogen/math_utils\\.py", diff --git a/test/interoperability/__init__.py b/test/interop/__init__.py similarity index 100% rename from test/interoperability/__init__.py rename to test/interop/__init__.py diff --git a/test/interoperability/crewai/__init__.py b/test/interop/crewai/__init__.py similarity index 100% rename from test/interoperability/crewai/__init__.py rename to test/interop/crewai/__init__.py diff --git a/test/interoperability/crewai/test_crewai.py b/test/interop/crewai/test_crewai.py similarity index 96% rename from test/interoperability/crewai/test_crewai.py rename to test/interop/crewai/test_crewai.py index 7c35af4a3f..1f0bae4bb1 100644 --- a/test/interoperability/crewai/test_crewai.py +++ b/test/interop/crewai/test_crewai.py @@ -16,10 +16,10 @@ FileReadTool = unittest.mock.MagicMock() from autogen import AssistantAgent, UserProxyAgent -from autogen.interoperability import Interoperable +from autogen.interop import Interoperable if sys.version_info >= (3, 10) and sys.version_info < (3, 13): - from autogen.interoperability.crewai import CrewAIInteroperability + from autogen.interop.crewai import CrewAIInteroperability else: CrewAIInteroperability = unittest.mock.MagicMock() diff --git a/test/interoperability/langchain/__init__.py b/test/interop/langchain/__init__.py similarity index 100% rename from test/interoperability/langchain/__init__.py rename to test/interop/langchain/__init__.py diff --git a/test/interoperability/langchain/test_langchain.py b/test/interop/langchain/test_langchain.py similarity index 95% rename from test/interoperability/langchain/test_langchain.py rename to test/interop/langchain/test_langchain.py index 8ab346ff40..070c396784 100644 --- a/test/interoperability/langchain/test_langchain.py +++ b/test/interop/langchain/test_langchain.py @@ -8,15 +8,17 @@ import pytest from conftest import reason, skip_openai -from langchain.tools import tool from pydantic import BaseModel, Field from autogen import AssistantAgent, UserProxyAgent -from autogen.interoperability import Interoperable +from autogen.interop import Interoperable if sys.version_info >= (3, 9): - from autogen.interoperability.langchain import LangchainInteroperability + from langchain.tools import tool + + from autogen.interop.langchain import LangchainInteroperability else: + tool = unittest.mock.MagicMock() LangchainInteroperability = unittest.mock.MagicMock() @@ -88,7 +90,7 @@ def test_with_llm(self) -> None: class TestLangchainInteroperabilityWithoutPydanticInput: @pytest.fixture(autouse=True) def setup(self) -> None: - @tool # type: ignore[misc] + @tool def search(query: str, max_length: int) -> str: """Look up things online.""" return f"LangChain Integration, max_length: {max_length}" diff --git a/test/interoperability/test_interoperability.py b/test/interop/test_interoperability.py similarity index 77% rename from test/interoperability/test_interoperability.py rename to test/interop/test_interoperability.py index 185cf4b571..164854f6aa 100644 --- a/test/interoperability/test_interoperability.py +++ b/test/interop/test_interoperability.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -from autogen.interoperability import Interoperable +from autogen.interop import Interoperable def test_interoperable() -> None: