Update Imports to Fix Breaking Change to LangChain (Issue #32)

docker/app_openai.py

@@ -1,6 +1,6 @@
 # Natural Language Query (NLQ) demo using Amazon RDS for PostgreSQL and OpenAI's LLM models via their API.
 # Author: Gary A. Stafford (garystaf@amazon.com)
-# Date: 2023-07-17
+# Date: 2023-08-05
 # Application expects the following environment variables (adjust for your environment):
 # export OPENAI_API_KEY="sk-<your_api_key>""
 # export REGION_NAME="us-east-1"
@@ -17,15 +17,15 @@
 import streamlit as st
 import yaml
 from botocore.exceptions import ClientError
-from langchain import (FewShotPromptTemplate, PromptTemplate, SQLDatabase,
-                       SQLDatabaseChain)
-from langchain.chains.sql_database.prompt import (PROMPT_SUFFIX,
-                                                  _postgres_prompt)
+from langchain import FewShotPromptTemplate, PromptTemplate, SQLDatabase
+from langchain.chains.sql_database.prompt import PROMPT_SUFFIX, _postgres_prompt
 from langchain.chat_models import ChatOpenAI
 from langchain.embeddings.huggingface import HuggingFaceEmbeddings
-from langchain.prompts.example_selector.semantic_similarity import \
-    SemanticSimilarityExampleSelector
+from langchain.prompts.example_selector.semantic_similarity import (
+    SemanticSimilarityExampleSelector,
+)
 from langchain.vectorstores import Chroma
+from langchain_experimental.sql import SQLDatabaseChain
 
 REGION_NAME = os.environ.get("REGION_NAME", "us-east-1")
 MODEL_NAME = os.environ.get("MODEL_NAME", "gpt-3.5-turbo")

docker/app_sagemaker.py

@@ -1,6 +1,6 @@
 # Natural Language Query (NLQ) demo using Amazon RDS for PostgreSQL and Amazon SageMaker JumpStart Foundation Models.
 # Author: Gary A. Stafford (garystaf@amazon.com)
-# Date: 2023-07-17
+# Date: 2023-08-05
 # Application expects the following environment variables (adjust for your environment):
 # export ENDPOINT_NAME="hf-text2text-flan-t5-xxl-fp16"
 # export REGION_NAME="us-east-1"
@@ -16,19 +16,15 @@
 import streamlit as st
 import yaml
 from botocore.exceptions import ClientError
-from langchain import (
-    FewShotPromptTemplate,
-    PromptTemplate,
-    SQLDatabase,
-    SQLDatabaseChain,
-)
+from langchain import FewShotPromptTemplate, PromptTemplate, SQLDatabase
 from langchain.chains.sql_database.prompt import PROMPT_SUFFIX, _postgres_prompt
 from langchain.embeddings.huggingface import HuggingFaceEmbeddings
 from langchain.llms.sagemaker_endpoint import LLMContentHandler, SagemakerEndpoint
 from langchain.prompts.example_selector.semantic_similarity import (
     SemanticSimilarityExampleSelector,
 )
 from langchain.vectorstores import Chroma
+from langchain_experimental.sql import SQLDatabaseChain
 
 REGION_NAME = os.environ.get("REGION_NAME", "us-east-1")
 ENDPOINT_NAME = os.environ.get("ENDPOINT_NAME")

docker/requirements.txt

@@ -1,12 +1,13 @@
-# package versions frozen and tested successfully 2023-07-23
-awscli==1.29.4
-boto3==1.28.4
-chromadb==0.4.0
-langchain==0.0.235
+# package versions frozen and tested successfully 2023-08-05
+awscli==1.29.20
+boto3==1.28.20
+chromadb==0.4.5
+langchain==0.0.252
+langchain-experimental==0.0.8
 openai==0.27.8
-psycopg2-binary==2.9.6
+psycopg2-binary==2.9.7
 python-dotenv==1.0.0
 PyYAML==6.0.1
 sentence-transformers==2.2.2
-SQLAlchemy==2.0.19
-streamlit==1.24.1
+SQLAlchemy>=2.0.19
+streamlit>=1.25.0