refactoring and test fix

Signed-off-by: Davor Runje <[email protected]>
ag2ai · Dec 17, 2024 · c9722b3 · c9722b3
1 parent 1b55bd7
commit c9722b3
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 9 deletions.
diff --git a/autogen/interoperability/__init__.py → autogen/interop/__init__.py b/autogen/interoperability/__init__.py → autogen/interop/__init__.py
diff --git a/autogen/interoperability/crewai/__init__.py → autogen/interop/crewai/__init__.py b/autogen/interoperability/crewai/__init__.py → autogen/interop/crewai/__init__.py
diff --git a/autogen/interoperability/crewai/crewai.py → autogen/interop/crewai/crewai.py b/autogen/interoperability/crewai/crewai.py → autogen/interop/crewai/crewai.py
diff --git a/autogen/interoperability/interoperability.py → autogen/interop/interoperability.py b/autogen/interoperability/interoperability.py → autogen/interop/interoperability.py
diff --git a/...en/interoperability/langchain/__init__.py → autogen/interop/langchain/__init__.py b/...en/interoperability/langchain/__init__.py → autogen/interop/langchain/__init__.py
diff --git a/...n/interoperability/langchain/langchain.py → autogen/interop/langchain/langchain.py b/...n/interoperability/langchain/langchain.py → autogen/interop/langchain/langchain.py
diff --git 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 → test/interop/__init__.py b/test/interoperability/__init__.py → test/interop/__init__.py
diff --git a/test/interoperability/crewai/__init__.py → test/interop/crewai/__init__.py b/test/interoperability/crewai/__init__.py → test/interop/crewai/__init__.py
diff --git a/test/interoperability/crewai/test_crewai.py → test/interop/crewai/test_crewai.py b/test/interoperability/crewai/test_crewai.py → 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 → test/interop/langchain/__init__.py b/test/interoperability/langchain/__init__.py → test/interop/langchain/__init__.py
diff --git a/...eroperability/langchain/test_langchain.py → test/interop/langchain/test_langchain.py b/...eroperability/langchain/test_langchain.py → 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/...interoperability/test_interoperability.py → test/interop/test_interoperability.py b/...interoperability/test_interoperability.py → 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: