fix license and remove azure

.env-example

@@ -1,22 +0,0 @@
-APP_PORT=7860
-
-LANGCHAIN_ENDPOINT="https://api.smith.langchain.com"
-LANGCHAIN_API_KEY="ls__..."
-LANGCHAIN_TRACING_V2="true"
-LANGCHAIN_PROJECT="streamlit_test"
-
-ANYSCALE_API_KEY="secret_..."
-OPENAI_API_KEY="sk-..."
-ANTHROPIC_API_KEY="sk-ant-..."
-
-DEFAULT_SYSTEM_PROMPT="You are a helpful chatbot."
-
-DEFAULT_MODEL="gpt-3.5-turbo"
-
-DEFAULT_TEMPERATURE=0.7
-MIN_TEMPERATURE=0.0
-MAX_TEMPERATURE=1.0
-
-DEFAULT_MAX_TOKENS=1000
-MIN_MAX_TOKENS=1
-MAX_MAX_TOKENS=100000

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Federico Sallemi
+Copyright (c) 2023 Joshua Sundance Bailey
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

langchain-streamlit-demo/app.py

@@ -1,13 +1,13 @@
 from datetime import datetime
-from typing import Tuple, List, Dict, Any, Union, Optional
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import anthropic
 import langsmith.utils
 import openai
 import streamlit as st
+from defaults import default_values
 from langchain.agents import load_tools
 from langchain.agents.tools import tool
-from langchain.callbacks import StreamlitCallbackHandler
 from langchain.callbacks.base import BaseCallbackHandler
 from langchain.callbacks.manager import Callbacks
 from langchain.callbacks.tracers.langchain import LangChainTracer, wait_for_all_tracers
@@ -16,12 +16,10 @@ from langchain.memory import ConversationBufferMemory, StreamlitChatMessageHisto
 from langchain.prompts import ChatPromptTemplate, MessagesPlaceholder
 from langchain.schema.document import Document
 from langchain.schema.retriever import BaseRetriever
-from langchain.tools import DuckDuckGoSearchRun, WikipediaQueryRun
-from langchain.utilities import WikipediaAPIWrapper
+from langchain_community.callbacks import StreamlitCallbackHandler
+from langchain_community.tools import DuckDuckGoSearchRun, WikipediaQueryRun
+from langchain_community.utilities import WikipediaAPIWrapper
 from langsmith.client import Client
-from streamlit_feedback import streamlit_feedback
-
-from defaults import default_values
 from llm_resources import (
     get_agent,
     get_doc_agent,
@@ -31,6 +29,7 @@ from llm_resources import (
 )
 from python_coder import get_agent as get_python_agent
 from research_assistant.chain import get_chain as get_research_assistant_chain
+from streamlit_feedback import streamlit_feedback
 
 __version__ = "2.1.4"
 
@@ -99,41 +98,41 @@ def azure_state_or_default(*args):
     )
 
 
-azure_state_or_default(
-    "AZURE_OPENAI_BASE_URL",
-    "AZURE_OPENAI_API_VERSION",
-    "AZURE_OPENAI_DEPLOYMENT_NAME",
-    "AZURE_OPENAI_EMB_DEPLOYMENT_NAME",
-    "AZURE_OPENAI_API_KEY",
-    "AZURE_OPENAI_MODEL_VERSION",
-)
-
-st.session_state.AZURE_AVAILABLE = all(
-    [
-        st.session_state.AZURE_OPENAI_BASE_URL,
-        st.session_state.AZURE_OPENAI_API_VERSION,
-        st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME,
-        st.session_state.AZURE_OPENAI_API_KEY,
-        st.session_state.AZURE_OPENAI_MODEL_VERSION,
-    ],
-)
-
-st.session_state.AZURE_EMB_AVAILABLE = (
-    st.session_state.AZURE_AVAILABLE
-    and st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME
-)
-
-AZURE_KWARGS = (
-    None
-    if not st.session_state.AZURE_EMB_AVAILABLE
-    else {
-        "openai_api_base": st.session_state.AZURE_OPENAI_BASE_URL,
-        "openai_api_version": st.session_state.AZURE_OPENAI_API_VERSION,
-        "deployment": st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME,
-        "openai_api_key": st.session_state.AZURE_OPENAI_API_KEY,
-        "openai_api_type": "azure",
-    }
-)
+# azure_state_or_default(
+#     "AZURE_OPENAI_BASE_URL",
+#     "AZURE_OPENAI_API_VERSION",
+#     "AZURE_OPENAI_DEPLOYMENT_NAME",
+#     "AZURE_OPENAI_EMB_DEPLOYMENT_NAME",
+#     "AZURE_OPENAI_API_KEY",
+#     "AZURE_OPENAI_MODEL_VERSION",
+# )
+
+# st.session_state.AZURE_AVAILABLE = all(
+#     [
+#         st.session_state.AZURE_OPENAI_BASE_URL,
+#         st.session_state.AZURE_OPENAI_API_VERSION,
+#         st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME,
+#         st.session_state.AZURE_OPENAI_API_KEY,
+#         st.session_state.AZURE_OPENAI_MODEL_VERSION,
+#     ],
+# )
+
+# st.session_state.AZURE_EMB_AVAILABLE = (
+#     st.session_state.AZURE_AVAILABLE
+#     and st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME
+# )
+
+# AZURE_KWARGS = (
+#     None
+#     if not st.session_state.AZURE_EMB_AVAILABLE
+#     else {
+#         "openai_api_base": st.session_state.AZURE_OPENAI_BASE_URL,
+#         "openai_api_version": st.session_state.AZURE_OPENAI_API_VERSION,
+#         "deployment": st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME,
+#         "openai_api_key": st.session_state.AZURE_OPENAI_API_KEY,
+#         "openai_api_type": "azure",
+#     }
+# )
 
 
 @st.cache_resource
