diff --git a/.github/workflows/imports.yml b/.github/workflows/imports.yml new file mode 100644 index 0000000000..7ad315f1b9 --- /dev/null +++ b/.github/workflows/imports.yml @@ -0,0 +1,23 @@ +--- +name: Imports + +on: + push: + branches: [master] + pull_request: + branches: [master] + +jobs: + check: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Run import check + run: | + # We should not encourage imports directly from main init file + # Expect for __version__ and hub + # And of course expect for this file + git grep 'from langchain import' | grep -vE 'from langchain import (__version__|hub)' | grep -v '.github/workflows/check-imports.yml' && exit 1 || exit 0 diff --git a/docs/docs_skeleton/docs/guides/safety/amazon_comprehend_chain.ipynb b/docs/docs_skeleton/docs/guides/safety/amazon_comprehend_chain.ipynb index 614db1b885..49f3d6f41e 100644 --- a/docs/docs_skeleton/docs/guides/safety/amazon_comprehend_chain.ipynb +++ b/docs/docs_skeleton/docs/guides/safety/amazon_comprehend_chain.ipynb @@ -105,7 +105,7 @@ }, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms.fake import FakeListLLM\n", "from langchain_experimental.comprehend_moderation.base_moderation_exceptions import ModerationPiiError\n", "\n", @@ -412,7 +412,7 @@ }, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms.fake import FakeListLLM\n", "\n", "template = \"\"\"Question: {question}\n", @@ -572,8 +572,8 @@ }, "outputs": [], "source": [ - "from langchain import HuggingFaceHub\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.llms import HuggingFaceHub\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "template = \"\"\"Question: {question}\"\"\"\n", "\n", @@ -697,7 +697,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import SagemakerEndpoint\n", + "from langchain.llms import SagemakerEndpoint\n", "from langchain.llms.sagemaker_endpoint import LLMContentHandler\n", "from langchain.chains import LLMChain\n", "from langchain.prompts import load_prompt, PromptTemplate\n", diff --git a/docs/extras/guides/evaluation/examples/comparisons.ipynb b/docs/extras/guides/evaluation/examples/comparisons.ipynb index 5c293d8984..35d79c9180 100644 --- a/docs/extras/guides/evaluation/examples/comparisons.ipynb +++ b/docs/extras/guides/evaluation/examples/comparisons.ipynb @@ -97,7 +97,7 @@ }, "outputs": [], "source": [ - "from langchain import SerpAPIWrapper\n", + "from langchain.utilities import SerpAPIWrapper\n", "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", "from langchain.chat_models import ChatOpenAI\n", diff --git a/docs/extras/guides/local_llms.ipynb b/docs/extras/guides/local_llms.ipynb index 90c3232a2b..6268923d38 100644 --- a/docs/extras/guides/local_llms.ipynb +++ b/docs/extras/guides/local_llms.ipynb @@ -468,7 +468,8 @@ } ], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\n", + "from langchain.chains import LLMChain\n", "from langchain.chains.prompt_selector import ConditionalPromptSelector\n", "\n", "DEFAULT_LLAMA_SEARCH_PROMPT = PromptTemplate(\n", @@ -593,7 +594,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.9.1" + "version": "3.10.1" } }, "nbformat": 4, diff --git a/docs/extras/guides/model_laboratory.ipynb b/docs/extras/guides/model_laboratory.ipynb index 24fd5f7760..3f4614ca9c 100644 --- a/docs/extras/guides/model_laboratory.ipynb +++ b/docs/extras/guides/model_laboratory.ipynb @@ -19,7 +19,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import LLMChain, OpenAI, Cohere, HuggingFaceHub, PromptTemplate\n", + "from langchain.chains import LLMChain\nfrom langchain.llms import OpenAI, Cohere, HuggingFaceHub\nfrom langchain.prompts import PromptTemplate\n", "from langchain.model_laboratory import ModelLaboratory" ] }, @@ -139,7 +139,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import SelfAskWithSearchChain, SerpAPIWrapper\n", + "from langchain.chains import SelfAskWithSearchChain\nfrom langchain.utilities import SerpAPIWrapper\n", "\n", "open_ai_llm = OpenAI(temperature=0)\n", "search = SerpAPIWrapper()\n", diff --git a/docs/extras/guides/safety/amazon_comprehend_chain.ipynb b/docs/extras/guides/safety/amazon_comprehend_chain.ipynb index 69117b8257..25eb4f2505 100644 --- a/docs/extras/guides/safety/amazon_comprehend_chain.ipynb +++ b/docs/extras/guides/safety/amazon_comprehend_chain.ipynb @@ -95,7 +95,7 @@ }, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms.fake import FakeListLLM\n", "from langchain_experimental.comprehend_moderation.base_moderation_exceptions import ModerationPiiError\n", "\n", @@ -399,7 +399,7 @@ }, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms.fake import FakeListLLM\n", "\n", "template = \"\"\"Question: {question}\n", @@ -564,8 +564,8 @@ }, "outputs": [], "source": [ - "from langchain import HuggingFaceHub\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.llms import HuggingFaceHub\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "template = \"\"\"Question: {question}\n", "\n", @@ -679,7 +679,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import SagemakerEndpoint\n", + "from langchain.llms import SagemakerEndpoint\n", "from langchain.llms.sagemaker_endpoint import LLMContentHandler\n", "from langchain.chains import LLMChain\n", "from langchain.prompts import load_prompt, PromptTemplate\n", diff --git a/docs/extras/guides/safety/hugging_face_prompt_injection.ipynb b/docs/extras/guides/safety/hugging_face_prompt_injection.ipynb index 52d9d0fca4..1277d48c90 100644 --- a/docs/extras/guides/safety/hugging_face_prompt_injection.ipynb +++ b/docs/extras/guides/safety/hugging_face_prompt_injection.ipynb @@ -123,7 +123,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType" ] }, diff --git a/docs/extras/integrations/callbacks/context.ipynb b/docs/extras/integrations/callbacks/context.ipynb index bf05268f6b..9da1e73f29 100644 --- a/docs/extras/integrations/callbacks/context.ipynb +++ b/docs/extras/integrations/callbacks/context.ipynb @@ -167,7 +167,7 @@ "import os\n", "\n", "from langchain.chat_models import ChatOpenAI\n", - "from langchain import LLMChain\n", + "from langchain.chains import LLMChain\n", "from langchain.prompts import PromptTemplate\n", "from langchain.prompts.chat import (\n", " ChatPromptTemplate,\n", diff --git a/docs/extras/integrations/chat/ollama.ipynb b/docs/extras/integrations/chat/ollama.ipynb index d5569397bf..d42827d4bd 100644 --- a/docs/extras/integrations/chat/ollama.ipynb +++ b/docs/extras/integrations/chat/ollama.ipynb @@ -199,7 +199,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "\n", "# Prompt\n", "template = \"\"\"[INST] <> Use the following pieces of context to answer the question at the end. \n", diff --git a/docs/extras/integrations/chat_loaders/discord.ipynb b/docs/extras/integrations/chat_loaders/discord.ipynb index 973b59640c..f8748706c6 100644 --- a/docs/extras/integrations/chat_loaders/discord.ipynb +++ b/docs/extras/integrations/chat_loaders/discord.ipynb @@ -81,7 +81,7 @@ "import re\n", "from typing import Iterator, List\n", "\n", - "from langchain import schema\n", + "from langchain.schema import BaseMessage, HumanMessage\n", "from langchain.chat_loaders import base as chat_loaders\n", "\n", "logger = logging.getLogger()\n", @@ -117,7 +117,7 @@ " with open(file_path, \"r\", encoding=\"utf-8\") as file:\n", " lines = file.readlines()\n", "\n", - " results: List[schema.BaseMessage] = []\n", + " results: List[BaseMessage] = []\n", " current_sender = None\n", " current_timestamp = None\n", " current_content = []\n", @@ -128,7 +128,7 @@ " ):\n", " if current_sender and current_content:\n", " results.append(\n", - " schema.HumanMessage(\n", + " HumanMessage(\n", " content=\"\".join(current_content).strip(),\n", " additional_kwargs={\n", " \"sender\": current_sender,\n", @@ -142,7 +142,7 @@ " ]\n", " elif re.match(r\"\\[\\d{1,2}:\\d{2} (?:AM|PM)\\]\", line.strip()):\n", " results.append(\n", - " schema.HumanMessage(\n", + " HumanMessage(\n", " content=\"\".join(current_content).strip(),\n", " additional_kwargs={\n", " \"sender\": current_sender,\n", @@ -157,7 +157,7 @@ "\n", " if current_sender and current_content:\n", " results.append(\n", - " schema.HumanMessage(\n", + " HumanMessage(\n", " content=\"\".join(current_content).strip(),\n", " additional_kwargs={\n", " \"sender\": current_sender,\n", diff --git a/docs/extras/integrations/chat_loaders/wechat.ipynb b/docs/extras/integrations/chat_loaders/wechat.ipynb index d5d0634572..7eb86e8169 100644 --- a/docs/extras/integrations/chat_loaders/wechat.ipynb +++ b/docs/extras/integrations/chat_loaders/wechat.ipynb @@ -78,7 +78,7 @@ "import re\n", "from typing import Iterator, List\n", "\n", - "from langchain import schema\n", + "from langchain.schema import HumanMessage, BaseMessage\n", "from langchain.chat_loaders import base as chat_loaders\n", "\n", "logger = logging.getLogger()\n", @@ -110,7 +110,7 @@ " # skip non-text messages like stickers, images, etc.\n", " if not re.match(r\"\\[.*\\]\", content):\n", " results.append(\n", - " schema.HumanMessage(\n", + " HumanMessage(\n", " content=content,\n", " additional_kwargs={\n", " \"sender\": current_sender,\n", @@ -135,7 +135,7 @@ " with open(file_path, \"r\", encoding=\"utf-8\") as file:\n", " lines = file.readlines()\n", "\n", - " results: List[schema.BaseMessage] = []\n", + " results: List[BaseMessage] = []\n", " current_sender = None\n", " current_timestamp = None\n", " current_content = []\n", @@ -292,7 +292,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.11" + "version": "3.10.1" } }, "nbformat": 4, diff --git a/docs/extras/integrations/llms/ai21.ipynb b/docs/extras/integrations/llms/ai21.ipynb index 2615217003..8cbbccfaa9 100644 --- a/docs/extras/integrations/llms/ai21.ipynb +++ b/docs/extras/integrations/llms/ai21.ipynb @@ -59,7 +59,7 @@ "outputs": [], "source": [ "from langchain.llms import AI21\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/aleph_alpha.ipynb b/docs/extras/integrations/llms/aleph_alpha.ipynb index cbe6151750..ac3c36dc81 100644 --- a/docs/extras/integrations/llms/aleph_alpha.ipynb +++ b/docs/extras/integrations/llms/aleph_alpha.ipynb @@ -59,7 +59,7 @@ "outputs": [], "source": [ "from langchain.llms import AlephAlpha\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/anyscale.ipynb b/docs/extras/integrations/llms/anyscale.ipynb index 3f9e2cc0b2..b94df06540 100644 --- a/docs/extras/integrations/llms/anyscale.ipynb +++ b/docs/extras/integrations/llms/anyscale.ipynb @@ -41,7 +41,7 @@ "outputs": [], "source": [ "from langchain.llms import Anyscale\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/azure_ml.ipynb b/docs/extras/integrations/llms/azure_ml.ipynb index 96fdf7494d..38c1cd2aea 100644 --- a/docs/extras/integrations/llms/azure_ml.ipynb +++ b/docs/extras/integrations/llms/azure_ml.ipynb @@ -154,7 +154,7 @@ } ], "source": [ - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "from langchain.llms.azureml_endpoint import DollyContentFormatter\n", "from langchain.chains import LLMChain\n", "\n", diff --git a/docs/extras/integrations/llms/banana.ipynb b/docs/extras/integrations/llms/banana.ipynb index b92db8daba..81453babd1 100644 --- a/docs/extras/integrations/llms/banana.ipynb +++ b/docs/extras/integrations/llms/banana.ipynb @@ -53,7 +53,7 @@ "outputs": [], "source": [ "from langchain.llms import Banana\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/baseten.ipynb b/docs/extras/integrations/llms/baseten.ipynb index b8e3d46b0e..7786578a64 100644 --- a/docs/extras/integrations/llms/baseten.ipynb +++ b/docs/extras/integrations/llms/baseten.ipynb @@ -107,7 +107,7 @@ "outputs": [], "source": [ "from langchain.chains import SimpleSequentialChain\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/bittensor.ipynb b/docs/extras/integrations/llms/bittensor.ipynb index d6f97dc6cb..c50f96fd75 100644 --- a/docs/extras/integrations/llms/bittensor.ipynb +++ b/docs/extras/integrations/llms/bittensor.ipynb @@ -80,7 +80,7 @@ "outputs": [], "source": [ "import langchain\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms import NIBittensorLLM\n", "\n", "langchain.debug = True\n", @@ -123,7 +123,7 @@ " AgentExecutor,\n", ")\n", "from langchain.memory import ConversationBufferMemory\n", - "from langchain import LLMChain, PromptTemplate\n", + "from langchain.chains import LLMChain\nfrom langchain.prompts import PromptTemplate\n", "from langchain.utilities import GoogleSearchAPIWrapper, SerpAPIWrapper\n", "from langchain.llms import NIBittensorLLM\n", "\n", diff --git a/docs/extras/integrations/llms/cerebriumai.ipynb b/docs/extras/integrations/llms/cerebriumai.ipynb index f7b32e92de..f9ea729c09 100644 --- a/docs/extras/integrations/llms/cerebriumai.ipynb +++ b/docs/extras/integrations/llms/cerebriumai.ipynb @@ -44,7 +44,7 @@ "source": [ "import os\n", "from langchain.llms import CerebriumAI\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/chatglm.ipynb b/docs/extras/integrations/llms/chatglm.ipynb index 0601925a5f..a1fbc3f95d 100644 --- a/docs/extras/integrations/llms/chatglm.ipynb +++ b/docs/extras/integrations/llms/chatglm.ipynb @@ -22,7 +22,7 @@ "outputs": [], "source": [ "from langchain.llms import ChatGLM\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "# import os" ] diff --git a/docs/extras/integrations/llms/clarifai.ipynb b/docs/extras/integrations/llms/clarifai.ipynb index f2fca728b7..7d58f35e16 100644 --- a/docs/extras/integrations/llms/clarifai.ipynb +++ b/docs/extras/integrations/llms/clarifai.ipynb @@ -82,7 +82,7 @@ "source": [ "# Import the required modules\n", "from langchain.llms import Clarifai\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/cohere.ipynb b/docs/extras/integrations/llms/cohere.ipynb index 0571292434..9795875ae6 100644 --- a/docs/extras/integrations/llms/cohere.ipynb +++ b/docs/extras/integrations/llms/cohere.ipynb @@ -59,7 +59,7 @@ "outputs": [], "source": [ "from langchain.llms import Cohere\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/ctransformers.ipynb b/docs/extras/integrations/llms/ctransformers.ipynb index 28ddfc6152..0539ca6c51 100644 --- a/docs/extras/integrations/llms/ctransformers.ipynb +++ b/docs/extras/integrations/llms/ctransformers.ipynb @@ -102,7 +102,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "template = \"\"\"Question: {question}\n", "\n", diff --git a/docs/extras/integrations/llms/ctranslate2.ipynb b/docs/extras/integrations/llms/ctranslate2.ipynb index 1554e13c55..dd0bf0978e 100644 --- a/docs/extras/integrations/llms/ctranslate2.ipynb +++ b/docs/extras/integrations/llms/ctranslate2.ipynb @@ -195,7 +195,7 @@ } ], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "template = \"\"\"{question}\n", "\n", diff --git a/docs/extras/integrations/llms/deepinfra.ipynb b/docs/extras/integrations/llms/deepinfra.ipynb index 45ba2ac8c5..ecb0fd6391 100644 --- a/docs/extras/integrations/llms/deepinfra.ipynb +++ b/docs/extras/integrations/llms/deepinfra.ipynb @@ -28,7 +28,7 @@ "source": [ "import os\n", "from langchain.llms import DeepInfra\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/edenai.ipynb b/docs/extras/integrations/llms/edenai.ipynb index 4b5ab69bdd..031f6986d6 100644 --- a/docs/extras/integrations/llms/edenai.ipynb +++ b/docs/extras/integrations/llms/edenai.ipynb @@ -103,7 +103,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "llm=EdenAI(feature=\"text\",provider=\"openai\",model=\"text-davinci-003\",temperature=0.2, max_tokens=250)\n", "\n", "prompt = \"\"\"\n", diff --git a/docs/extras/integrations/llms/fireworks.ipynb b/docs/extras/integrations/llms/fireworks.ipynb index 4da49230bf..70834f06b5 100644 --- a/docs/extras/integrations/llms/fireworks.ipynb +++ b/docs/extras/integrations/llms/fireworks.ipynb @@ -20,7 +20,7 @@ "outputs": [], "source": [ "from langchain.llms.fireworks import Fireworks, FireworksChat\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.prompts.chat import (\n", " ChatPromptTemplate,\n", " HumanMessagePromptTemplate,\n", diff --git a/docs/extras/integrations/llms/forefrontai.ipynb b/docs/extras/integrations/llms/forefrontai.ipynb index 8aca6234d1..5f988c25c9 100644 --- a/docs/extras/integrations/llms/forefrontai.ipynb +++ b/docs/extras/integrations/llms/forefrontai.ipynb @@ -27,7 +27,7 @@ "source": [ "import os\n", "from langchain.llms import ForefrontAI\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/google_vertex_ai_palm.ipynb b/docs/extras/integrations/llms/google_vertex_ai_palm.ipynb index b55f2771f1..0327465f34 100644 --- a/docs/extras/integrations/llms/google_vertex_ai_palm.ipynb +++ b/docs/extras/integrations/llms/google_vertex_ai_palm.ipynb @@ -66,7 +66,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/gooseai.ipynb b/docs/extras/integrations/llms/gooseai.ipynb index aaedce3a69..fc0fad0bdd 100644 --- a/docs/extras/integrations/llms/gooseai.ipynb +++ b/docs/extras/integrations/llms/gooseai.ipynb @@ -43,7 +43,7 @@ "source": [ "import os\n", "from langchain.llms import GooseAI\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/gpt4all.ipynb b/docs/extras/integrations/llms/gpt4all.ipynb index a8760ceeab..604f604999 100644 --- a/docs/extras/integrations/llms/gpt4all.ipynb +++ b/docs/extras/integrations/llms/gpt4all.ipynb @@ -47,7 +47,7 @@ }, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms import GPT4All\n", "from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler" ] diff --git a/docs/extras/integrations/llms/huggingface_hub.ipynb b/docs/extras/integrations/llms/huggingface_hub.ipynb index f635e5c679..8b0d33d9bb 100644 --- a/docs/extras/integrations/llms/huggingface_hub.ipynb +++ b/docs/extras/integrations/llms/huggingface_hub.ipynb @@ -91,7 +91,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import HuggingFaceHub" + "from langchain.llms import HuggingFaceHub" ] }, { @@ -101,7 +101,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/llamacpp.ipynb b/docs/extras/integrations/llms/llamacpp.ipynb index 71ba60db70..45df2ac8a8 100644 --- a/docs/extras/integrations/llms/llamacpp.ipynb +++ b/docs/extras/integrations/llms/llamacpp.ipynb @@ -189,7 +189,7 @@ "outputs": [], "source": [ "from langchain.llms import LlamaCpp\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.callbacks.manager import CallbackManager\n", "from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler" ] diff --git a/docs/extras/integrations/llms/manifest.ipynb b/docs/extras/integrations/llms/manifest.ipynb index 3664b20396..1238ae84f4 100644 --- a/docs/extras/integrations/llms/manifest.ipynb +++ b/docs/extras/integrations/llms/manifest.ipynb @@ -80,7 +80,7 @@ "outputs": [], "source": [ "# Map reduce example\n", - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "from langchain.text_splitter import CharacterTextSplitter\n", "from langchain.chains.mapreduce import MapReduceChain\n", "\n", diff --git a/docs/extras/integrations/llms/minimax.ipynb b/docs/extras/integrations/llms/minimax.ipynb index e889b99a91..fecad66fea 100644 --- a/docs/extras/integrations/llms/minimax.ipynb +++ b/docs/extras/integrations/llms/minimax.ipynb @@ -94,7 +94,7 @@ "outputs": [], "source": [ "from langchain.llms import Minimax\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ], "metadata": { "collapsed": false diff --git a/docs/extras/integrations/llms/modal.ipynb b/docs/extras/integrations/llms/modal.ipynb index 719c7ce54c..c2031e0a9d 100644 --- a/docs/extras/integrations/llms/modal.ipynb +++ b/docs/extras/integrations/llms/modal.ipynb @@ -108,7 +108,7 @@ "outputs": [], "source": [ "from langchain.llms import Modal\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/mosaicml.ipynb b/docs/extras/integrations/llms/mosaicml.ipynb index cd9be156fc..08d378cdcc 100644 --- a/docs/extras/integrations/llms/mosaicml.ipynb +++ b/docs/extras/integrations/llms/mosaicml.ipynb @@ -43,7 +43,7 @@ "outputs": [], "source": [ "from langchain.llms import MosaicML\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/nlpcloud.ipynb b/docs/extras/integrations/llms/nlpcloud.ipynb index 931a317c9d..d8d0e2daf3 100644 --- a/docs/extras/integrations/llms/nlpcloud.ipynb +++ b/docs/extras/integrations/llms/nlpcloud.ipynb @@ -73,7 +73,7 @@ "outputs": [], "source": [ "from langchain.llms import NLPCloud\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/octoai.ipynb b/docs/extras/integrations/llms/octoai.ipynb index d783c1e511..79324cd9ac 100644 --- a/docs/extras/integrations/llms/octoai.ipynb +++ b/docs/extras/integrations/llms/octoai.ipynb @@ -43,7 +43,7 @@ "outputs": [], "source": [ "from langchain.llms.octoai_endpoint import OctoAIEndpoint\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/ollama.ipynb b/docs/extras/integrations/llms/ollama.ipynb index 49f8ae8f53..9e2a31c258 100644 --- a/docs/extras/integrations/llms/ollama.ipynb +++ b/docs/extras/integrations/llms/ollama.ipynb @@ -206,7 +206,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "\n", "# Prompt\n", "template = \"\"\"Use the following pieces of context to answer the question at the end. \n", diff --git a/docs/extras/integrations/llms/opaqueprompts.ipynb b/docs/extras/integrations/llms/opaqueprompts.ipynb index 132b37e8ce..c2ec73fe41 100644 --- a/docs/extras/integrations/llms/opaqueprompts.ipynb +++ b/docs/extras/integrations/llms/opaqueprompts.ipynb @@ -59,7 +59,7 @@ "outputs": [], "source": [ "import langchain\n", - "from langchain import LLMChain, PromptTemplate\n", + "from langchain.chains import LLMChain\nfrom langchain.prompts import PromptTemplate\n", "from langchain.callbacks.stdout import StdOutCallbackHandler\n", "from langchain.llms import OpenAI\n", "from langchain.memory import ConversationBufferWindowMemory\n", diff --git a/docs/extras/integrations/llms/openai.ipynb b/docs/extras/integrations/llms/openai.ipynb index 9cd691e104..3bd1da7c82 100644 --- a/docs/extras/integrations/llms/openai.ipynb +++ b/docs/extras/integrations/llms/openai.ipynb @@ -67,7 +67,7 @@ "outputs": [], "source": [ "from langchain.llms import OpenAI\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/openllm.ipynb b/docs/extras/integrations/llms/openllm.ipynb index 9038ef262a..6d85ea29b0 100644 --- a/docs/extras/integrations/llms/openllm.ipynb +++ b/docs/extras/integrations/llms/openllm.ipynb @@ -114,7 +114,7 @@ } ], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "template = \"What is a good name for a company that makes {product}?\"\n", "\n", diff --git a/docs/extras/integrations/llms/openlm.ipynb b/docs/extras/integrations/llms/openlm.ipynb index 997d321f12..ecb4f0ee0c 100644 --- a/docs/extras/integrations/llms/openlm.ipynb +++ b/docs/extras/integrations/llms/openlm.ipynb @@ -71,7 +71,7 @@ "outputs": [], "source": [ "from langchain.llms import OpenLM\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/petals.ipynb b/docs/extras/integrations/llms/petals.ipynb index d2d386af7f..1128429e78 100644 --- a/docs/extras/integrations/llms/petals.ipynb +++ b/docs/extras/integrations/llms/petals.ipynb @@ -45,7 +45,7 @@ "source": [ "import os\n", "from langchain.llms import Petals\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/pipelineai.ipynb b/docs/extras/integrations/llms/pipelineai.ipynb index 509a61f03a..7e89832fd6 100644 --- a/docs/extras/integrations/llms/pipelineai.ipynb +++ b/docs/extras/integrations/llms/pipelineai.ipynb @@ -50,7 +50,7 @@ "source": [ "import os\n", "from langchain.llms import PipelineAI\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/predictionguard.ipynb b/docs/extras/integrations/llms/predictionguard.ipynb index ed0225b157..83950aefea 100644 --- a/docs/extras/integrations/llms/predictionguard.ipynb +++ b/docs/extras/integrations/llms/predictionguard.ipynb @@ -32,7 +32,7 @@ "\n", "import predictionguard as pg\n", "from langchain.llms import PredictionGuard\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ], "id": "7191a5ce" }, diff --git a/docs/extras/integrations/llms/replicate.ipynb b/docs/extras/integrations/llms/replicate.ipynb index abc7d9e7dd..60bff90a40 100644 --- a/docs/extras/integrations/llms/replicate.ipynb +++ b/docs/extras/integrations/llms/replicate.ipynb @@ -104,7 +104,7 @@ "outputs": [], "source": [ "from langchain.llms import Replicate\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/runhouse.ipynb b/docs/extras/integrations/llms/runhouse.ipynb index 209975b355..27b3c5c919 100644 --- a/docs/extras/integrations/llms/runhouse.ipynb +++ b/docs/extras/integrations/llms/runhouse.ipynb @@ -44,7 +44,7 @@ ], "source": [ "from langchain.llms import SelfHostedPipeline, SelfHostedHuggingFaceLLM\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "import runhouse as rh" ] }, diff --git a/docs/extras/integrations/llms/sagemaker.ipynb b/docs/extras/integrations/llms/sagemaker.ipynb index bbdbd5a6da..067aeaaa56 100644 --- a/docs/extras/integrations/llms/sagemaker.ipynb +++ b/docs/extras/integrations/llms/sagemaker.ipynb @@ -92,7 +92,7 @@ "source": [ "from typing import Dict\n", "\n", - "from langchain import PromptTemplate, SagemakerEndpoint\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.llms import SagemakerEndpoint\n", "from langchain.llms.sagemaker_endpoint import LLMContentHandler\n", "from langchain.chains.question_answering import load_qa_chain\n", "import json\n", diff --git a/docs/extras/integrations/llms/stochasticai.ipynb b/docs/extras/integrations/llms/stochasticai.ipynb index 26dcacc236..efd4db43b9 100644 --- a/docs/extras/integrations/llms/stochasticai.ipynb +++ b/docs/extras/integrations/llms/stochasticai.ipynb @@ -80,7 +80,7 @@ "outputs": [], "source": [ "from langchain.llms import StochasticAI\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/symblai_nebula.ipynb b/docs/extras/integrations/llms/symblai_nebula.ipynb index 304917a5cf..3faab38216 100644 --- a/docs/extras/integrations/llms/symblai_nebula.ipynb +++ b/docs/extras/integrations/llms/symblai_nebula.ipynb @@ -54,7 +54,7 @@ "execution_count": null, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "conversation = \"\"\"Sam: Good morning, team! Let's keep this standup concise. We'll go in the usual order: what you did yesterday, what you plan to do today, and any blockers. Alex, kick us off.\n", "Alex: Morning! Yesterday, I wrapped up the UI for the user dashboard. The new charts and widgets are now responsive. I also had a sync with the design team to ensure the final touchups are in line with the brand guidelines. Today, I'll start integrating the frontend with the new API endpoints Rhea was working on. The only blocker is waiting for some final API documentation, but I guess Rhea can update on that.\n", diff --git a/docs/extras/integrations/llms/textgen.ipynb b/docs/extras/integrations/llms/textgen.ipynb index 3ffd83e69f..411f2e9c33 100644 --- a/docs/extras/integrations/llms/textgen.ipynb +++ b/docs/extras/integrations/llms/textgen.ipynb @@ -44,7 +44,7 @@ "outputs": [], "source": [ "import langchain\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms import TextGen\n", "\n", "langchain.debug = True\n", @@ -93,7 +93,7 @@ "outputs": [], "source": [ "import langchain\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.llms import TextGen\n", "from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler\n", "\n", diff --git a/docs/extras/integrations/llms/titan_takeoff.ipynb b/docs/extras/integrations/llms/titan_takeoff.ipynb index 5b8fddcb1e..5ccff18764 100644 --- a/docs/extras/integrations/llms/titan_takeoff.ipynb +++ b/docs/extras/integrations/llms/titan_takeoff.ipynb @@ -157,7 +157,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "llm = TitanTakeoff()\n", "\n", diff --git a/docs/extras/integrations/llms/tongyi.ipynb b/docs/extras/integrations/llms/tongyi.ipynb index c8e1b1a596..6fb8cb336c 100644 --- a/docs/extras/integrations/llms/tongyi.ipynb +++ b/docs/extras/integrations/llms/tongyi.ipynb @@ -76,7 +76,7 @@ "outputs": [], "source": [ "from langchain.llms import Tongyi\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/vllm.ipynb b/docs/extras/integrations/llms/vllm.ipynb index 8a9ff01df1..b4f491f47a 100644 --- a/docs/extras/integrations/llms/vllm.ipynb +++ b/docs/extras/integrations/llms/vllm.ipynb @@ -128,7 +128,7 @@ } ], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "template = \"\"\"Question: {question}\n", "\n", diff --git a/docs/extras/integrations/llms/writer.ipynb b/docs/extras/integrations/llms/writer.ipynb index 208155309f..dc7451048f 100644 --- a/docs/extras/integrations/llms/writer.ipynb +++ b/docs/extras/integrations/llms/writer.ipynb @@ -56,7 +56,7 @@ "outputs": [], "source": [ "from langchain.llms import Writer\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/llms/xinference.ipynb b/docs/extras/integrations/llms/xinference.ipynb index d4010cf34f..037470e8a0 100644 --- a/docs/extras/integrations/llms/xinference.ipynb +++ b/docs/extras/integrations/llms/xinference.ipynb @@ -122,7 +122,7 @@ } ], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "template = \"Where can we visit in the capital of {country}?\"\n", "\n", diff --git a/docs/extras/integrations/memory/motorhead_memory.ipynb b/docs/extras/integrations/memory/motorhead_memory.ipynb index 7801e0f3c8..87ded21c3e 100644 --- a/docs/extras/integrations/memory/motorhead_memory.ipynb +++ b/docs/extras/integrations/memory/motorhead_memory.ipynb @@ -20,7 +20,7 @@ "outputs": [], "source": [ "from langchain.memory.motorhead_memory import MotorheadMemory\n", - "from langchain import OpenAI, LLMChain, PromptTemplate\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\nfrom langchain.prompts import PromptTemplate\n", "\n", "template = \"\"\"You are a chatbot having a conversation with a human.\n", "\n", diff --git a/docs/extras/integrations/memory/motorhead_memory_managed.ipynb b/docs/extras/integrations/memory/motorhead_memory_managed.ipynb index f577bef8d9..bfaee89cbc 100644 --- a/docs/extras/integrations/memory/motorhead_memory_managed.ipynb +++ b/docs/extras/integrations/memory/motorhead_memory_managed.ipynb @@ -21,7 +21,7 @@ "outputs": [], "source": [ "from langchain.memory.motorhead_memory import MotorheadMemory\n", - "from langchain import OpenAI, LLMChain, PromptTemplate\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\nfrom langchain.prompts import PromptTemplate\n", "\n", "template = \"\"\"You are a chatbot having a conversation with a human.\n", "\n", diff --git a/docs/extras/integrations/memory/zep_memory.ipynb b/docs/extras/integrations/memory/zep_memory.ipynb index aa4d668665..f30816acc4 100644 --- a/docs/extras/integrations/memory/zep_memory.ipynb +++ b/docs/extras/integrations/memory/zep_memory.ipynb @@ -49,7 +49,7 @@ "source": [ "from langchain.memory import ZepMemory\n", "from langchain.retrievers import ZepRetriever\n", - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.schema import HumanMessage, AIMessage\n", "from langchain.utilities import WikipediaAPIWrapper\n", "from langchain.agents import initialize_agent, AgentType, Tool\n", diff --git a/docs/extras/integrations/providers/cnosdb.mdx b/docs/extras/integrations/providers/cnosdb.mdx index eab53c9bfc..60cadd2820 100644 --- a/docs/extras/integrations/providers/cnosdb.mdx +++ b/docs/extras/integrations/providers/cnosdb.mdx @@ -31,7 +31,7 @@ Args: ## Examples ```python # Connecting to CnosDB with SQLDatabase Wrapper -from langchain import SQLDatabase +from langchain.utilities import SQLDatabase db = SQLDatabase.from_cnosdb() ``` @@ -45,7 +45,7 @@ llm = ChatOpenAI(temperature=0, model_name="gpt-3.5-turbo") ### SQL Database Chain This example demonstrates the use of the SQL Chain for answering a question over a CnosDB. ```python -from langchain import SQLDatabaseChain +from langchain.utilities import SQLDatabaseChain db_chain = SQLDatabaseChain.from_llm(llm, db, verbose=True) diff --git a/docs/extras/integrations/providers/databricks.ipynb b/docs/extras/integrations/providers/databricks.ipynb index 4064b1c264..c37794143b 100644 --- a/docs/extras/integrations/providers/databricks.ipynb +++ b/docs/extras/integrations/providers/databricks.ipynb @@ -80,7 +80,7 @@ "outputs": [], "source": [ "# Connecting to Databricks with SQLDatabase wrapper\n", - "from langchain import SQLDatabase\n", + "from langchain.utilities import SQLDatabase\n", "\n", "db = SQLDatabase.from_databricks(catalog=\"samples\", schema=\"nyctaxi\")" ] @@ -115,7 +115,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import SQLDatabaseChain\n", + "from langchain.utilities import SQLDatabaseChain\n", "\n", "db_chain = SQLDatabaseChain.from_llm(llm, db, verbose=True)" ] diff --git a/docs/extras/integrations/providers/jina.mdx b/docs/extras/integrations/providers/jina.mdx index 560c220740..bec3e9fd78 100644 --- a/docs/extras/integrations/providers/jina.mdx +++ b/docs/extras/integrations/providers/jina.mdx @@ -37,7 +37,8 @@ from lcserve import serving @serving def ask(input: str) -> str: - from langchain import LLMChain, OpenAI + from langchain.chains import LLMChain + from langchain.llms import OpenAI from langchain.agents import AgentExecutor, ZeroShotAgent tools = [...] # list of tools diff --git a/docs/extras/integrations/providers/log10.mdx b/docs/extras/integrations/providers/log10.mdx index 6511cb8d43..a4d634566d 100644 --- a/docs/extras/integrations/providers/log10.mdx +++ b/docs/extras/integrations/providers/log10.mdx @@ -40,7 +40,7 @@ llm = ChatOpenAI(model_name="gpt-3.5-turbo", callbacks=[log10_callback]) ## How to use tags with Log10 ```python -from langchain import OpenAI +from langchain.llms import OpenAI from langchain.chat_models import ChatAnthropic from langchain.chat_models import ChatOpenAI from langchain.schema import HumanMessage @@ -74,7 +74,7 @@ You can also intermix direct OpenAI calls and Langchain LLM calls: import os from log10.load import log10, log10_session import openai -from langchain import OpenAI +from langchain.llms import OpenAI log10(openai) diff --git a/docs/extras/integrations/providers/mlflow_ai_gateway.mdx b/docs/extras/integrations/providers/mlflow_ai_gateway.mdx index aaeb84f2f5..6931a90cf9 100644 --- a/docs/extras/integrations/providers/mlflow_ai_gateway.mdx +++ b/docs/extras/integrations/providers/mlflow_ai_gateway.mdx @@ -60,7 +60,7 @@ See the [API documentation and examples](https://www.mlflow.org/docs/latest/pyth ```python import mlflow -from langchain import LLMChain, PromptTemplate +from langchain.chains import LLMChain, PromptTemplate from langchain.llms import MlflowAIGateway gateway = MlflowAIGateway( @@ -134,7 +134,8 @@ Databricks MLflow AI Gateway is in private preview. Please contact a Databricks representative to enroll in the preview. ```python -from langchain import LLMChain, PromptTemplate +from langchain.chains import LLMChain +from langchain.prompts import PromptTemplate from langchain.llms import MlflowAIGateway gateway = MlflowAIGateway( diff --git a/docs/extras/integrations/providers/motherduck.mdx b/docs/extras/integrations/providers/motherduck.mdx index a388bd96fc..9f6d79146d 100644 --- a/docs/extras/integrations/providers/motherduck.mdx +++ b/docs/extras/integrations/providers/motherduck.mdx @@ -26,7 +26,7 @@ conn_str = f"duckdb:///md:{token}@my_db" You can use the SQLChain to query data in your Motherduck instance in natural language. ``` -from langchain import OpenAI, SQLDatabase, SQLDatabaseChain +from langchain.llms import OpenAI, SQLDatabase, SQLDatabaseChain db = SQLDatabase.from_uri(conn_str) db_chain = SQLDatabaseChain.from_llm(OpenAI(temperature=0), db, verbose=True) ``` diff --git a/docs/extras/integrations/providers/predictionguard.mdx b/docs/extras/integrations/providers/predictionguard.mdx index 06766504f7..f953e37eff 100644 --- a/docs/extras/integrations/providers/predictionguard.mdx +++ b/docs/extras/integrations/providers/predictionguard.mdx @@ -37,7 +37,7 @@ import os import predictionguard as pg from langchain.llms import PredictionGuard -from langchain import PromptTemplate, LLMChain +from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain # Your Prediction Guard API key. Get one at predictionguard.com os.environ["PREDICTIONGUARD_TOKEN"] = "" @@ -76,7 +76,7 @@ Basic LLM Chaining with the Prediction Guard wrapper: ```python import os -from langchain import PromptTemplate, LLMChain +from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain from langchain.llms import PredictionGuard # Optional, add your OpenAI API Key. This is optional, as Prediction Guard allows diff --git a/docs/extras/integrations/providers/ray_serve.ipynb b/docs/extras/integrations/providers/ray_serve.ipynb index da26930ad2..0e56b3d37c 100644 --- a/docs/extras/integrations/providers/ray_serve.ipynb +++ b/docs/extras/integrations/providers/ray_serve.ipynb @@ -108,7 +108,7 @@ "outputs": [], "source": [ "from langchain.llms import OpenAI\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/providers/shaleprotocol.md b/docs/extras/integrations/providers/shaleprotocol.md index 0ffa6294bd..332963050e 100644 --- a/docs/extras/integrations/providers/shaleprotocol.md +++ b/docs/extras/integrations/providers/shaleprotocol.md @@ -20,7 +20,7 @@ As of June 2023, the API supports Vicuna-13B by default. We are going to support For example ```python from langchain.llms import OpenAI -from langchain import PromptTemplate, LLMChain +from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain import os os.environ['OPENAI_API_BASE'] = "https://shale.live/v1" diff --git a/docs/extras/integrations/retrievers/google_drive.ipynb b/docs/extras/integrations/retrievers/google_drive.ipynb index caf0bf3092..77de80be30 100644 --- a/docs/extras/integrations/retrievers/google_drive.ipynb +++ b/docs/extras/integrations/retrievers/google_drive.ipynb @@ -204,7 +204,7 @@ }, "outputs": [], "source": [ - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "retriever = GoogleDriveRetriever(\n", " template=PromptTemplate(input_variables=['query'],\n", " # See https://developers.google.com/drive/api/guides/search-files\n", diff --git a/docs/extras/integrations/retrievers/re_phrase.ipynb b/docs/extras/integrations/retrievers/re_phrase.ipynb index 31221663e3..1432a8d20e 100644 --- a/docs/extras/integrations/retrievers/re_phrase.ipynb +++ b/docs/extras/integrations/retrievers/re_phrase.ipynb @@ -150,7 +150,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import LLMChain\n", + "from langchain.chains import LLMChain\n", "from langchain.prompts import PromptTemplate\n", "\n", "QUERY_PROMPT = PromptTemplate(\n", diff --git a/docs/extras/integrations/text_embedding/clarifai.ipynb b/docs/extras/integrations/text_embedding/clarifai.ipynb index 17c7cf454a..1fb53e49fc 100644 --- a/docs/extras/integrations/text_embedding/clarifai.ipynb +++ b/docs/extras/integrations/text_embedding/clarifai.ipynb @@ -82,7 +82,7 @@ "source": [ "# Import the required modules\n", "from langchain.embeddings import ClarifaiEmbeddings\n", - "from langchain import PromptTemplate, LLMChain" + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/integrations/toolkits/amadeus.ipynb b/docs/extras/integrations/toolkits/amadeus.ipynb index baa9288dcd..91fc4bb9e1 100644 --- a/docs/extras/integrations/toolkits/amadeus.ipynb +++ b/docs/extras/integrations/toolkits/amadeus.ipynb @@ -81,7 +81,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType" ] }, diff --git a/docs/extras/integrations/toolkits/azure_cognitive_services.ipynb b/docs/extras/integrations/toolkits/azure_cognitive_services.ipynb index 609cc2e4e4..de9d16c656 100644 --- a/docs/extras/integrations/toolkits/azure_cognitive_services.ipynb +++ b/docs/extras/integrations/toolkits/azure_cognitive_services.ipynb @@ -105,7 +105,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType" ] }, diff --git a/docs/extras/integrations/toolkits/gmail.ipynb b/docs/extras/integrations/toolkits/gmail.ipynb index d24ded1f36..9ae8fc2b8d 100644 --- a/docs/extras/integrations/toolkits/gmail.ipynb +++ b/docs/extras/integrations/toolkits/gmail.ipynb @@ -118,7 +118,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType" ] }, diff --git a/docs/extras/integrations/toolkits/google_drive.ipynb b/docs/extras/integrations/toolkits/google_drive.ipynb index 38ee843d43..7e5bc413d2 100644 --- a/docs/extras/integrations/toolkits/google_drive.ipynb +++ b/docs/extras/integrations/toolkits/google_drive.ipynb @@ -167,7 +167,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType\n", "llm = OpenAI(temperature=0)\n", "agent = initialize_agent(\n", diff --git a/docs/extras/integrations/toolkits/multion.ipynb b/docs/extras/integrations/toolkits/multion.ipynb index 5502d3e704..7f168d001b 100644 --- a/docs/extras/integrations/toolkits/multion.ipynb +++ b/docs/extras/integrations/toolkits/multion.ipynb @@ -81,7 +81,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType\n", "llm = OpenAI(temperature=0)\n", "from langchain.agents.agent_toolkits import MultionToolkit\n", diff --git a/docs/extras/integrations/toolkits/office365.ipynb b/docs/extras/integrations/toolkits/office365.ipynb index 350bcc0495..c22f2a047e 100644 --- a/docs/extras/integrations/toolkits/office365.ipynb +++ b/docs/extras/integrations/toolkits/office365.ipynb @@ -93,7 +93,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType" ] }, diff --git a/docs/extras/integrations/toolkits/vectorstore.ipynb b/docs/extras/integrations/toolkits/vectorstore.ipynb index db388fdb07..75909b6406 100644 --- a/docs/extras/integrations/toolkits/vectorstore.ipynb +++ b/docs/extras/integrations/toolkits/vectorstore.ipynb @@ -30,7 +30,7 @@ "from langchain.embeddings.openai import OpenAIEmbeddings\n", "from langchain.vectorstores import Chroma\n", "from langchain.text_splitter import CharacterTextSplitter\n", - "from langchain import OpenAI, VectorDBQA\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import VectorDBQA\n", "\n", "llm = OpenAI(temperature=0)" ] diff --git a/docs/extras/integrations/tools/awslambda.ipynb b/docs/extras/integrations/tools/awslambda.ipynb index be44befa2d..30a9fb968d 100644 --- a/docs/extras/integrations/tools/awslambda.ipynb +++ b/docs/extras/integrations/tools/awslambda.ipynb @@ -61,7 +61,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import load_tools, initialize_agent, AgentType\n", "\n", "llm = OpenAI(temperature=0)\n", diff --git a/docs/extras/integrations/tools/eleven_labs_tts.ipynb b/docs/extras/integrations/tools/eleven_labs_tts.ipynb index 093679c8d1..55a9d3fd80 100644 --- a/docs/extras/integrations/tools/eleven_labs_tts.ipynb +++ b/docs/extras/integrations/tools/eleven_labs_tts.ipynb @@ -126,7 +126,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType, load_tools" ] }, diff --git a/docs/extras/integrations/tools/google_drive.ipynb b/docs/extras/integrations/tools/google_drive.ipynb index c8ad25c2cc..6dbd337c3b 100644 --- a/docs/extras/integrations/tools/google_drive.ipynb +++ b/docs/extras/integrations/tools/google_drive.ipynb @@ -167,7 +167,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType\n", "llm = OpenAI(temperature=0)\n", "agent = initialize_agent(\n", diff --git a/docs/extras/integrations/tools/graphql.ipynb b/docs/extras/integrations/tools/graphql.ipynb index 6cdd3d3019..76a3cf910f 100644 --- a/docs/extras/integrations/tools/graphql.ipynb +++ b/docs/extras/integrations/tools/graphql.ipynb @@ -43,7 +43,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import load_tools, initialize_agent, AgentType\n", "from langchain.utilities import GraphQLAPIWrapper\n", "\n", diff --git a/docs/extras/integrations/tools/lemonai.ipynb b/docs/extras/integrations/tools/lemonai.ipynb index 454d3b9312..79cf1d6e17 100644 --- a/docs/extras/integrations/tools/lemonai.ipynb +++ b/docs/extras/integrations/tools/lemonai.ipynb @@ -126,7 +126,7 @@ "source": [ "import os\n", "from lemonai import execute_workflow\n", - "from langchain import OpenAI" + "from langchain.llms import OpenAI" ] }, { diff --git a/docs/extras/integrations/vectorstores/marqo.ipynb b/docs/extras/integrations/vectorstores/marqo.ipynb index 13f0164e7f..d208f7a6f7 100644 --- a/docs/extras/integrations/vectorstores/marqo.ipynb +++ b/docs/extras/integrations/vectorstores/marqo.ipynb @@ -474,7 +474,7 @@ ], "source": [ "from langchain.chains import RetrievalQAWithSourcesChain\n", - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "\n", "import os\n", "import getpass\n", diff --git a/docs/extras/integrations/vectorstores/starrocks.ipynb b/docs/extras/integrations/vectorstores/starrocks.ipynb index 6291d49f23..39d4de18ae 100644 --- a/docs/extras/integrations/vectorstores/starrocks.ipynb +++ b/docs/extras/integrations/vectorstores/starrocks.ipynb @@ -62,7 +62,7 @@ "from langchain.vectorstores.starrocks import StarRocksSettings\n", "from langchain.vectorstores import Chroma\n", "from langchain.text_splitter import CharacterTextSplitter, TokenTextSplitter\n", - "from langchain import OpenAI, VectorDBQA\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import VectorDBQA\n", "from langchain.document_loaders import DirectoryLoader\n", "from langchain.chains import RetrievalQA\n", "from langchain.document_loaders import TextLoader, UnstructuredMarkdownLoader\n", diff --git a/docs/extras/integrations/vectorstores/vearch.ipynb b/docs/extras/integrations/vectorstores/vearch.ipynb index 8e14c12369..efddac3eb5 100644 --- a/docs/extras/integrations/vectorstores/vearch.ipynb +++ b/docs/extras/integrations/vectorstores/vearch.ipynb @@ -39,7 +39,7 @@ "\n", "import os, sys, torch\n", "from transformers import AutoTokenizer, AutoModelForCausalLM, AutoModel\n", - "from langchain import HuggingFacePipeline, ConversationChain\n", + "from langchain.llms import HuggingFacePipeline\nfrom langchain.chains import ConversationChain\n", "from langchain.text_splitter import RecursiveCharacterTextSplitter\n", "from langchain.vectorstores.vearch import VearchDb\n", "from langchain.document_loaders import TextLoader\n", diff --git a/docs/extras/integrations/vectorstores/weaviate.ipynb b/docs/extras/integrations/vectorstores/weaviate.ipynb index 382baab971..7b25d80d62 100644 --- a/docs/extras/integrations/vectorstores/weaviate.ipynb +++ b/docs/extras/integrations/vectorstores/weaviate.ipynb @@ -332,7 +332,7 @@ "outputs": [], "source": [ "from langchain.chains import RetrievalQAWithSourcesChain\n", - "from langchain import OpenAI" + "from langchain.llms import OpenAI" ] }, { diff --git a/docs/extras/modules/agents/agent_types/openai_multi_functions_agent.ipynb b/docs/extras/modules/agents/agent_types/openai_multi_functions_agent.ipynb index b2b1885388..5c8d1c1012 100644 --- a/docs/extras/modules/agents/agent_types/openai_multi_functions_agent.ipynb +++ b/docs/extras/modules/agents/agent_types/openai_multi_functions_agent.ipynb @@ -23,7 +23,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import SerpAPIWrapper\n", + "from langchain.utilities import SerpAPIWrapper\n", "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", "from langchain.chat_models import ChatOpenAI" diff --git a/docs/extras/modules/agents/agent_types/react_docstore.ipynb b/docs/extras/modules/agents/agent_types/react_docstore.ipynb index c18a491448..ede8d0a097 100644 --- a/docs/extras/modules/agents/agent_types/react_docstore.ipynb +++ b/docs/extras/modules/agents/agent_types/react_docstore.ipynb @@ -17,7 +17,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI, Wikipedia\n", + "from langchain.llms import OpenAI\from langchain.utilities import Wikipedia\n", "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", "from langchain.agents.react.base import DocstoreExplorer\n", diff --git a/docs/extras/modules/agents/agent_types/self_ask_with_search.ipynb b/docs/extras/modules/agents/agent_types/self_ask_with_search.ipynb index 673a13eddb..59c9c9ff07 100644 --- a/docs/extras/modules/agents/agent_types/self_ask_with_search.ipynb +++ b/docs/extras/modules/agents/agent_types/self_ask_with_search.ipynb @@ -45,7 +45,7 @@ } ], "source": [ - "from langchain import OpenAI, SerpAPIWrapper\n", + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\n", "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", "\n", diff --git a/docs/extras/modules/agents/how_to/add_memory_openai_functions.ipynb b/docs/extras/modules/agents/how_to/add_memory_openai_functions.ipynb index c69ce64976..6530f477e5 100644 --- a/docs/extras/modules/agents/how_to/add_memory_openai_functions.ipynb +++ b/docs/extras/modules/agents/how_to/add_memory_openai_functions.ipynb @@ -17,13 +17,11 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import (\n", - " LLMMathChain,\n", - " OpenAI,\n", - " SerpAPIWrapper,\n", - " SQLDatabase,\n", - " SQLDatabaseChain,\n", - ")\n", + "from langchain.chains import LLMMathChain\n", + "from langchain.llms import OpenAI\n", + "from langchain.utilities import SerpAPIWrapper\n", + "from langchain.utilities import SQLDatabase\n", + "from langchain_experimental.sql import SQLDatabaseChain\n", "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", "from langchain.chat_models import ChatOpenAI" diff --git a/docs/extras/modules/agents/how_to/agent_iter.ipynb b/docs/extras/modules/agents/how_to/agent_iter.ipynb index 35a32f83b5..280e73eabc 100644 --- a/docs/extras/modules/agents/how_to/agent_iter.ipynb +++ b/docs/extras/modules/agents/how_to/agent_iter.ipynb @@ -29,7 +29,7 @@ "from langchain.agents import AgentExecutor, initialize_agent, AgentType\n", "from langchain.schema import AgentFinish\n", "from langchain.agents.tools import Tool\n", - "from langchain import LLMMathChain\n", + "from langchain.chains import LLMMathChain\n", "from langchain.chat_models import ChatOpenAI" ] }, diff --git a/docs/extras/modules/agents/how_to/agent_vectorstore.ipynb b/docs/extras/modules/agents/how_to/agent_vectorstore.ipynb index 7259982e94..611d61e70d 100644 --- a/docs/extras/modules/agents/how_to/agent_vectorstore.ipynb +++ b/docs/extras/modules/agents/how_to/agent_vectorstore.ipynb @@ -166,7 +166,7 @@ "from langchain.agents import AgentType\n", "from langchain.tools import BaseTool\n", "from langchain.llms import OpenAI\n", - "from langchain import LLMMathChain, SerpAPIWrapper" + "from langchain.chains import LLMMathChain\nfrom langchain.utilities import SerpAPIWrapper" ] }, { diff --git a/docs/extras/modules/agents/how_to/chatgpt_clone.ipynb b/docs/extras/modules/agents/how_to/chatgpt_clone.ipynb index 7b5bba41a7..009ff2eb96 100644 --- a/docs/extras/modules/agents/how_to/chatgpt_clone.ipynb +++ b/docs/extras/modules/agents/how_to/chatgpt_clone.ipynb @@ -47,7 +47,7 @@ } ], "source": [ - "from langchain import OpenAI, ConversationChain, LLMChain, PromptTemplate\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import ConversationChain, LLMChain\nfrom langchain.prompts import PromptTemplate\n", "from langchain.memory import ConversationBufferWindowMemory\n", "\n", "\n", diff --git a/docs/extras/modules/agents/how_to/custom_agent.ipynb b/docs/extras/modules/agents/how_to/custom_agent.ipynb index 19faa567e1..071deb1486 100644 --- a/docs/extras/modules/agents/how_to/custom_agent.ipynb +++ b/docs/extras/modules/agents/how_to/custom_agent.ipynb @@ -26,7 +26,7 @@ "outputs": [], "source": [ "from langchain.agents import Tool, AgentExecutor, BaseSingleActionAgent\n", - "from langchain import OpenAI, SerpAPIWrapper" + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper" ] }, { diff --git a/docs/extras/modules/agents/how_to/custom_agent_with_tool_retrieval.ipynb b/docs/extras/modules/agents/how_to/custom_agent_with_tool_retrieval.ipynb index 5d8bbd372d..5471eec006 100644 --- a/docs/extras/modules/agents/how_to/custom_agent_with_tool_retrieval.ipynb +++ b/docs/extras/modules/agents/how_to/custom_agent_with_tool_retrieval.ipynb @@ -38,7 +38,7 @@ " AgentOutputParser,\n", ")\n", "from langchain.prompts import StringPromptTemplate\n", - "from langchain import OpenAI, SerpAPIWrapper, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\nfrom langchain.chains import LLMChain\n", "from typing import List, Union\n", "from langchain.schema import AgentAction, AgentFinish\n", "import re" diff --git a/docs/extras/modules/agents/how_to/custom_mrkl_agent.ipynb b/docs/extras/modules/agents/how_to/custom_mrkl_agent.ipynb index 9892f2450c..7b7ddebe3a 100644 --- a/docs/extras/modules/agents/how_to/custom_mrkl_agent.ipynb +++ b/docs/extras/modules/agents/how_to/custom_mrkl_agent.ipynb @@ -48,7 +48,7 @@ "outputs": [], "source": [ "from langchain.agents import ZeroShotAgent, Tool, AgentExecutor\n", - "from langchain import OpenAI, SerpAPIWrapper, LLMChain" + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\nfrom langchain.chains import LLMChain" ] }, { diff --git a/docs/extras/modules/agents/how_to/custom_multi_action_agent.ipynb b/docs/extras/modules/agents/how_to/custom_multi_action_agent.ipynb index 1dedebc194..11c204cce7 100644 --- a/docs/extras/modules/agents/how_to/custom_multi_action_agent.ipynb +++ b/docs/extras/modules/agents/how_to/custom_multi_action_agent.ipynb @@ -26,7 +26,7 @@ "outputs": [], "source": [ "from langchain.agents import Tool, AgentExecutor, BaseMultiActionAgent\n", - "from langchain import OpenAI, SerpAPIWrapper" + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper" ] }, { diff --git a/docs/extras/modules/agents/how_to/handle_parsing_errors.ipynb b/docs/extras/modules/agents/how_to/handle_parsing_errors.ipynb index c56c1b36ae..c2bcea22fd 100644 --- a/docs/extras/modules/agents/how_to/handle_parsing_errors.ipynb +++ b/docs/extras/modules/agents/how_to/handle_parsing_errors.ipynb @@ -25,12 +25,11 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import (\n", - " OpenAI,\n", - " LLMMathChain,\n", - " SerpAPIWrapper,\n", - " SQLDatabase,\n", - " SQLDatabaseChain,\n", + "from langchain.llms import OpenAI\n", + "from langchain.chains import LLMMathChain\n", + "from langchain.utilities import SerpAPIWrapper\n", + "from langchain.utilities import SQLDatabase\n", + "from langchain_experimental.sql import SQLDatabaseChain\n", ")\n", "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", diff --git a/docs/extras/modules/agents/how_to/sharedmemory_for_tools.ipynb b/docs/extras/modules/agents/how_to/sharedmemory_for_tools.ipynb index 66bd13f7cf..ece210c841 100644 --- a/docs/extras/modules/agents/how_to/sharedmemory_for_tools.ipynb +++ b/docs/extras/modules/agents/how_to/sharedmemory_for_tools.ipynb @@ -24,7 +24,7 @@ "source": [ "from langchain.agents import ZeroShotAgent, Tool, AgentExecutor\n", "from langchain.memory import ConversationBufferMemory, ReadOnlySharedMemory\n", - "from langchain import OpenAI, LLMChain, PromptTemplate\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\nfrom langchain.prompts import PromptTemplate\n", "from langchain.utilities import GoogleSearchAPIWrapper" ] }, diff --git a/docs/extras/modules/agents/how_to/use_toolkits_with_openai_functions.ipynb b/docs/extras/modules/agents/how_to/use_toolkits_with_openai_functions.ipynb index 8fba48771f..60a0442fde 100644 --- a/docs/extras/modules/agents/how_to/use_toolkits_with_openai_functions.ipynb +++ b/docs/extras/modules/agents/how_to/use_toolkits_with_openai_functions.ipynb @@ -17,13 +17,11 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import (\n", - " LLMMathChain,\n", - " OpenAI,\n", - " SerpAPIWrapper,\n", - " SQLDatabase,\n", - " SQLDatabaseChain,\n", - ")\n", + "from langchain.chains import LLMMathChain\n", + "from langchain.llms import OpenAI\n", + "from langchain.utilities import SerpAPIWrapper\n", + "from langchain.utilities import SQLDatabase\n", + "from langchain_experimental.sql import SQLDatabaseChain\n", "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", "from langchain.chat_models import ChatOpenAI\n", diff --git a/docs/extras/modules/agents/tools/custom_tools.ipynb b/docs/extras/modules/agents/tools/custom_tools.ipynb index 11e629ffe5..086c162705 100644 --- a/docs/extras/modules/agents/tools/custom_tools.ipynb +++ b/docs/extras/modules/agents/tools/custom_tools.ipynb @@ -29,7 +29,7 @@ "outputs": [], "source": [ "# Import things that are needed generically\n", - "from langchain import LLMMathChain, SerpAPIWrapper\n", + "from langchain.chains import LLMMathChain\nfrom langchain.utilities import SerpAPIWrapper\n", "from langchain.agents import AgentType, initialize_agent\n", "from langchain.chat_models import ChatOpenAI\n", "from langchain.tools import BaseTool, StructuredTool, Tool, tool" @@ -774,7 +774,7 @@ "from langchain.agents import initialize_agent, Tool\n", "from langchain.agents import AgentType\n", "from langchain.llms import OpenAI\n", - "from langchain import LLMMathChain, SerpAPIWrapper\n", + "from langchain.chains import LLMMathChain\nfrom langchain.utilities import SerpAPIWrapper\n", "\n", "search = SerpAPIWrapper()\n", "tools = [\n", @@ -936,7 +936,7 @@ "source": [ "from langchain.tools.base import ToolException\n", "\n", - "from langchain import SerpAPIWrapper\n", + "from langchain.utilities import SerpAPIWrapper\n", "from langchain.agents import AgentType, initialize_agent\n", "from langchain.chat_models import ChatOpenAI\n", "from langchain.tools import Tool\n", diff --git a/docs/extras/modules/agents/tools/multi_input_tool.ipynb b/docs/extras/modules/agents/tools/multi_input_tool.ipynb index dad96af6cb..8ea3bb639a 100644 --- a/docs/extras/modules/agents/tools/multi_input_tool.ipynb +++ b/docs/extras/modules/agents/tools/multi_input_tool.ipynb @@ -34,7 +34,7 @@ }, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent, AgentType\n", "\n", "llm = OpenAI(temperature=0)" diff --git a/docs/extras/modules/chains/how_to/from_hub.ipynb b/docs/extras/modules/chains/how_to/from_hub.ipynb index 99b1db8ae1..e862b527a1 100644 --- a/docs/extras/modules/chains/how_to/from_hub.ipynb +++ b/docs/extras/modules/chains/how_to/from_hub.ipynb @@ -73,7 +73,7 @@ "from langchain.embeddings.openai import OpenAIEmbeddings\n", "from langchain.vectorstores import Chroma\n", "from langchain.text_splitter import CharacterTextSplitter\n", - "from langchain import OpenAI, VectorDBQA" + "from langchain.llms import OpenAI\nfrom langchain.chains import VectorDBQA" ] }, { diff --git a/docs/extras/modules/chains/how_to/serialization.ipynb b/docs/extras/modules/chains/how_to/serialization.ipynb index 409d495fa0..555ff1beaa 100644 --- a/docs/extras/modules/chains/how_to/serialization.ipynb +++ b/docs/extras/modules/chains/how_to/serialization.ipynb @@ -25,7 +25,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate, OpenAI, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\n", "\n", "template = \"\"\"Question: {question}\n", "\n", diff --git a/docs/extras/modules/data_connection/retrievers/MultiQueryRetriever.ipynb b/docs/extras/modules/data_connection/retrievers/MultiQueryRetriever.ipynb index 73747bd5c2..86aadd97c7 100644 --- a/docs/extras/modules/data_connection/retrievers/MultiQueryRetriever.ipynb +++ b/docs/extras/modules/data_connection/retrievers/MultiQueryRetriever.ipynb @@ -126,7 +126,7 @@ "outputs": [], "source": [ "from typing import List\n", - "from langchain import LLMChain\n", + "from langchain.chains import LLMChain\n", "from pydantic import BaseModel, Field\n", "from langchain.prompts import PromptTemplate\n", "from langchain.output_parsers import PydanticOutputParser\n", diff --git a/docs/extras/modules/memory/agent_with_memory.ipynb b/docs/extras/modules/memory/agent_with_memory.ipynb index acf4980f29..1ece76969d 100644 --- a/docs/extras/modules/memory/agent_with_memory.ipynb +++ b/docs/extras/modules/memory/agent_with_memory.ipynb @@ -29,7 +29,7 @@ "source": [ "from langchain.agents import ZeroShotAgent, Tool, AgentExecutor\n", "from langchain.memory import ConversationBufferMemory\n", - "from langchain import OpenAI, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\n", "from langchain.utilities import GoogleSearchAPIWrapper" ] }, diff --git a/docs/extras/modules/memory/agent_with_memory_in_db.ipynb b/docs/extras/modules/memory/agent_with_memory_in_db.ipynb index d53a9d916e..adf48b9e04 100644 --- a/docs/extras/modules/memory/agent_with_memory_in_db.ipynb +++ b/docs/extras/modules/memory/agent_with_memory_in_db.ipynb @@ -37,7 +37,7 @@ "from langchain.memory import ConversationBufferMemory\n", "from langchain.memory.chat_memory import ChatMessageHistory\n", "from langchain.memory.chat_message_histories import RedisChatMessageHistory\n", - "from langchain import OpenAI, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\n", "from langchain.utilities import GoogleSearchAPIWrapper" ] }, diff --git a/docs/extras/modules/memory/custom_memory.ipynb b/docs/extras/modules/memory/custom_memory.ipynb index 8de18c824d..4abc0c094a 100644 --- a/docs/extras/modules/memory/custom_memory.ipynb +++ b/docs/extras/modules/memory/custom_memory.ipynb @@ -25,7 +25,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI, ConversationChain\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import ConversationChain\n", "from langchain.schema import BaseMemory\n", "from pydantic import BaseModel\n", "from typing import List, Dict, Any" diff --git a/docs/extras/modules/model_io/prompts/prompt_templates/connecting_to_a_feature_store.ipynb b/docs/extras/modules/model_io/prompts/prompt_templates/connecting_to_a_feature_store.ipynb index 768c43e929..ec5e681f6c 100644 --- a/docs/extras/modules/model_io/prompts/prompt_templates/connecting_to_a_feature_store.ipynb +++ b/docs/extras/modules/model_io/prompts/prompt_templates/connecting_to_a_feature_store.ipynb @@ -781,7 +781,7 @@ "os.environ[\"OPENAI_API_KEY\"]=\"\" # Fill the open ai key here\n", "\n", "from langchain.chat_models import ChatOpenAI\n", - "from langchain import LLMChain\n", + "from langchain.chains import LLMChain\n", "\n", "chain = LLMChain(llm=ChatOpenAI(), prompt=prompt_template)" ] diff --git a/docs/extras/use_cases/code_understanding.ipynb b/docs/extras/use_cases/code_understanding.ipynb index df0cfbf9d1..73e02145e6 100644 --- a/docs/extras/use_cases/code_understanding.ipynb +++ b/docs/extras/use_cases/code_understanding.ipynb @@ -245,7 +245,7 @@ { "data": { "text/plain": [ - "'To initialize a ReAct agent, you need to follow these steps:\\n\\n1. Initialize a language model `llm` of type `BaseLanguageModel`.\\n\\n2. Initialize a document store `docstore` of type `Docstore`.\\n\\n3. Create a `DocstoreExplorer` with the initialized `docstore`. The `DocstoreExplorer` is used to search for and look up terms in the document store.\\n\\n4. Create an array of `Tool` objects. The `Tool` objects represent the actions that the agent can perform. In the case of `ReActDocstoreAgent`, the tools must be \"Search\" and \"Lookup\" with their corresponding functions from the `DocstoreExplorer`.\\n\\n5. Initialize the `ReActDocstoreAgent` using the `from_llm_and_tools` method with the `llm` (language model) and `tools` as parameters.\\n\\n6. Initialize the `ReActChain` (which is the `AgentExecutor`) using the `ReActDocstoreAgent` and `tools` as parameters.\\n\\nHere is an example of how to do this:\\n\\n```python\\nfrom langchain import ReActChain, OpenAI\\nfrom langchain.docstore.base import Docstore\\nfrom langchain.docstore.document import Document\\nfrom langchain.tools.base import BaseTool\\n\\n# Initialize the LLM and a docstore\\nllm = OpenAI()\\ndocstore = Docstore()\\n\\ndocstore_explorer = DocstoreExplorer(docstore)\\ntools = [\\n Tool(\\n name=\"Search\",\\n func=docstore_explorer.search,\\n description=\"Search for a term in the docstore.\",\\n ),\\n Tool(\\n name=\"Lookup\",\\n func=docstore_explorer.lookup,\\n description=\"Lookup a term in the docstore.\",\\n ),\\n]\\nagent = ReActDocstoreAgent.from_llm_and_tools(llm, tools)\\nreact = ReActChain(agent=agent, tools=tools)\\n```\\n\\nKeep in mind that this is a simplified example and you might need to adapt it to your specific needs.'" + "'To initialize a ReAct agent, you need to follow these steps:\\n\\n1. Initialize a language model `llm` of type `BaseLanguageModel`.\\n\\n2. Initialize a document store `docstore` of type `Docstore`.\\n\\n3. Create a `DocstoreExplorer` with the initialized `docstore`. The `DocstoreExplorer` is used to search for and look up terms in the document store.\\n\\n4. Create an array of `Tool` objects. The `Tool` objects represent the actions that the agent can perform. In the case of `ReActDocstoreAgent`, the tools must be \"Search\" and \"Lookup\" with their corresponding functions from the `DocstoreExplorer`.\\n\\n5. Initialize the `ReActDocstoreAgent` using the `from_llm_and_tools` method with the `llm` (language model) and `tools` as parameters.\\n\\n6. Initialize the `ReActChain` (which is the `AgentExecutor`) using the `ReActDocstoreAgent` and `tools` as parameters.\\n\\nHere is an example of how to do this:\\n\\n```python\\nfrom langchain.chains import ReActChain, OpenAI\\nfrom langchain.docstore.base import Docstore\\nfrom langchain.docstore.document import Document\\nfrom langchain.tools.base import BaseTool\\n\\n# Initialize the LLM and a docstore\\nllm = OpenAI()\\ndocstore = Docstore()\\n\\ndocstore_explorer = DocstoreExplorer(docstore)\\ntools = [\\n Tool(\\n name=\"Search\",\\n func=docstore_explorer.search,\\n description=\"Search for a term in the docstore.\",\\n ),\\n Tool(\\n name=\"Lookup\",\\n func=docstore_explorer.lookup,\\n description=\"Lookup a term in the docstore.\",\\n ),\\n]\\nagent = ReActDocstoreAgent.from_llm_and_tools(llm, tools)\\nreact = ReActChain(agent=agent, tools=tools)\\n```\\n\\nKeep in mind that this is a simplified example and you might need to adapt it to your specific needs.'" ] }, "execution_count": 43, @@ -361,7 +361,7 @@ "outputs": [], "source": [ "from langchain.llms import LlamaCpp\n", - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "from langchain.callbacks.manager import CallbackManager\n", "from langchain.memory import ConversationSummaryMemory\n", "from langchain.chains import ConversationalRetrievalChain \n", diff --git a/docs/extras/use_cases/more/agents/agent_simulations/multiagent_bidding.ipynb b/docs/extras/use_cases/more/agents/agent_simulations/multiagent_bidding.ipynb index ec0ed5b884..7ec494a9d7 100644 --- a/docs/extras/use_cases/more/agents/agent_simulations/multiagent_bidding.ipynb +++ b/docs/extras/use_cases/more/agents/agent_simulations/multiagent_bidding.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "import re\n", "import tenacity\n", "from typing import List, Dict, Callable\n", diff --git a/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval.ipynb b/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval.ipynb index a10ebf7eb3..ba1d12fb84 100644 --- a/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval.ipynb +++ b/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval.ipynb @@ -39,7 +39,7 @@ " AgentOutputParser,\n", ")\n", "from langchain.prompts import StringPromptTemplate\n", - "from langchain import OpenAI, SerpAPIWrapper, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\nfrom langchain.chains import LLMChain\n", "from typing import List, Union\n", "from langchain.schema import AgentAction, AgentFinish\n", "from langchain.agents.agent_toolkits import NLAToolkit\n", diff --git a/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb b/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb index 4980924463..4284fe459e 100644 --- a/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb +++ b/docs/extras/use_cases/more/agents/agents/custom_agent_with_plugin_retrieval_using_plugnplai.ipynb @@ -63,7 +63,7 @@ " AgentOutputParser,\n", ")\n", "from langchain.prompts import StringPromptTemplate\n", - "from langchain import OpenAI, SerpAPIWrapper, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\nfrom langchain.chains import LLMChain\n", "from typing import List, Union\n", "from langchain.schema import AgentAction, AgentFinish\n", "from langchain.agents.agent_toolkits import NLAToolkit\n", diff --git a/docs/extras/use_cases/more/agents/agents/sales_agent_with_context.ipynb b/docs/extras/use_cases/more/agents/agents/sales_agent_with_context.ipynb index b0179f3dbf..64273459a8 100644 --- a/docs/extras/use_cases/more/agents/agents/sales_agent_with_context.ipynb +++ b/docs/extras/use_cases/more/agents/agents/sales_agent_with_context.ipynb @@ -44,7 +44,7 @@ "\n", "from typing import Dict, List, Any, Union, Callable\n", "from pydantic import BaseModel, Field\n", - "from langchain import LLMChain, PromptTemplate\n", + "from langchain.chains import LLMChain\nfrom langchain.prompts import PromptTemplate\n", "from langchain.llms import BaseLLM\n", "from langchain.chains.base import Chain\n", "from langchain.chat_models import ChatOpenAI\n", diff --git a/docs/extras/use_cases/more/agents/agents/wikibase_agent.ipynb b/docs/extras/use_cases/more/agents/agents/wikibase_agent.ipynb index 2b3fe21d9f..415f4e3a9e 100644 --- a/docs/extras/use_cases/more/agents/agents/wikibase_agent.ipynb +++ b/docs/extras/use_cases/more/agents/agents/wikibase_agent.ipynb @@ -396,7 +396,7 @@ " AgentOutputParser,\n", ")\n", "from langchain.prompts import StringPromptTemplate\n", - "from langchain import OpenAI, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\n", "from typing import List, Union\n", "from langchain.schema import AgentAction, AgentFinish\n", "import re" diff --git a/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi.ipynb b/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi.ipynb index 88e53c9798..b0bb79e1d4 100644 --- a/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi.ipynb +++ b/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi.ipynb @@ -33,7 +33,7 @@ "from collections import deque\n", "from typing import Dict, List, Optional, Any\n", "\n", - "from langchain import LLMChain, OpenAI, PromptTemplate\n", + "from langchain.chains import LLMChain\nfrom langchain.llms import OpenAI\nfrom langchain.prompts import PromptTemplate\n", "from langchain.embeddings import OpenAIEmbeddings\n", "from langchain.llms import BaseLLM\n", "from langchain.vectorstores.base import VectorStore\n", diff --git a/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi_with_agent.ipynb b/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi_with_agent.ipynb index dc4c4f0974..bf03f95e0c 100644 --- a/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi_with_agent.ipynb +++ b/docs/extras/use_cases/more/agents/autonomous_agents/baby_agi_with_agent.ipynb @@ -29,7 +29,7 @@ "from collections import deque\n", "from typing import Dict, List, Optional, Any\n", "\n", - "from langchain import LLMChain, OpenAI, PromptTemplate\n", + "from langchain.chains import LLMChain\nfrom langchain.llms import OpenAI\nfrom langchain.prompts import PromptTemplate\n", "from langchain.embeddings import OpenAIEmbeddings\n", "from langchain.llms import BaseLLM\n", "from langchain.vectorstores.base import VectorStore\n", @@ -111,7 +111,7 @@ "outputs": [], "source": [ "from langchain.agents import ZeroShotAgent, Tool, AgentExecutor\n", - "from langchain import OpenAI, SerpAPIWrapper, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\nfrom langchain.chains import LLMChain\n", "\n", "todo_prompt = PromptTemplate.from_template(\n", " \"You are a planner who is an expert at coming up with a todo list for a given objective. Come up with a todo list for this objective: {objective}\"\n", diff --git a/docs/extras/use_cases/more/agents/autonomous_agents/meta_prompt.ipynb b/docs/extras/use_cases/more/agents/autonomous_agents/meta_prompt.ipynb index 1f746b15b7..c5a532900c 100644 --- a/docs/extras/use_cases/more/agents/autonomous_agents/meta_prompt.ipynb +++ b/docs/extras/use_cases/more/agents/autonomous_agents/meta_prompt.ipynb @@ -56,7 +56,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI, LLMChain, PromptTemplate\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMChain\nfrom langchain.prompts import PromptTemplate\n", "from langchain.memory import ConversationBufferWindowMemory" ] }, diff --git a/docs/extras/use_cases/more/agents/multi_modal/multi_modal_output_agent.ipynb b/docs/extras/use_cases/more/agents/multi_modal/multi_modal_output_agent.ipynb index cc32520acd..632a41350c 100644 --- a/docs/extras/use_cases/more/agents/multi_modal/multi_modal_output_agent.ipynb +++ b/docs/extras/use_cases/more/agents/multi_modal/multi_modal_output_agent.ipynb @@ -41,7 +41,7 @@ "metadata": {}, "outputs": [], "source": [ - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "from langchain.agents import initialize_agent\n", "from langchain.agents import AgentType\n", "from langchain.tools import SteamshipImageGenerationTool" diff --git a/docs/extras/use_cases/more/code_writing/cpal.ipynb b/docs/extras/use_cases/more/code_writing/cpal.ipynb index 47e2decbfd..b6277e0ccc 100644 --- a/docs/extras/use_cases/more/code_writing/cpal.ipynb +++ b/docs/extras/use_cases/more/code_writing/cpal.ipynb @@ -50,7 +50,7 @@ "\n", "from langchain_experimental.cpal.base import CPALChain\n", "from langchain_experimental.pal_chain import PALChain\n", - "from langchain import OpenAI\n", + "from langchain.llms import OpenAI\n", "\n", "llm = OpenAI(temperature=0, max_tokens=512)\n", "cpal_chain = CPALChain.from_univariate_prompt(llm=llm, verbose=True)\n", diff --git a/docs/extras/use_cases/more/code_writing/llm_math.ipynb b/docs/extras/use_cases/more/code_writing/llm_math.ipynb index b8e824d9f6..edc56654bb 100644 --- a/docs/extras/use_cases/more/code_writing/llm_math.ipynb +++ b/docs/extras/use_cases/more/code_writing/llm_math.ipynb @@ -45,7 +45,7 @@ } ], "source": [ - "from langchain import OpenAI, LLMMathChain\n", + "from langchain.llms import OpenAI\nfrom langchain.chains import LLMMathChain\n", "\n", "llm = OpenAI(temperature=0)\n", "llm_math = LLMMathChain.from_llm(llm, verbose=True)\n", diff --git a/docs/extras/use_cases/more/code_writing/pal.ipynb b/docs/extras/use_cases/more/code_writing/pal.ipynb index 4a5e9fc57e..3b8ab0dfef 100644 --- a/docs/extras/use_cases/more/code_writing/pal.ipynb +++ b/docs/extras/use_cases/more/code_writing/pal.ipynb @@ -18,7 +18,7 @@ "outputs": [], "source": [ "from langchain_experimental.pal_chain import PALChain\n", - "from langchain import OpenAI" + "from langchain.llms import OpenAI" ] }, { diff --git a/docs/extras/use_cases/more/graph/graph_memgraph_qa.ipynb b/docs/extras/use_cases/more/graph/graph_memgraph_qa.ipynb index 6a6f89c4f9..94df7393bf 100644 --- a/docs/extras/use_cases/more/graph/graph_memgraph_qa.ipynb +++ b/docs/extras/use_cases/more/graph/graph_memgraph_qa.ipynb @@ -67,7 +67,7 @@ "from langchain.chat_models import ChatOpenAI\n", "from langchain.chains import GraphCypherQAChain\n", "from langchain.graphs import MemgraphGraph\n", - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "\n", "from gqlalchemy import Memgraph\n", "\n", diff --git a/docs/extras/use_cases/qa_structured/integrations/myscale_vector_sql.ipynb b/docs/extras/use_cases/qa_structured/integrations/myscale_vector_sql.ipynb index 65bd8323ed..bc7044eb17 100644 --- a/docs/extras/use_cases/qa_structured/integrations/myscale_vector_sql.ipynb +++ b/docs/extras/use_cases/qa_structured/integrations/myscale_vector_sql.ipynb @@ -31,10 +31,10 @@ "from os import environ\n", "import getpass\n", "from typing import Dict, Any\n", - "from langchain import OpenAI, SQLDatabase, LLMChain\n", + "from langchain.llms import OpenAI\nfrom langchain.utilities import SQLDatabase\nfrom langchain.chains import LLMChain\n", "from langchain_experimental.sql.vector_sql import VectorSQLDatabaseChain\n", "from sqlalchemy import create_engine, Column, MetaData\n", - "from langchain import PromptTemplate\n", + "from langchain.prompts import PromptTemplate\n", "\n", "\n", "from sqlalchemy import create_engine\n", diff --git a/docs/extras/use_cases/question_answering/how_to/local_retrieval_qa.ipynb b/docs/extras/use_cases/question_answering/how_to/local_retrieval_qa.ipynb index a1fe71e8b5..9a704ea252 100644 --- a/docs/extras/use_cases/question_answering/how_to/local_retrieval_qa.ipynb +++ b/docs/extras/use_cases/question_answering/how_to/local_retrieval_qa.ipynb @@ -413,7 +413,7 @@ } ], "source": [ - "from langchain import PromptTemplate, LLMChain\n", + "from langchain.prompts import PromptTemplate\nfrom langchain.chains import LLMChain\n", "\n", "# Prompt\n", "prompt = PromptTemplate.from_template(\n", diff --git a/docs/snippets/modules/agents/agent_types/conversational_agent.mdx b/docs/snippets/modules/agents/agent_types/conversational_agent.mdx index 50f0129cad..285014ae9c 100644 --- a/docs/snippets/modules/agents/agent_types/conversational_agent.mdx +++ b/docs/snippets/modules/agents/agent_types/conversational_agent.mdx @@ -4,7 +4,7 @@ This is accomplished with a specific type of agent (`conversational-react-descri from langchain.agents import Tool from langchain.agents import AgentType from langchain.memory import ConversationBufferMemory -from langchain import OpenAI +from langchain.llms import OpenAI from langchain.utilities import SerpAPIWrapper from langchain.agents import initialize_agent ``` diff --git a/docs/snippets/modules/agents/agent_types/plan_and_execute.mdx b/docs/snippets/modules/agents/agent_types/plan_and_execute.mdx index e5a529525f..81960064a6 100644 --- a/docs/snippets/modules/agents/agent_types/plan_and_execute.mdx +++ b/docs/snippets/modules/agents/agent_types/plan_and_execute.mdx @@ -5,9 +5,9 @@ from langchain.chat_models import ChatOpenAI from langchain_experimental.plan_and_execute import PlanAndExecute, load_agent_executor, load_chat_planner from langchain.llms import OpenAI -from langchain import SerpAPIWrapper +from langchain.utilities import SerpAPIWrapper from langchain.agents.tools import Tool -from langchain import LLMMathChain +from langchain.chains import LLMMathChain ``` ## Tools diff --git a/docs/snippets/modules/agents/how_to/custom_llm_agent.mdx b/docs/snippets/modules/agents/how_to/custom_llm_agent.mdx index b8a03de621..b23404e4e7 100644 --- a/docs/snippets/modules/agents/how_to/custom_llm_agent.mdx +++ b/docs/snippets/modules/agents/how_to/custom_llm_agent.mdx @@ -20,7 +20,7 @@ Do necessary imports, etc. ```python from langchain.agents import Tool, AgentExecutor, LLMSingleActionAgent, AgentOutputParser from langchain.prompts import StringPromptTemplate -from langchain import OpenAI, SerpAPIWrapper, LLMChain +from langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\nfrom langchain.chains import LLMChain from typing import List, Union from langchain.schema import AgentAction, AgentFinish, OutputParserException import re diff --git a/docs/snippets/modules/agents/how_to/custom_llm_chat_agent.mdx b/docs/snippets/modules/agents/how_to/custom_llm_chat_agent.mdx index 87f1d58464..acacb63599 100644 --- a/docs/snippets/modules/agents/how_to/custom_llm_chat_agent.mdx +++ b/docs/snippets/modules/agents/how_to/custom_llm_chat_agent.mdx @@ -27,7 +27,8 @@ pip install openai ```python from langchain.agents import Tool, AgentExecutor, LLMSingleActionAgent, AgentOutputParser from langchain.prompts import BaseChatPromptTemplate -from langchain import SerpAPIWrapper, LLMChain +from langchain.utilities import SerpAPIWrapper +from langchain.chains.llm import LLMChain from langchain.chat_models import ChatOpenAI from typing import List, Union from langchain.schema import AgentAction, AgentFinish, HumanMessage diff --git a/docs/snippets/modules/agents/how_to/mrkl.mdx b/docs/snippets/modules/agents/how_to/mrkl.mdx index 4d46a31c64..c88951762d 100644 --- a/docs/snippets/modules/agents/how_to/mrkl.mdx +++ b/docs/snippets/modules/agents/how_to/mrkl.mdx @@ -1,5 +1,5 @@ ```python -from langchain import LLMMathChain, OpenAI, SerpAPIWrapper, SQLDatabase, SQLDatabaseChain +from langchain.chains import LLMMathChain\nfrom langchain.llms import OpenAI\nfrom langchain.utilities import SerpAPIWrapper\nfrom langchain.utilities import SQLDatabase\nfrom langchain_experimental.sql import SQLDatabaseChain from langchain.agents import initialize_agent, Tool from langchain.agents import AgentType ``` diff --git a/docs/snippets/modules/chains/additional/analyze_document.mdx b/docs/snippets/modules/chains/additional/analyze_document.mdx index b9d6bdeaa3..640ed4ea8d 100644 --- a/docs/snippets/modules/chains/additional/analyze_document.mdx +++ b/docs/snippets/modules/chains/additional/analyze_document.mdx @@ -8,7 +8,7 @@ Let's take a look at it in action below, using it to summarize a long document. ```python -from langchain import OpenAI +from langchain.llms import OpenAI from langchain.chains.summarize import load_summarize_chain llm = OpenAI(temperature=0) diff --git a/docs/snippets/modules/chains/foundational/llm_chain.mdx b/docs/snippets/modules/chains/foundational/llm_chain.mdx index d22e01c39a..ac680d9b5b 100644 --- a/docs/snippets/modules/chains/foundational/llm_chain.mdx +++ b/docs/snippets/modules/chains/foundational/llm_chain.mdx @@ -1,5 +1,5 @@ ```python -from langchain import PromptTemplate, OpenAI, LLMChain +from langchain.prompts import PromptTemplate\nfrom langchain.llms import OpenAI\nfrom langchain.chains import LLMChain prompt_template = "What is a good name for a company that makes {product}?" diff --git a/docs/snippets/modules/chains/popular/sqlite.mdx b/docs/snippets/modules/chains/popular/sqlite.mdx index a709328d1e..6319a0917c 100644 --- a/docs/snippets/modules/chains/popular/sqlite.mdx +++ b/docs/snippets/modules/chains/popular/sqlite.mdx @@ -537,7 +537,7 @@ Sometimes you may not have the luxury of using OpenAI or other service-hosted la import logging import torch from transformers import AutoTokenizer, GPT2TokenizerFast, pipeline, AutoModelForSeq2SeqLM, AutoModelForCausalLM -from langchain import HuggingFacePipeline +from langchain.llms import HuggingFacePipeline # Note: This model requires a large GPU, e.g. an 80GB A100. See documentation for other ways to run private non-OpenAI models. model_id = "google/flan-ul2" @@ -882,7 +882,7 @@ Now that you have some examples (with manually corrected output SQL), you can do ```python -from langchain import FewShotPromptTemplate, PromptTemplate +from langchain.prompts import FewShotPromptTemplate, PromptTemplate from langchain.chains.sql_database.prompt import _sqlite_prompt, PROMPT_SUFFIX from langchain.embeddings.huggingface import HuggingFaceEmbeddings from langchain.prompts.example_selector.semantic_similarity import SemanticSimilarityExampleSelector diff --git a/docs/snippets/modules/chains/popular/vector_db_qa_with_sources.mdx b/docs/snippets/modules/chains/popular/vector_db_qa_with_sources.mdx index 564406bb61..fbf77554db 100644 --- a/docs/snippets/modules/chains/popular/vector_db_qa_with_sources.mdx +++ b/docs/snippets/modules/chains/popular/vector_db_qa_with_sources.mdx @@ -49,7 +49,7 @@ docsearch = Chroma.from_texts(texts, embeddings, metadatas=[{"source": f"{i}-pl" ```python from langchain.chains import RetrievalQAWithSourcesChain -from langchain import OpenAI +from langchain.llms import OpenAI chain = RetrievalQAWithSourcesChain.from_chain_type(OpenAI(temperature=0), chain_type="stuff", retriever=docsearch.as_retriever()) ``` diff --git a/docs/snippets/modules/model_io/models/chat/how_to/prompts.mdx b/docs/snippets/modules/model_io/models/chat/how_to/prompts.mdx index da0df2dbc9..509851d792 100644 --- a/docs/snippets/modules/model_io/models/chat/how_to/prompts.mdx +++ b/docs/snippets/modules/model_io/models/chat/how_to/prompts.mdx @@ -4,7 +4,7 @@ For convenience, there is a `from_template` method defined on the template. If y ```python -from langchain import PromptTemplate +from langchain.prompts import PromptTemplate from langchain.prompts.chat import ( ChatPromptTemplate, SystemMessagePromptTemplate, diff --git a/docs/snippets/modules/model_io/prompts/prompt_templates/get_started.mdx b/docs/snippets/modules/model_io/prompts/prompt_templates/get_started.mdx index 25d62563ce..f481177a3c 100644 --- a/docs/snippets/modules/model_io/prompts/prompt_templates/get_started.mdx +++ b/docs/snippets/modules/model_io/prompts/prompt_templates/get_started.mdx @@ -8,7 +8,7 @@ By default, `PromptTemplate` uses [Python's str.format](https://docs.python.org/ syntax for templating; however other templating syntax is available (e.g., `jinja2`). ```python -from langchain import PromptTemplate +from langchain.prompts import PromptTemplate prompt_template = PromptTemplate.from_template( "Tell me a {adjective} joke about {content}." @@ -27,7 +27,7 @@ prompt_template.format(adjective="funny", content="chickens") The template supports any number of variables, including no variables: ```python -from langchain import PromptTemplate +from langchain.prompts import PromptTemplate prompt_template = PromptTemplate.from_template( "Tell me a joke" @@ -40,7 +40,7 @@ will be compared against the variables present in the template string during ins there is a mismatch; for example, ```python -from langchain import PromptTemplate +from langchain.prompts import PromptTemplate invalid_prompt = PromptTemplate( input_variables=["adjective"], diff --git a/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/repsonse_generator.py b/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/repsonse_generator.py index a624710f08..1df95270cf 100644 --- a/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/repsonse_generator.py +++ b/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/repsonse_generator.py @@ -1,8 +1,9 @@ from typing import Any, List, Optional -from langchain import LLMChain, PromptTemplate from langchain.base_language import BaseLanguageModel from langchain.callbacks.manager import Callbacks +from langchain.chains import LLMChain +from langchain.prompts import PromptTemplate class ResponseGenerationChain(LLMChain): diff --git a/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/task_planner.py b/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/task_planner.py index e1228161cf..34aaab55ab 100644 --- a/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/task_planner.py +++ b/libs/experimental/langchain_experimental/autonomous_agents/hugginggpt/task_planner.py @@ -3,9 +3,9 @@ import re from abc import abstractmethod from typing import Any, Dict, List, Optional, Union -from langchain import LLMChain from langchain.base_language import BaseLanguageModel from langchain.callbacks.manager import Callbacks +from langchain.chains import LLMChain from langchain.prompts.chat import ( AIMessagePromptTemplate, ChatPromptTemplate, diff --git a/libs/experimental/langchain_experimental/sql/base.py b/libs/experimental/langchain_experimental/sql/base.py index c9c8a89e9e..9144a705e3 100644 --- a/libs/experimental/langchain_experimental/sql/base.py +++ b/libs/experimental/langchain_experimental/sql/base.py @@ -26,7 +26,7 @@ class SQLDatabaseChain(Chain): .. code-block:: python from langchain_experimental.sql import SQLDatabaseChain - from langchain import OpenAI, SQLDatabase + from langchain.llms import OpenAI, SQLDatabase db = SQLDatabase(...) db_chain = SQLDatabaseChain.from_llm(OpenAI(), db) diff --git a/libs/experimental/langchain_experimental/sql/vector_sql.py b/libs/experimental/langchain_experimental/sql/vector_sql.py index 98f3c2dee0..05ccb453b2 100644 --- a/libs/experimental/langchain_experimental/sql/vector_sql.py +++ b/libs/experimental/langchain_experimental/sql/vector_sql.py @@ -102,7 +102,7 @@ class VectorSQLDatabaseChain(SQLDatabaseChain): .. code-block:: python from langchain_experimental.sql import SQLDatabaseChain - from langchain import OpenAI, SQLDatabase, OpenAIEmbeddings + from langchain.llms import OpenAI, SQLDatabase, OpenAIEmbeddings db = SQLDatabase(...) db_chain = VectorSQLDatabaseChain.from_llm(OpenAI(), db, OpenAIEmbeddings()) diff --git a/libs/experimental/tests/integration_tests/chains/test_cpal.py b/libs/experimental/tests/integration_tests/chains/test_cpal.py index f377586173..fc332b2a2e 100644 --- a/libs/experimental/tests/integration_tests/chains/test_cpal.py +++ b/libs/experimental/tests/integration_tests/chains/test_cpal.py @@ -6,7 +6,7 @@ from typing import Type from unittest import mock import pytest -from langchain import OpenAI +from langchain.llms import OpenAI from langchain.output_parsers import PydanticOutputParser from langchain.prompts.prompt import PromptTemplate diff --git a/libs/experimental/tests/integration_tests/chains/test_pal.py b/libs/experimental/tests/integration_tests/chains/test_pal.py index 355bfb8c10..6f3d83b5a1 100644 --- a/libs/experimental/tests/integration_tests/chains/test_pal.py +++ b/libs/experimental/tests/integration_tests/chains/test_pal.py @@ -1,7 +1,7 @@ """Test PAL chain.""" -from langchain import OpenAI from langchain.chains.pal.base import PALChain +from langchain.llms import OpenAI def test_math_prompt() -> None: diff --git a/libs/langchain/langchain/agents/mrkl/base.py b/libs/langchain/langchain/agents/mrkl/base.py index 71b33a92f7..177291c03f 100644 --- a/libs/langchain/langchain/agents/mrkl/base.py +++ b/libs/langchain/langchain/agents/mrkl/base.py @@ -137,18 +137,7 @@ class ZeroShotAgent(Agent): class MRKLChain(AgentExecutor): - """Chain that implements the MRKL system. - - Example: - .. code-block:: python - - from langchain import OpenAI, MRKLChain - from langchain.chains.mrkl.base import ChainConfig - llm = OpenAI(temperature=0) - prompt = PromptTemplate(...) - chains = [...] - mrkl = MRKLChain.from_chains(llm=llm, prompt=prompt) - """ + """[Deprecated] Chain that implements the MRKL system.""" @classmethod def from_chains( @@ -166,28 +155,6 @@ class MRKLChain(AgentExecutor): Returns: An initialized MRKL chain. - - Example: - .. code-block:: python - - from langchain import LLMMathChain, OpenAI, SerpAPIWrapper, MRKLChain - from langchain.chains.mrkl.base import ChainConfig - llm = OpenAI(temperature=0) - search = SerpAPIWrapper() - llm_math_chain = LLMMathChain(llm=llm) - chains = [ - ChainConfig( - action_name = "Search", - action=search.search, - action_description="useful for searching" - ), - ChainConfig( - action_name="Calculator", - action=llm_math_chain.run, - action_description="useful for doing math" - ) - ] - mrkl = MRKLChain.from_chains(llm, chains) """ tools = [ Tool( diff --git a/libs/langchain/langchain/agents/react/base.py b/libs/langchain/langchain/agents/react/base.py index 3d2e73ec20..323104cd30 100644 --- a/libs/langchain/langchain/agents/react/base.py +++ b/libs/langchain/langchain/agents/react/base.py @@ -131,14 +131,7 @@ class ReActTextWorldAgent(ReActDocstoreAgent): class ReActChain(AgentExecutor): - """Chain that implements the ReAct paper. - - Example: - .. code-block:: python - - from langchain import ReActChain, OpenAI - react = ReAct(llm=OpenAI()) - """ + """[Deprecated] Chain that implements the ReAct paper.""" def __init__(self, llm: BaseLanguageModel, docstore: Docstore, **kwargs: Any): """Initialize with the LLM and a docstore.""" diff --git a/libs/langchain/langchain/agents/self_ask_with_search/base.py b/libs/langchain/langchain/agents/self_ask_with_search/base.py index f2db10b4f7..ddd77f2277 100644 --- a/libs/langchain/langchain/agents/self_ask_with_search/base.py +++ b/libs/langchain/langchain/agents/self_ask_with_search/base.py @@ -58,15 +58,7 @@ class SelfAskWithSearchAgent(Agent): class SelfAskWithSearchChain(AgentExecutor): - """Chain that does self-ask with search. - - Example: - .. code-block:: python - - from langchain import SelfAskWithSearchChain, OpenAI, GoogleSerperAPIWrapper - search_chain = GoogleSerperAPIWrapper() - self_ask = SelfAskWithSearchChain(llm=OpenAI(), search_chain=search_chain) - """ + """[Deprecated] Chain that does self-ask with search.""" def __init__( self, diff --git a/libs/langchain/langchain/callbacks/context_callback.py b/libs/langchain/langchain/callbacks/context_callback.py index d95db1ecee..12791d9119 100644 --- a/libs/langchain/langchain/callbacks/context_callback.py +++ b/libs/langchain/langchain/callbacks/context_callback.py @@ -63,8 +63,8 @@ class ContextCallbackHandler(BaseCallbackHandler): >>> chat(messages) Chain Example: - >>> from langchain import LLMChain - >>> from langchain.llms import ChatOpenAI + >>> from langchain.chains import LLMChain + >>> from langchain.chat_models import ChatOpenAI >>> from langchain.callbacks import ContextCallbackHandler >>> context_callback = ContextCallbackHandler( ... token="", diff --git a/libs/langchain/langchain/chains/conversation/base.py b/libs/langchain/langchain/chains/conversation/base.py index 033e73ffef..06e5481c30 100644 --- a/libs/langchain/langchain/chains/conversation/base.py +++ b/libs/langchain/langchain/chains/conversation/base.py @@ -14,7 +14,8 @@ class ConversationChain(LLMChain): Example: .. code-block:: python - from langchain import ConversationChain, OpenAI + from langchain.chains import ConversationChain + from langchain.llms import OpenAI conversation = ConversationChain(llm=OpenAI()) """ diff --git a/libs/langchain/langchain/chains/elasticsearch_database/base.py b/libs/langchain/langchain/chains/elasticsearch_database/base.py index f4cc3a6837..5ee33c9fb9 100644 --- a/libs/langchain/langchain/chains/elasticsearch_database/base.py +++ b/libs/langchain/langchain/chains/elasticsearch_database/base.py @@ -24,7 +24,8 @@ class ElasticsearchDatabaseChain(Chain): Example: .. code-block:: python - from langchain import ElasticsearchDatabaseChain, OpenAI + from langchain.chains import ElasticsearchDatabaseChain + from langchain.llms import OpenAI from elasticsearch import Elasticsearch database = Elasticsearch("http://localhost:9200") diff --git a/libs/langchain/langchain/chains/llm.py b/libs/langchain/langchain/chains/llm.py index ba8c107305..efa16ff4fc 100644 --- a/libs/langchain/langchain/chains/llm.py +++ b/libs/langchain/langchain/chains/llm.py @@ -32,7 +32,9 @@ class LLMChain(Chain): Example: .. code-block:: python - from langchain import LLMChain, OpenAI, PromptTemplate + from langchain.chains import LLMChain + from langchain.llms import OpenAI + from langchain.prompts import PromptTemplate prompt_template = "Tell me a {adjective} joke" prompt = PromptTemplate( input_variables=["adjective"], template=prompt_template diff --git a/libs/langchain/langchain/chains/llm_bash/base.py b/libs/langchain/langchain/chains/llm_bash/base.py index 9b1bd568bb..3d885a4bd4 100644 --- a/libs/langchain/langchain/chains/llm_bash/base.py +++ b/libs/langchain/langchain/chains/llm_bash/base.py @@ -23,7 +23,8 @@ class LLMBashChain(Chain): Example: .. code-block:: python - from langchain import LLMBashChain, OpenAI + from langchain.chains import LLMBashChain + from langchain.llms import OpenAI llm_bash = LLMBashChain.from_llm(OpenAI()) """ diff --git a/libs/langchain/langchain/chains/llm_checker/base.py b/libs/langchain/langchain/chains/llm_checker/base.py index d72d389398..a9ff8178da 100644 --- a/libs/langchain/langchain/chains/llm_checker/base.py +++ b/libs/langchain/langchain/chains/llm_checker/base.py @@ -67,7 +67,8 @@ class LLMCheckerChain(Chain): Example: .. code-block:: python - from langchain import OpenAI, LLMCheckerChain + from langchain.llms import OpenAI + from langchain.chains import LLMCheckerChain llm = OpenAI(temperature=0.7) checker_chain = LLMCheckerChain.from_llm(llm) """ diff --git a/libs/langchain/langchain/chains/llm_math/base.py b/libs/langchain/langchain/chains/llm_math/base.py index fc54999b91..ceddc3e9cb 100644 --- a/libs/langchain/langchain/chains/llm_math/base.py +++ b/libs/langchain/langchain/chains/llm_math/base.py @@ -26,7 +26,8 @@ class LLMMathChain(Chain): Example: .. code-block:: python - from langchain import LLMMathChain, OpenAI + from langchain.chains import LLMMathChain + from langchain.llms import OpenAI llm_math = LLMMathChain.from_llm(OpenAI()) """ diff --git a/libs/langchain/langchain/chains/llm_summarization_checker/base.py b/libs/langchain/langchain/chains/llm_summarization_checker/base.py index 0728571eb3..282b431800 100644 --- a/libs/langchain/langchain/chains/llm_summarization_checker/base.py +++ b/libs/langchain/langchain/chains/llm_summarization_checker/base.py @@ -78,7 +78,8 @@ class LLMSummarizationCheckerChain(Chain): Example: .. code-block:: python - from langchain import OpenAI, LLMSummarizationCheckerChain + from langchain.llms import OpenAI + from langchain.chains import LLMSummarizationCheckerChain llm = OpenAI(temperature=0.0) checker_chain = LLMSummarizationCheckerChain.from_llm(llm) """ diff --git a/libs/langchain/langchain/chains/llm_symbolic_math/base.py b/libs/langchain/langchain/chains/llm_symbolic_math/base.py index c511b8cc37..1ae92fa9d8 100644 --- a/libs/langchain/langchain/chains/llm_symbolic_math/base.py +++ b/libs/langchain/langchain/chains/llm_symbolic_math/base.py @@ -22,7 +22,8 @@ class LLMSymbolicMathChain(Chain): Example: .. code-block:: python - from langchain import LLMSymbolicMathChain, OpenAI + from langchain.chains import LLMSymbolicMathChain + from langchain.llms import OpenAI llm_symbolic_math = LLMSymbolicMathChain.from_llm(OpenAI()) """ diff --git a/libs/langchain/langchain/chains/natbot/base.py b/libs/langchain/langchain/chains/natbot/base.py index 0fbffe6885..e772ee7b42 100644 --- a/libs/langchain/langchain/chains/natbot/base.py +++ b/libs/langchain/langchain/chains/natbot/base.py @@ -19,7 +19,7 @@ class NatBotChain(Chain): Example: .. code-block:: python - from langchain import NatBotChain + from langchain.chains import NatBotChain natbot = NatBotChain.from_default("Buy me a new hat.") """ diff --git a/libs/langchain/langchain/chains/openai_functions/openapi.py b/libs/langchain/langchain/chains/openai_functions/openapi.py index a06d147ff6..5d03b59562 100644 --- a/libs/langchain/langchain/chains/openai_functions/openapi.py +++ b/libs/langchain/langchain/chains/openai_functions/openapi.py @@ -8,9 +8,9 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Un import requests from requests import Response -from langchain import LLMChain from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain +from langchain.chains.llm import LLMChain from langchain.chains.sequential import SequentialChain from langchain.chat_models import ChatOpenAI from langchain.output_parsers.openai_functions import JsonOutputFunctionsParser diff --git a/libs/langchain/langchain/chains/query_constructor/base.py b/libs/langchain/langchain/chains/query_constructor/base.py index 46c8c69491..71106753f0 100644 --- a/libs/langchain/langchain/chains/query_constructor/base.py +++ b/libs/langchain/langchain/chains/query_constructor/base.py @@ -4,7 +4,7 @@ from __future__ import annotations import json from typing import Any, Callable, List, Optional, Sequence -from langchain import FewShotPromptTemplate, LLMChain +from langchain.chains.llm import LLMChain from langchain.chains.query_constructor.ir import ( Comparator, Operator, @@ -22,6 +22,7 @@ from langchain.chains.query_constructor.prompt import ( ) from langchain.chains.query_constructor.schema import AttributeInfo from langchain.output_parsers.json import parse_and_check_json_markdown +from langchain.prompts.few_shot import FewShotPromptTemplate from langchain.schema import BaseOutputParser, BasePromptTemplate, OutputParserException from langchain.schema.language_model import BaseLanguageModel diff --git a/libs/langchain/langchain/chains/query_constructor/prompt.py b/libs/langchain/langchain/chains/query_constructor/prompt.py index 22cf248af8..fb6a7901c5 100644 --- a/libs/langchain/langchain/chains/query_constructor/prompt.py +++ b/libs/langchain/langchain/chains/query_constructor/prompt.py @@ -1,5 +1,5 @@ # flake8: noqa -from langchain import PromptTemplate +from langchain.prompts import PromptTemplate SONG_DATA_SOURCE = """\ ```json diff --git a/libs/langchain/langchain/chains/transform.py b/libs/langchain/langchain/chains/transform.py index 66762fa4ab..bdf51bf5c0 100644 --- a/libs/langchain/langchain/chains/transform.py +++ b/libs/langchain/langchain/chains/transform.py @@ -19,7 +19,7 @@ class TransformChain(Chain): Example: .. code-block:: python - from langchain import TransformChain + from langchain.chains import TransformChain transform_chain = TransformChain(input_variables=["text"], output_variables["entities"], transform=func()) """ diff --git a/libs/langchain/langchain/chat_loaders/imessage.py b/libs/langchain/langchain/chat_loaders/imessage.py index eed0cfea37..a656c60b76 100644 --- a/libs/langchain/langchain/chat_loaders/imessage.py +++ b/libs/langchain/langchain/chat_loaders/imessage.py @@ -3,8 +3,8 @@ from __future__ import annotations from pathlib import Path from typing import TYPE_CHECKING, Iterator, List, Optional, Union -from langchain import schema from langchain.chat_loaders.base import BaseChatLoader, ChatSession +from langchain.schema import HumanMessage if TYPE_CHECKING: import sqlite3 @@ -57,7 +57,7 @@ class IMessageChatLoader(BaseChatLoader): Returns: ChatSession: Loaded chat session. """ - results: List[schema.HumanMessage] = [] + results: List[HumanMessage] = [] query = """ SELECT message.date, handle.id, message.text @@ -73,7 +73,7 @@ class IMessageChatLoader(BaseChatLoader): for date, sender, text in messages: if text: # Skip empty messages results.append( - schema.HumanMessage( + HumanMessage( role=sender, content=text, additional_kwargs={ diff --git a/libs/langchain/langchain/chat_loaders/slack.py b/libs/langchain/langchain/chat_loaders/slack.py index 7c9f76c965..29c2dc794c 100644 --- a/libs/langchain/langchain/chat_loaders/slack.py +++ b/libs/langchain/langchain/chat_loaders/slack.py @@ -5,8 +5,8 @@ import zipfile from pathlib import Path from typing import Dict, Iterator, List, Union -from langchain import schema from langchain.chat_loaders.base import BaseChatLoader, ChatSession +from langchain.schema import AIMessage, HumanMessage logger = logging.getLogger(__name__) @@ -28,7 +28,7 @@ class SlackChatLoader(BaseChatLoader): raise FileNotFoundError(f"File {self.zip_path} not found") def _load_single_chat_session(self, messages: List[Dict]) -> ChatSession: - results: List[Union[schema.AIMessage, schema.HumanMessage]] = [] + results: List[Union[AIMessage, HumanMessage]] = [] previous_sender = None for message in messages: if not isinstance(message, dict): @@ -50,7 +50,7 @@ class SlackChatLoader(BaseChatLoader): ) else: results.append( - schema.HumanMessage( + HumanMessage( role=sender, content=text, additional_kwargs={ diff --git a/libs/langchain/langchain/chat_loaders/telegram.py b/libs/langchain/langchain/chat_loaders/telegram.py index 12c30014ac..2441d49a07 100644 --- a/libs/langchain/langchain/chat_loaders/telegram.py +++ b/libs/langchain/langchain/chat_loaders/telegram.py @@ -6,8 +6,8 @@ import zipfile from pathlib import Path from typing import Iterator, List, Union -from langchain import schema from langchain.chat_loaders.base import BaseChatLoader, ChatSession +from langchain.schema import AIMessage, BaseMessage, HumanMessage logger = logging.getLogger(__name__) @@ -55,7 +55,7 @@ class TelegramChatLoader(BaseChatLoader): with open(file_path, "r", encoding="utf-8") as file: soup = BeautifulSoup(file, "html.parser") - results: List[Union[schema.HumanMessage, schema.AIMessage]] = [] + results: List[Union[HumanMessage, AIMessage]] = [] previous_sender = None for message in soup.select(".message.default"): timestamp = message.select_one(".pull_right.date.details")["title"] @@ -69,7 +69,7 @@ class TelegramChatLoader(BaseChatLoader): from_name = from_name_element.text.strip() text = message.select_one(".text").text.strip() results.append( - schema.HumanMessage( + HumanMessage( content=text, additional_kwargs={ "sender": from_name, @@ -94,14 +94,14 @@ class TelegramChatLoader(BaseChatLoader): data = json.load(file) messages = data.get("messages", []) - results: List[schema.BaseMessage] = [] + results: List[BaseMessage] = [] for message in messages: text = message.get("text", "") timestamp = message.get("date", "") from_name = message.get("from", "") results.append( - schema.HumanMessage( + HumanMessage( content=text, additional_kwargs={ "sender": from_name, diff --git a/libs/langchain/langchain/chat_loaders/utils.py b/libs/langchain/langchain/chat_loaders/utils.py index da41cfd23f..1c75c852d2 100644 --- a/libs/langchain/langchain/chat_loaders/utils.py +++ b/libs/langchain/langchain/chat_loaders/utils.py @@ -2,9 +2,8 @@ from copy import deepcopy from typing import Iterable, Iterator, List -from langchain import schema from langchain.chat_loaders.base import ChatSession -from langchain.schema.messages import BaseMessage +from langchain.schema.messages import AIMessage, BaseMessage def merge_chat_runs_in_session( @@ -65,7 +64,7 @@ def map_ai_messages_in_session(chat_sessions: ChatSession, sender: str) -> ChatS num_converted = 0 for message in chat_sessions["messages"]: if message.additional_kwargs.get("sender") == sender: - message = schema.AIMessage( + message = AIMessage( content=message.content, additional_kwargs=message.additional_kwargs.copy(), example=getattr(message, "example", None), diff --git a/libs/langchain/langchain/chat_loaders/whatsapp.py b/libs/langchain/langchain/chat_loaders/whatsapp.py index 39266485e2..ad9c1ee9c3 100644 --- a/libs/langchain/langchain/chat_loaders/whatsapp.py +++ b/libs/langchain/langchain/chat_loaders/whatsapp.py @@ -4,9 +4,8 @@ import re import zipfile from typing import Iterator, List, Union -from langchain import schema from langchain.chat_loaders.base import BaseChatLoader, ChatSession -from langchain.schema import messages +from langchain.schema import AIMessage, HumanMessage logger = logging.getLogger(__name__) @@ -66,14 +65,14 @@ class WhatsAppChatLoader(BaseChatLoader): current_message += " " + line.strip() if current_message: chat_lines.append(current_message) - results: List[Union[messages.HumanMessage, messages.AIMessage]] = [] + results: List[Union[HumanMessage, AIMessage]] = [] for line in chat_lines: result = self._message_line_regex.match(line.strip()) if result: timestamp, sender, text = result.groups() if not self._ignore_lines.match(text.strip()): results.append( - schema.HumanMessage( + HumanMessage( role=sender, content=text, additional_kwargs={ diff --git a/libs/langchain/langchain/evaluation/qa/eval_chain.py b/libs/langchain/langchain/evaluation/qa/eval_chain.py index 7e3af64168..9f270b6f12 100644 --- a/libs/langchain/langchain/evaluation/qa/eval_chain.py +++ b/libs/langchain/langchain/evaluation/qa/eval_chain.py @@ -4,11 +4,11 @@ from __future__ import annotations import re from typing import Any, List, Optional, Sequence -from langchain import PromptTemplate from langchain.callbacks.manager import Callbacks from langchain.chains.llm import LLMChain from langchain.evaluation.qa.eval_prompt import CONTEXT_PROMPT, COT_PROMPT, PROMPT from langchain.evaluation.schema import LLMEvalChain, StringEvaluator +from langchain.prompts import PromptTemplate from langchain.pydantic_v1 import Extra from langchain.schema import RUN_KEY from langchain.schema.language_model import BaseLanguageModel diff --git a/libs/langchain/langchain/indexes/graph.py b/libs/langchain/langchain/indexes/graph.py index c29f56de5e..9772a9ef2b 100644 --- a/libs/langchain/langchain/indexes/graph.py +++ b/libs/langchain/langchain/indexes/graph.py @@ -1,7 +1,6 @@ """Graph Index Creator.""" from typing import Optional, Type -from langchain import BasePromptTemplate from langchain.chains.llm import LLMChain from langchain.graphs.networkx_graph import NetworkxEntityGraph, parse_triples from langchain.indexes.prompts.knowledge_triplet_extraction import ( @@ -9,6 +8,7 @@ from langchain.indexes.prompts.knowledge_triplet_extraction import ( ) from langchain.pydantic_v1 import BaseModel from langchain.schema.language_model import BaseLanguageModel +from langchain.schema.prompt_template import BasePromptTemplate class GraphIndexCreator(BaseModel): diff --git a/libs/langchain/langchain/llms/pipelineai.py b/libs/langchain/langchain/llms/pipelineai.py index cff6c0f5b1..248666e6f4 100644 --- a/libs/langchain/langchain/llms/pipelineai.py +++ b/libs/langchain/langchain/llms/pipelineai.py @@ -22,7 +22,7 @@ class PipelineAI(LLM, BaseModel): Example: .. code-block:: python - from langchain import PipelineAI + from langchain.llms import PipelineAI pipeline = PipelineAI(pipeline_key="") """ diff --git a/libs/langchain/langchain/llms/sagemaker_endpoint.py b/libs/langchain/langchain/llms/sagemaker_endpoint.py index e0383552b2..9505f17330 100644 --- a/libs/langchain/langchain/llms/sagemaker_endpoint.py +++ b/libs/langchain/langchain/llms/sagemaker_endpoint.py @@ -83,7 +83,7 @@ class SagemakerEndpoint(LLM): Example: .. code-block:: python - from langchain import SagemakerEndpoint + from langchain.llms import SagemakerEndpoint endpoint_name = ( "my-endpoint-name" ) diff --git a/libs/langchain/langchain/llms/writer.py b/libs/langchain/langchain/llms/writer.py index 5f83d16e69..54a8a5fc21 100644 --- a/libs/langchain/langchain/llms/writer.py +++ b/libs/langchain/langchain/llms/writer.py @@ -18,7 +18,7 @@ class Writer(LLM): Example: .. code-block:: python - from langchain import Writer + from langchain.llms import Writer writer = Writer(model_id="palmyra-base") """ diff --git a/libs/langchain/langchain/prompts/prompt.py b/libs/langchain/langchain/prompts/prompt.py index 9f18af8a16..ce87ec468d 100644 --- a/libs/langchain/langchain/prompts/prompt.py +++ b/libs/langchain/langchain/prompts/prompt.py @@ -26,7 +26,7 @@ class PromptTemplate(StringPromptTemplate): .. code-block:: python - from langchain import PromptTemplate + from langchain.prompts import PromptTemplate # Instantiation using from_template (recommended) prompt = PromptTemplate.from_template("Say {foo}") diff --git a/libs/langchain/langchain/retrievers/document_compressors/chain_extract.py b/libs/langchain/langchain/retrievers/document_compressors/chain_extract.py index 43a50be79d..7fc0041640 100644 --- a/libs/langchain/langchain/retrievers/document_compressors/chain_extract.py +++ b/libs/langchain/langchain/retrievers/document_compressors/chain_extract.py @@ -4,8 +4,9 @@ from __future__ import annotations import asyncio from typing import Any, Callable, Dict, Optional, Sequence -from langchain import LLMChain, PromptTemplate from langchain.callbacks.manager import Callbacks +from langchain.chains.llm import LLMChain +from langchain.prompts import PromptTemplate from langchain.retrievers.document_compressors.base import BaseDocumentCompressor from langchain.retrievers.document_compressors.chain_extract_prompt import ( prompt_template, diff --git a/libs/langchain/langchain/retrievers/document_compressors/chain_filter.py b/libs/langchain/langchain/retrievers/document_compressors/chain_filter.py index efe6886c88..716909fab8 100644 --- a/libs/langchain/langchain/retrievers/document_compressors/chain_filter.py +++ b/libs/langchain/langchain/retrievers/document_compressors/chain_filter.py @@ -1,9 +1,10 @@ """Filter that uses an LLM to drop documents that aren't relevant to the query.""" from typing import Any, Callable, Dict, Optional, Sequence -from langchain import LLMChain, PromptTemplate from langchain.callbacks.manager import Callbacks +from langchain.chains import LLMChain from langchain.output_parsers.boolean import BooleanOutputParser +from langchain.prompts import PromptTemplate from langchain.retrievers.document_compressors.base import BaseDocumentCompressor from langchain.retrievers.document_compressors.chain_filter_prompt import ( prompt_template, diff --git a/libs/langchain/langchain/utilities/google_places_api.py b/libs/langchain/langchain/utilities/google_places_api.py index 22d4d0e626..abd4539474 100644 --- a/libs/langchain/langchain/utilities/google_places_api.py +++ b/libs/langchain/langchain/utilities/google_places_api.py @@ -24,7 +24,7 @@ class GooglePlacesAPIWrapper(BaseModel): .. code-block:: python - from langchain import GooglePlacesAPIWrapper + from langchain.utilities import GooglePlacesAPIWrapper gplaceapi = GooglePlacesAPIWrapper() """ diff --git a/libs/langchain/langchain/utilities/google_serper.py b/libs/langchain/langchain/utilities/google_serper.py index 951c00b8fa..15a7614881 100644 --- a/libs/langchain/langchain/utilities/google_serper.py +++ b/libs/langchain/langchain/utilities/google_serper.py @@ -21,7 +21,7 @@ class GoogleSerperAPIWrapper(BaseModel): Example: .. code-block:: python - from langchain import GoogleSerperAPIWrapper + from langchain.utilities import GoogleSerperAPIWrapper google_serper = GoogleSerperAPIWrapper() """ diff --git a/libs/langchain/langchain/vectorstores/annoy.py b/libs/langchain/langchain/vectorstores/annoy.py index 22c569781b..233b574f01 100644 --- a/libs/langchain/langchain/vectorstores/annoy.py +++ b/libs/langchain/langchain/vectorstores/annoy.py @@ -40,7 +40,7 @@ class Annoy(VectorStore): Example: .. code-block:: python - from langchain import Annoy + from langchain.vectorstores import Annoy db = Annoy(embedding_function, index, docstore, index_to_docstore_id) """ @@ -350,7 +350,7 @@ class Annoy(VectorStore): Example: .. code-block:: python - from langchain import Annoy + from langchain.vectorstores import Annoy from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() index = Annoy.from_texts(texts, embeddings) @@ -390,7 +390,7 @@ class Annoy(VectorStore): Example: .. code-block:: python - from langchain import Annoy + from langchain.vectorstores import Annoy from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() text_embeddings = embeddings.embed_documents(texts) diff --git a/libs/langchain/langchain/vectorstores/dingo.py b/libs/langchain/langchain/vectorstores/dingo.py index e6d3419c79..8527f8a31b 100644 --- a/libs/langchain/langchain/vectorstores/dingo.py +++ b/libs/langchain/langchain/vectorstores/dingo.py @@ -286,7 +286,7 @@ class Dingo(VectorStore): Example: .. code-block:: python - from langchain import Dingo + from langchain.vectorstores import Dingo from langchain.embeddings import OpenAIEmbeddings import dingodb sss diff --git a/libs/langchain/langchain/vectorstores/elastic_vector_search.py b/libs/langchain/langchain/vectorstores/elastic_vector_search.py index 978da1d5ce..2ac7bbd71d 100644 --- a/libs/langchain/langchain/vectorstores/elastic_vector_search.py +++ b/libs/langchain/langchain/vectorstores/elastic_vector_search.py @@ -62,7 +62,7 @@ class ElasticVectorSearch(VectorStore): Example: .. code-block:: python - from langchain import ElasticVectorSearch + from langchain.vectorstores import ElasticVectorSearch from langchain.embeddings import OpenAIEmbeddings embedding = OpenAIEmbeddings() @@ -98,7 +98,7 @@ class ElasticVectorSearch(VectorStore): Example: .. code-block:: python - from langchain import ElasticVectorSearch + from langchain.vectorstores import ElasticVectorSearch from langchain.embeddings import OpenAIEmbeddings embedding = OpenAIEmbeddings() @@ -282,7 +282,7 @@ class ElasticVectorSearch(VectorStore): Example: .. code-block:: python - from langchain import ElasticVectorSearch + from langchain.vectorstores import ElasticVectorSearch from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() elastic_vector_search = ElasticVectorSearch.from_texts( diff --git a/libs/langchain/langchain/vectorstores/faiss.py b/libs/langchain/langchain/vectorstores/faiss.py index ec95c67e0b..d3599f3f14 100644 --- a/libs/langchain/langchain/vectorstores/faiss.py +++ b/libs/langchain/langchain/vectorstores/faiss.py @@ -593,7 +593,7 @@ class FAISS(VectorStore): Example: .. code-block:: python - from langchain import FAISS + from langchain.vectorstores import FAISS from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() @@ -630,7 +630,7 @@ class FAISS(VectorStore): Example: .. code-block:: python - from langchain import FAISS + from langchain.vectorstores import FAISS from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() diff --git a/libs/langchain/langchain/vectorstores/hologres.py b/libs/langchain/langchain/vectorstores/hologres.py index ce816e8f90..c387612c84 100644 --- a/libs/langchain/langchain/vectorstores/hologres.py +++ b/libs/langchain/langchain/vectorstores/hologres.py @@ -403,7 +403,7 @@ class Hologres(VectorStore): Example: .. code-block:: python - from langchain import Hologres + from langchain.vectorstores import Hologres from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() text_embeddings = embeddings.embed_documents(texts) diff --git a/libs/langchain/langchain/vectorstores/meilisearch.py b/libs/langchain/langchain/vectorstores/meilisearch.py index 05ffb9700f..43ab448ad1 100644 --- a/libs/langchain/langchain/vectorstores/meilisearch.py +++ b/libs/langchain/langchain/vectorstores/meilisearch.py @@ -281,7 +281,7 @@ class Meilisearch(VectorStore): Example: .. code-block:: python - from langchain import Meilisearch + from langchain.vectorstores import Meilisearch from langchain.embeddings import OpenAIEmbeddings import meilisearch diff --git a/libs/langchain/langchain/vectorstores/milvus.py b/libs/langchain/langchain/vectorstores/milvus.py index e5ee2a015c..5ae88f893e 100644 --- a/libs/langchain/langchain/vectorstores/milvus.py +++ b/libs/langchain/langchain/vectorstores/milvus.py @@ -84,7 +84,7 @@ class Milvus(VectorStore): Example: .. code-block:: python - from langchain import Milvus + from langchain.vectorstores import Milvus from langchain.embeddings import OpenAIEmbeddings embedding = OpenAIEmbeddings() diff --git a/libs/langchain/langchain/vectorstores/opensearch_vector_search.py b/libs/langchain/langchain/vectorstores/opensearch_vector_search.py index ddc2e72ac3..319e98d92a 100644 --- a/libs/langchain/langchain/vectorstores/opensearch_vector_search.py +++ b/libs/langchain/langchain/vectorstores/opensearch_vector_search.py @@ -319,7 +319,7 @@ class OpenSearchVectorSearch(VectorStore): Example: .. code-block:: python - from langchain import OpenSearchVectorSearch + from langchain.vectorstores import OpenSearchVectorSearch opensearch_vector_search = OpenSearchVectorSearch( "http://localhost:9200", "embeddings", @@ -670,7 +670,7 @@ class OpenSearchVectorSearch(VectorStore): Example: .. code-block:: python - from langchain import OpenSearchVectorSearch + from langchain.vectorstores import OpenSearchVectorSearch from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() opensearch_vector_search = OpenSearchVectorSearch.from_texts( diff --git a/libs/langchain/langchain/vectorstores/pgvector.py b/libs/langchain/langchain/vectorstores/pgvector.py index 6186d1d7e6..96be6c2568 100644 --- a/libs/langchain/langchain/vectorstores/pgvector.py +++ b/libs/langchain/langchain/vectorstores/pgvector.py @@ -523,7 +523,7 @@ class PGVector(VectorStore): Example: .. code-block:: python - from langchain import PGVector + from langchain.vectorstores import PGVector from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() text_embeddings = embeddings.embed_documents(texts) diff --git a/libs/langchain/langchain/vectorstores/pinecone.py b/libs/langchain/langchain/vectorstores/pinecone.py index ec9fff790a..e84549f5eb 100644 --- a/libs/langchain/langchain/vectorstores/pinecone.py +++ b/libs/langchain/langchain/vectorstores/pinecone.py @@ -396,7 +396,7 @@ class Pinecone(VectorStore): Example: .. code-block:: python - from langchain import Pinecone + from langchain.vectorstores import Pinecone from langchain.embeddings import OpenAIEmbeddings import pinecone diff --git a/libs/langchain/langchain/vectorstores/qdrant.py b/libs/langchain/langchain/vectorstores/qdrant.py index 0be0766f31..76608b5206 100644 --- a/libs/langchain/langchain/vectorstores/qdrant.py +++ b/libs/langchain/langchain/vectorstores/qdrant.py @@ -75,7 +75,7 @@ class Qdrant(VectorStore): .. code-block:: python from qdrant_client import QdrantClient - from langchain import Qdrant + from langchain.vectorstores import Qdrant client = QdrantClient() collection_name = "MyCollection" @@ -1293,7 +1293,7 @@ class Qdrant(VectorStore): Example: .. code-block:: python - from langchain import Qdrant + from langchain.vectorstores import Qdrant from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() qdrant = Qdrant.from_texts(texts, embeddings, "localhost") @@ -1469,7 +1469,7 @@ class Qdrant(VectorStore): Example: .. code-block:: python - from langchain import Qdrant + from langchain.vectorstores import Qdrant from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() qdrant = await Qdrant.afrom_texts(texts, embeddings, "localhost") diff --git a/libs/langchain/langchain/vectorstores/scann.py b/libs/langchain/langchain/vectorstores/scann.py index 434080e7e2..a7a80e7a87 100644 --- a/libs/langchain/langchain/vectorstores/scann.py +++ b/libs/langchain/langchain/vectorstores/scann.py @@ -382,7 +382,7 @@ class ScaNN(VectorStore): Example: .. code-block:: python - from langchain import ScaNN + from langchain.vectorstores import ScaNN from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() scann = ScaNN.from_texts(texts, embeddings) @@ -418,7 +418,7 @@ class ScaNN(VectorStore): Example: .. code-block:: python - from langchain import ScaNN + from langchain.vectorstores import ScaNN from langchain.embeddings import OpenAIEmbeddings embeddings = OpenAIEmbeddings() text_embeddings = embeddings.embed_documents(texts) diff --git a/libs/langchain/langchain/vectorstores/vectara.py b/libs/langchain/langchain/vectorstores/vectara.py index 3e8a2549e2..603410842a 100644 --- a/libs/langchain/langchain/vectorstores/vectara.py +++ b/libs/langchain/langchain/vectorstores/vectara.py @@ -388,7 +388,7 @@ class Vectara(VectorStore): Example: .. code-block:: python - from langchain import Vectara + from langchain.vectorstores import Vectara vectara = Vectara.from_texts( texts, vectara_customer_id=customer_id, @@ -420,7 +420,7 @@ class Vectara(VectorStore): Example: .. code-block:: python - from langchain import Vectara + from langchain.vectorstores import Vectara vectara = Vectara.from_files( files_list, vectara_customer_id=customer_id, diff --git a/libs/langchain/langchain/vectorstores/zilliz.py b/libs/langchain/langchain/vectorstores/zilliz.py index e62bfb1aa8..9e592664e2 100644 --- a/libs/langchain/langchain/vectorstores/zilliz.py +++ b/libs/langchain/langchain/vectorstores/zilliz.py @@ -66,7 +66,7 @@ class Zilliz(Milvus): Example: .. code-block:: python - from langchain import Zilliz + from langchain.vectorstores import Zilliz from langchain.embeddings import OpenAIEmbeddings embedding = OpenAIEmbeddings() diff --git a/libs/langchain/tests/integration_tests/llms/test_fireworks.py b/libs/langchain/tests/integration_tests/llms/test_fireworks.py index e0dcb4fe43..b111d5b57b 100644 --- a/libs/langchain/tests/integration_tests/llms/test_fireworks.py +++ b/libs/langchain/tests/integration_tests/llms/test_fireworks.py @@ -3,13 +3,14 @@ from pathlib import Path import pytest -from langchain import LLMChain, PromptTemplate from langchain.chains import RetrievalQA +from langchain.chains.llm import LLMChain from langchain.document_loaders import TextLoader from langchain.embeddings.openai import OpenAIEmbeddings from langchain.llms import OpenAIChat from langchain.llms.fireworks import Fireworks, FireworksChat from langchain.llms.loading import load_llm +from langchain.prompts import PromptTemplate from langchain.prompts.chat import ( ChatPromptTemplate, HumanMessagePromptTemplate, diff --git a/libs/langchain/tests/integration_tests/llms/test_huggingface_text_gen_inference.py b/libs/langchain/tests/integration_tests/llms/test_huggingface_text_gen_inference.py index 46e63383a4..2d97dfa57d 100644 --- a/libs/langchain/tests/integration_tests/llms/test_huggingface_text_gen_inference.py +++ b/libs/langchain/tests/integration_tests/llms/test_huggingface_text_gen_inference.py @@ -1,4 +1,4 @@ -from langchain import HuggingFaceTextGenInference +from langchain.llms import HuggingFaceTextGenInference def test_invocation_params_stop_sequences() -> None: diff --git a/libs/langchain/tests/integration_tests/llms/test_opaqueprompts.py b/libs/langchain/tests/integration_tests/llms/test_opaqueprompts.py index 1a2fb604bf..c9d0b17567 100644 --- a/libs/langchain/tests/integration_tests/llms/test_opaqueprompts.py +++ b/libs/langchain/tests/integration_tests/llms/test_opaqueprompts.py @@ -1,8 +1,9 @@ import langchain.utilities.opaqueprompts as op -from langchain import LLMChain, PromptTemplate +from langchain.chains.llm import LLMChain from langchain.llms import OpenAI from langchain.llms.opaqueprompts import OpaquePrompts from langchain.memory import ConversationBufferWindowMemory +from langchain.prompts import PromptTemplate from langchain.schema.output_parser import StrOutputParser from langchain.schema.runnable import RunnableMap diff --git a/libs/langchain/tests/integration_tests/llms/test_symblai_nebula.py b/libs/langchain/tests/integration_tests/llms/test_symblai_nebula.py index 35ebd96838..9776167684 100644 --- a/libs/langchain/tests/integration_tests/llms/test_symblai_nebula.py +++ b/libs/langchain/tests/integration_tests/llms/test_symblai_nebula.py @@ -1,6 +1,7 @@ """Test Nebula API wrapper.""" -from langchain import LLMChain, PromptTemplate +from langchain.chains.llm import LLMChain from langchain.llms.symblai_nebula import Nebula +from langchain.prompts.prompt import PromptTemplate def test_symblai_nebula_call() -> None: diff --git a/libs/langchain/tests/unit_tests/chains/test_api.py b/libs/langchain/tests/unit_tests/chains/test_api.py index 2a6854fb4f..93d38ff6ad 100644 --- a/libs/langchain/tests/unit_tests/chains/test_api.py +++ b/libs/langchain/tests/unit_tests/chains/test_api.py @@ -5,9 +5,9 @@ from typing import Any import pytest -from langchain import LLMChain from langchain.chains.api.base import APIChain from langchain.chains.api.prompt import API_RESPONSE_PROMPT, API_URL_PROMPT +from langchain.chains.llm import LLMChain from langchain.utilities.requests import TextRequestsWrapper from tests.unit_tests.llms.fake_llm import FakeLLM diff --git a/libs/langchain/tests/unit_tests/chains/test_combine_documents.py b/libs/langchain/tests/unit_tests/chains/test_combine_documents.py index a970c33cd4..7acbdeba63 100644 --- a/libs/langchain/tests/unit_tests/chains/test_combine_documents.py +++ b/libs/langchain/tests/unit_tests/chains/test_combine_documents.py @@ -4,13 +4,13 @@ from typing import Any, List import pytest -from langchain import PromptTemplate from langchain.chains.combine_documents.reduce import ( _collapse_docs, _split_list_of_docs, ) from langchain.chains.qa_with_sources import load_qa_with_sources_chain from langchain.docstore.document import Document +from langchain.prompts.prompt import PromptTemplate from langchain.schema import format_document from tests.unit_tests.llms.fake_llm import FakeLLM diff --git a/libs/langchain/tests/unit_tests/chat_loaders/test_telegram.py b/libs/langchain/tests/unit_tests/chat_loaders/test_telegram.py index 7984adc194..c35dfbaa2b 100644 --- a/libs/langchain/tests/unit_tests/chat_loaders/test_telegram.py +++ b/libs/langchain/tests/unit_tests/chat_loaders/test_telegram.py @@ -6,13 +6,13 @@ from typing import Sequence import pytest -from langchain import schema from langchain.chat_loaders import telegram, utils +from langchain.schema import AIMessage, BaseMessage, HumanMessage def _assert_messages_are_equal( - actual_messages: Sequence[schema.BaseMessage], - expected_messages: Sequence[schema.BaseMessage], + actual_messages: Sequence[BaseMessage], + expected_messages: Sequence[BaseMessage], ) -> None: assert len(actual_messages) == len(expected_messages) for actual, expected in zip(actual_messages, expected_messages): @@ -47,21 +47,21 @@ def _check_telegram_chat_loader(path: str) -> None: assert len(session["messages"]) > 0 assert session["messages"][0].content == "i refuse to converse with you" expected_content = [ - schema.HumanMessage( + HumanMessage( content="i refuse to converse with you", additional_kwargs={ "sender": "Jimmeny Marvelton", "events": [{"message_time": "23.08.2023 13:11:23 UTC-08:00"}], }, ), - schema.AIMessage( + AIMessage( content="Hi nemesis", additional_kwargs={ "sender": "Batman & Robin", "events": [{"message_time": "23.08.2023 13:13:20 UTC-08:00"}], }, ), - schema.HumanMessage( + HumanMessage( content="we meet again\n\nyou will not trick me this time", additional_kwargs={ "sender": "Jimmeny Marvelton", diff --git a/libs/langchain/tests/unit_tests/schema/__init__.py b/libs/langchain/tests/unit_tests/schema/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/langchain/tests/unit_tests/schema/runnable/__snapshots__/test_runnable.ambr b/libs/langchain/tests/unit_tests/schema/runnable/__snapshots__/test_runnable.ambr index 63c0acc38d..fb950d5b53 100644 --- a/libs/langchain/tests/unit_tests/schema/runnable/__snapshots__/test_runnable.ambr +++ b/libs/langchain/tests/unit_tests/schema/runnable/__snapshots__/test_runnable.ambr @@ -573,6 +573,9 @@ "lc": 1, "type": "constructor", "id": [ + "tests", + "unit_tests", + "schema", "runnable", "test_runnable", "FakeSplitIntoListParser" @@ -1716,6 +1719,9 @@ "lc": 1, "type": "not_implemented", "id": [ + "tests", + "unit_tests", + "schema", "runnable", "test_runnable", "FakeRetriever" diff --git a/libs/langchain/tests/unit_tests/schema/runnable/test_locals.py b/libs/langchain/tests/unit_tests/schema/runnable/test_locals.py index ee07c0cfc6..4b0bbb0136 100644 --- a/libs/langchain/tests/unit_tests/schema/runnable/test_locals.py +++ b/libs/langchain/tests/unit_tests/schema/runnable/test_locals.py @@ -2,8 +2,8 @@ from typing import Any, Callable, Type import pytest -from langchain import PromptTemplate from langchain.llms import FakeListLLM +from langchain.prompts import PromptTemplate from langchain.schema.runnable import ( GetLocalVar, PutLocalVar, diff --git a/libs/langchain/tests/unit_tests/schema/runnable/test_runnable.py b/libs/langchain/tests/unit_tests/schema/runnable/test_runnable.py index 9b1275e95b..a6b8db9ff2 100644 --- a/libs/langchain/tests/unit_tests/schema/runnable/test_runnable.py +++ b/libs/langchain/tests/unit_tests/schema/runnable/test_runnable.py @@ -7,7 +7,6 @@ from freezegun import freeze_time from pytest_mock import MockerFixture from syrupy import SnapshotAssertion -from langchain import PromptTemplate from langchain.callbacks.manager import Callbacks from langchain.callbacks.tracers.base import BaseTracer from langchain.callbacks.tracers.schemas import Run @@ -16,6 +15,7 @@ from langchain.chat_models.fake import FakeListChatModel from langchain.llms.fake import FakeListLLM, FakeStreamingListLLM from langchain.load.dump import dumpd, dumps from langchain.output_parsers.list import CommaSeparatedListOutputParser +from langchain.prompts import PromptTemplate from langchain.prompts.chat import ( ChatPromptTemplate, ChatPromptValue,