langchain-arcade 0.1.1__py3-none-any.whl → 1.0.0__py3-none-any.whl

langchain_arcade/_utilities.py

@@ -1,7 +1,7 @@
 from typing import Any, Callable
 
 from arcadepy import NOT_GIVEN, Arcade
-from arcadepy.types.shared import ToolDefinition
+from arcadepy.types import ToolDefinition
 from langchain_core.runnables import RunnableConfig
 from langchain_core.tools import StructuredTool
 from pydantic import BaseModel, Field, create_model
@@ -50,7 +50,7 @@ def tool_definition_to_pydantic_model(tool_def: ToolDefinition) -> type[BaseMode
     """
     try:
         fields: dict[str, Any] = {}
-        for param in tool_def.inputs.parameters or []:
+        for param in tool_def.input.parameters or []:
             param_type = get_python_type(param.value_schema.val_type)
             if param_type == list and param.value_schema.inner_val_type:  # noqa: E721
                 inner_type: type[Any] = get_python_type(param.value_schema.inner_val_type)
@@ -116,10 +116,7 @@ def create_tool_function(
             # Authorize the user for the tool
             auth_response = client.tools.authorize(tool_name=tool_name, user_id=user_id)
             if auth_response.status != "completed":
-                auth_message = (
-                    "Please use the following link to authorize: "
-                    f"{auth_response.authorization_url}"
-                )
+                auth_message = f"Please use the following link to authorize: {auth_response.url}"
                 if langgraph:
                     raise NodeInterrupt(auth_message)
                 return {"error": auth_message}
@@ -127,7 +124,7 @@ def create_tool_function(
         # Execute the tool with provided inputs
         execute_response = client.tools.execute(
             tool_name=tool_name,
-            inputs=kwargs,
+            input=kwargs,
             user_id=user_id if user_id is not None else NOT_GIVEN,
         )
 

langchain_arcade/manager.py

@@ -3,7 +3,8 @@ from collections.abc import Iterator
 from typing import Any, Optional
 
 from arcadepy import Arcade
-from arcadepy.types.shared import AuthorizationResponse, ToolDefinition
+from arcadepy.types import ToolDefinition
+from arcadepy.types.shared import AuthorizationResponse
 from langchain_core.tools import StructuredTool
 
 from langchain_arcade._utilities import (
@@ -40,10 +41,16 @@ class ArcadeToolManager:
 
         Args:
             client: Optional Arcade client instance.
+            **kwargs: Additional keyword arguments to pass to the Arcade client.
         """
         if not client:
-            api_key = kwargs.get("api_key", os.getenv("ARCADE_API_KEY", None))
-            client = Arcade(api_key=api_key)  # type: ignore[arg-type]
+            api_key = kwargs.get("api_key", os.getenv("ARCADE_API_KEY"))
+            base_url = kwargs.get("base_url", os.getenv("ARCADE_BASE_URL"))
+            arcade_kwargs = {"api_key": api_key, **kwargs}
+            if base_url:
+                arcade_kwargs["base_url"] = base_url
+
+            client = Arcade(**arcade_kwargs)  # type: ignore[arg-type]
         self.client = client
         self._tools: dict[str, ToolDefinition] = {}
 
@@ -84,13 +91,17 @@ class ArcadeToolManager:
         self,
         tools: Optional[list[str]] = None,
         toolkits: Optional[list[str]] = None,
-        langgraph: bool = False,
+        langgraph: bool = True,
     ) -> list[StructuredTool]:
         """Return the tools in the manager as LangChain StructuredTool objects.
 
         Note: if tools/toolkits are provided, the manager will update it's
         internal tools using a dictionary update by tool name.
 
+        If langgraph is True, the tools will be wrapped with LangGraph-specific
+        behavior such as NodeInterrupts for auth.
+        Note: Changed in 1.0.0 to default to True.
+
         Example:
             >>> manager = ArcadeToolManager(api_key="...")
             >>>
@@ -140,10 +151,23 @@ class ArcadeToolManager:
 
         Example:
             >>> manager = ArcadeToolManager(api_key="...")
-            >>> manager.init_tools(tools=["Searc"])
+            >>> manager.init_tools(toolkits=["Search"])
             >>> manager.is_authorized("auth_123")
         """
-        return self.client.auth.status(authorization_id=authorization_id).status == "completed"
+        return self.client.auth.status(id=authorization_id).status == "completed"
+
+    def wait_for_auth(self, authorization_id: str) -> AuthorizationResponse:
+        """Wait for a tool authorization to complete.
+
+        Example:
+            >>> manager = ArcadeToolManager(api_key="...")
+            >>> manager.init_tools(toolkits=["Google.ListEmails"])
+            >>> response = manager.authorize("Google.ListEmails", "user_123")
+            >>> manager.wait_for_auth(response)
+            >>> # or
+            >>> manager.wait_for_auth(response.id)
+        """
+        return self.client.auth.wait_for_completion(authorization_id)
 
     def requires_auth(self, tool_name: str) -> bool:
         """Check if a tool requires authorization."""
@@ -162,21 +186,33 @@ class ArcadeToolManager:
     def _retrieve_tool_definitions(
         self, tools: Optional[list[str]] = None, toolkits: Optional[list[str]] = None
     ) -> dict[str, ToolDefinition]:
