Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

feat: add `get_raw_composio_tools` and `get_raw_composio_tool_by_slug`

angrybayblade5c5abceec9ff
diff --git a/python/composio/core/models/tools.py b/python/composio/core/models/tools.py
index f83aaf453..ab02d5081 100644
--- a/python/composio/core/models/tools.py
+++ b/python/composio/core/models/tools.py
@@ -64,68 +64,6 @@ class Tools(Resource, t.Generic[TProvider]):
self.custom_tool = self._custom_tools.register
self.provider = provider
- @t.overload
- def get(
- self,
- user_id: str,
- *,
- slug: t.Optional[str] = None,
- modifiers: t.Optional[Modifiers] = None,
- ):
- """Get tool by slug"""
-
- @t.overload
- def get(
- self,
- user_id: str,
- *,
- tools: t.Optional[list[str]] = None,
- modifiers: t.Optional[Modifiers] = None,
- ):
- """Get tools by tool slugs"""
-
- @t.overload
- def get(
- self,
- user_id: str,
- *,
- toolkits: t.Optional[list[str]] = None,
- modifiers: t.Optional[Modifiers] = None,
- ):
- """Get tools by toolkit slugs (Only important tools are returned)"""
-
- @t.overload
- def get(
- self,
- user_id: str,
- *,
- search: t.Optional[str] = None,
- toolkits: t.Optional[list[str]] = None,
- modifiers: t.Optional[Modifiers] = None,
- ):
- """Search tool by search term and/or toolkit slugs"""
-
- def get(
- self,
- user_id: str,
- *,
- slug: t.Optional[str] = None,
- tools: t.Optional[list[str]] = None,
- search: t.Optional[str] = None,
- toolkits: t.Optional[list[str]] = None,
- modifiers: t.Optional[Modifiers] = None,
- ):
- """Get a tool or list of tools based on the provided arguments."""
- if slug is not None:
- return self._get(user_id=user_id, tools=[slug], modifiers=modifiers)
- return self._get(
- user_id=user_id,
- tools=tools,
- search=search,
- toolkits=toolkits,
- modifiers=modifiers,
- )
-
def _filter_custom_tools(
self, tools: t.List[str]
) -> t.Tuple[t.List[str], t.List[Tool]]:
@@ -139,18 +77,27 @@ class Tools(Resource, t.Generic[TProvider]):
_tools.append(tool)
return _tools, _custom_tools
- def _get(
+ def get_raw_composio_tool_by_slug(self, slug: str) -> Tool:
+ """
+ Returns schema for the given tool slug.
+ """
+ try:
+ return t.cast(Tool, self._custom_tools[slug])
+ except KeyError:
+ return t.cast(Tool, self._client.tools.retrieve(tool_slug=slug))
+
+ def get_raw_composio_tools(
self,
- user_id: str,
tools: t.Optional[list[str]] = None,
search: t.Optional[str] = None,
toolkits: t.Optional[list[str]] = None,
- modifiers: t.Optional[Modifiers] = None,
- ):
- """Get a list of tools based on the provided filters."""
+ ) -> list[Tool]:
+ """
+ Get a list of tool schemas based on the provided filters.
+ """
if tools is None and search is None and toolkits is None:
raise InvalidParams(
- "Either `slug`, `tools`, `search`, or `toolkits` must be provided"
+ "Either `tools`, `search`, or `toolkits` must be provided"
)
tools_list = []
@@ -169,7 +116,22 @@ class Tools(Resource, t.Generic[TProvider]):
search=search if search else self._client.not_given,
).items
)
+ return tools_list
+ def _get(
+ self,
+ user_id: str,
+ tools: t.Optional[list[str]] = None,
+ search: t.Optional[str] = None,
+ toolkits: t.Optional[list[str]] = None,
+ modifiers: t.Optional[Modifiers] = None,
+ ):
+ """Get a list of tools based on the provided filters."""
+ tools_list = self.get_raw_composio_tools(
+ tools=tools,
+ search=search,
+ toolkits=toolkits,
+ )
if modifiers is not None:
tools_list = [
apply_modifier_by_type(
@@ -202,6 +164,68 @@ class Tools(Resource, t.Generic[TProvider]):
),
)
+ @t.overload
+ def get(
+ self,
+ user_id: str,
+ *,
+ slug: t.Optional[str] = None,
+ modifiers: t.Optional[Modifiers] = None,
+ ):
+ """Get tool by slug"""
+
+ @t.overload
+ def get(
+ self,
+ user_id: str,
+ *,
+ tools: t.Optional[list[str]] = None,
+ modifiers: t.Optional[Modifiers] = None,
+ ):
+ """Get tools by tool slugs"""
+
+ @t.overload
+ def get(
+ self,
+ user_id: str,
+ *,
+ toolkits: t.Optional[list[str]] = None,
+ modifiers: t.Optional[Modifiers] = None,
+ ):
+ """Get tools by toolkit slugs (Only important tools are returned)"""
+
+ @t.overload
+ def get(
+ self,
+ user_id: str,
+ *,
+ search: t.Optional[str] = None,
+ toolkits: t.Optional[list[str]] = None,
+ modifiers: t.Optional[Modifiers] = None,
+ ):
+ """Search tool by search term and/or toolkit slugs"""
+
+ def get(
+ self,
+ user_id: str,
+ *,
+ slug: t.Optional[str] = None,
+ tools: t.Optional[list[str]] = None,
+ search: t.Optional[str] = None,
+ toolkits: t.Optional[list[str]] = None,
+ modifiers: t.Optional[Modifiers] = None,
+ ):
+ """Get a tool or list of tools based on the provided arguments."""
+ if slug is not None:
+ return self._get(user_id=user_id, tools=[slug], modifiers=modifiers)
+ return self._get(
+ user_id=user_id,
+ tools=tools,
+ search=search,
+ toolkits=toolkits,
+ modifiers=modifiers,
+ )
+
def _wrap_execute_tool(
self,
modifiers: t.Optional[Modifiers] = None,