@@ -209,7 +208,7 @@ with sidebar:
             help="How many document chunks will be used for context?",
             value=default_values.DEFAULT_RETRIEVER_K,
             min_value=1,
-            max_value=10,
+            max_value=1000,
         )
 
         chunk_size = st.slider(
@@ -255,14 +254,14 @@ with sidebar:
             index=0,
             help=chain_type_help,
         )
-        use_azure = st.toggle(
-            label="Use Azure OpenAI",
-            value=st.session_state.AZURE_EMB_AVAILABLE,
-            help="Use Azure for embeddings instead of using OpenAI directly.",
-        )
+        # use_azure = st.toggle(
+        #     label="Use Azure OpenAI",
+        #     value=st.session_state.AZURE_EMB_AVAILABLE,
+        #     help="Use Azure for embeddings instead of using OpenAI directly.",
+        # )
 
         if uploaded_file:
-            if st.session_state.AZURE_EMB_AVAILABLE or openai_api_key:
+            if openai_api_key:
                 (
                     st.session_state.texts,
                     st.session_state.retriever,
@@ -272,8 +271,8 @@ with sidebar:
                     chunk_size=chunk_size,
                     chunk_overlap=chunk_overlap,
                     k=k,
-                    azure_kwargs=AZURE_KWARGS,
-                    use_azure=use_azure,
+                    # azure_kwargs=AZURE_KWARGS,
+                    use_azure=False,
                 )
             else:
                 st.error("Please enter a valid OpenAI API key.", icon="❌")
@@ -313,11 +312,15 @@ with sidebar:
 
     # --- LangSmith Options ---
     if default_values.SHOW_LANGSMITH_OPTIONS:
-        with st.expander("LangSmith Options", expanded=False):
+        with st.expander(
+            "LangSmith Options",
+            expanded=False,
+        ):
             st.session_state.LANGSMITH_API_KEY = st.text_input(
                 "LangSmith API Key (optional)",
                 value=st.session_state.LANGSMITH_API_KEY,
                 type="password",
+                disabled=True,
             )
 
             st.session_state.LANGSMITH_PROJECT = st.text_input(
@@ -336,38 +339,38 @@ with sidebar:
         )
 
     # --- Azure Options ---
-    if default_values.SHOW_AZURE_OPTIONS:
-        with st.expander("Azure Options", expanded=False):
-            st.session_state.AZURE_OPENAI_BASE_URL = st.text_input(
-                "AZURE_OPENAI_BASE_URL",
-                value=st.session_state.AZURE_OPENAI_BASE_URL,
-            )
-
-            st.session_state.AZURE_OPENAI_API_VERSION = st.text_input(
-                "AZURE_OPENAI_API_VERSION",
-                value=st.session_state.AZURE_OPENAI_API_VERSION,
-            )
-
-            st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME = st.text_input(
-                "AZURE_OPENAI_DEPLOYMENT_NAME",
-                value=st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME,
-            )
-
-            st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME = st.text_input(
-                "AZURE_OPENAI_EMB_DEPLOYMENT_NAME",
-                value=st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME,
-            )
-
-            st.session_state.AZURE_OPENAI_API_KEY = st.text_input(
-                "AZURE_OPENAI_API_KEY",
-                value=st.session_state.AZURE_OPENAI_API_KEY,
-                type="password",
-            )
-
-            st.session_state.AZURE_OPENAI_MODEL_VERSION = st.text_input(
-                "AZURE_OPENAI_MODEL_VERSION",
-                value=st.session_state.AZURE_OPENAI_MODEL_VERSION,
-            )
+    # if default_values.SHOW_AZURE_OPTIONS:
+    #     with st.expander("Azure Options", expanded=False):
+    #         st.session_state.AZURE_OPENAI_BASE_URL = st.text_input(
+    #             "AZURE_OPENAI_BASE_URL",
+    #             value=st.session_state.AZURE_OPENAI_BASE_URL,
+    #         )
+
+    #         st.session_state.AZURE_OPENAI_API_VERSION = st.text_input(
+    #             "AZURE_OPENAI_API_VERSION",
+    #             value=st.session_state.AZURE_OPENAI_API_VERSION,
+    #         )
+
+    #         st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME = st.text_input(
+    #             "AZURE_OPENAI_DEPLOYMENT_NAME",
+    #             value=st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME,
+    #         )
+
+    #         st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME = st.text_input(
+    #             "AZURE_OPENAI_EMB_DEPLOYMENT_NAME",
+    #             value=st.session_state.AZURE_OPENAI_EMB_DEPLOYMENT_NAME,
+    #         )
+
+    #         st.session_state.AZURE_OPENAI_API_KEY = st.text_input(
+    #             "AZURE_OPENAI_API_KEY",
+    #             value=st.session_state.AZURE_OPENAI_API_KEY,
+    #             type="password",
+    #         )
+
+    #         st.session_state.AZURE_OPENAI_MODEL_VERSION = st.text_input(
+    #             "AZURE_OPENAI_MODEL_VERSION",
+    #             value=st.session_state.AZURE_OPENAI_MODEL_VERSION,
+    #         )
 
 
 # --- LLM Instantiation ---
