Merge branch 'main' into devin/1744196072-add-huggingface-provider

tests/cli/cli_test.py

@@ -55,72 +55,83 @@ def test_train_invalid_string_iterations(train_crew, runner):
     )
 
 
-@mock.patch("crewai.cli.reset_memories_command.ShortTermMemory")
-@mock.patch("crewai.cli.reset_memories_command.EntityMemory")
-@mock.patch("crewai.cli.reset_memories_command.LongTermMemory")
-@mock.patch("crewai.cli.reset_memories_command.TaskOutputStorageHandler")
-def test_reset_all_memories(
-    MockTaskOutputStorageHandler,
-    MockLongTermMemory,
-    MockEntityMemory,
-    MockShortTermMemory,
-    runner,
-):
-    result = runner.invoke(reset_memories, ["--all"])
-    MockShortTermMemory().reset.assert_called_once()
-    MockEntityMemory().reset.assert_called_once()
-    MockLongTermMemory().reset.assert_called_once()
-    MockTaskOutputStorageHandler().reset.assert_called_once()
+@mock.patch("crewai.cli.reset_memories_command.get_crew")
+def test_reset_all_memories(mock_get_crew, runner):
+    mock_crew = mock.Mock()
+    mock_get_crew.return_value = mock_crew
+    result = runner.invoke(reset_memories, ["-a"])
 
+    mock_crew.reset_memories.assert_called_once_with(command_type="all")
     assert result.output == "All memories have been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.ShortTermMemory")
-def test_reset_short_term_memories(MockShortTermMemory, runner):
+@mock.patch("crewai.cli.reset_memories_command.get_crew")
+def test_reset_short_term_memories(mock_get_crew, runner):
+    mock_crew = mock.Mock()
+    mock_get_crew.return_value = mock_crew
     result = runner.invoke(reset_memories, ["-s"])
-    MockShortTermMemory().reset.assert_called_once()
+
+    mock_crew.reset_memories.assert_called_once_with(command_type="short")
     assert result.output == "Short term memory has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.EntityMemory")
-def test_reset_entity_memories(MockEntityMemory, runner):
+@mock.patch("crewai.cli.reset_memories_command.get_crew")
+def test_reset_entity_memories(mock_get_crew, runner):
+    mock_crew = mock.Mock()
+    mock_get_crew.return_value = mock_crew
     result = runner.invoke(reset_memories, ["-e"])
-    MockEntityMemory().reset.assert_called_once()
+
+    mock_crew.reset_memories.assert_called_once_with(command_type="entity")
     assert result.output == "Entity memory has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.LongTermMemory")
-def test_reset_long_term_memories(MockLongTermMemory, runner):
+@mock.patch("crewai.cli.reset_memories_command.get_crew")
+def test_reset_long_term_memories(mock_get_crew, runner):
+    mock_crew = mock.Mock()
+    mock_get_crew.return_value = mock_crew
     result = runner.invoke(reset_memories, ["-l"])
-    MockLongTermMemory().reset.assert_called_once()
+
+    mock_crew.reset_memories.assert_called_once_with(command_type="long")
     assert result.output == "Long term memory has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.TaskOutputStorageHandler")
-def test_reset_kickoff_outputs(MockTaskOutputStorageHandler, runner):
+@mock.patch("crewai.cli.reset_memories_command.get_crew")
+def test_reset_kickoff_outputs(mock_get_crew, runner):
+    mock_crew = mock.Mock()
+    mock_get_crew.return_value = mock_crew
     result = runner.invoke(reset_memories, ["-k"])
-    MockTaskOutputStorageHandler().reset.assert_called_once()
+
+    mock_crew.reset_memories.assert_called_once_with(command_type="kickoff_outputs")
     assert result.output == "Latest Kickoff outputs stored has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.ShortTermMemory")
-@mock.patch("crewai.cli.reset_memories_command.LongTermMemory")
-def test_reset_multiple_memory_flags(MockShortTermMemory, MockLongTermMemory, runner):
-    result = runner.invoke(
-        reset_memories,
-        [
-            "-s",
-            "-l",
-        ],
+@mock.patch("crewai.cli.reset_memories_command.get_crew")
+def test_reset_multiple_memory_flags(mock_get_crew, runner):
+    mock_crew = mock.Mock()
+    mock_get_crew.return_value = mock_crew
+    result = runner.invoke(reset_memories, ["-s", "-l"])
+
+    # Check that reset_memories was called twice with the correct arguments
+    assert mock_crew.reset_memories.call_count == 2
+    mock_crew.reset_memories.assert_has_calls(
+        [mock.call(command_type="long"), mock.call(command_type="short")]
     )
-    MockShortTermMemory().reset.assert_called_once()
-    MockLongTermMemory().reset.assert_called_once()
     assert (
         result.output
         == "Long term memory has been reset.\nShort term memory has been reset.\n"
     )
 
 
+@mock.patch("crewai.cli.reset_memories_command.get_crew")
+def test_reset_knowledge(mock_get_crew, runner):
+    mock_crew = mock.Mock()
+    mock_get_crew.return_value = mock_crew
+    result = runner.invoke(reset_memories, ["--knowledge"])
+
+    mock_crew.reset_memories.assert_called_once_with(command_type="knowledge")
+    assert result.output == "Knowledge has been reset.\n"
+
+
 def test_reset_no_memory_flags(runner):
     result = runner.invoke(
         reset_memories,

tests/cli/deploy/test_deploy_main.py

@@ -177,12 +177,12 @@ class TestDeployCommand(unittest.TestCase):
     def test_get_crew_status(self):
         mock_response = MagicMock()
         mock_response.status_code = 200
-        mock_response.json.return_value = {"name": "TestCrew", "status": "active"}
+        mock_response.json.return_value = {"name": "InternalCrew", "status": "active"}
         self.mock_client.crew_status_by_name.return_value = mock_response
 
         with patch("sys.stdout", new=StringIO()) as fake_out:
             self.deploy_command.get_crew_status()
-            self.assertIn("TestCrew", fake_out.getvalue())
+            self.assertIn("InternalCrew", fake_out.getvalue())
             self.assertIn("active", fake_out.getvalue())
 
     def test_get_crew_logs(self):

tests/cli/tools/test_main.py

@@ -28,9 +28,10 @@ def test_create_success(mock_subprocess):
     with in_temp_dir():
         tool_command = ToolCommand()
 
-        with patch.object(tool_command, "login") as mock_login, patch(
-            "sys.stdout", new=StringIO()
-        ) as fake_out:
+        with (
+            patch.object(tool_command, "login") as mock_login,
+            patch("sys.stdout", new=StringIO()) as fake_out,
+        ):
             tool_command.create("test-tool")
             output = fake_out.getvalue()
 
@@ -82,7 +83,7 @@ def test_install_success(mock_get, mock_subprocess_run):
         capture_output=False,
         text=True,
         check=True,
-        env=unittest.mock.ANY
+        env=unittest.mock.ANY,
     )
 
     assert "Successfully installed sample-tool" in output