From 93e924ec96c6adcbc4c25be8554f2f57d19f630d Mon Sep 17 00:00:00 2001 From: Bagatur <22008038+baskaryan@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:58:50 -0500 Subject: [PATCH] langchain[patch], docs: update agent toolkit imports (#15434) --- cookbook/autogpt/marathon_times.ipynb | 2 +- .../custom_agent_with_plugin_retrieval.ipynb | 2 +- ...ith_plugin_retrieval_using_plugnplai.ipynb | 2 +- cookbook/databricks_sql_db.ipynb | 2 +- docs/docs/integrations/platforms/google.mdx | 2 +- .../docs/integrations/platforms/microsoft.mdx | 6 +- .../docs/integrations/providers/ainetwork.mdx | 2 +- docs/docs/integrations/providers/cnosdb.mdx | 2 +- .../integrations/toolkits/ainetwork.ipynb | 2 +- docs/docs/integrations/toolkits/amadeus.ipynb | 2 +- .../toolkits/azure_cognitive_services.ipynb | 2 +- docs/docs/integrations/toolkits/clickup.ipynb | 2 +- docs/docs/integrations/toolkits/github.ipynb | 2 +- docs/docs/integrations/toolkits/gitlab.ipynb | 2 +- docs/docs/integrations/toolkits/gmail.ipynb | 2 +- docs/docs/integrations/toolkits/jira.ipynb | 2 +- docs/docs/integrations/toolkits/json.ipynb | 2 +- docs/docs/integrations/toolkits/multion.ipynb | 4 +- docs/docs/integrations/toolkits/nasa.ipynb | 2 +- .../integrations/toolkits/office365.ipynb | 2 +- docs/docs/integrations/toolkits/openapi.ipynb | 6 +- .../integrations/toolkits/openapi_nla.ipynb | 2 +- docs/docs/integrations/toolkits/powerbi.ipynb | 2 +- docs/docs/integrations/toolkits/slack.ipynb | 2 +- .../integrations/toolkits/spark_sql.ipynb | 2 +- .../integrations/toolkits/sql_database.ipynb | 2 +- docs/docs/integrations/toolkits/steam.ipynb | 2 +- docs/docs/integrations/tools/filesystem.ipynb | 2 +- docs/docs/integrations/tools/zapier.ipynb | 2 +- docs/docs/use_cases/qa_structured/sql.ipynb | 10 ++-- libs/langchain/langchain/agents/__init__.py | 16 ++--- .../agents/agent_toolkits/__init__.py | 60 ++++++++++--------- .../file_management/__init__.py | 2 +- .../agent_toolkits/playwright/__init__.py | 4 +- .../agent_toolkits/vectorstore/toolkit.py | 2 +- .../agent/test_ainetwork_agent.py | 2 +- .../agent/test_powerbi_agent.py | 2 +- .../tests/unit_tests/agents/test_sql.py | 3 +- 38 files changed, 88 insertions(+), 81 deletions(-) diff --git a/cookbook/autogpt/marathon_times.ipynb b/cookbook/autogpt/marathon_times.ipynb index 15367159a02..d998630b708 100644 --- a/cookbook/autogpt/marathon_times.ipynb +++ b/cookbook/autogpt/marathon_times.ipynb @@ -39,8 +39,8 @@ "\n", "import nest_asyncio\n", "import pandas as pd\n", - "from langchain.agents.agent_toolkits.pandas.base import create_pandas_dataframe_agent\n", "from langchain.docstore.document import Document\n", + "from langchain_community.agent_toolkits.pandas.base import create_pandas_dataframe_agent\n", "from langchain_community.chat_models import ChatOpenAI\n", "from langchain_experimental.autonomous_agents import AutoGPT\n", "\n", diff --git a/cookbook/custom_agent_with_plugin_retrieval.ipynb b/cookbook/custom_agent_with_plugin_retrieval.ipynb index 8a7287d2928..7046a9fba62 100644 --- a/cookbook/custom_agent_with_plugin_retrieval.ipynb +++ b/cookbook/custom_agent_with_plugin_retrieval.ipynb @@ -40,10 +40,10 @@ " AgentOutputParser,\n", " LLMSingleActionAgent,\n", ")\n", - "from langchain.agents.agent_toolkits import NLAToolkit\n", "from langchain.chains import LLMChain\n", "from langchain.prompts import StringPromptTemplate\n", "from langchain.schema import AgentAction, AgentFinish\n", + "from langchain_community.agent_toolkits import NLAToolkit\n", "from langchain_community.llms import OpenAI\n", "from langchain_community.tools.plugin import AIPlugin" ] diff --git a/cookbook/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb b/cookbook/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb index 7bcd4fa18c7..e8b3611761e 100644 --- a/cookbook/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb +++ b/cookbook/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb @@ -65,10 +65,10 @@ " AgentOutputParser,\n", " LLMSingleActionAgent,\n", ")\n", - "from langchain.agents.agent_toolkits import NLAToolkit\n", "from langchain.chains import LLMChain\n", "from langchain.prompts import StringPromptTemplate\n", "from langchain.schema import AgentAction, AgentFinish\n", + "from langchain_community.agent_toolkits import NLAToolkit\n", "from langchain_community.llms import OpenAI\n", "from langchain_community.tools.plugin import AIPlugin" ] diff --git a/cookbook/databricks_sql_db.ipynb b/cookbook/databricks_sql_db.ipynb index f00d9953497..85e04c85653 100644 --- a/cookbook/databricks_sql_db.ipynb +++ b/cookbook/databricks_sql_db.ipynb @@ -177,7 +177,7 @@ "outputs": [], "source": [ "from langchain.agents import create_sql_agent\n", - "from langchain.agents.agent_toolkits import SQLDatabaseToolkit\n", + "from langchain_community.agent_toolkits import SQLDatabaseToolkit\n", "\n", "toolkit = SQLDatabaseToolkit(db=db, llm=llm)\n", "agent = create_sql_agent(llm=llm, toolkit=toolkit, verbose=True)" diff --git a/docs/docs/integrations/platforms/google.mdx b/docs/docs/integrations/platforms/google.mdx index 595f1326146..c61f0001e0e 100644 --- a/docs/docs/integrations/platforms/google.mdx +++ b/docs/docs/integrations/platforms/google.mdx @@ -504,7 +504,7 @@ pip install google-api-python-client google-auth-oauthlib google-auth-httplib2 See a [usage example and authorization instructions](/docs/integrations/toolkits/gmail). ```python -from langchain.agents.agent_toolkits import GmailToolkit +from langchain_community.agent_toolkits import GmailToolkit ``` diff --git a/docs/docs/integrations/platforms/microsoft.mdx b/docs/docs/integrations/platforms/microsoft.mdx index 6c616dc20e6..d7c408c4a6b 100644 --- a/docs/docs/integrations/platforms/microsoft.mdx +++ b/docs/docs/integrations/platforms/microsoft.mdx @@ -288,7 +288,7 @@ pip install azure-ai-formrecognizer azure-cognitiveservices-speech azure-ai-visi See a [usage example](/docs/integrations/toolkits/azure_cognitive_services). ```python -from langchain.agents.agent_toolkits import O365Toolkit +from langchain_community.agent_toolkits import O365Toolkit ``` ### Microsoft Office 365 email and calendar @@ -302,7 +302,7 @@ pip install O365 See a [usage example](/docs/integrations/toolkits/office365). ```python -from langchain.agents.agent_toolkits import O365Toolkit +from langchain_community.agent_toolkits import O365Toolkit ``` ### Microsoft Azure PowerBI @@ -316,7 +316,7 @@ pip install azure-identity See a [usage example](/docs/integrations/toolkits/powerbi). ```python -from langchain.agents.agent_toolkits import PowerBIToolkit +from langchain_community.agent_toolkits import PowerBIToolkit from langchain.utilities.powerbi import PowerBIDataset ``` diff --git a/docs/docs/integrations/providers/ainetwork.mdx b/docs/docs/integrations/providers/ainetwork.mdx index 16bcbab1ca0..4c8923c4029 100644 --- a/docs/docs/integrations/providers/ainetwork.mdx +++ b/docs/docs/integrations/providers/ainetwork.mdx @@ -18,6 +18,6 @@ You need to set the `AIN_BLOCKCHAIN_ACCOUNT_PRIVATE_KEY` environmental variable See a [usage example](/docs/integrations/toolkits/ainetwork). ```python -from langchain.agents.agent_toolkits.ainetwork.toolkit import AINetworkToolkit +from langchain_community.agent_toolkits.ainetwork.toolkit import AINetworkToolkit ``` diff --git a/docs/docs/integrations/providers/cnosdb.mdx b/docs/docs/integrations/providers/cnosdb.mdx index 29c5362f065..c94facbca77 100644 --- a/docs/docs/integrations/providers/cnosdb.mdx +++ b/docs/docs/integrations/providers/cnosdb.mdx @@ -65,7 +65,7 @@ Answer:The average temperature of air at station XiaoMaiDao between October 19, This example demonstrates the use of the SQL Database Agent for answering questions over a CnosDB. ```python from langchain.agents import create_sql_agent -from langchain.agents.agent_toolkits import SQLDatabaseToolkit +from langchain_community.agent_toolkits import SQLDatabaseToolkit toolkit = SQLDatabaseToolkit(db=db, llm=llm) agent = create_sql_agent(llm=llm, toolkit=toolkit, verbose=True) diff --git a/docs/docs/integrations/toolkits/ainetwork.ipynb b/docs/docs/integrations/toolkits/ainetwork.ipynb index 37ded7824ce..30ea069e2d5 100644 --- a/docs/docs/integrations/toolkits/ainetwork.ipynb +++ b/docs/docs/integrations/toolkits/ainetwork.ipynb @@ -108,7 +108,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits.ainetwork.toolkit import AINetworkToolkit\n", + "from langchain_community.agent_toolkits.ainetwork.toolkit import AINetworkToolkit\n", "\n", "toolkit = AINetworkToolkit()\n", "tools = toolkit.get_tools()\n", diff --git a/docs/docs/integrations/toolkits/amadeus.ipynb b/docs/docs/integrations/toolkits/amadeus.ipynb index 7f52f25c97b..cba9f016d1d 100644 --- a/docs/docs/integrations/toolkits/amadeus.ipynb +++ b/docs/docs/integrations/toolkits/amadeus.ipynb @@ -65,7 +65,7 @@ }, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits.amadeus.toolkit import AmadeusToolkit\n", + "from langchain_community.agent_toolkits.amadeus.toolkit import AmadeusToolkit\n", "\n", "toolkit = AmadeusToolkit()\n", "tools = toolkit.get_tools()" diff --git a/docs/docs/integrations/toolkits/azure_cognitive_services.ipynb b/docs/docs/integrations/toolkits/azure_cognitive_services.ipynb index 614e258f6fb..d0ac001ed18 100644 --- a/docs/docs/integrations/toolkits/azure_cognitive_services.ipynb +++ b/docs/docs/integrations/toolkits/azure_cognitive_services.ipynb @@ -66,7 +66,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits import AzureCognitiveServicesToolkit\n", + "from langchain_community.agent_toolkits import AzureCognitiveServicesToolkit\n", "\n", "toolkit = AzureCognitiveServicesToolkit()" ] diff --git a/docs/docs/integrations/toolkits/clickup.ipynb b/docs/docs/integrations/toolkits/clickup.ipynb index 5cec8d11002..53e503ca02b 100644 --- a/docs/docs/integrations/toolkits/clickup.ipynb +++ b/docs/docs/integrations/toolkits/clickup.ipynb @@ -22,8 +22,8 @@ "from datetime import datetime\n", "\n", "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits.clickup.toolkit import ClickupToolkit\n", "from langchain.utilities.clickup import ClickupAPIWrapper\n", + "from langchain_community.agent_toolkits.clickup.toolkit import ClickupToolkit\n", "from langchain_community.llms import OpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/github.ipynb b/docs/docs/integrations/toolkits/github.ipynb index 0cdfd7822f4..70720895621 100644 --- a/docs/docs/integrations/toolkits/github.ipynb +++ b/docs/docs/integrations/toolkits/github.ipynb @@ -107,8 +107,8 @@ "import os\n", "\n", "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits.github.toolkit import GitHubToolkit\n", "from langchain.utilities.github import GitHubAPIWrapper\n", + "from langchain_community.agent_toolkits.github.toolkit import GitHubToolkit\n", "from langchain_community.chat_models import ChatOpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/gitlab.ipynb b/docs/docs/integrations/toolkits/gitlab.ipynb index 9d325c54105..3a6d2af29e5 100644 --- a/docs/docs/integrations/toolkits/gitlab.ipynb +++ b/docs/docs/integrations/toolkits/gitlab.ipynb @@ -101,8 +101,8 @@ "import os\n", "\n", "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits.gitlab.toolkit import GitLabToolkit\n", "from langchain.utilities.gitlab import GitLabAPIWrapper\n", + "from langchain_community.agent_toolkits.gitlab.toolkit import GitLabToolkit\n", "from langchain_community.llms import OpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/gmail.ipynb b/docs/docs/integrations/toolkits/gmail.ipynb index c64054e8212..c161122e2ec 100644 --- a/docs/docs/integrations/toolkits/gmail.ipynb +++ b/docs/docs/integrations/toolkits/gmail.ipynb @@ -40,7 +40,7 @@ }, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits import GmailToolkit\n", + "from langchain_community.agent_toolkits import GmailToolkit\n", "\n", "toolkit = GmailToolkit()" ] diff --git a/docs/docs/integrations/toolkits/jira.ipynb b/docs/docs/integrations/toolkits/jira.ipynb index 69d47af1da2..801c3aa2e5e 100644 --- a/docs/docs/integrations/toolkits/jira.ipynb +++ b/docs/docs/integrations/toolkits/jira.ipynb @@ -50,8 +50,8 @@ "import os\n", "\n", "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits.jira.toolkit import JiraToolkit\n", "from langchain.utilities.jira import JiraAPIWrapper\n", + "from langchain_community.agent_toolkits.jira.toolkit import JiraToolkit\n", "from langchain_community.llms import OpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/json.ipynb b/docs/docs/integrations/toolkits/json.ipynb index 283c0557115..92b55925f20 100644 --- a/docs/docs/integrations/toolkits/json.ipynb +++ b/docs/docs/integrations/toolkits/json.ipynb @@ -34,7 +34,7 @@ "source": [ "import yaml\n", "from langchain.agents import create_json_agent\n", - "from langchain.agents.agent_toolkits import JsonToolkit\n", + "from langchain_community.agent_toolkits import JsonToolkit\n", "from langchain_community.llms.openai import OpenAI\n", "from langchain_community.tools.json.tool import JsonSpec" ] diff --git a/docs/docs/integrations/toolkits/multion.ipynb b/docs/docs/integrations/toolkits/multion.ipynb index 2df08656948..7e45205642d 100644 --- a/docs/docs/integrations/toolkits/multion.ipynb +++ b/docs/docs/integrations/toolkits/multion.ipynb @@ -26,7 +26,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits import MultionToolkit\n", + "from langchain_community.agent_toolkits import MultionToolkit\n", "\n", "toolkit = MultionToolkit()\n", "\n", @@ -83,7 +83,7 @@ "from langchain_community.llms import OpenAI\n", "\n", "llm = OpenAI(temperature=0)\n", - "from langchain.agents.agent_toolkits import MultionToolkit\n", + "from langchain_community.agent_toolkits import MultionToolkit\n", "\n", "toolkit = MultionToolkit()\n", "tools = toolkit.get_tools()\n", diff --git a/docs/docs/integrations/toolkits/nasa.ipynb b/docs/docs/integrations/toolkits/nasa.ipynb index 06759ffaedd..7b2f7fa35b8 100644 --- a/docs/docs/integrations/toolkits/nasa.ipynb +++ b/docs/docs/integrations/toolkits/nasa.ipynb @@ -30,8 +30,8 @@ "outputs": [], "source": [ "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits.nasa.toolkit import NasaToolkit\n", "from langchain.utilities.nasa import NasaAPIWrapper\n", + "from langchain_community.agent_toolkits.nasa.toolkit import NasaToolkit\n", "from langchain_community.llms import OpenAI\n", "\n", "llm = OpenAI(temperature=0, openai_api_key=\"\")\n", diff --git a/docs/docs/integrations/toolkits/office365.ipynb b/docs/docs/integrations/toolkits/office365.ipynb index 77a950f02f1..afebf423ea7 100644 --- a/docs/docs/integrations/toolkits/office365.ipynb +++ b/docs/docs/integrations/toolkits/office365.ipynb @@ -77,7 +77,7 @@ } ], "source": [ - "from langchain.agents.agent_toolkits import O365Toolkit\n", + "from langchain_community.agent_toolkits import O365Toolkit\n", "\n", "toolkit = O365Toolkit()\n", "tools = toolkit.get_tools()\n", diff --git a/docs/docs/integrations/toolkits/openapi.ipynb b/docs/docs/integrations/toolkits/openapi.ipynb index 5222ef0167a..129fd321360 100644 --- a/docs/docs/integrations/toolkits/openapi.ipynb +++ b/docs/docs/integrations/toolkits/openapi.ipynb @@ -105,7 +105,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits.openapi.spec import reduce_openapi_spec" + "from langchain_community.agent_toolkits.openapi.spec import reduce_openapi_spec" ] }, { @@ -260,7 +260,7 @@ } ], "source": [ - "from langchain.agents.agent_toolkits.openapi import planner\n", + "from langchain_community.agent_toolkits.openapi import planner\n", "from langchain_community.llms.openai import OpenAI\n", "\n", "llm = OpenAI(model_name=\"gpt-4\", temperature=0.0)" @@ -583,7 +583,7 @@ "outputs": [], "source": [ "from langchain.agents import create_openapi_agent\n", - "from langchain.agents.agent_toolkits import OpenAPIToolkit\n", + "from langchain_community.agent_toolkits import OpenAPIToolkit\n", "from langchain_community.llms.openai import OpenAI\n", "from langchain_community.tools.json.tool import JsonSpec" ] diff --git a/docs/docs/integrations/toolkits/openapi_nla.ipynb b/docs/docs/integrations/toolkits/openapi_nla.ipynb index a4df00f3be2..4b2609e4cb1 100644 --- a/docs/docs/integrations/toolkits/openapi_nla.ipynb +++ b/docs/docs/integrations/toolkits/openapi_nla.ipynb @@ -26,8 +26,8 @@ "outputs": [], "source": [ "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits import NLAToolkit\n", "from langchain.requests import Requests\n", + "from langchain_community.agent_toolkits import NLAToolkit\n", "from langchain_community.llms import OpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/powerbi.ipynb b/docs/docs/integrations/toolkits/powerbi.ipynb index ae6f0a9409b..985efc60305 100644 --- a/docs/docs/integrations/toolkits/powerbi.ipynb +++ b/docs/docs/integrations/toolkits/powerbi.ipynb @@ -38,8 +38,8 @@ "outputs": [], "source": [ "from azure.identity import DefaultAzureCredential\n", - "from langchain.agents.agent_toolkits import PowerBIToolkit, create_pbi_agent\n", "from langchain.utilities.powerbi import PowerBIDataset\n", + "from langchain_community.agent_toolkits import PowerBIToolkit, create_pbi_agent\n", "from langchain_community.chat_models import ChatOpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/slack.ipynb b/docs/docs/integrations/toolkits/slack.ipynb index bdf207d6bdc..a211fce6a3a 100644 --- a/docs/docs/integrations/toolkits/slack.ipynb +++ b/docs/docs/integrations/toolkits/slack.ipynb @@ -54,7 +54,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits import SlackToolkit\n", + "from langchain_community.agent_toolkits import SlackToolkit\n", "\n", "toolkit = SlackToolkit()\n", "tools = toolkit.get_tools()\n", diff --git a/docs/docs/integrations/toolkits/spark_sql.ipynb b/docs/docs/integrations/toolkits/spark_sql.ipynb index 7249763dde9..496865497a5 100644 --- a/docs/docs/integrations/toolkits/spark_sql.ipynb +++ b/docs/docs/integrations/toolkits/spark_sql.ipynb @@ -25,8 +25,8 @@ "outputs": [], "source": [ "from langchain.agents import create_spark_sql_agent\n", - "from langchain.agents.agent_toolkits import SparkSQLToolkit\n", "from langchain.utilities.spark_sql import SparkSQL\n", + "from langchain_community.agent_toolkits import SparkSQLToolkit\n", "from langchain_community.chat_models import ChatOpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/sql_database.ipynb b/docs/docs/integrations/toolkits/sql_database.ipynb index 412168a0f75..8df121c90f3 100644 --- a/docs/docs/integrations/toolkits/sql_database.ipynb +++ b/docs/docs/integrations/toolkits/sql_database.ipynb @@ -35,9 +35,9 @@ "outputs": [], "source": [ "from langchain.agents import create_sql_agent\n", - "from langchain.agents.agent_toolkits import SQLDatabaseToolkit\n", "from langchain.agents.agent_types import AgentType\n", "from langchain.sql_database import SQLDatabase\n", + "from langchain_community.agent_toolkits import SQLDatabaseToolkit\n", "from langchain_community.llms.openai import OpenAI" ] }, diff --git a/docs/docs/integrations/toolkits/steam.ipynb b/docs/docs/integrations/toolkits/steam.ipynb index 44e28b6fd1c..72edde402a3 100644 --- a/docs/docs/integrations/toolkits/steam.ipynb +++ b/docs/docs/integrations/toolkits/steam.ipynb @@ -75,8 +75,8 @@ "outputs": [], "source": [ "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits.steam.toolkit import SteamToolkit\n", "from langchain.utilities.steam import SteamWebAPIWrapper\n", + "from langchain_community.agent_toolkits.steam.toolkit import SteamToolkit\n", "from langchain_community.llms import OpenAI" ] }, diff --git a/docs/docs/integrations/tools/filesystem.ipynb b/docs/docs/integrations/tools/filesystem.ipynb index 48f8e5d4706..c7599a0019d 100644 --- a/docs/docs/integrations/tools/filesystem.ipynb +++ b/docs/docs/integrations/tools/filesystem.ipynb @@ -28,7 +28,7 @@ "source": [ "from tempfile import TemporaryDirectory\n", "\n", - "from langchain.agents.agent_toolkits import FileManagementToolkit\n", + "from langchain_community.agent_toolkits import FileManagementToolkit\n", "\n", "# We'll make a temporary directory to avoid clutter\n", "working_directory = TemporaryDirectory()" diff --git a/docs/docs/integrations/tools/zapier.ipynb b/docs/docs/integrations/tools/zapier.ipynb index b32667c850f..a2546829100 100644 --- a/docs/docs/integrations/tools/zapier.ipynb +++ b/docs/docs/integrations/tools/zapier.ipynb @@ -61,8 +61,8 @@ "outputs": [], "source": [ "from langchain.agents import AgentType, initialize_agent\n", - "from langchain.agents.agent_toolkits import ZapierToolkit\n", "from langchain.utilities.zapier import ZapierNLAWrapper\n", + "from langchain_community.agent_toolkits import ZapierToolkit\n", "from langchain_community.llms import OpenAI" ] }, diff --git a/docs/docs/use_cases/qa_structured/sql.ipynb b/docs/docs/use_cases/qa_structured/sql.ipynb index b11f9293338..8351b689556 100644 --- a/docs/docs/use_cases/qa_structured/sql.ipynb +++ b/docs/docs/use_cases/qa_structured/sql.ipynb @@ -518,10 +518,10 @@ "outputs": [], "source": [ "from langchain.agents import create_sql_agent\n", - "from langchain.agents.agent_toolkits import SQLDatabaseToolkit\n", "\n", "# from langchain.agents import AgentExecutor\n", "from langchain.agents.agent_types import AgentType\n", + "from langchain_community.agent_toolkits import SQLDatabaseToolkit\n", "\n", "db = SQLDatabase.from_uri(\"sqlite:///Chinook.db\")\n", "\n", @@ -809,7 +809,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits import create_retriever_tool\n", + "from langchain_community.agent_toolkits import create_retriever_tool\n", "\n", "tool_description = \"\"\"\n", "This tool will help you understand similar examples to adapt them to the user question.\n", @@ -836,8 +836,8 @@ "outputs": [], "source": [ "from langchain.agents import AgentType, create_sql_agent\n", - "from langchain.agents.agent_toolkits import SQLDatabaseToolkit\n", "from langchain.utilities import SQLDatabase\n", + "from langchain_community.agent_toolkits import SQLDatabaseToolkit\n", "from langchain_community.chat_models import ChatOpenAI\n", "\n", "db = SQLDatabase.from_uri(\"sqlite:///Chinook.db\")\n", @@ -969,7 +969,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain.agents.agent_toolkits import create_retriever_tool\n", + "from langchain_community.agent_toolkits import create_retriever_tool\n", "from langchain_community.embeddings.openai import OpenAIEmbeddings\n", "from langchain_community.vectorstores import FAISS\n", "\n", @@ -995,8 +995,8 @@ "outputs": [], "source": [ "from langchain.agents import AgentType, create_sql_agent\n", - "from langchain.agents.agent_toolkits import SQLDatabaseToolkit\n", "from langchain.utilities import SQLDatabase\n", + "from langchain_community.agent_toolkits import SQLDatabaseToolkit\n", "from langchain_community.chat_models import ChatOpenAI\n", "\n", "# db = SQLDatabase.from_uri(\"sqlite:///Chinook.db\")\n", diff --git a/libs/langchain/langchain/agents/__init__.py b/libs/langchain/langchain/agents/__init__.py index 7378e39d6bf..c20ac003420 100644 --- a/libs/langchain/langchain/agents/__init__.py +++ b/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, ) diff --git a/libs/langchain/langchain/agents/agent_toolkits/__init__.py b/libs/langchain/langchain/agents/agent_toolkits/__init__.py index 062ab1f3176..1c6726ac3d9 100644 --- a/libs/langchain/langchain/agents/agent_toolkits/__init__.py +++ b/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 = [ diff --git a/libs/langchain/langchain/agents/agent_toolkits/file_management/__init__.py b/libs/langchain/langchain/agents/agent_toolkits/file_management/__init__.py index d245816ad01..53ce9329f91 100644 --- a/libs/langchain/langchain/agents/agent_toolkits/file_management/__init__.py +++ b/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, ) diff --git a/libs/langchain/langchain/agents/agent_toolkits/playwright/__init__.py b/libs/langchain/langchain/agents/agent_toolkits/playwright/__init__.py index e8c5106134f..7fc7f6d9950 100644 --- a/libs/langchain/langchain/agents/agent_toolkits/playwright/__init__.py +++ b/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"] diff --git a/libs/langchain/langchain/agents/agent_toolkits/vectorstore/toolkit.py b/libs/langchain/langchain/agents/agent_toolkits/vectorstore/toolkit.py index 5f0fef63b63..65e4e374587 100644 --- a/libs/langchain/langchain/agents/agent_toolkits/vectorstore/toolkit.py +++ b/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 diff --git a/libs/langchain/tests/integration_tests/agent/test_ainetwork_agent.py b/libs/langchain/tests/integration_tests/agent/test_ainetwork_agent.py index 896da5a0a0d..e9fe03c148b 100644 --- a/libs/langchain/tests/integration_tests/agent/test_ainetwork_agent.py +++ b/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): diff --git a/libs/langchain/tests/integration_tests/agent/test_powerbi_agent.py b/libs/langchain/tests/integration_tests/agent/test_powerbi_agent.py index 3e9d227cf81..caaf71a3b9f 100644 --- a/libs/langchain/tests/integration_tests/agent/test_powerbi_agent.py +++ b/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 diff --git a/libs/langchain/tests/unit_tests/agents/test_sql.py b/libs/langchain/tests/unit_tests/agents/test_sql.py index 5bb2d272111..85612f564a8 100644 --- a/libs/langchain/tests/unit_tests/agents/test_sql.py +++ b/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