From d501760ffc521d3f9989c700639d1749ced3978e Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Mon, 28 Oct 2024 11:19:00 +0530 Subject: [PATCH 1/2] Fix Pydantic deprecation errors --- .../pebblo-saferag/sharepoint-postgres/pebblo_saferag.py | 2 +- .../pebblo-saferag/sharepoint-qdrant/pebblo_saferag.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/pebblo_saferag.py b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/pebblo_saferag.py index bad28d21..24933db9 100644 --- a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/pebblo_saferag.py +++ b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/pebblo_saferag.py @@ -154,7 +154,7 @@ def ask( query=question, auth_context=auth_context, semantic_context=semantic_context ) # Print chain input in formatted json - print(f"\nchain_input: {chain_input.json(indent=4)}") + print(f"\nchain_input: {chain_input.model_dump_json(indent=4)}") return self.retrieval_chain.invoke(chain_input.dict()) diff --git a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/pebblo_saferag.py b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/pebblo_saferag.py index 0617dfb4..35571e72 100644 --- a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/pebblo_saferag.py +++ b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/pebblo_saferag.py @@ -124,7 +124,7 @@ def ask( query=question, auth_context=auth_context, semantic_context=semantic_context ) # Print chain input in formatted json - print(f"\nchain_input: {chain_input.json(indent=4)}") + print(f"\nchain_input: {chain_input.model_dump_json(indent=4)}") return self.retrieval_chain.invoke(chain_input.dict()) From 2bdc608146ed43b7356353d1589e98d0f36ecfcd Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Mon, 28 Oct 2024 11:39:28 +0530 Subject: [PATCH 2/2] Update langchain package dependencies to versions compatible with pydantic v2 --- .../identity-rag/googledrive-qdrant/requirements.txt | 6 +++--- .../pebblo-saferag/googledrive-qdrant/requirements.txt | 6 +++--- .../pebblo-saferag/sharepoint-postgres/requirements.txt | 8 +++++--- .../pebblo-saferag/sharepoint-qdrant/requirements.txt | 4 ++-- .../semantic-rag/googledrive-qdrant/requirements.txt | 6 +++--- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pebblo_saferetriever/langchain/identity-rag/googledrive-qdrant/requirements.txt b/pebblo_saferetriever/langchain/identity-rag/googledrive-qdrant/requirements.txt index 4e00e700..7d27f6ed 100644 --- a/pebblo_saferetriever/langchain/identity-rag/googledrive-qdrant/requirements.txt +++ b/pebblo_saferetriever/langchain/identity-rag/googledrive-qdrant/requirements.txt @@ -1,6 +1,6 @@ -langchain-community>=0.2.9 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore -langchain-google-community>=1.0.4 # For GoogleDriveLoader -langchain-openai>=0.1.7 # For OpenAI LLM and OpenAIEmbeddings +langchain-community>=0.3.1 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore +langchain-google-community>=2.0.0 # For GoogleDriveLoader +langchain-openai>=0.2.1 # For OpenAI LLM and OpenAIEmbeddings python-dotenv==1.0.0 tiktoken requests>=2.32.0 diff --git a/pebblo_saferetriever/langchain/pebblo-saferag/googledrive-qdrant/requirements.txt b/pebblo_saferetriever/langchain/pebblo-saferag/googledrive-qdrant/requirements.txt index bd825287..0265db2f 100644 --- a/pebblo_saferetriever/langchain/pebblo-saferag/googledrive-qdrant/requirements.txt +++ b/pebblo_saferetriever/langchain/pebblo-saferag/googledrive-qdrant/requirements.txt @@ -1,6 +1,6 @@ -langchain-community>=0.2.9 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore -langchain-google-community>=1.0.4 # For GoogleDriveLoader -langchain-openai>=0.1.7 # For OpenAI LLM and OpenAIEmbeddings +langchain-community>=0.3.1 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore +langchain-openai>=0.2.1 # For OpenAI LLM and OpenAIEmbeddings +langchain-google-community>=2.0.0 # For GoogleDriveLoader python-dotenv==1.0.0 requests>=2.32.0 Markdown==3.5 diff --git a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/requirements.txt b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/requirements.txt index 2c9f58a3..a4b619f3 100644 --- a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/requirements.txt +++ b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-postgres/requirements.txt @@ -3,11 +3,13 @@ unstructured[all-docs] # For Docx, PDF loading pymupdf # For PDF loading tiktoken # OpenAI tokenizer -langchain-openai>=0.1.7 # For OpenAI LLM and OpenAIEmbeddings -langchain-community>=0.2.9 # for PebbloSafeLoader, PebbloRetrievalQA +langchain-community>=0.3.1 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore +langchain-openai>=0.2.1 # For OpenAI LLM and OpenAIEmbeddings o365 # Sharepoint azure-identity # Sharepoint psycopg2-binary # For Postgres VectorStore -langchain-postgres # For Postgres VectorStore \ No newline at end of file +langchain-postgres>=0.0.12 # For Postgres VectorStore +#psycopg[binary,pool] # For Remote Postgres +pgvector # Postgres Vector Extension diff --git a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/requirements.txt b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/requirements.txt index 523e424c..0d48815e 100644 --- a/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/requirements.txt +++ b/pebblo_saferetriever/langchain/pebblo-saferag/sharepoint-qdrant/requirements.txt @@ -3,8 +3,8 @@ unstructured[all-docs] # For Docx, PDF loading pymupdf # For PDF loading tiktoken # OpenAI tokenizer -langchain-openai>=0.1.7 # For OpenAI LLM and OpenAIEmbeddings -langchain-community>=0.2.9 # For PebbloSafeLoader, PebbloRetrievalQA +langchain-community>=0.3.1 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore +langchain-openai>=0.2.1 # For OpenAI LLM and OpenAIEmbeddings o365 # Sharepoint azure-identity # Sharepoint diff --git a/pebblo_saferetriever/langchain/semantic-rag/googledrive-qdrant/requirements.txt b/pebblo_saferetriever/langchain/semantic-rag/googledrive-qdrant/requirements.txt index bd825287..3e41d4c0 100644 --- a/pebblo_saferetriever/langchain/semantic-rag/googledrive-qdrant/requirements.txt +++ b/pebblo_saferetriever/langchain/semantic-rag/googledrive-qdrant/requirements.txt @@ -1,6 +1,6 @@ -langchain-community>=0.2.9 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore -langchain-google-community>=1.0.4 # For GoogleDriveLoader -langchain-openai>=0.1.7 # For OpenAI LLM and OpenAIEmbeddings +langchain-community>=0.3.1 # For PebbloSafeLoader, PebbloRetrievalQA, VectorStore +langchain-google-community>=2.0.0 # For GoogleDriveLoader +langchain-openai>=0.2.1 # For OpenAI LLM and OpenAIEmbeddings python-dotenv==1.0.0 requests>=2.32.0 Markdown==3.5