Framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.
Fix legacy platform tool alias discovery (#7269)
Vinicius Brasila5f26f359880
diff --git a/lib/crewai-tools/src/crewai_tools/tools/crewai_platform_tools/integrations_client.py b/lib/crewai-tools/src/crewai_tools/tools/crewai_platform_tools/integrations_client.pyindex efa0e7b33..3d96c2540 100644--- a/lib/crewai-tools/src/crewai_tools/tools/crewai_platform_tools/integrations_client.py+++ b/lib/crewai-tools/src/crewai_tools/tools/crewai_platform_tools/integrations_client.py@@ -257,18 +257,16 @@ class LegacyClient:if not isinstance(parameters, dict):parameters = {}- tool_infos.extend(+ tool_infos.append(ToolInfo(app=app,action=action,- connection_id=selector.connection_id,+ connection_id=None,description=action_data.get("description", f"Execute {action}"),parameters=parameters,)- for selector in selectors- if selector.app == app and selector.action in (None, action))return tool_infosdiff --git a/lib/crewai-tools/tests/tools/crewai_platform_tools/test_crewai_platform_tools.py b/lib/crewai-tools/tests/tools/crewai_platform_tools/test_crewai_platform_tools.pyindex 6443bdd21..62b0814fc 100644--- a/lib/crewai-tools/tests/tools/crewai_platform_tools/test_crewai_platform_tools.py+++ b/lib/crewai-tools/tests/tools/crewai_platform_tools/test_crewai_platform_tools.py@@ -67,7 +67,17 @@ class TestCrewaiPlatformTools(unittest.TestCase):],}}- mock_get.return_value = mock_response+ github_response = Mock()+ github_response.raise_for_status.return_value = None+ github_response.json.return_value = {+ "actions": {"github": mock_response.json.return_value["actions"]["github"]}+ }+ slack_response = Mock()+ slack_response.raise_for_status.return_value = None+ slack_response.json.return_value = {+ "actions": {"slack": mock_response.json.return_value["actions"]["slack"]}+ }+ mock_get.side_effect = [github_response, slack_response]tools = CrewaiPlatformTools(apps=["github", "slack"])assert tools is not None@@ -312,7 +322,17 @@ class TestCrewaiPlatformTools(unittest.TestCase):],}}- mock_get.return_value = response+ github_response = Mock()+ github_response.raise_for_status.return_value = None+ github_response.json.return_value = {+ "actions": {"github": response.json.return_value["actions"]["github"]}+ }+ slack_response = Mock()+ slack_response.raise_for_status.return_value = None+ slack_response.json.return_value = {+ "actions": {"slack": response.json.return_value["actions"]["slack"]}+ }+ mock_get.side_effect = [github_response, slack_response]tools = CrewaiPlatformTools(apps=["github", "slack"])diff --git a/lib/crewai-tools/tests/tools/crewai_platform_tools/test_integrations_client.py b/lib/crewai-tools/tests/tools/crewai_platform_tools/test_integrations_client.pyindex 867b01d87..7d57a5d01 100644--- a/lib/crewai-tools/tests/tools/crewai_platform_tools/test_integrations_client.py+++ b/lib/crewai-tools/tests/tools/crewai_platform_tools/test_integrations_client.py@@ -395,17 +395,15 @@ def test_legacy_client_normalizes_discovered_actions(mock_get: Mock) -> None:}}mock_get.return_value = response- connection_id = UUID("550e8400-e29b-41d4-a716-446655440000")-tools = LegacyClient().get_actions(- [ApplicationSelector.from_string(f"github/create_issue@{connection_id}")]+ [ApplicationSelector.from_string("github/create_issue")])assert tools == [ToolInfo(app="github",action="create_issue",- connection_id=connection_id,+ connection_id=None,description="Create a GitHub issue",parameters={"type": "object",@@ -421,7 +419,7 @@ def test_legacy_client_normalizes_discovered_actions(mock_get: Mock) -> None:@patch("crewai_tools.tools.crewai_platform_tools.integrations_client.requests.get")-def test_legacy_client_emits_action_for_each_matching_selector(+def test_legacy_client_sends_multiple_selectors_in_one_request(mock_get: Mock,) -> None:response = Mock()@@ -438,43 +436,49 @@ def test_legacy_client_emits_action_for_each_matching_selector(}}mock_get.return_value = response- app_connection_id = UUID("550e8400-e29b-41d4-a716-446655440000")- action_connection_id = UUID("8c5f9d69-902b-4b48-a23c-8d037c242e1e")-tools = LegacyClient().get_actions([- ApplicationSelector.from_string(f"github@{app_connection_id}"),- ApplicationSelector.from_string(- f"github/create_issue@{action_connection_id}"- ),+ ApplicationSelector.from_string("github"),+ ApplicationSelector.from_string("github/create_issue"),])- assert [tool.connection_id for tool in tools] == [- app_connection_id,- action_connection_id,- ]- assert [tool.qualified_name for tool in tools] == [- "github_create_issue_550e8400_e29b_41d4_a716_446655440000",- "github_create_issue_8c5f9d69_902b_4b48_a23c_8d037c242e1e",+ assert tools == [+ ToolInfo(+ app="github",+ action="create_issue",+ connection_id=None,+ description="Create a GitHub issue",+ parameters={},+ )]+ assert mock_get.call_args.kwargs["params"] == {+ "apps": "github,github/create_issue"+ }@patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token"})@patch("crewai_tools.tools.crewai_platform_tools.integrations_client.requests.get")-def test_legacy_client_excludes_actions_without_a_matching_selector(- mock_get: Mock,+ "selector",+ [+ "share_point",+ "share_point/download_file_by_server_relative_url",+ ],+)+def test_legacy_client_accepts_canonicalized_actions(+ mock_get: Mock, selector: str) -> None:response = Mock()response.raise_for_status.return_value = Noneresponse.json.return_value = {"actions": {- "github": [+ "microsoft_sharepoint": [{- "name": "delete_issue",- "description": "Delete a GitHub issue",+ "name": "SHARE_POINT_DOWNLOAD_FILE_BY_SERVER_RELATIVE_URL",+ "description": "Download a SharePoint file","parameters": {},}]@@ -482,11 +486,17 @@ def test_legacy_client_excludes_actions_without_a_matching_selector(}mock_get.return_value = response- tools = LegacyClient().get_actions(- [ApplicationSelector.from_string("github/create_issue")]- )+ tools = LegacyClient().get_actions([ApplicationSelector.from_string(selector)])- assert tools == []+ assert tools == [+ ToolInfo(+ app="microsoft_sharepoint",+ action="SHARE_POINT_DOWNLOAD_FILE_BY_SERVER_RELATIVE_URL",+ connection_id=None,+ description="Download a SharePoint file",+ parameters={},+ )+ ]def test_tool_info_is_immutable() -> None: