From dcd7f99510d8179982b33214867aa0d6e34a89e6 Mon Sep 17 00:00:00 2001 From: Umang Mistry Date: Mon, 6 May 2024 19:28:00 -0500 Subject: [PATCH] Updated interfaces with constants --- streamlit-server/main.tf | 2 +- streamlit-server/requirements.txt | 8 +++----- streamlit/constants.py | 23 +++++++++++++++++++++++ streamlit/interface_1.py | 7 +++---- streamlit/interface_2.py | 6 ++---- streamlit/interface_2_rag.py | 6 ++---- streamlit/interface_3.py | 6 ++---- streamlit/interface_3_rag.py | 6 ++---- 8 files changed, 38 insertions(+), 26 deletions(-) diff --git a/streamlit-server/main.tf b/streamlit-server/main.tf index e9e4dcf..09dd152 100644 --- a/streamlit-server/main.tf +++ b/streamlit-server/main.tf @@ -92,7 +92,7 @@ resource "aws_instance" "streamlit_server" { echo '${file("${path.module}/requirements.txt")}' > /tmp/requirements.txt apt-get update apt-get install -y python3 python3-pip - pip3 install $(cat /tmp/requirements.txt) + python3 -m pip install $(cat /tmp/requirements.txt) sudo apt install openssh-client # Create UI0 systemd service diff --git a/streamlit-server/requirements.txt b/streamlit-server/requirements.txt index c8ec80f..1190ad0 100644 --- a/streamlit-server/requirements.txt +++ b/streamlit-server/requirements.txt @@ -8,9 +8,7 @@ faiss-cpu huggingface_hub transformers autoawq -protobuf==3.20.2; sys_platform != 'darwin' -protobuf==3.20.2; sys_platform == 'darwin' and platform_machine != 'arm64' -protobuf==3.20.3; sys_platform == 'darwin' and platform_machine == 'arm64' +protobuf==3.20.2 auto-gptq==0.2.2 docx2txt unstructured @@ -19,8 +17,8 @@ unstructured[pdf] # Utilities urllib3==1.26.6 accelerate -bitsandbytes ; sys_platform != 'win32' -bitsandbytes-windows ; sys_platform == 'win32' +#bitsandbytes ; sys_platform != 'win32' +#bitsandbytes-windows ; sys_platform == 'win32' click flask requests diff --git a/streamlit/constants.py b/streamlit/constants.py index 6f1285c..83e33d8 100644 --- a/streamlit/constants.py +++ b/streamlit/constants.py @@ -188,3 +188,26 @@ MODEL_BASENAME = "llama-2-7b-chat.Q4_K_M.gguf" #### # MODEL_ID = "TheBloke/Llama-2-7B-Chat-AWQ" # MODEL_BASENAME = "model.safetensors.awq" + + + +########################################################################################################################################## + +## CONSTANTS FOR INFRATRUCTURE + +# SSO User list +USER_LIST = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com', 'akadam@aarete.com', 'pkatariya@aarete.com' +, 'piragavarapu@aarete.com', 'umistry@aarete.com', 'ahutchison@aarete.com', 'bgrunst@aarete.com', 'ddimeglio@aarete.com' +, 'vnair@aarete.com', 'kminhas@aarete.com', 'fmohiuddin@aarete.com', 'slitewka@aarete.com', 'qdoest@aarete.com', 'bkoryga@aarete.com', 'bcielecki@aarete.com', 'mszymanski@aarete.com','hupreti@aarete.com'] + + +# DOCZY pipeline url - DEV +DOCZY_PIPELINE_URL_DEV = 'https://8ir4vi1ri4.execute-api.us-east-2.amazonaws.com/dev/' + + +# SNOWFLAKE DEV DATABASE +SNOWFLAKE_ACCOUNT_LOCATOR="aarete-doczyai", +DEV_DB_ROLE = "DEVADMIN", +DEV_WH="DEV_XS", +DEV_DB="DOCZY_DEV", +DEV_STAGING_SCHEMA="STG" \ No newline at end of file diff --git a/streamlit/interface_1.py b/streamlit/interface_1.py index e58b137..48a70f0 100644 --- a/streamlit/interface_1.py +++ b/streamlit/interface_1.py @@ -9,13 +9,12 @@ import boto3 import util import requests from sf_conn import get_client_names, get_secret, save_to_sf +from constants import USER_LIST, DOCZY_PIPELINE_URL_DEV -doczy_pipeline = 'https://8ir4vi1ri4.execute-api.us-east-2.amazonaws.com/dev/' +doczy_pipeline = DOCZY_PIPELINE_URL_DEV REDIRECT_URI = 'https://doczy.aarete.com:8501' -user_list = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com', 'akadam@aarete.com', 'pkatariya@aarete.com' -, 'piragavarapu@aarete.com', 'umistry@aarete.com', 'ahutchison@aarete.com', 'bgrunst@aarete.com', 'ddimeglio@aarete.com' -, 'vnair@aarete.com', 'kminhas@aarete.com', 'fmohiuddin@aarete.com', 'slitewka@aarete.com', 'qdoest@aarete.com', 'bkoryga@aarete.com', 'bcielecki@aarete.com', 'mszymanski@aarete.com','hupreti@aarete.com'] +user_list = USER_LIST st.set_page_config(layout = "wide") # # Sidebar contents # with st.sidebar: diff --git a/streamlit/interface_2.py b/streamlit/interface_2.py index 1a4bd78..3d2c8a0 100644 --- a/streamlit/interface_2.py +++ b/streamlit/interface_2.py @@ -5,7 +5,7 @@ from langchain.prompts import PromptTemplate from langchain.embeddings.bedrock import BedrockEmbeddings from langchain.llms.bedrock import Bedrock from langchain_community.vectorstores import Chroma -from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY +from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY, USER_LIST from langchain.chains import RetrievalQA import streamlit as st @@ -20,9 +20,7 @@ from typing import List import re REDIRECT_URI = 'https://doczy.aarete.com:8502' -user_list = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com', 'akadam@aarete.com', 'pkatariya@aarete.com' -, 'piragavarapu@aarete.com', 'umistry@aarete.com', 'ahutchison@aarete.com', 'bgrunst@aarete.com', 'ddimeglio@aarete.com' -, 'vnair@aarete.com', 'kminhas@aarete.com','dculotta@aarete.com','cbull@aarete.com','sclark@aarete.com', 'fmohiuddin@aarete.com', 'hupreti@aarete.com'] +user_list = USER_LIST st.set_page_config(layout = "wide") # Sidebar contents diff --git a/streamlit/interface_2_rag.py b/streamlit/interface_2_rag.py index f0ab1d1..4993f61 100644 --- a/streamlit/interface_2_rag.py +++ b/streamlit/interface_2_rag.py @@ -5,7 +5,7 @@ from langchain.prompts import PromptTemplate from langchain.embeddings.bedrock import BedrockEmbeddings from langchain.llms.bedrock import Bedrock from langchain_community.vectorstores import Chroma -from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY +from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY, USER_LIST from langchain.chains import RetrievalQA import streamlit as st @@ -15,9 +15,7 @@ import pandas as pd import util REDIRECT_URI = 'https://doczy.aarete.com:8502' -user_list = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com', 'akadam@aarete.com', 'pkatariya@aarete.com' -, 'piragavarapu@aarete.com', 'umistry@aarete.com', 'ahutchison@aarete.com', 'bgrunst@aarete.com', 'ddimeglio@aarete.com' -, 'vnair@aarete.com', 'kminhas@aarete.com', 'fmohiuddin@aarete.com', 'slitewka@aarete.com', 'qdoest@aarete.com', 'bkoryga@aarete.com', 'bcielecki@aarete.com', 'mszymanski@aarete.com','hupreti@aarete.com'] +user_list = USER_LIST st.set_page_config(layout = "wide") # Sidebar contents diff --git a/streamlit/interface_3.py b/streamlit/interface_3.py index ae6c57f..817c826 100644 --- a/streamlit/interface_3.py +++ b/streamlit/interface_3.py @@ -4,7 +4,7 @@ from langchain.prompts import PromptTemplate from langchain.embeddings.bedrock import BedrockEmbeddings from langchain.llms.bedrock import Bedrock from langchain_community.vectorstores import Chroma -from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY +from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY, USER_LIST from langchain.chains import RetrievalQA import streamlit as st @@ -25,9 +25,7 @@ from io import StringIO REDIRECT_URI = 'https://doczy.aarete.com:8503' -user_list = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com', 'akadam@aarete.com', 'pkatariya@aarete.com' -, 'piragavarapu@aarete.com', 'umistry@aarete.com', 'ahutchison@aarete.com', 'bgrunst@aarete.com', 'ddimeglio@aarete.com' -, 'vnair@aarete.com', 'kminhas@aarete.com', 'fmohiuddin@aarete.com', 'slitewka@aarete.com', 'qdoest@aarete.com', 'bkoryga@aarete.com', 'bcielecki@aarete.com', 'mszymanski@aarete.com','hupreti@aarete.com'] +user_list = USER_LIST st.set_page_config(layout = "wide") # Sidebar contents diff --git a/streamlit/interface_3_rag.py b/streamlit/interface_3_rag.py index 538ddd5..eda97c5 100644 --- a/streamlit/interface_3_rag.py +++ b/streamlit/interface_3_rag.py @@ -4,7 +4,7 @@ from langchain.prompts import PromptTemplate from langchain.embeddings.bedrock import BedrockEmbeddings from langchain.llms.bedrock import Bedrock from langchain_community.vectorstores import Chroma -from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY +from constants import CHROMA_SETTINGS, EMBEDDING_MODEL_NAME, PERSIST_DIRECTORY, MODEL_ID, MODEL_BASENAME, SOURCE_DIRECTORY, USER_LIST from langchain.chains import RetrievalQA import streamlit as st @@ -18,9 +18,7 @@ import dateutil import util REDIRECT_URI = 'http://172.29.20.126:8503' -user_list = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com', 'akadam@aarete.com', 'pkatariya@aarete.com' -, 'piragavarapu@aarete.com', 'umistry@aarete.com', 'ahutchison@aarete.com', 'bgrunst@aarete.com', 'ddimeglio@aarete.com' -, 'vnair@aarete.com', 'kminhas@aarete.com', 'fmohiuddin@aarete.com', 'slitewka@aarete.com', 'qdoest@aarete.com', 'bkoryga@aarete.com', 'bcielecki@aarete.com', 'mszymanski@aarete.com','hupreti@aarete.com'] +user_list = USER_LIST st.set_page_config(layout = "wide") # Sidebar contents