From 6e9bdcd7c7c27d8dc368d2560b6fc52fc8bf8b77 Mon Sep 17 00:00:00 2001 From: Lance Martin Date: Tue, 11 Jun 2024 10:43:25 -0700 Subject: [PATCH 1/3] Update Nomic embeddings --- examples/rag/langgraph_adaptive_rag_local.ipynb | 4 ++-- examples/rag/langgraph_crag_local.ipynb | 4 ++-- examples/rag/langgraph_rag_agent_llama3_local.ipynb | 8 ++++---- examples/rag/langgraph_self_rag_local.ipynb | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/rag/langgraph_adaptive_rag_local.ipynb b/examples/rag/langgraph_adaptive_rag_local.ipynb index 1f2decad1..879e4e21a 100644 --- a/examples/rag/langgraph_adaptive_rag_local.ipynb +++ b/examples/rag/langgraph_adaptive_rag_local.ipynb @@ -123,7 +123,7 @@ "from langchain.text_splitter import RecursiveCharacterTextSplitter\n", "from langchain_community.document_loaders import WebBaseLoader\n", "from langchain_community.vectorstores import Chroma\n", - "from langchain_community.embeddings import GPT4AllEmbeddings\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "\n", "urls = [\n", " \"https://lilianweng.github.io/posts/2023-06-23-agent/\",\n", @@ -143,7 +143,7 @@ "vectorstore = Chroma.from_documents(\n", " documents=doc_splits,\n", " collection_name=\"rag-chroma\",\n", - " embedding=GPT4AllEmbeddings(),\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\"),\n", ")\n", "retriever = vectorstore.as_retriever()" ] diff --git a/examples/rag/langgraph_crag_local.ipynb b/examples/rag/langgraph_crag_local.ipynb index bc94e65b9..f76094fe3 100644 --- a/examples/rag/langgraph_crag_local.ipynb +++ b/examples/rag/langgraph_crag_local.ipynb @@ -185,7 +185,7 @@ "source": [ "from langchain_community.document_loaders import WebBaseLoader\n", "from langchain_community.vectorstores import Chroma\n", - "from langchain_community.embeddings import GPT4AllEmbeddings\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "from langchain.text_splitter import RecursiveCharacterTextSplitter\n", "from langchain_mistralai import MistralAIEmbeddings\n", "\n", @@ -202,7 +202,7 @@ "\n", "# Embed and index\n", "if run_local == \"Yes\":\n", - " embedding = GPT4AllEmbeddings()\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\")\n", "else:\n", " embedding = MistralAIEmbeddings(mistral_api_key=mistral_api_key)\n", "\n", diff --git a/examples/rag/langgraph_rag_agent_llama3_local.ipynb b/examples/rag/langgraph_rag_agent_llama3_local.ipynb index c9e05b08b..23366559f 100644 --- a/examples/rag/langgraph_rag_agent_llama3_local.ipynb +++ b/examples/rag/langgraph_rag_agent_llama3_local.ipynb @@ -78,7 +78,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 4, "id": "2096d49c-d3dc-4329-ada7-aff56d210198", "metadata": {}, "outputs": [], @@ -90,16 +90,16 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 5, "id": "267c63e1-4c2f-439d-8d95-4c6aa01f41cf", "metadata": {}, "outputs": [], "source": [ "### Index\n", "\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "from langchain_community.document_loaders import WebBaseLoader\n", "from langchain_community.vectorstores import Chroma\n", - "from langchain_community.embeddings import GPT4AllEmbeddings\n", "from langchain_text_splitters import RecursiveCharacterTextSplitter\n", "\n", "urls = [\n", @@ -120,7 +120,7 @@ "vectorstore = Chroma.from_documents(\n", " documents=doc_splits,\n", " collection_name=\"rag-chroma\",\n", - " embedding=GPT4AllEmbeddings(),\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\"),\n", ")\n", "retriever = vectorstore.as_retriever()" ] diff --git a/examples/rag/langgraph_self_rag_local.ipynb b/examples/rag/langgraph_self_rag_local.ipynb index 1f1a920e5..f288c3b86 100644 --- a/examples/rag/langgraph_self_rag_local.ipynb +++ b/examples/rag/langgraph_self_rag_local.ipynb @@ -140,7 +140,7 @@ "from langchain.text_splitter import RecursiveCharacterTextSplitter\n", "from langchain_community.document_loaders import WebBaseLoader\n", "from langchain_community.vectorstores import Chroma\n", - "from langchain_community.embeddings import GPT4AllEmbeddings\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "\n", "urls = [\n", " \"https://lilianweng.github.io/posts/2023-06-23-agent/\",\n", @@ -160,7 +160,7 @@ "vectorstore = Chroma.from_documents(\n", " documents=doc_splits,\n", " collection_name=\"rag-chroma\",\n", - " embedding=GPT4AllEmbeddings(),\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\"),\n", ")\n", "retriever = vectorstore.as_retriever()" ] From ca3ed1e3229a897e7befcbfb4f30fd812d698dff Mon Sep 17 00:00:00 2001 From: Lance Martin Date: Tue, 11 Jun 2024 11:17:37 -0700 Subject: [PATCH 2/3] Update local to ensure running locally --- examples/rag/langgraph_adaptive_rag_local.ipynb | 5 +++-- examples/rag/langgraph_crag_local.ipynb | 3 ++- examples/rag/langgraph_rag_agent_llama3_local.ipynb | 5 +++-- examples/rag/langgraph_self_rag_local.ipynb | 7 ++++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/rag/langgraph_adaptive_rag_local.ipynb b/examples/rag/langgraph_adaptive_rag_local.ipynb index 879e4e21a..5f7570de1 100644 --- a/examples/rag/langgraph_adaptive_rag_local.ipynb +++ b/examples/rag/langgraph_adaptive_rag_local.ipynb @@ -45,7 +45,7 @@ "metadata": {}, "outputs": [], "source": [ - "! pip install -U langchain-nomic langchain_community tiktoken langchainhub chromadb langchain langgraph tavily-python" + "! pip install -U langchain-nomic langchain_community tiktoken langchainhub chromadb langchain langgraph tavily-python nomic[local]" ] }, { @@ -143,7 +143,8 @@ "vectorstore = Chroma.from_documents(\n", " documents=doc_splits,\n", " collection_name=\"rag-chroma\",\n", - " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\"),\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\",\n", + " inference_mode='local'),\n", ")\n", "retriever = vectorstore.as_retriever()" ] diff --git a/examples/rag/langgraph_crag_local.ipynb b/examples/rag/langgraph_crag_local.ipynb index f76094fe3..98ca3343a 100644 --- a/examples/rag/langgraph_crag_local.ipynb +++ b/examples/rag/langgraph_crag_local.ipynb @@ -202,7 +202,8 @@ "\n", "# Embed and index\n", "if run_local == \"Yes\":\n", - " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\")\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\",\n", + " inference_mode='local',)\n", "else:\n", " embedding = MistralAIEmbeddings(mistral_api_key=mistral_api_key)\n", "\n", diff --git a/examples/rag/langgraph_rag_agent_llama3_local.ipynb b/examples/rag/langgraph_rag_agent_llama3_local.ipynb index 23366559f..4f4a305d7 100644 --- a/examples/rag/langgraph_rag_agent_llama3_local.ipynb +++ b/examples/rag/langgraph_rag_agent_llama3_local.ipynb @@ -51,7 +51,7 @@ "outputs": [], "source": [ "%%capture --no-stderr\n", - "%pip install -U langchain-nomic langchain_community tiktoken langchainhub chromadb langchain langgraph tavily-python gpt4all langchain-text-splitters" + "%pip install -U langchain-nomic langchain_community tiktoken langchainhub chromadb langchain langgraph tavily-python nomic[local] langchain-text-splitters" ] }, { @@ -120,7 +120,8 @@ "vectorstore = Chroma.from_documents(\n", " documents=doc_splits,\n", " collection_name=\"rag-chroma\",\n", - " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\"),\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\",\n", + " inference_mode='local'),\n", ")\n", "retriever = vectorstore.as_retriever()" ] diff --git a/examples/rag/langgraph_self_rag_local.ipynb b/examples/rag/langgraph_self_rag_local.ipynb index f288c3b86..c6e6c6d36 100644 --- a/examples/rag/langgraph_self_rag_local.ipynb +++ b/examples/rag/langgraph_self_rag_local.ipynb @@ -60,7 +60,7 @@ "metadata": {}, "outputs": [], "source": [ - "! pip install -U langchain-nomic langchain_community tiktoken langchainhub chromadb langchain langgraph" + "! pip install -U langchain-nomic langchain_community tiktoken langchainhub chromadb langchain langgraph nomic[local]" ] }, { @@ -132,7 +132,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": null, "id": "c3bb9060-ad74-4470-9991-2ba167b6b8d8", "metadata": {}, "outputs": [], @@ -160,7 +160,8 @@ "vectorstore = Chroma.from_documents(\n", " documents=doc_splits,\n", " collection_name=\"rag-chroma\",\n", - " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\"),\n", + " embedding=NomicEmbeddings(model=\"nomic-embed-text-v1.5\",\n", + " inference_mode='local'),\n", ")\n", "retriever = vectorstore.as_retriever()" ] From b3116ece60e39e5bfbc783828399f046b9c3ee51 Mon Sep 17 00:00:00 2001 From: Lance Martin Date: Tue, 18 Jun 2024 10:54:55 -0700 Subject: [PATCH 3/3] fmt --- examples/rag/langgraph_adaptive_rag_local.ipynb | 2 +- examples/rag/langgraph_crag_local.ipynb | 2 +- examples/rag/langgraph_rag_agent_llama3_local.ipynb | 2 +- examples/rag/langgraph_self_rag_local.ipynb | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/rag/langgraph_adaptive_rag_local.ipynb b/examples/rag/langgraph_adaptive_rag_local.ipynb index d82c2198c..ecf778a4f 100644 --- a/examples/rag/langgraph_adaptive_rag_local.ipynb +++ b/examples/rag/langgraph_adaptive_rag_local.ipynb @@ -125,8 +125,8 @@ "source": [ "from langchain.text_splitter import RecursiveCharacterTextSplitter\n", "from langchain_community.document_loaders import WebBaseLoader\n", - "from langchain_nomic.embeddings import NomicEmbeddings\n", "from langchain_community.vectorstores import Chroma\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "\n", "urls = [\n", " \"https://lilianweng.github.io/posts/2023-06-23-agent/\",\n", diff --git a/examples/rag/langgraph_crag_local.ipynb b/examples/rag/langgraph_crag_local.ipynb index 587f4fb38..28f6e2ac5 100644 --- a/examples/rag/langgraph_crag_local.ipynb +++ b/examples/rag/langgraph_crag_local.ipynb @@ -186,9 +186,9 @@ "source": [ "from langchain.text_splitter import RecursiveCharacterTextSplitter\n", "from langchain_community.document_loaders import WebBaseLoader\n", - "from langchain_nomic.embeddings import NomicEmbeddings\n", "from langchain_community.vectorstores import Chroma\n", "from langchain_mistralai import MistralAIEmbeddings\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "\n", "# Load\n", "url = \"https://lilianweng.github.io/posts/2023-06-23-agent/\"\n", diff --git a/examples/rag/langgraph_rag_agent_llama3_local.ipynb b/examples/rag/langgraph_rag_agent_llama3_local.ipynb index 5dc54f0b6..038579575 100644 --- a/examples/rag/langgraph_rag_agent_llama3_local.ipynb +++ b/examples/rag/langgraph_rag_agent_llama3_local.ipynb @@ -97,9 +97,9 @@ "source": [ "### Index\n", "\n", - "from langchain_nomic.embeddings import NomicEmbeddings\n", "from langchain_community.document_loaders import WebBaseLoader\n", "from langchain_community.vectorstores import Chroma\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "from langchain_text_splitters import RecursiveCharacterTextSplitter\n", "\n", "urls = [\n", diff --git a/examples/rag/langgraph_self_rag_local.ipynb b/examples/rag/langgraph_self_rag_local.ipynb index 7e70baf6f..5ba7d8d57 100644 --- a/examples/rag/langgraph_self_rag_local.ipynb +++ b/examples/rag/langgraph_self_rag_local.ipynb @@ -142,9 +142,8 @@ "source": [ "from langchain.text_splitter import RecursiveCharacterTextSplitter\n", "from langchain_community.document_loaders import WebBaseLoader\n", - - "from langchain_nomic.embeddings import NomicEmbeddings\n", "from langchain_community.vectorstores import Chroma\n", + "from langchain_nomic.embeddings import NomicEmbeddings\n", "\n", "urls = [\n", " \"https://lilianweng.github.io/posts/2023-06-23-agent/\",\n",