@@ -378,13 +381,13 @@ get_llm_args = dict(
     temperature=temperature,
     max_tokens=max_tokens,
     azure_available=st.session_state.AZURE_AVAILABLE,
-    azure_dict={
-        "AZURE_OPENAI_BASE_URL": st.session_state.AZURE_OPENAI_BASE_URL,
-        "AZURE_OPENAI_API_VERSION": st.session_state.AZURE_OPENAI_API_VERSION,
-        "AZURE_OPENAI_DEPLOYMENT_NAME": st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME,
-        "AZURE_OPENAI_API_KEY": st.session_state.AZURE_OPENAI_API_KEY,
-        "AZURE_OPENAI_MODEL_VERSION": st.session_state.AZURE_OPENAI_MODEL_VERSION,
-    },
+    # azure_dict={
+    #     "AZURE_OPENAI_BASE_URL": st.session_state.AZURE_OPENAI_BASE_URL,
+    #     "AZURE_OPENAI_API_VERSION": st.session_state.AZURE_OPENAI_API_VERSION,
+    #     "AZURE_OPENAI_DEPLOYMENT_NAME": st.session_state.AZURE_OPENAI_DEPLOYMENT_NAME,
+    #     "AZURE_OPENAI_API_KEY": st.session_state.AZURE_OPENAI_API_KEY,
+    #     "AZURE_OPENAI_MODEL_VERSION": st.session_state.AZURE_OPENAI_MODEL_VERSION,
+    # },
 )
 get_llm_args_temp_zero = get_llm_args | {"temperature": 0.0}
 st.session_state.llm = get_llm(**get_llm_args)

langchain-streamlit-demo/defaults.py

@@ -1,10 +1,10 @@
 import os
 from collections import namedtuple
 