+        """Retrieve tool definitions from the Arcade client, accounting for pagination."""
         all_tools: list[ToolDefinition] = []
-        if tools is not None or toolkits is not None:
-            if tools:
-                single_tools = [self.client.tools.get(tool_id=tool_id) for tool_id in tools]
-                all_tools.extend(single_tools)
-            if toolkits:
-                for tk in toolkits:
-                    all_tools.extend(self.client.tools.list(toolkit=tk))
-        else:
-            # retrieve all tools
-            all_tools = self.client.tools.list().items
 
+        # First, gather single tools if the user specifically requested them.
+        if tools:
+            for tool_id in tools:
+                # ToolsResource.get(...) returns a single ToolDefinition.
+                single_tool = self.client.tools.get(name=tool_id)
+                all_tools.append(single_tool)
+
+        # Next, gather tool definitions from any requested toolkits.
+        if toolkits:
+            for tk in toolkits:
+                # tools.list(...) returns a paginated response (SyncOffsetPage),
+                # so we iterate over its items to accumulate tool definitions.
+                paginated_tools = self.client.tools.list(toolkit=tk)
+                all_tools.extend(paginated_tools.items)
+
+        # If no specific tools or toolkits were requested, retrieve *all* tools.
+        if not tools and not toolkits:
+            paginated_all_tools = self.client.tools.list()
+            all_tools.extend(paginated_all_tools.items)
+        # Build a dictionary that maps the "full_tool_name" to the tool definition.
         tool_definitions: dict[str, ToolDefinition] = {}
-
         for tool in all_tools:
+            # For items returned by .list(), the 'toolkit' and 'name' attributes
+            # should be present as plain fields on the object. (No need to do toolkit.name)
             full_tool_name = f"{tool.toolkit.name}_{tool.name}"
             tool_definitions[full_tool_name] = tool
 

{langchain_arcade-0.1.1.dist-info → langchain_arcade-1.0.0.dist-info}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024, Arcade AI
+Copyright (c) 2025, Arcade AI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{langchain_arcade-0.1.1.dist-info → langchain_arcade-1.0.0.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: langchain-arcade
-Version: 0.1.1
-Summary: An integration package connecting Arcade AI and LangChain/LangGraph
+Version: 1.0.0
+Summary: An integration package connecting Arcade and LangChain/LangGraph
 Home-page: https://github.com/arcadeai/arcade-ai/tree/main/contrib/langchain
 License: MIT
 Author: Arcade AI
@@ -12,10 +12,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Provides-Extra: langgraph
-Requires-Dist: arcadepy (>=0.1.1,<0.2.0)
-Requires-Dist: langchain-core (>=0.3.0,<0.4.0)
-Requires-Dist: langgraph (>=0.2.32,<0.3.0) ; extra == "langgraph"
+Requires-Dist: arcadepy (>=1.0.0,<2.0.0)
+Requires-Dist: langgraph (>=0.2.67,<0.3.0)
 Project-URL: Repository, https://github.com/arcadeai/arcade-ai/tree/main/contrib/langchain
 Description-Content-Type: text/markdown
 
@@ -46,7 +44,7 @@ Description-Content-Type: text/markdown
 
 ## Overview
 
-`arcade-langchain` allows you to use Arcade AI tools in your LangChain and LangGraph applications.
+`langchain-arcade` allows you to use Arcade AI tools in your LangChain and LangGraph applications.
 
 ## Installation
 

langchain_arcade-1.0.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+langchain_arcade/__init__.py,sha256=nYAKEQBNNacNjGU6r_UY3lpkNzurGdujh2AsmdOky78,72
+langchain_arcade/_utilities.py,sha256=LvT3kYS1urBftixyzOlQbzYsBQC5zn8_VE9xkIxCfRY,5946
+langchain_arcade/manager.py,sha256=eTPeAxT7s2vBOio6Pik8hjXvsVIrFlNvM4M2MoQFSyA,8222
+langchain_arcade/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+langchain_arcade-1.0.0.dist-info/LICENSE,sha256=f4Q0XUZJ2MqZBO1XsqqHhuZfSs2ar1cZEJ45150zERo,1067
+langchain_arcade-1.0.0.dist-info/METADATA,sha256=RWHefz0bobB_gzCYxXP41cDGAphijosVV1CIdIFX_CQ,2004
+langchain_arcade-1.0.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+langchain_arcade-1.0.0.dist-info/RECORD,,

langchain_arcade-0.1.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-langchain_arcade/__init__.py,sha256=nYAKEQBNNacNjGU6r_UY3lpkNzurGdujh2AsmdOky78,72
-langchain_arcade/_utilities.py,sha256=G6IEYfhSh4dPa7tT94qHMP1QmgP2xyTLibwtMXYRHy4,6032
-langchain_arcade/manager.py,sha256=cnufccFd0_sciMIfRhtdsikkDizHmqCT1GYmpcI3hdc,6325
-langchain_arcade/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-langchain_arcade-0.1.1.dist-info/LICENSE,sha256=108KqUBZubw2RlcTUyNL3IdivNNLKjXoONGFEmzoaeo,1067
-langchain_arcade-0.1.1.dist-info/METADATA,sha256=jg_mYO-RtLs8LdADWNYC-4MFOoyWlGNR9-PI8kqu7Ns,2103
-langchain_arcade-0.1.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-langchain_arcade-0.1.1.dist-info/RECORD,,