refactor(core): dedup version, plus_api, and oauth2 stack into crewai-core

lib/cli/tests/authentication/test_auth_main.py

@@ -43,7 +43,7 @@ class TestAuthenticationCommand:
         "crewai_cli.authentication.main.AuthenticationCommand._display_auth_instructions"
     )
     @patch("crewai_cli.authentication.main.AuthenticationCommand._poll_for_token")
-    @patch("crewai_cli.authentication.main.console.print")
+    @patch("crewai_core.auth.oauth2.console.print")
     def test_login(
         self,
         mock_console_print,
@@ -82,8 +82,8 @@ class TestAuthenticationCommand:
             self.auth_command.oauth2_provider._get_domain() == expected_urls["domain"]
         )
 
-    @patch("crewai_cli.authentication.main.webbrowser")
-    @patch("crewai_cli.authentication.main.console.print")
+    @patch("crewai_core.auth.oauth2.webbrowser")
+    @patch("crewai_core.auth.oauth2.console.print")
     def test_display_auth_instructions(self, mock_console_print, mock_webbrowser):
         device_code_data = {
             "verification_uri_complete": "https://example.com/auth",
@@ -113,8 +113,8 @@ class TestAuthenticationCommand:
         ],
     )
     @pytest.mark.parametrize("has_expiration", [True, False])
-    @patch("crewai_cli.authentication.main.validate_jwt_token")
-    @patch("crewai_cli.authentication.main.TokenManager.save_tokens")
+    @patch("crewai_core.auth.oauth2.validate_jwt_token")
+    @patch("crewai_core.auth.oauth2.TokenManager.save_tokens")
     def test_validate_and_save_token(
         self,
         mock_save_tokens,
@@ -164,7 +164,7 @@ class TestAuthenticationCommand:
 
     @patch("crewai_cli.tools.main.ToolCommand")
     @patch("crewai_cli.authentication.main.Settings")
-    @patch("crewai_cli.authentication.main.console.print")
+    @patch("crewai_core.auth.oauth2.console.print")
     def test_login_to_tool_repository_success(
         self, mock_console_print, mock_settings, mock_tool_command
     ):
@@ -196,7 +196,7 @@ class TestAuthenticationCommand:
         mock_console_print.assert_has_calls(expected_calls)
 
     @patch("crewai_cli.tools.main.ToolCommand")
-    @patch("crewai_cli.authentication.main.console.print")
+    @patch("crewai_core.auth.oauth2.console.print")
     def test_login_to_tool_repository_error(
         self, mock_console_print, mock_tool_command
     ):
@@ -226,7 +226,7 @@ class TestAuthenticationCommand:
         ]
         mock_console_print.assert_has_calls(expected_calls)
 
-    @patch("crewai_cli.authentication.main.httpx.post")
+    @patch("crewai_core.auth.oauth2.httpx.post")
     def test_get_device_code(self, mock_post):
         mock_response = MagicMock()
         mock_response.json.return_value = {
@@ -262,8 +262,8 @@ class TestAuthenticationCommand:
             "verification_uri_complete": "https://example.com/auth",
         }
 
-    @patch("crewai_cli.authentication.main.httpx.post")
-    @patch("crewai_cli.authentication.main.console.print")
+    @patch("crewai_core.auth.oauth2.httpx.post")
+    @patch("crewai_core.auth.oauth2.console.print")
     def test_poll_for_token_success(self, mock_console_print, mock_post):
         mock_response_success = MagicMock()
         mock_response_success.status_code = 200
@@ -311,8 +311,8 @@ class TestAuthenticationCommand:
             ]
             mock_console_print.assert_has_calls(expected_calls)
 
-    @patch("crewai_cli.authentication.main.httpx.post")
-    @patch("crewai_cli.authentication.main.console.print")
+    @patch("crewai_core.auth.oauth2.httpx.post")
+    @patch("crewai_core.auth.oauth2.console.print")
     def test_poll_for_token_timeout(self, mock_console_print, mock_post):
         mock_response_pending = MagicMock()
         mock_response_pending.status_code = 400
@@ -330,7 +330,7 @@ class TestAuthenticationCommand:
             "Timeout: Failed to get the token. Please try again.", style="bold red"
         )
 
-    @patch("crewai_cli.authentication.main.httpx.post")
+    @patch("crewai_core.auth.oauth2.httpx.post")
     def test_poll_for_token_error(self, mock_post):
         """Test the method to poll for token (error path)."""
         # Setup mock to return error