-
 MODEL_DICT = {
     "gpt-3.5-turbo": "OpenAI",
     "gpt-4": "OpenAI",
+    "gpt-4-turbo-preview": "OpenAI",
     "gpt-4-1106-preview": "OpenAI",
     "claude-instant-1": "Anthropic",
     "claude-instant-1.2": "Anthropic",
@@ -21,7 +21,7 @@ MODEL_DICT = {
 
 SUPPORTED_MODELS = list(MODEL_DICT.keys())
 
-DEFAULT_MODEL = os.environ.get("DEFAULT_MODEL", "gpt-3.5-turbo")
+DEFAULT_MODEL = os.environ.get("DEFAULT_MODEL", "gpt-4-turbo-preview")
 
 DEFAULT_SYSTEM_PROMPT = os.environ.get(
     "DEFAULT_SYSTEM_PROMPT",
@@ -38,16 +38,16 @@ DEFAULT_MAX_TOKENS = int(os.environ.get("DEFAULT_MAX_TOKENS", 1000))
 
 DEFAULT_LANGSMITH_PROJECT = os.environ.get("LANGCHAIN_PROJECT")
 
-AZURE_VARS = [
-    "AZURE_OPENAI_BASE_URL",
-    "AZURE_OPENAI_API_VERSION",
-    "AZURE_OPENAI_DEPLOYMENT_NAME",
-    "AZURE_OPENAI_EMB_DEPLOYMENT_NAME",
-    "AZURE_OPENAI_API_KEY",
-    "AZURE_OPENAI_MODEL_VERSION",
-]
+# AZURE_VARS = [
+#     "AZURE_OPENAI_BASE_URL",
+#     "AZURE_OPENAI_API_VERSION",
+#     "AZURE_OPENAI_DEPLOYMENT_NAME",
+#     "AZURE_OPENAI_EMB_DEPLOYMENT_NAME",
+#     "AZURE_OPENAI_API_KEY",
+#     "AZURE_OPENAI_MODEL_VERSION",
+# ]
 
-AZURE_DICT = {v: os.environ.get(v, "") for v in AZURE_VARS}
+# AZURE_DICT = {v: os.environ.get(v, "") for v in AZURE_VARS}
 
 
 SHOW_LANGSMITH_OPTIONS = (
@@ -89,8 +89,8 @@ DEFAULT_VALUES = namedtuple(
         "MAX_MAX_TOKENS",
         "DEFAULT_MAX_TOKENS",
         "DEFAULT_LANGSMITH_PROJECT",
-        "AZURE_VARS",
-        "AZURE_DICT",
+        #        "AZURE_VARS",
+        #        "AZURE_DICT",
         "PROVIDER_KEY_DICT",
         "OPENAI_API_KEY",
         "MIN_CHUNK_SIZE",
@@ -118,8 +118,8 @@ default_values = DEFAULT_VALUES(
     MAX_MAX_TOKENS,
     DEFAULT_MAX_TOKENS,
     DEFAULT_LANGSMITH_PROJECT,
-    AZURE_VARS,
-    AZURE_DICT,
+    #    AZURE_VARS,
+    #    AZURE_DICT,
     PROVIDER_KEY_DICT,
     OPENAI_API_KEY,
     MIN_CHUNK_SIZE,

langchain-streamlit-demo/llm_resources.py

@@ -1,27 +1,27 @@
 import uuid
 from tempfile import NamedTemporaryFile
-from typing import Tuple, List, Optional, Dict
+from typing import Dict, List, Optional, Tuple
 
+from defaults import DEFAULT_CHUNK_OVERLAP, DEFAULT_CHUNK_SIZE, DEFAULT_RETRIEVER_K
 from langchain.agents import AgentExecutor, AgentType, initialize_agent
 from langchain.agents.openai_functions_agent.base import OpenAIFunctionsAgent
 from langchain.callbacks.base import BaseCallbackHandler
-from langchain.chains import LLMChain
-from langchain.chains import RetrievalQA
+from langchain.chains import LLMChain, RetrievalQA
 from langchain.chat_models import (
     AzureChatOpenAI,
-    ChatOpenAI,
     ChatAnthropic,
     ChatAnyscale,
+    ChatOpenAI,
 )
 from langchain.document_loaders import PyPDFLoader
 from langchain.embeddings import AzureOpenAIEmbeddings, OpenAIEmbeddings
 from langchain.llms.base import BaseLLM
 from langchain.memory import ConversationBufferMemory
-from langchain.prompts import MessagesPlaceholder, ChatPromptTemplate
+from langchain.prompts import ChatPromptTemplate, MessagesPlaceholder
 from langchain.retrievers import EnsembleRetriever
 from langchain.retrievers.multi_query import MultiQueryRetriever
 from langchain.retrievers.multi_vector import MultiVectorRetriever
-from langchain.schema import Document, BaseRetriever
+from langchain.schema import BaseRetriever, Document
 from langchain.schema.chat_history import BaseChatMessageHistory
 from langchain.schema.runnable import RunnablePassthrough
 from langchain.storage import InMemoryStore
@@ -29,8 +29,6 @@ from langchain.text_splitter import RecursiveCharacterTextSplitter
 from langchain.tools.base import BaseTool
 from langchain.vectorstores import FAISS
 from langchain_core.messages import SystemMessage
-
-from defaults import DEFAULT_CHUNK_SIZE, DEFAULT_CHUNK_OVERLAP, DEFAULT_RETRIEVER_K
 from qagen import get_rag_qa_gen_chain
 from summarize import get_rag_summarization_chain
 
@@ -166,8 +164,8 @@ def get_llm(
     provider_api_key: str,
     temperature: float,
     max_tokens: int,
-    azure_available: bool,
-    azure_dict: dict[str, str],
+    azure_available: bool = False,
+    azure_dict: dict[str, str] = {},
 ):
     if azure_available and provider == "Azure OpenAI":
         return AzureChatOpenAI(

requirements.txt

@@ -5,8 +5,9 @@ certifi>=2023.7.22 # not directly required, pinned by Snyk to avoid a vulnerabil
 duckduckgo-search==4.3.1
 faiss-cpu==1.7.4
 langchain==0.1.4
+langchain-community==0.0.16
 langsmith==0.0.84
-mypy==1.8.0
+# mypy==1.8.0
 numexpr==2.9.0
 numpy>=1.22.2 # not directly required, pinned by Snyk to avoid a vulnerability
 openai==1.10.0