๐ซ CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
chore: fix precommit (#3943)
Tao Suna2691e41c7b5
diff --git a/camel/toolkits/terminal_toolkit/go_runtime.py b/camel/toolkits/terminal_toolkit/go_runtime.pyindex b8e0ed104..4757a4059 100644--- a/camel/toolkits/terminal_toolkit/go_runtime.py+++ b/camel/toolkits/terminal_toolkit/go_runtime.py@@ -76,9 +76,7 @@ def ensure_go_available()if result.returncode == 0:version_info = result.stdout.strip()- info = (- f"Go is already available: {version_info}"- )+ info = f"Go is already available: {version_info}"if update_callback:update_callback(f"{info}\n")return os.path.dirname(existing_go)@@ -87,42 +85,37 @@ def ensure_go_available(# Go not found, attempt auto-installif update_callback:- update_callback(- f"Go not found, installing Go {GO_VERSION}...\n"- )+ update_callback(f"Go not found, installing Go {GO_VERSION}...\n")try:os_name, arch = get_platform_info()except RuntimeError as e:if update_callback:- update_callback(- f"Cannot auto-install Go: {e}\n"- )+ update_callback(f"Cannot auto-install Go: {e}\n")return None# Construct download URL from template- ext: ArchiveType = (- "zip" if os_name == "windows" else "tar.gz"- )+ ext: ArchiveType = "zip" if os_name == "windows" else "tar.gz"url = GO_DOWNLOAD_URL_TEMPLATE.format(- version=GO_VERSION, os_name=os_name, arch=arch, ext=ext,+ version=GO_VERSION,+ os_name=os_name,+ arch=arch,+ ext=ext,)checksum_url = GO_CHECKSUM_URL_TEMPLATE.format(- version=GO_VERSION, os_name=os_name, arch=arch, ext=ext,+ version=GO_VERSION,+ os_name=os_name,+ arch=arch,+ ext=ext,)go_runtime_dir = os.path.join(RUNTIMES_DIR, "go")# Check if already downloadedgo_bin_dir = os.path.join(go_runtime_dir, "go", "bin")- go_executable = (- "go.exe" if os_name == "windows" else "go"- )+ go_executable = "go.exe" if os_name == "windows" else "go"if os.path.exists(os.path.join(go_bin_dir, go_executable)):- info = (- f"Go {GO_VERSION} is already installed at "- f"{go_runtime_dir}"- )+ info = f"Go {GO_VERSION} is already installed at " f"{go_runtime_dir}"if update_callback:update_callback(f"{info}\n")return go_bin_dir@@ -155,7 +148,6 @@ def ensure_go_available(if update_callback:update_callback(- "Failed to install Go. "- "If needed, please install it manually.\n"+ "Failed to install Go. " "If needed, please install it manually.\n")return Nonediff --git a/camel/toolkits/terminal_toolkit/java_runtime.py b/camel/toolkits/terminal_toolkit/java_runtime.pyindex b54ed717e..5e4b07e79 100644--- a/camel/toolkits/terminal_toolkit/java_runtime.py+++ b/camel/toolkits/terminal_toolkit/java_runtime.py@@ -82,22 +82,12 @@ def ensure_java_available(timeout=10,)# java -version outputs to stderr- version_output = (- result.stderr.strip() or result.stdout.strip()- )- if (- result.returncode == 0- and javac_result.returncode == 0- ):- info = (- f"Java is already available: "- f"{version_output}"- )+ version_output = result.stderr.strip() or result.stdout.strip()+ if result.returncode == 0 and javac_result.returncode == 0:+ info = f"Java is already available: " f"{version_output}"if update_callback:update_callback(f"{info}\n")- return os.path.dirname(- os.path.dirname(existing_java)- )+ return os.path.dirname(os.path.dirname(existing_java))except Exception:pass@@ -112,9 +102,7 @@ def ensure_java_available(os_name, arch = get_platform_info()except RuntimeError as e:if update_callback:- update_callback(- f"Cannot auto-install Java: {e}\n"- )+ update_callback(f"Cannot auto-install Java: {e}\n")return None# Map arch/OS names for Adoptium API@@ -129,16 +117,12 @@ def ensure_java_available()java_runtime_dir = os.path.join(RUNTIMES_DIR, "java")- archive_type: ArchiveType = (- "zip" if os_name == "windows" else "tar.gz"- )+ archive_type: ArchiveType = "zip" if os_name == "windows" else "tar.gz"# Check if already downloadedjava_home = _find_java_home(java_runtime_dir, os_name)if java_home:- info = (- f"Java JDK is already installed at {java_home}"- )+ info = f"Java JDK is already installed at {java_home}"if update_callback:update_callback(f"{info}\n")return java_home@@ -196,9 +180,7 @@ def _find_java_home(if not os.path.exists(java_runtime_dir):return None- java_executable = (- "java.exe" if os_name == "windows" else "java"- )+ java_executable = "java.exe" if os_name == "windows" else "java"for entry in os.listdir(java_runtime_dir):entry_path = os.path.join(java_runtime_dir, entry)@@ -216,14 +198,10 @@ def _find_java_home(java_executable,)if os.path.exists(java_path):- return os.path.join(- entry_path, "Contents", "Home"- )+ return os.path.join(entry_path, "Contents", "Home")# On Linux/Windows, the structure is jdk-xxx/bin/java- java_path = os.path.join(- entry_path, "bin", java_executable- )+ java_path = os.path.join(entry_path, "bin", java_executable)if os.path.exists(java_path):return entry_pathdiff --git a/camel/toolkits/terminal_toolkit/runtime_utils.py b/camel/toolkits/terminal_toolkit/runtime_utils.pyindex 0123aa0a6..542bda7a9 100644--- a/camel/toolkits/terminal_toolkit/runtime_utils.py+++ b/camel/toolkits/terminal_toolkit/runtime_utils.py@@ -45,16 +45,16 @@ UpdateCallback = Optional[Callable[[str], None]]class Runtime(str, Enum):r"""Supported language runtimes."""+GO = "go"JAVA = "java"+# โโ Constants โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโGO_VERSION = "1.23.6"JAVA_VERSION = "21"-RUNTIMES_DIR = os.path.join(- os.path.expanduser("~"), ".camel", "runtimes"-)+RUNTIMES_DIR = os.path.join(os.path.expanduser("~"), ".camel", "runtimes")# โโ URL Templates โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ@@ -111,9 +111,7 @@ def get_platform_info() -> tuple[SupportedOS, SupportedArch]:"""os_name = platform.system().lower()if os_name not in _SUPPORTED_OS_SET:- raise RuntimeError(- f"Unsupported operating system: {os_name}"- )+ raise RuntimeError(f"Unsupported operating system: {os_name}")machine = platform.machine().lower()arch = _MACHINE_TO_ARCH.get(machine)@@ -195,15 +193,11 @@ def download_and_extract_runtime(f"Failed to download from {url}: {e}") from eexcept (tarfile.TarError, zipfile.BadZipFile) as e:- raise RuntimeExtractionError(- f"Failed to extract archive: {e}"- ) from e+ raise RuntimeExtractionError(f"Failed to extract archive: {e}") from eexcept (RuntimeDownloadError, RuntimeExtractionError):raiseexcept Exception as e:- raise RuntimeInstallError(- f"Runtime installation failed: {e}"- ) from e+ raise RuntimeInstallError(f"Runtime installation failed: {e}") from efinally:if tmp_file and os.path.exists(tmp_file):try:@@ -245,8 +239,7 @@ def _verify_checksum(if actual_hash not in checksum_data:raise RuntimeDownloadError(- "Checksum verification failed! "- "Download may be corrupted."+ "Checksum verification failed! " "Download may be corrupted.")if update_callback:@@ -257,6 +250,5 @@ def _verify_checksum(logger.warning(f"Checksum verification skipped: {e}")if update_callback:update_callback(- f"Warning: Checksum verification skipped: "- f"{e}\n"+ f"Warning: Checksum verification skipped: " f"{e}\n")diff --git a/camel/toolkits/terminal_toolkit/terminal_toolkit.py b/camel/toolkits/terminal_toolkit/terminal_toolkit.pyindex 3cc713176..c455c75b3 100644--- a/camel/toolkits/terminal_toolkit/terminal_toolkit.py+++ b/camel/toolkits/terminal_toolkit/terminal_toolkit.py@@ -438,9 +438,7 @@ class TerminalToolkit(BaseToolkit):current = self._runtime_env_vars.get("PATH", os.environ.get("PATH", ""))- self._runtime_env_vars["PATH"] = (- go_path + os.pathsep + current- )+ self._runtime_env_vars["PATH"] = go_path + os.pathsep + current# Check Java availability if enabledif Runtime.JAVA in self.enable_other_runtimes:diff --git a/camel/toolkits/terminal_toolkit/utils.py b/camel/toolkits/terminal_toolkit/utils.pyindex d78a77270..7ed75df38 100644--- a/camel/toolkits/terminal_toolkit/utils.py+++ b/camel/toolkits/terminal_toolkit/utils.py@@ -840,4 +840,3 @@ def check_nodejs_availability(update_callback=None) -> Tuple[bool, str]:update_callback(f"Note: {info}.\n")logger.warning(f"Failed to check Node.js: {e}")return False, info-diff --git a/examples/toolkits/terminal_toolkit_runtimes.py b/examples/toolkits/terminal_toolkit_runtimes.pyindex b01ec08ef..d9990085d 100644--- a/examples/toolkits/terminal_toolkit_runtimes.py+++ b/examples/toolkits/terminal_toolkit_runtimes.py@@ -150,7 +150,7 @@ The agent will:# Example 4: Default (no extra runtimes)# =====================================================================print("\n" + "=" * 60)-print("Example 4: Default โ Python only (no Go/Java)")+print("Example 4: Default - Python only (no Go/Java)")print("=" * 60)tools = TerminalToolkit(diff --git a/test/toolkits/test_enable_other_runtimes.py b/test/toolkits/test_enable_other_runtimes.pyindex 751fd59b8..2f964f170 100644--- a/test/toolkits/test_enable_other_runtimes.py+++ b/test/toolkits/test_enable_other_runtimes.py@@ -18,12 +18,10 @@ from camel.toolkits.terminal_toolkit.runtime_utils import Runtime@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_java_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_java_available")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_go_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_go_available")@patch("camel.toolkits.terminal_toolkit.terminal_toolkit"@@ -34,8 +32,7 @@ from camel.toolkits.terminal_toolkit.runtime_utils import Runtime".setup_initial_env_with_uv")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_uv_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_uv_available")def test_default_skips_go_java(mock_uv,@@ -60,12 +57,10 @@ def test_default_skips_go_java(@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_java_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_java_available")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_go_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_go_available")@patch("camel.toolkits.terminal_toolkit.terminal_toolkit"@@ -76,8 +71,7 @@ def test_default_skips_go_java(".setup_initial_env_with_uv")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_uv_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_uv_available")def test_go_enabled_calls_go_only(mock_uv,@@ -104,12 +98,10 @@ def test_go_enabled_calls_go_only(@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_java_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_java_available")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_go_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_go_available")@patch("camel.toolkits.terminal_toolkit.terminal_toolkit"@@ -120,8 +112,7 @@ def test_go_enabled_calls_go_only(".setup_initial_env_with_uv")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_uv_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_uv_available")def test_both_enabled_calls_both(mock_uv,@@ -149,12 +140,10 @@ def test_both_enabled_calls_both(@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_java_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_java_available")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_go_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_go_available")@patch("camel.toolkits.terminal_toolkit.terminal_toolkit"@@ -183,12 +172,10 @@ def test_cloned_env_also_sets_up_runtimes(@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_java_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_java_available")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_go_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_go_available")@patch("camel.toolkits.terminal_toolkit.terminal_toolkit"@@ -199,8 +186,7 @@ def test_cloned_env_also_sets_up_runtimes(".setup_initial_env_with_uv")@patch(- "camel.toolkits.terminal_toolkit.terminal_toolkit"- ".ensure_uv_available"+ "camel.toolkits.terminal_toolkit.terminal_toolkit" ".ensure_uv_available")def test_runtime_env_vars_not_in_os_environ(mock_uv,@@ -227,9 +213,6 @@ def test_runtime_env_vars_not_in_os_environ(# Process-level PATH should remain unchangedassert os.environ.get("PATH", "") == original_path# Instance should have Go path stored- assert "/custom/go/bin" in toolkit._runtime_env_vars.get(- "PATH", ""- )+ assert "/custom/go/bin" in toolkit._runtime_env_vars.get("PATH", "")finally:toolkit.cleanup()-diff --git a/test/toolkits/test_go_runtime.py b/test/toolkits/test_go_runtime.pyindex a0d8b73c5..a9a1dae20 100644--- a/test/toolkits/test_go_runtime.py+++ b/test/toolkits/test_go_runtime.py@@ -34,28 +34,16 @@ def test_go_already_installed(mock_which, mock_run):assert path == "/usr/local/go/bin"callback.assert_called()# Should NOT have tried to download- assert (- "installing"- not in str(callback.call_args_list).lower()- )+ assert "installing" not in str(callback.call_args_list).lower()@patch("camel.toolkits.terminal_toolkit.go_runtime"".download_and_extract_runtime")-@patch(- "camel.toolkits.terminal_toolkit.go_runtime"- ".get_platform_info"-)-@patch(- "camel.toolkits.terminal_toolkit.go_runtime"- ".os.path.exists"-)-@patch(- "camel.toolkits.terminal_toolkit.go_runtime"- ".shutil.which"-)+@patch("camel.toolkits.terminal_toolkit.go_runtime" ".get_platform_info")+@patch("camel.toolkits.terminal_toolkit.go_runtime" ".os.path.exists")+@patch("camel.toolkits.terminal_toolkit.go_runtime" ".shutil.which")def test_go_not_installed_downloads(mock_which,mock_exists,@@ -76,20 +64,11 @@ def test_go_not_installed_downloads(mock_download.assert_called_once()# Verify the URL uses the template correctlycall_kwargs = mock_download.call_args- assert (- "go1.23.6.linux-amd64.tar.gz"- in call_kwargs.kwargs["url"]- )+ assert "go1.23.6.linux-amd64.tar.gz" in call_kwargs.kwargs["url"]-@patch(- "camel.toolkits.terminal_toolkit.go_runtime"- ".get_platform_info"-)-@patch(- "camel.toolkits.terminal_toolkit.go_runtime"- ".shutil.which"-)+@patch("camel.toolkits.terminal_toolkit.go_runtime" ".get_platform_info")+@patch("camel.toolkits.terminal_toolkit.go_runtime" ".shutil.which")def test_go_unsupported_platform(mock_which, mock_platform):"""Should return None for unsupported platforms."""mock_which.return_value = Nonediff --git a/test/toolkits/test_java_runtime.py b/test/toolkits/test_java_runtime.pyindex b947aa77b..75d1098aa 100644--- a/test/toolkits/test_java_runtime.py+++ b/test/toolkits/test_java_runtime.py@@ -19,14 +19,8 @@ from camel.toolkits.terminal_toolkit.java_runtime import ()-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- ".subprocess.run"-)-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- ".shutil.which"-)+@patch("camel.toolkits.terminal_toolkit.java_runtime" ".subprocess.run")+@patch("camel.toolkits.terminal_toolkit.java_runtime" ".shutil.which")def test_java_already_installed(mock_which, mock_run):"""Should return path without downloading if java and javac are on PATH."""mock_which.side_effect = lambda cmd: (@@ -54,18 +48,9 @@ def test_java_already_installed(mock_which, mock_run):"camel.toolkits.terminal_toolkit.java_runtime"".download_and_extract_runtime")-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- "._find_java_home"-)-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- ".get_platform_info"-)-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- ".shutil.which"-)+@patch("camel.toolkits.terminal_toolkit.java_runtime" "._find_java_home")+@patch("camel.toolkits.terminal_toolkit.java_runtime" ".get_platform_info")+@patch("camel.toolkits.terminal_toolkit.java_runtime" ".shutil.which")def test_java_without_javac_downloads(mock_which,mock_platform,@@ -92,18 +77,9 @@ def test_java_without_javac_downloads("camel.toolkits.terminal_toolkit.java_runtime"".download_and_extract_runtime")-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- "._find_java_home"-)-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- ".get_platform_info"-)-@patch(- "camel.toolkits.terminal_toolkit.java_runtime"- ".shutil.which"-)+@patch("camel.toolkits.terminal_toolkit.java_runtime" "._find_java_home")+@patch("camel.toolkits.terminal_toolkit.java_runtime" ".get_platform_info")+@patch("camel.toolkits.terminal_toolkit.java_runtime" ".shutil.which")def test_java_not_installed_downloads(mock_which,mock_platform,@@ -114,15 +90,11 @@ def test_java_not_installed_downloads(mock_which.return_value = Nonemock_platform.return_value = ("linux", "amd64")# First call: not found; second: found after download- java_path = (- "/home/user/.camel/runtimes/java/jdk-21"- )+ java_path = "/home/user/.camel/runtimes/java/jdk-21"mock_find.side_effect = [None, java_path]callback = MagicMock()- path = ensure_java_available(- update_callback=callback- )+ path = ensure_java_available(update_callback=callback)assert path == java_pathmock_download.assert_called_once()@@ -130,8 +102,7 @@ def test_java_not_installed_downloads(call_kwargs = mock_download.call_argscall_url = call_kwargs.kwargs["url"]assert call_url.startswith(- "https://api.adoptium.net/v3/binary/latest/"- "21/ga/linux/x64/"+ "https://api.adoptium.net/v3/binary/latest/" "21/ga/linux/x64/")diff --git a/test/toolkits/test_runtime_utils.py b/test/toolkits/test_runtime_utils.pyindex d043382d1..7cd551b38 100644--- a/test/toolkits/test_runtime_utils.py+++ b/test/toolkits/test_runtime_utils.py@@ -51,9 +51,7 @@ def test_windows_amd64(mock_platform):def test_unsupported_os(mock_platform):mock_platform.system.return_value = "FreeBSD"mock_platform.machine.return_value = "x86_64"- with pytest.raises(- RuntimeError, match="Unsupported operating system"- ):+ with pytest.raises(RuntimeError, match="Unsupported operating system"):get_platform_info()@@ -61,7 +59,5 @@ def test_unsupported_os(mock_platform):def test_unsupported_arch(mock_platform):mock_platform.system.return_value = "Linux"mock_platform.machine.return_value = "mips"- with pytest.raises(- RuntimeError, match="Unsupported architecture"- ):+ with pytest.raises(RuntimeError, match="Unsupported architecture"):get_platform_info()