lib/cli/tests/authentication/test_utils.py

@@ -6,8 +6,8 @@ import jwt
 from crewai_cli.authentication.utils import validate_jwt_token
 
 
-@patch("crewai_cli.authentication.utils.PyJWKClient", return_value=MagicMock())
-@patch("crewai_cli.authentication.utils.jwt")
+@patch("crewai_core.auth.utils.PyJWKClient", return_value=MagicMock())
+@patch("crewai_core.auth.utils.jwt")
 class TestUtils(unittest.TestCase):
     def test_validate_jwt_token(self, mock_jwt, mock_pyjwkclient):
         mock_jwt.decode.return_value = {"exp": 1719859200}

lib/cli/tests/test_plus_api.py

@@ -20,7 +20,7 @@ class TestPlusAPI(unittest.TestCase):
         self.assertIn("CrewAI-CLI/", self.api.headers["User-Agent"])
         self.assertTrue(self.api.headers["X-Crewai-Version"])
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_login_to_tool_repository(self, mock_make_request):
         mock_response = MagicMock()
         mock_make_request.return_value = mock_response
@@ -48,8 +48,8 @@ class TestPlusAPI(unittest.TestCase):
             **kwargs,
         )
 
-    @patch("crewai_cli.plus_api.Settings")
-    @patch("crewai_cli.plus_api.httpx.Client")
+    @patch("crewai_core.plus_api.Settings")
+    @patch("crewai_core.plus_api.httpx.Client")
     def test_login_to_tool_repository_with_org_uuid(
         self, mock_client_class, mock_settings_class
     ):
@@ -71,7 +71,7 @@ class TestPlusAPI(unittest.TestCase):
         )
         self.assertEqual(response, mock_response)
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_get_tool(self, mock_make_request):
         mock_response = MagicMock()
         mock_make_request.return_value = mock_response
@@ -82,8 +82,8 @@ class TestPlusAPI(unittest.TestCase):
         )
         self.assertEqual(response, mock_response)
 
-    @patch("crewai_cli.plus_api.Settings")
-    @patch("crewai_cli.plus_api.httpx.Client")
+    @patch("crewai_core.plus_api.Settings")
+    @patch("crewai_core.plus_api.httpx.Client")
     def test_get_tool_with_org_uuid(self, mock_client_class, mock_settings_class):
         mock_settings = MagicMock()
         mock_settings.org_uuid = self.org_uuid
@@ -103,7 +103,7 @@ class TestPlusAPI(unittest.TestCase):
         )
         self.assertEqual(response, mock_response)
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_publish_tool(self, mock_make_request):
         mock_response = MagicMock()
         mock_make_request.return_value = mock_response
@@ -131,8 +131,8 @@ class TestPlusAPI(unittest.TestCase):
         )
         self.assertEqual(response, mock_response)
 
-    @patch("crewai_cli.plus_api.Settings")
-    @patch("crewai_cli.plus_api.httpx.Client")
+    @patch("crewai_core.plus_api.Settings")
+    @patch("crewai_core.plus_api.httpx.Client")
     def test_publish_tool_with_org_uuid(self, mock_client_class, mock_settings_class):
         mock_settings = MagicMock()
         mock_settings.org_uuid = self.org_uuid
@@ -170,7 +170,7 @@ class TestPlusAPI(unittest.TestCase):
         )
         self.assertEqual(response, mock_response)
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_publish_tool_without_description(self, mock_make_request):
         mock_response = MagicMock()
         mock_make_request.return_value = mock_response
@@ -198,7 +198,7 @@ class TestPlusAPI(unittest.TestCase):
         )
         self.assertEqual(response, mock_response)
 
-    @patch("crewai_cli.plus_api.httpx.Client")
+    @patch("crewai_core.plus_api.httpx.Client")
     def test_make_request(self, mock_client_class):
         mock_client_instance = MagicMock()
         mock_response = MagicMock()
