Skip to content

armgit / camel

Public Imported from GitHub
0

🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org

fix: cicd issue due to terminal tool (#3354)

Wendong-Fan963b7173a70f
diff --git a/camel/toolkits/terminal_toolkit/terminal_toolkit.py b/camel/toolkits/terminal_toolkit/terminal_toolkit.py
index c563642f8..32d7c4190 100644
--- a/camel/toolkits/terminal_toolkit/terminal_toolkit.py
+++ b/camel/toolkits/terminal_toolkit/terminal_toolkit.py
@@ -11,7 +11,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
-import atexit
import os
import platform
import select
@@ -147,8 +146,6 @@ class TerminalToolkit(BaseToolkit):
self.initial_env_path: Optional[str] = None
self.python_executable = sys.executable
- atexit.register(self.__del__)
-
self.log_dir = os.path.abspath(
session_logs_dir or os.path.join(self.working_dir, "terminal_logs")
)
@@ -932,6 +929,8 @@ class TerminalToolkit(BaseToolkit):
f"during cleanup: {e}"
)
+ cleanup._manual_timeout = True # type: ignore[attr-defined]
+
def __del__(self):
r"""Fallback cleanup in destructor."""
try:
@@ -939,6 +938,8 @@ class TerminalToolkit(BaseToolkit):
except Exception:
pass
+ __del__._manual_timeout = True # type: ignore[attr-defined]
+
def get_tools(self) -> List[FunctionTool]:
r"""Returns a list of FunctionTool objects representing the functions
in the toolkit.
diff --git a/test/toolkits/test_terminal_toolkit.py b/test/toolkits/test_terminal_toolkit.py
index 3d4e02a41..9a2c154dc 100644
--- a/test/toolkits/test_terminal_toolkit.py
+++ b/test/toolkits/test_terminal_toolkit.py
@@ -21,8 +21,11 @@ from camel.toolkits import TerminalToolkit
@pytest.fixture
-def terminal_toolkit(temp_dir):
- return TerminalToolkit(working_directory=temp_dir, safe_mode=False)
+def terminal_toolkit(temp_dir, request):
+ toolkit = TerminalToolkit(working_directory=temp_dir, safe_mode=False)
+ # Ensure cleanup happens after test completes
+ request.addfinalizer(toolkit.cleanup)
+ return toolkit
@pytest.fixture
@@ -41,9 +44,12 @@ def test_file(temp_dir):
def test_init():
toolkit = TerminalToolkit()
- assert toolkit.timeout == 20.0
- assert isinstance(toolkit.shell_sessions, dict)
- assert toolkit.os_type == platform.system()
+ try:
+ assert toolkit.timeout == 20.0
+ assert isinstance(toolkit.shell_sessions, dict)
+ assert toolkit.os_type == platform.system()
+ finally:
+ toolkit.cleanup()
def test_shell_exec(terminal_toolkit, temp_dir):