langchain[patch], docs: update agent toolkit imports (#15434)

libs/langchain/langchain/agents/__init__.py

@@ -31,6 +31,14 @@ Agents select and use **Tools** and **Toolkits** for actions.
 from pathlib import Path
 from typing import Any
 
+from langchain_community.agent_toolkits import (
+    create_json_agent,
+    create_openapi_agent,
+    create_pbi_agent,
+    create_pbi_chat_agent,
+    create_spark_sql_agent,
+    create_sql_agent,
+)
 from langchain_core._api.path import as_import_path
 
 from langchain.agents.agent import (
@@ -42,13 +50,7 @@ from langchain.agents.agent import (
     LLMSingleActionAgent,
 )
 from langchain.agents.agent_iterator import AgentExecutorIterator
-from langchain.agents.agent_toolkits import (
-    create_json_agent,
-    create_openapi_agent,
-    create_pbi_agent,
-    create_pbi_chat_agent,
-    create_spark_sql_agent,
-    create_sql_agent,
+from langchain.agents.agent_toolkits.vectorstore.base import (
     create_vectorstore_agent,
     create_vectorstore_router_agent,
 )

libs/langchain/langchain/agents/agent_toolkits/__init__.py

@@ -16,39 +16,42 @@ See [Security](https://python.langchain.com/docs/security) for more information.
 from pathlib import Path
 from typing import Any
 
-from langchain_core._api.path import as_import_path
-
-from langchain.agents.agent_toolkits.ainetwork.toolkit import AINetworkToolkit
-from langchain.agents.agent_toolkits.amadeus.toolkit import AmadeusToolkit
-from langchain.agents.agent_toolkits.azure_cognitive_services import (
+from langchain_community.agent_toolkits.ainetwork.toolkit import AINetworkToolkit
+from langchain_community.agent_toolkits.amadeus.toolkit import AmadeusToolkit
+from langchain_community.agent_toolkits.azure_cognitive_services import (
     AzureCognitiveServicesToolkit,
 )
+from langchain_community.agent_toolkits.file_management.toolkit import (
+    FileManagementToolkit,
+)
+from langchain_community.agent_toolkits.gmail.toolkit import GmailToolkit
+from langchain_community.agent_toolkits.jira.toolkit import JiraToolkit
+from langchain_community.agent_toolkits.json.base import create_json_agent
+from langchain_community.agent_toolkits.json.toolkit import JsonToolkit
+from langchain_community.agent_toolkits.multion.toolkit import MultionToolkit
+from langchain_community.agent_toolkits.nasa.toolkit import NasaToolkit
+from langchain_community.agent_toolkits.nla.toolkit import NLAToolkit
+from langchain_community.agent_toolkits.office365.toolkit import O365Toolkit
+from langchain_community.agent_toolkits.openapi.base import create_openapi_agent
+from langchain_community.agent_toolkits.openapi.toolkit import OpenAPIToolkit
+from langchain_community.agent_toolkits.playwright.toolkit import (
+    PlayWrightBrowserToolkit,
+)
+from langchain_community.agent_toolkits.powerbi.base import create_pbi_agent
+from langchain_community.agent_toolkits.powerbi.chat_base import create_pbi_chat_agent
+from langchain_community.agent_toolkits.powerbi.toolkit import PowerBIToolkit
+from langchain_community.agent_toolkits.slack.toolkit import SlackToolkit
+from langchain_community.agent_toolkits.spark_sql.base import create_spark_sql_agent
+from langchain_community.agent_toolkits.spark_sql.toolkit import SparkSQLToolkit
+from langchain_community.agent_toolkits.sql.base import create_sql_agent
+from langchain_community.agent_toolkits.sql.toolkit import SQLDatabaseToolkit
+from langchain_community.agent_toolkits.steam.toolkit import SteamToolkit
+from langchain_community.agent_toolkits.zapier.toolkit import ZapierToolkit
+from langchain_core._api.path import as_import_path
+
 from langchain.agents.agent_toolkits.conversational_retrieval.openai_functions import (
     create_conversational_retrieval_agent,
 )
-from langchain.agents.agent_toolkits.file_management.toolkit import (
-    FileManagementToolkit,
-)
-from langchain.agents.agent_toolkits.gmail.toolkit import GmailToolkit
-from langchain.agents.agent_toolkits.jira.toolkit import JiraToolkit
-from langchain.agents.agent_toolkits.json.base import create_json_agent
-from langchain.agents.agent_toolkits.json.toolkit import JsonToolkit
-from langchain.agents.agent_toolkits.multion.toolkit import MultionToolkit
-from langchain.agents.agent_toolkits.nasa.toolkit import NasaToolkit
-from langchain.agents.agent_toolkits.nla.toolkit import NLAToolkit
-from langchain.agents.agent_toolkits.office365.toolkit import O365Toolkit
-from langchain.agents.agent_toolkits.openapi.base import create_openapi_agent
-from langchain.agents.agent_toolkits.openapi.toolkit import OpenAPIToolkit
-from langchain.agents.agent_toolkits.playwright.toolkit import PlayWrightBrowserToolkit
-from langchain.agents.agent_toolkits.powerbi.base import create_pbi_agent
-from langchain.agents.agent_toolkits.powerbi.chat_base import create_pbi_chat_agent
-from langchain.agents.agent_toolkits.powerbi.toolkit import PowerBIToolkit
-from langchain.agents.agent_toolkits.slack.toolkit import SlackToolkit
-from langchain.agents.agent_toolkits.spark_sql.base import create_spark_sql_agent
-from langchain.agents.agent_toolkits.spark_sql.toolkit import SparkSQLToolkit
-from langchain.agents.agent_toolkits.sql.base import create_sql_agent
-from langchain.agents.agent_toolkits.sql.toolkit import SQLDatabaseToolkit
-from langchain.agents.agent_toolkits.steam.toolkit import SteamToolkit
 from langchain.agents.agent_toolkits.vectorstore.base import (
     create_vectorstore_agent,
     create_vectorstore_router_agent,
@@ -58,7 +61,6 @@ from langchain.agents.agent_toolkits.vectorstore.toolkit import (
     VectorStoreRouterToolkit,
     VectorStoreToolkit,
 )
-from langchain.agents.agent_toolkits.zapier.toolkit import ZapierToolkit
 from langchain.tools.retriever import create_retriever_tool
 
 DEPRECATED_AGENTS = [

libs/langchain/langchain/agents/agent_toolkits/file_management/__init__.py

@@ -1,6 +1,6 @@
 """Local file management toolkit."""
 
-from langchain.agents.agent_toolkits.file_management.toolkit import (
+from langchain_community.agent_toolkits.file_management.toolkit import (
     FileManagementToolkit,
 )
 

libs/langchain/langchain/agents/agent_toolkits/playwright/__init__.py

@@ -1,4 +1,6 @@
 """Playwright browser toolkit."""
-from langchain.agents.agent_toolkits.playwright.toolkit import PlayWrightBrowserToolkit
+from langchain_community.agent_toolkits.playwright.toolkit import (
+    PlayWrightBrowserToolkit,
+)
 
 __all__ = ["PlayWrightBrowserToolkit"]

libs/langchain/langchain/agents/agent_toolkits/vectorstore/toolkit.py

@@ -1,6 +1,7 @@
 """Toolkit for interacting with a vector store."""
 from typing import List
 
+from langchain_community.agent_toolkits.base import BaseToolkit
 from langchain_community.llms.openai import OpenAI
 from langchain_community.tools.vectorstore.tool import (
     VectorStoreQATool,
@@ -10,7 +11,6 @@ from langchain_core.language_models import BaseLanguageModel
 from langchain_core.pydantic_v1 import BaseModel, Field
 from langchain_core.vectorstores import VectorStore
 
-from langchain.agents.agent_toolkits.base import BaseToolkit
 from langchain.tools import BaseTool
 
 

libs/langchain/tests/integration_tests/agent/test_ainetwork_agent.py

@@ -8,11 +8,11 @@ from typing import Any
 from urllib.error import HTTPError
 
 import pytest
+from langchain_community.agent_toolkits.ainetwork.toolkit import AINetworkToolkit
 from langchain_community.chat_models import ChatOpenAI
 from langchain_community.tools.ainetwork.utils import authenticate
 
 from langchain.agents import AgentType, initialize_agent
-from langchain.agents.agent_toolkits.ainetwork.toolkit import AINetworkToolkit
 
 
 class Match(Enum):

libs/langchain/tests/integration_tests/agent/test_powerbi_agent.py

@@ -1,7 +1,7 @@
 import pytest
+from langchain_community.agent_toolkits import PowerBIToolkit, create_pbi_agent
 from langchain_community.chat_models import ChatOpenAI
 
-from langchain.agents.agent_toolkits import PowerBIToolkit, create_pbi_agent
 from langchain.utilities.powerbi import PowerBIDataset
 from langchain.utils import get_from_env
 

libs/langchain/tests/unit_tests/agents/test_sql.py

@@ -1,5 +1,6 @@
+from langchain_community.agent_toolkits import SQLDatabaseToolkit
+
 from langchain.agents import create_sql_agent
-from langchain.agents.agent_toolkits import SQLDatabaseToolkit
 from langchain.utilities.sql_database import SQLDatabase
 from tests.unit_tests.llms.fake_llm import FakeLLM