@@ -213,35 +213,35 @@ class TestPlusAPI(unittest.TestCase):
         )
         self.assertEqual(response, mock_response)
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_deploy_by_name(self, mock_make_request):
         self.api.deploy_by_name("test_project")
         mock_make_request.assert_called_once_with(
             "POST", "/crewai_plus/api/v1/crews/by-name/test_project/deploy"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_deploy_by_uuid(self, mock_make_request):
         self.api.deploy_by_uuid("test_uuid")
         mock_make_request.assert_called_once_with(
             "POST", "/crewai_plus/api/v1/crews/test_uuid/deploy"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_crew_status_by_name(self, mock_make_request):
         self.api.crew_status_by_name("test_project")
         mock_make_request.assert_called_once_with(
             "GET", "/crewai_plus/api/v1/crews/by-name/test_project/status"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_crew_status_by_uuid(self, mock_make_request):
         self.api.crew_status_by_uuid("test_uuid")
         mock_make_request.assert_called_once_with(
             "GET", "/crewai_plus/api/v1/crews/test_uuid/status"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_crew_by_name(self, mock_make_request):
         self.api.crew_by_name("test_project")
         mock_make_request.assert_called_once_with(
@@ -253,7 +253,7 @@ class TestPlusAPI(unittest.TestCase):
             "GET", "/crewai_plus/api/v1/crews/by-name/test_project/logs/custom_log"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_crew_by_uuid(self, mock_make_request):
         self.api.crew_by_uuid("test_uuid")
         mock_make_request.assert_called_once_with(
@@ -265,26 +265,26 @@ class TestPlusAPI(unittest.TestCase):
             "GET", "/crewai_plus/api/v1/crews/test_uuid/logs/custom_log"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_delete_crew_by_name(self, mock_make_request):
         self.api.delete_crew_by_name("test_project")
         mock_make_request.assert_called_once_with(
             "DELETE", "/crewai_plus/api/v1/crews/by-name/test_project"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_delete_crew_by_uuid(self, mock_make_request):
         self.api.delete_crew_by_uuid("test_uuid")
         mock_make_request.assert_called_once_with(
             "DELETE", "/crewai_plus/api/v1/crews/test_uuid"
         )
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_list_crews(self, mock_make_request):
         self.api.list_crews()
         mock_make_request.assert_called_once_with("GET", "/crewai_plus/api/v1/crews")
 
-    @patch("crewai_cli.plus_api.PlusAPI._make_request")
+    @patch("crewai_core.plus_api.PlusAPI._make_request")
     def test_create_crew(self, mock_make_request):
         payload = {"name": "test_crew"}
         self.api.create_crew(payload)
@@ -292,7 +292,7 @@ class TestPlusAPI(unittest.TestCase):
             "POST", "/crewai_plus/api/v1/crews", json=payload
         )
 
-    @patch("crewai_cli.plus_api.Settings")
+    @patch("crewai_core.plus_api.Settings")
     @patch.dict(os.environ, {"CREWAI_PLUS_URL": ""})
     def test_custom_base_url(self, mock_settings_class):
         mock_settings = MagicMock()
@@ -333,7 +333,7 @@ async def test_get_agent(mock_async_client_class):
 
 @pytest.mark.asyncio
 @patch("httpx.AsyncClient")
-@patch("crewai_cli.plus_api.Settings")
+@patch("crewai_core.plus_api.Settings")
 async def test_get_agent_with_org_uuid(mock_settings_class, mock_async_client_class):
     org_uuid = "test-org-uuid"
     mock_settings = MagicMock()

lib/cli/tests/test_version.py

@@ -7,15 +7,17 @@ from unittest.mock import MagicMock, patch
 
 from crewai_cli.version import get_crewai_version as _get_ver
 from crewai_cli.version import (
-    _find_latest_non_yanked_version,
-    _get_cache_file,
-    _is_cache_valid,
-    _is_version_yanked,
     get_crewai_version,
     get_latest_version_from_pypi,
     is_current_version_yanked,
     is_newer_version_available,
 )
+from crewai_core.version import (
+    _find_latest_non_yanked_version,
+    _get_cache_file,
+    _is_cache_valid,
+    _is_version_yanked,
+)
 
 
 def test_dynamic_versioning_consistency() -> None:
@@ -60,8 +62,8 @@ class TestVersionChecking:
         cache_data = {"version": "1.0.0"}
         assert _is_cache_valid(cache_data) is False
 
-    @patch("crewai_cli.version.Path.exists")
-    @patch("crewai_cli.version.request.urlopen")
+    @patch("crewai_core.version.Path.exists")
+    @patch("crewai_core.version.request.urlopen")
     def test_get_latest_version_from_pypi_success(
         self, mock_urlopen: MagicMock, mock_exists: MagicMock
     ) -> None:
@@ -82,8 +84,8 @@ class TestVersionChecking:
         version = get_latest_version_from_pypi()
         assert version == "2.0.0"
 
-    @patch("crewai_cli.version.Path.exists")
-    @patch("crewai_cli.version.request.urlopen")
+    @patch("crewai_core.version.Path.exists")
+    @patch("crewai_core.version.request.urlopen")
     def test_get_latest_version_from_pypi_failure(
         self, mock_urlopen: MagicMock, mock_exists: MagicMock
     ) -> None:
@@ -97,8 +99,8 @@ class TestVersionChecking:
         version = get_latest_version_from_pypi()
         assert version is None
 
-    @patch("crewai_cli.version.get_crewai_version")
-    @patch("crewai_cli.version.get_latest_version_from_pypi")
+    @patch("crewai_core.version.get_crewai_version")
+    @patch("crewai_core.version.get_latest_version_from_pypi")
     def test_is_newer_version_available_true(
         self, mock_latest: MagicMock, mock_current: MagicMock
     ) -> None:
@@ -111,8 +113,8 @@ class TestVersionChecking:
         assert current == "1.0.0"
         assert latest == "2.0.0"
 
-    @patch("crewai_cli.version.get_crewai_version")
-    @patch("crewai_cli.version.get_latest_version_from_pypi")
+    @patch("crewai_core.version.get_crewai_version")
+    @patch("crewai_core.version.get_latest_version_from_pypi")
     def test_is_newer_version_available_false(
         self, mock_latest: MagicMock, mock_current: MagicMock
     ) -> None:
@@ -125,8 +127,8 @@ class TestVersionChecking:
         assert current == "2.0.0"
         assert latest == "2.0.0"
 
-    @patch("crewai_cli.version.get_crewai_version")
-    @patch("crewai_cli.version.get_latest_version_from_pypi")
+    @patch("crewai_core.version.get_crewai_version")
+    @patch("crewai_core.version.get_latest_version_from_pypi")
     def test_is_newer_version_available_with_none_latest(
         self, mock_latest: MagicMock, mock_current: MagicMock
     ) -> None:
@@ -260,8 +262,8 @@ class TestIsVersionYanked:
 class TestIsCurrentVersionYanked:
     """Test is_current_version_yanked public function."""
 
-    @patch("crewai_cli.version.get_crewai_version")
-    @patch("crewai_cli.version._get_cache_file")
+    @patch("crewai_core.version.get_crewai_version")
+    @patch("crewai_core.version._get_cache_file")
     def test_reads_from_valid_cache(
         self, mock_cache_file: MagicMock, mock_version: MagicMock, tmp_path: Path
     ) -> None:
@@ -282,8 +284,8 @@ class TestIsCurrentVersionYanked:
         assert is_yanked is True
         assert reason == "bad release"
 
-    @patch("crewai_cli.version.get_crewai_version")
-    @patch("crewai_cli.version._get_cache_file")
+    @patch("crewai_core.version.get_crewai_version")
+    @patch("crewai_core.version._get_cache_file")
     def test_not_yanked_from_cache(
         self, mock_cache_file: MagicMock, mock_version: MagicMock, tmp_path: Path
     ) -> None:
@@ -304,9 +306,9 @@ class TestIsCurrentVersionYanked:
         assert is_yanked is False
         assert reason == ""
 
-    @patch("crewai_cli.version.get_latest_version_from_pypi")
-    @patch("crewai_cli.version.get_crewai_version")
-    @patch("crewai_cli.version._get_cache_file")
+    @patch("crewai_core.version.get_latest_version_from_pypi")
+    @patch("crewai_core.version.get_crewai_version")
+    @patch("crewai_core.version._get_cache_file")
     def test_triggers_fetch_on_stale_cache(
         self,
         mock_cache_file: MagicMock,
@@ -346,9 +348,9 @@ class TestIsCurrentVersionYanked:
         assert is_yanked is False
         mock_fetch.assert_called_once()
 
-    @patch("crewai_cli.version.get_latest_version_from_pypi")
-    @patch("crewai_cli.version.get_crewai_version")
-    @patch("crewai_cli.version._get_cache_file")
+    @patch("crewai_core.version.get_latest_version_from_pypi")
+    @patch("crewai_core.version.get_crewai_version")
+    @patch("crewai_core.version._get_cache_file")
     def test_returns_false_on_fetch_failure(
         self,
         mock_cache_file: MagicMock,