ci(test): update paths and dependencies for iclaw rename

Author: lzwjava

.github/workflows/test.yaml

@@ -4,11 +4,11 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - 'mini_copilot/**'
+      - 'iclaw/**'
       - 'tests/**'
   pull_request:
     paths:
-      - 'mini_copilot/**'
+      - 'iclaw/**'
       - 'tests/**'
 
 concurrency:
@@ -18,7 +18,7 @@ concurrency:
 jobs:
   test_job:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -32,10 +32,10 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install coverage pytest-cov beautifulsoup4 readability-lxml lxml requests pyperclip
+          pip install coverage
 
       - name: Run test script
         run: |
           export PYTHONPATH=$PYTHONPATH:.
           python3 -m coverage run -m unittest discover tests
-          python3 -m coverage report -m mini_copilot/*.py mini_copilot/commands/*.py
+          python3 -m coverage report -m iclaw/*.py iclaw/commands/*.py iclaw/tools/*.py

requirements.txt

@@ -1,3 +1,7 @@
 # Dependencies are declared in pyproject.toml.
 # To install for development: pip install -e .
 requests>=2.32.0
+pyperclip>=1.8.0
+beautifulsoup4>=4.12.0
+readability-lxml>=0.8.1
+lxml>=5.0.0

tests/test_commands.py

@@ -31,13 +31,203 @@ def test_handle_login_command(self, mock_input, mock_poll, mock_device):
 
     @patch("iclaw.commands.utils.sys")
     def test_handle_copy_command(self, mock_sys):
-        # We'll patch pyperclip inside sys.modules because it's imported inside the function
         mock_py = MagicMock()
         with patch.dict("sys.modules", {"pyperclip": mock_py}):
             with patch("sys.stdout"):
                 utils.handle_copy_command("text")
         mock_py.copy.assert_called_with("text")
 
+    # --- New tests for model.py ---
+
+    def test_handle_model_command_no_token(self):
+        with patch("sys.stderr"):
+            res = model.handle_model_command(None, "gpt-4o")
+        self.assertEqual(res, "gpt-4o")
+
+    @patch("iclaw.commands.model.get_models", side_effect=Exception("fail"))
+    def test_handle_model_command_fetch_error(self, mock_models):
+        with patch("sys.stderr"):
+            res = model.handle_model_command("t", "gpt-4o")
+        self.assertEqual(res, "gpt-4o")
+
+    @patch("iclaw.commands.model.get_models")
+    @patch("iclaw.commands.model.input", return_value="")
+    def test_handle_model_command_empty_input(self, mock_input, mock_models):
+        mock_models.return_value = [{"id": "m1", "owned_by": "o1"}]
+        with patch("sys.stdout"):
+            res = model.handle_model_command("t", "curr")
+        self.assertEqual(res, "curr")
+
+    @patch("iclaw.commands.model.get_models")
+    @patch("iclaw.commands.model.input", return_value="m1")
+    def test_handle_model_command_by_name(self, mock_input, mock_models):
+        mock_models.return_value = [{"id": "m1", "owned_by": "o1"}]
+        with patch("sys.stdout"):
+            res = model.handle_model_command("t", "curr")
+        self.assertEqual(res, "m1")
+
+    @patch("iclaw.commands.model.get_models")
+    @patch("iclaw.commands.model.input", return_value="999")
+    def test_handle_model_command_invalid_number(self, mock_input, mock_models):
+        mock_models.return_value = [{"id": "m1", "owned_by": "o1"}]
+        with patch("sys.stdout"):
+            res = model.handle_model_command("t", "curr")
+        self.assertEqual(res, "curr")
+
+    @patch("iclaw.commands.model.get_models")
+    @patch("iclaw.commands.model.input", return_value="nonexistent")
+    def test_handle_model_command_unknown_name(self, mock_input, mock_models):
+        mock_models.return_value = [{"id": "m1", "owned_by": "o1"}]
+        with patch("sys.stdout"):
+            res = model.handle_model_command("t", "curr")
+        self.assertEqual(res, "curr")
+
+    @patch("iclaw.commands.model.get_models")
+    @patch("iclaw.commands.model.input", side_effect=EOFError)
+    def test_handle_model_command_eof(self, mock_input, mock_models):
+        mock_models.return_value = [{"id": "m1", "owned_by": "o1"}]
+        with patch("sys.stdout"):
+            res = model.handle_model_command("t", "curr")
+        self.assertEqual(res, "curr")
+
+    # --- New tests for model_provider ---
+
+    @patch("iclaw.commands.model.input", return_value="")
+    def test_model_provider_empty_input(self, mock_input):
+        with patch("sys.stdout"):
+            p, t = model.handle_model_provider_command(MagicMock(), "copilot")
+        self.assertEqual(p, "copilot")
+        self.assertIsNone(t)
+
+    @patch("iclaw.commands.model.handle_login_command", return_value="gh_tok")
+    @patch("iclaw.commands.model.get_copilot_token", return_value="cp_tok")
+    @patch("iclaw.commands.model.input", return_value="1")
+    def test_model_provider_copilot_success(self, mock_input, mock_cp, mock_login):
+        with patch("sys.stdout"):
+            p, t = model.handle_model_provider_command(MagicMock(), "copilot")
+        self.assertEqual(p, "copilot")
+        self.assertEqual(t, "cp_tok")
+
+    @patch("iclaw.commands.model.handle_login_command", return_value="gh_tok")
+    @patch("iclaw.commands.model.get_copilot_token", side_effect=Exception("err"))
+    @patch("iclaw.commands.model.input", return_value="1")
+    def test_model_provider_copilot_error(self, mock_input, mock_cp, mock_login):
+        with patch("sys.stdout"), patch("sys.stderr"):
+            p, t = model.handle_model_provider_command(MagicMock(), "copilot")
+        self.assertEqual(p, "copilot")
+        self.assertIsNone(t)
+
+    @patch("iclaw.commands.model.handle_login_command", return_value=None)
+    @patch("iclaw.commands.model.input", return_value="1")
+    def test_model_provider_copilot_no_github_token(self, mock_input, mock_login):
+        with patch("sys.stdout"):
+            p, t = model.handle_model_provider_command(MagicMock(), "copilot")
+        self.assertEqual(p, "copilot")
+        self.assertIsNone(t)
+
+    @patch("iclaw.commands.model.input", return_value="2")
+    def test_model_provider_others(self, mock_input):
+        with patch("sys.stdout"):
+            p, t = model.handle_model_provider_command(MagicMock(), "copilot")
+        self.assertEqual(p, "copilot")
+        self.assertIsNone(t)
+
+    @patch("iclaw.commands.model.input", return_value="99")
+    def test_model_provider_invalid(self, mock_input):
+        with patch("sys.stdout"):
+            p, t = model.handle_model_provider_command(MagicMock(), "copilot")
+        self.assertEqual(p, "copilot")
+        self.assertIsNone(t)
+
+    # --- New tests for search_provider ---
+
+    @patch("iclaw.commands.search_provider.input", return_value="2")
+    def test_search_provider_select_startpage(self, mock_input):
+        with patch("sys.stdout"):
+            res = search_provider.handle_search_provider_command("duckduckgo")
+        self.assertEqual(res, "startpage")
+
+    @patch("iclaw.commands.search_provider.input", return_value="99")
+    def test_search_provider_invalid_number(self, mock_input):
+        with patch("sys.stdout"):
+            res = search_provider.handle_search_provider_command("duckduckgo")
+        self.assertEqual(res, "duckduckgo")
+
+    @patch("iclaw.commands.search_provider.input", return_value="abc")
+    def test_search_provider_not_a_number(self, mock_input):
+        with patch("sys.stdout"):
+            res = search_provider.handle_search_provider_command("duckduckgo")
+        self.assertEqual(res, "duckduckgo")
+
+    @patch("iclaw.commands.search_provider.input", return_value="")
+    def test_search_provider_empty(self, mock_input):
+        with patch("sys.stdout"):
+            res = search_provider.handle_search_provider_command("duckduckgo")
+        self.assertEqual(res, "duckduckgo")
+
+    @patch("iclaw.commands.search_provider.os.getenv", return_value=None)
+    @patch("iclaw.commands.search_provider.input", side_effect=["4", "mykey"])
+    def test_search_provider_tavily_with_key(self, mock_input, mock_getenv):
+        with patch("sys.stdout"):
+            res = search_provider.handle_search_provider_command("duckduckgo")
+        self.assertEqual(res, "tavily")
+
+    @patch("iclaw.commands.search_provider.os.getenv", return_value=None)
+    @patch("iclaw.commands.search_provider.input", side_effect=["4", ""])
+    def test_search_provider_tavily_no_key(self, mock_input, mock_getenv):
+        with patch("sys.stdout"):
+            res = search_provider.handle_search_provider_command("duckduckgo")
+        self.assertEqual(res, "duckduckgo")
+
+    @patch("iclaw.commands.search_provider.input", side_effect=EOFError)
+    def test_search_provider_eof(self, mock_input):
+        with patch("sys.stdout"):
+            res = search_provider.handle_search_provider_command("duckduckgo")
+        self.assertEqual(res, "duckduckgo")
+
+    # --- New tests for auth ---
+
+    @patch("iclaw.commands.auth.input", return_value="2")
+    def test_login_direct_token(self, mock_input):
+        mock_input.side_effect = ["2", "my_token"]
+        mock_path = MagicMock()
+        with patch("sys.stdout"):
+            res = auth.handle_login_command(mock_path)
+        self.assertEqual(res, "my_token")
+
+    @patch("iclaw.commands.auth.input", side_effect=["2", ""])
+    def test_login_direct_token_empty(self, mock_input):
+        mock_path = MagicMock()
+        with patch("sys.stdout"):
+            res = auth.handle_login_command(mock_path)
+        self.assertIsNone(res)
+
+    @patch("iclaw.commands.auth.input", return_value="3")
+    def test_login_invalid_choice(self, mock_input):
+        mock_path = MagicMock()
+        with patch("sys.stdout"):
+            res = auth.handle_login_command(mock_path)
+        self.assertIsNone(res)
+
+    @patch("iclaw.commands.auth.get_device_code", side_effect=Exception("net err"))
+    @patch("iclaw.commands.auth.input", return_value="1")
+    def test_login_device_flow_error(self, mock_input, mock_device):
+        mock_path = MagicMock()
+        with patch("sys.stdout"), patch("sys.stderr"):
+            res = auth.handle_login_command(mock_path)
+        self.assertIsNone(res)
+
+    # --- New tests for utils ---
+
+    def test_copy_nothing(self):
+        with patch("sys.stdout"):
+            utils.handle_copy_command(None)
+
+    def test_copy_exception(self):
+        with patch.dict("sys.modules", {"pyperclip": None}):
+            with patch("sys.stderr"), patch("sys.stdout"):
+                utils.handle_copy_command("text")
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_edit_tool.py

@@ -57,6 +57,61 @@ def test_multiple_hunks(self):
         self.assertEqual(lines[0], "First Line")
         self.assertEqual(lines[-1], "Last Line")
 
+    def test_new_file(self):
+        new_file = "test_new_file.txt"
+        try:
+            edit = """--- /dev/null
++++ test_new_file.txt
+@@ -1,0 +1,2 @@
++New line 1
++New line 2
+"""
+            new_content = EditTool.edit(new_file, edit)
+            self.assertIn("New line 1", new_content)
+            self.assertIn("New line 2", new_content)
+        finally:
+            if os.path.exists(new_file):
+                os.remove(new_file)
+
+    def test_context_lines(self):
+        edit = """--- test_file.txt
++++ test_file.txt
+@@ -1,3 +1,3 @@
+ Line 1
+-Line 2
++Line TWO
+ Line 3
+"""
+        new_content = EditTool.edit(self.test_file, edit)
+        lines = new_content.splitlines()
+        self.assertEqual(lines[0], "Line 1")
+        self.assertEqual(lines[1], "Line TWO")
+        self.assertEqual(lines[2], "Line 3")
+
+    def test_delete_lines(self):
+        edit = """--- test_file.txt
++++ test_file.txt
+@@ -2,2 +2,0 @@
+-Line 2
+-Line 3
+"""
+        new_content = EditTool.edit(self.test_file, edit)
+        lines = new_content.splitlines()
+        self.assertEqual(len(lines), 3)
+        self.assertEqual(lines[0], "Line 1")
+        self.assertEqual(lines[1], "Line 4")
+
+    def test_add_lines(self):
+        edit = """--- test_file.txt
++++ test_file.txt
+@@ -2,0 +2,2 @@
++Inserted A
++Inserted B
+"""
+        new_content = EditTool.edit(self.test_file, edit)
+        self.assertIn("Inserted A", new_content)
+        self.assertIn("Inserted B", new_content)
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_exec_tool.py

@@ -1,4 +1,5 @@
 import unittest
+from unittest.mock import patch
 from iclaw.exec_tool import exec_command
 
 
@@ -12,10 +13,28 @@ def test_exec_ls(self):
         self.assertIn("pyproject.toml", output)
 
     def test_exec_error(self):
-        # Depending on the system, the error message might vary, but it should contain some indication of failure
         output = exec_command("non_existent_command_12345")
         self.assertIn("not found", output.lower())
 
+    def test_exec_empty_output_nonzero(self):
+        output = exec_command("bash -c 'exit 42'")
+        self.assertIn("Process exited with code 42", output)
+
+    @patch("iclaw.exec_tool.subprocess.run", side_effect=Exception("unexpected"))
+    def test_exec_exception(self, mock_run):
+        output = exec_command("anything")
+        self.assertIn("Error executing command", output)
+
+    def test_exec_timeout(self):
+        import subprocess
+
+        with patch(
+            "iclaw.exec_tool.subprocess.run",
+            side_effect=subprocess.TimeoutExpired("cmd", 30),
+        ):
+            output = exec_command("sleep 999")
+        self.assertIn("timed out", output)
+
 
 if __name__ == "__main__":
     unittest.main()