bump version to 131 (#2391)

1 year ago · c7b083ab56
parent dc3ac8082b
commit c7b083ab56
31 changed files with 50 additions and 37 deletions
--- a/docs/ecosystem/aim_tracking.ipynb
+++ b/docs/ecosystem/aim_tracking.ipynb
@ -206,7 +206,7 @@
   "outputs": [],
   "source": [
    "from langchain.agents import initialize_agent, load_tools\n",
-    "from langchain.agents.agent_types import AgentType"
+    "from langchain.agents import AgentType"
   ]
  },
  {
--- a/docs/ecosystem/clearml_tracking.ipynb
+++ b/docs/ecosystem/clearml_tracking.ipynb
@ -520,7 +520,7 @@
   ],
   "source": [
    "from langchain.agents import initialize_agent, load_tools\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "\n",
    "# SCENARIO 2 - Agent with Tools\n",
    "tools = load_tools([\"serpapi\", \"llm-math\"], llm=llm, callback_manager=manager)\n",
--- a/docs/ecosystem/google_serper.md
+++ b/docs/ecosystem/google_serper.md
@ -23,7 +23,7 @@ You can use it as part of a Self Ask chain:
 from langchain.utilities import GoogleSerperAPIWrapper
 from langchain.llms.openai import OpenAI
 from langchain.agents import initialize_agent, Tool
-from langchain.agents.agent_types import AgentType
+from langchain.agents import AgentType

 import os

--- a/docs/ecosystem/wandb_tracking.ipynb
+++ b/docs/ecosystem/wandb_tracking.ipynb
@ -506,7 +506,7 @@
   "outputs": [],
   "source": [
    "from langchain.agents import initialize_agent, load_tools\n",
-    "from langchain.agents.agent_types import AgentType"
+    "from langchain.agents import AgentType"
   ]
  },
  {
--- a/docs/getting_started/getting_started.md
+++ b/docs/getting_started/getting_started.md
@ -197,7 +197,7 @@ Now we can get started!
 ```python
 from langchain.agents import load_tools
 from langchain.agents import initialize_agent
-from langchain.agents.agent_types import AgentType
+from langchain.agents import AgentType
 from langchain.llms import OpenAI

 # First, let's load the language model we're going to use to control the agent.
@ -410,7 +410,7 @@ Agents can also be used with chat models, you can initialize one using `AgentTyp
 ```python
 from langchain.agents import load_tools
 from langchain.agents import initialize_agent
-from langchain.agents.agent_types import AgentType
+from langchain.agents import AgentType
 from langchain.chat_models import ChatOpenAI
 from langchain.llms import OpenAI

--- a/docs/modules/agents/agent_executors/examples/agent_vectorstore.ipynb
+++ b/docs/modules/agents/agent_executors/examples/agent_vectorstore.ipynb
@ -154,7 +154,7 @@
   "source": [
    "# Import things that are needed generically\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.tools import BaseTool\n",
    "from langchain.llms import OpenAI\n",
    "from langchain import LLMMathChain, SerpAPIWrapper"
--- a/docs/modules/agents/agent_executors/examples/async_agent.ipynb
+++ b/docs/modules/agents/agent_executors/examples/async_agent.ipynb
@ -39,7 +39,7 @@
    "import time\n",
    "\n",
    "from langchain.agents import initialize_agent, load_tools\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.llms import OpenAI\n",
    "from langchain.callbacks.stdout import StdOutCallbackHandler\n",
    "from langchain.callbacks.base import CallbackManager\n",
--- a/docs/modules/agents/agent_executors/examples/intermediate_steps.ipynb
+++ b/docs/modules/agents/agent_executors/examples/intermediate_steps.ipynb
@ -19,7 +19,7 @@
   "source": [
    "from langchain.agents import load_tools\n",
    "from langchain.agents import initialize_agent\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.llms import OpenAI"
   ]
  },
--- a/docs/modules/agents/agent_executors/examples/max_iterations.ipynb
+++ b/docs/modules/agents/agent_executors/examples/max_iterations.ipynb
@ -19,7 +19,7 @@
   "source": [
    "from langchain.agents import load_tools\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.llms import OpenAI"
   ]
  },
--- a/docs/modules/agents/agents/examples/chat_conversation_agent.ipynb
+++ b/docs/modules/agents/agents/examples/chat_conversation_agent.ipynb
@ -35,7 +35,7 @@
    "from langchain.chat_models import ChatOpenAI\n",
    "from langchain.utilities import SerpAPIWrapper\n",
    "from langchain.agents import initialize_agent\n",
-    "from langchain.agents.agent_types import AgentType"
+    "from langchain.agents import AgentType"
   ]
  },
  {
--- a/docs/modules/agents/agents/examples/conversational_agent.ipynb
+++ b/docs/modules/agents/agents/examples/conversational_agent.ipynb
@ -20,7 +20,7 @@
   "outputs": [],
   "source": [
    "from langchain.agents import Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.memory import ConversationBufferMemory\n",
    "from langchain import OpenAI\n",
    "from langchain.utilities import GoogleSearchAPIWrapper\n",
--- a/docs/modules/agents/agents/examples/mrkl.ipynb
+++ b/docs/modules/agents/agents/examples/mrkl.ipynb
@ -28,7 +28,7 @@
   "source": [
    "from langchain import LLMMathChain, OpenAI, SerpAPIWrapper, SQLDatabase, SQLDatabaseChain\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType"
+    "from langchain.agents import AgentType"
   ]
  },
  {
--- a/docs/modules/agents/agents/examples/mrkl_chat.ipynb
+++ b/docs/modules/agents/agents/examples/mrkl_chat.ipynb
@ -28,7 +28,7 @@
   "source": [
    "from langchain import OpenAI, LLMMathChain, SerpAPIWrapper, SQLDatabase, SQLDatabaseChain\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.chat_models import ChatOpenAI"
   ]
  },
--- a/docs/modules/agents/agents/examples/react.ipynb
+++ b/docs/modules/agents/agents/examples/react.ipynb
@ -19,7 +19,7 @@
   "source": [
    "from langchain import OpenAI, Wikipedia\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.agents.react.base import DocstoreExplorer\n",
    "docstore=DocstoreExplorer(Wikipedia())\n",
    "tools = [\n",
--- a/docs/modules/agents/agents/examples/self_ask_with_search.ipynb
+++ b/docs/modules/agents/agents/examples/self_ask_with_search.ipynb
@ -46,7 +46,7 @@
   "source": [
    "from langchain import OpenAI, SerpAPIWrapper\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "\n",
    "llm = OpenAI(temperature=0)\n",
    "search = SerpAPIWrapper()\n",
--- a/docs/modules/agents/tools/custom_tools.ipynb
+++ b/docs/modules/agents/tools/custom_tools.ipynb
@ -27,7 +27,7 @@
   "source": [
    "# Import things that are needed generically\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.tools import BaseTool\n",
    "from langchain.llms import OpenAI\n",
    "from langchain import LLMMathChain, SerpAPIWrapper"
@ -485,7 +485,7 @@
   "source": [
    "# Import things that are needed generically\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.llms import OpenAI\n",
    "from langchain import LLMMathChain, SerpAPIWrapper\n",
    "search = SerpAPIWrapper()\n",
--- a/docs/modules/agents/tools/examples/chatgpt_plugins.ipynb
+++ b/docs/modules/agents/tools/examples/chatgpt_plugins.ipynb
@ -23,7 +23,7 @@
   "source": [
    "from langchain.chat_models import ChatOpenAI\n",
    "from langchain.agents import load_tools, initialize_agent\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.tools import AIPluginTool"
   ]
  },
--- a/docs/modules/agents/tools/examples/google_serper.ipynb
+++ b/docs/modules/agents/tools/examples/google_serper.ipynb
@ -115,7 +115,7 @@
    "from langchain.utilities import GoogleSerperAPIWrapper\n",
    "from langchain.llms.openai import OpenAI\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "\n",
    "llm = OpenAI(temperature=0)\n",
    "search = GoogleSerperAPIWrapper()\n",
--- a/docs/modules/agents/tools/examples/human_tools.ipynb
+++ b/docs/modules/agents/tools/examples/human_tools.ipynb
@ -20,7 +20,7 @@
    "from langchain.chat_models import ChatOpenAI\n",
    "from langchain.llms import OpenAI\n",
    "from langchain.agents import load_tools, initialize_agent\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "\n",
    "llm = ChatOpenAI(temperature=0.0)\n",
    "math_llm = OpenAI(temperature=0.0)\n",
--- a/docs/modules/agents/tools/examples/search_tools.ipynb
+++ b/docs/modules/agents/tools/examples/search_tools.ipynb
@ -23,7 +23,7 @@
   "source": [
    "from langchain.agents import load_tools\n",
    "from langchain.agents import initialize_agent\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.llms import OpenAI"
   ]
  },
--- a/docs/modules/agents/tools/examples/zapier.ipynb
+++ b/docs/modules/agents/tools/examples/zapier.ipynb
@ -77,7 +77,7 @@
    "from langchain.llms import OpenAI\n",
    "from langchain.agents import initialize_agent\n",
    "from langchain.agents.agent_toolkits import ZapierToolkit\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.utilities.zapier import ZapierNLAWrapper"
   ]
  },
--- a/docs/modules/agents/tools/multi_input_tool.ipynb
+++ b/docs/modules/agents/tools/multi_input_tool.ipynb
@ -24,7 +24,7 @@
   "source": [
    "from langchain.llms import OpenAI\n",
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType"
+    "from langchain.agents import AgentType"
   ]
  },
  {
--- a/docs/modules/models/llms/examples/fake_llm.ipynb
+++ b/docs/modules/models/llms/examples/fake_llm.ipynb
@ -32,7 +32,7 @@
   "source": [
    "from langchain.agents import load_tools\n",
    "from langchain.agents import initialize_agent\n",
-    "from langchain.agents.agent_types import AgentType"
+    "from langchain.agents import AgentType"
   ]
  },
  {
--- a/docs/modules/models/llms/examples/token_usage_tracking.ipynb
+++ b/docs/modules/models/llms/examples/token_usage_tracking.ipynb
@ -107,7 +107,7 @@
   "source": [
    "from langchain.agents import load_tools\n",
    "from langchain.agents import initialize_agent\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.llms import OpenAI\n",
    "\n",
    "llm = OpenAI(temperature=0)\n",
--- a/docs/modules/models/llms/integrations/gpt4all.ipynb
+++ b/docs/modules/models/llms/integrations/gpt4all.ipynb
@ -1,11 +1,10 @@
 {
 "cells": [
  {
-   "attachments": {},
   "cell_type": "markdown",
   "metadata": {},
   "source": [
-    "# OpenAI\n",
+    "# GPT4all\n",
    "\n",
    "This example goes over how to use LangChain to interact with GPT4All models"
   ]
@ -75,10 +74,23 @@
  }
 ],
 "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
  },
-  "orig_nbformat": 4
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.1"
+  }
 },
 "nbformat": 4,
 "nbformat_minor": 2
--- a/docs/tracing/agent_with_tracing.ipynb
+++ b/docs/tracing/agent_with_tracing.ipynb
@ -35,7 +35,7 @@
    "\n",
    "import langchain\n",
    "from langchain.agents import Tool, initialize_agent, load_tools\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "from langchain.chat_models import ChatOpenAI\n",
    "from langchain.llms import OpenAI"
   ]
--- a/docs/use_cases/evaluation/agent_benchmarking.ipynb
+++ b/docs/use_cases/evaluation/agent_benchmarking.ipynb
@ -85,7 +85,7 @@
    "from langchain.llms import OpenAI\n",
    "from langchain.chains import LLMMathChain\n",
    "from langchain.agents import initialize_agent, Tool, load_tools\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "\n",
    "tools = load_tools(['serpapi', 'llm-math'], llm=OpenAI(temperature=0))\n",
    "agent = initialize_agent(tools, OpenAI(temperature=0), agent=AgentType.ZERO_SHOT_REACT_DESCRIPTION)\n"
--- a/docs/use_cases/evaluation/agent_vectordb_sota_pg.ipynb
+++ b/docs/use_cases/evaluation/agent_vectordb_sota_pg.ipynb
@ -255,7 +255,7 @@
   "outputs": [],
   "source": [
    "from langchain.agents import initialize_agent, Tool\n",
-    "from langchain.agents.agent_types import AgentType\n",
+    "from langchain.agents import AgentType\n",
    "tools = [\n",
    "    Tool(\n",
    "        name = \"State of Union QA System\",\n",
--- a/langchain/agents/init.py
+++ b/langchain/agents/init.py
@ -15,6 +15,7 @@ from langchain.agents.agent_toolkits import (
    create_vectorstore_agent,
    create_vectorstore_router_agent,
 )
+from langchain.agents.agent_types import AgentType
 from langchain.agents.conversational.base import ConversationalAgent
 from langchain.agents.conversational_chat.base import ConversationalChatAgent
 from langchain.agents.initialize import initialize_agent
@ -51,4 +52,5 @@ __all__ = [
    "LLMSingleActionAgent",
    "AgentOutputParser",
    "BaseSingleActionAgent",
+    "AgentType",
 ]
--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain"
-version = "0.0.130"
+version = "0.0.131"
 description = "Building applications with LLMs through composability"
 authors = []
 license = "MIT"
--- a/tests/unit_tests/agents/test_agent.py
+++ b/tests/unit_tests/agents/test_agent.py
@ -4,8 +4,7 @@ from typing import Any, List, Mapping, Optional

 from pydantic import BaseModel

-from langchain.agents import AgentExecutor, initialize_agent
-from langchain.agents.agent_types import AgentType
+from langchain.agents import AgentExecutor, AgentType, initialize_agent
 from langchain.agents.tools import Tool
 from langchain.callbacks.base import CallbackManager
 from langchain.llms.base import LLM