diff --git a/streamlit/constants.py b/streamlit/constants.py
index 0603dec..254c509 100644
--- a/streamlit/constants.py
+++ b/streamlit/constants.py
@@ -203,9 +203,9 @@ USER_LIST = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com'
# DOCZY DEV
-DOCZY_PIPELINE_URL_DEV = 'https://8ir4vi1ri4.execute-api.us-east-2.amazonaws.com/dev/'
+DOCZY_PIPELINE_URL_DEV = 'https://4lzhid1s0h.execute-api.us-east-2.amazonaws.com/dev/trigger-pipeline'
DOCZY_REDIRECT_URL_DEV = 'https://doczydev.aarete.com:850'
-DOCZY_CREATE_BATCH_URL_DEV = 'https://lfksus2t62.execute-api.us-east-2.amazonaws.com/dev/create-batch'
+DOCZY_CREATE_BATCH_URL_DEV = 'https://4lzhid1s0h.execute-api.us-east-2.amazonaws.com/dev/create-batch'
# DOCZY UAT
DOCZY_PIPELINE_URL_UAT = 'https://29gm8cek03.execute-api.us-east-2.amazonaws.com/dev/trigger-pipeline'
diff --git a/streamlit/interface_0.py b/streamlit/interface_0.py
index dfb9436..7621dfd 100644
--- a/streamlit/interface_0.py
+++ b/streamlit/interface_0.py
@@ -17,7 +17,7 @@ from sf_conn import get_client_names, insert_upload_logs
from constants import USER_LIST
from util import logger
-(redirect_uri, create_batch_url, doczy_pipeline) = util.load_page_details(0)
+(REDIRECT_URI, create_batch_url, doczy_pipeline) = util.load_page_details(0)
user_list = USER_LIST
if 'uploading' not in st.session_state:
@@ -75,7 +75,7 @@ st.markdown(hide_img_fs, unsafe_allow_html=True)
_,c1= st.columns([5,1])
try:
- util.setup_page(redirect_uri)
+ util.setup_page(REDIRECT_URI)
except Exception as e:
st.write(f"SSO Failed = {e}")
st.session_state['user_info'] = {'mail': 'maamseek@aarete.com', 'displayName': 'Mayank Aamseek'}
@@ -84,7 +84,7 @@ try:
user_mail = st.session_state.user_info['mail']
except KeyError as e:
st.write("Session Expired.")
- auth_url = security.get_auth_url(redirect_uri)
+ auth_url = security.get_auth_url(REDIRECT_URI)
st.markdown(f"Sign In", unsafe_allow_html=True)
st.stop()
@@ -113,7 +113,7 @@ with client_row[1]:
client_bucket = client_s3_paths.get(client)
# to be deleted when client buckets are created
-client_bucket = 'doczy-dev-infra-textract'
+client_bucket = 'doczyai-use2-d-cn1-s3-textract-processing-001'
file_row = st.columns([0.1, 0.8])
with file_row[0]:
diff --git a/streamlit/interface_1.py b/streamlit/interface_1.py
index 75a9a4f..0835d0c 100644
--- a/streamlit/interface_1.py
+++ b/streamlit/interface_1.py
@@ -14,10 +14,10 @@ from sf_conn import get_client_names, get_secret, save_to_sf
from constants import USER_LIST
from util import logger
-(redirect_uri, create_batch_url, doczy_pipeline) = util.load_page_details(1)
+(REDIRECT_URI, create_batch_url, doczy_pipeline) = util.load_page_details(1)
user_list = USER_LIST
-st.set_page_config(layout="wide")
+st.set_page_config(layout = "wide")
# Sidebar contents
with st.sidebar:
st.title("Doczy.AI ™")
@@ -25,14 +25,14 @@ with st.sidebar:
"""
## About
This app extracts data from contracts
-
+
"""
)
add_vertical_space(15)
# st.write("Doczy")
# AARETE LOGO
-x, y, z = st.columns([15, 2, 15])
+x,y,z = st.columns([15,2,15])
with y:
st.image('aaretelogo.png')
@@ -44,9 +44,9 @@ button[title="View fullscreen"]{
'''
st.markdown(hide_img_fs, unsafe_allow_html=True)
-_, c1 = st.columns([5, 1])
+_,c1= st.columns([5,1])
try:
- util.setup_page(redirect_uri)
+ util.setup_page(REDIRECT_URI)
except:
st.write("SSO Failed")
st.session_state['user_info'] = {'mail': 'maamseek@aarete.com', 'displayName': 'Mayank Aamseek'}
@@ -57,13 +57,15 @@ except KeyError as e:
# Do we add a link to get to the login page here?
st.write("Session Expired.")
# st.write("Please sign-in to use this app.")
- auth_url = security.get_auth_url(redirect_uri)
+ auth_url = security.get_auth_url(REDIRECT_URI)
st.markdown(f"Sign In", unsafe_allow_html=True)
st.stop()
+
+
s3_client = boto3.client('s3',
- region_name="us-east-2",
- )
+ region_name="us-east-2",
+)
# # to be replaced with snowflake data
# client_list = ['doczy-ai-client-1', 'Delaware First Health, Inc.', 'Community Health Choice, Inc','CareSource Network Partners LLC',
@@ -71,24 +73,21 @@ s3_client = boto3.client('s3',
# 'WellCare New Jersey']
client_list, s3_paths = get_client_names()
-logger.info(f"client_list={client_list}")
-logger.info(f"s3_paths={s3_paths}")
client_s3_paths = dict(zip(client_list, s3_paths))
client_row = st.columns([0.1, 0.8])
with client_row[0]:
st.write("**Client Name**")
with client_row[1]:
- client = st.selectbox('Client Name', (client_list), label_visibility="collapsed",
- index=None) # MODIFIED for Ticket DOC-344
+ client = st.selectbox('Client Name',(client_list), label_visibility = "collapsed", index = None)
client_bucket = client_s3_paths.get(client)
# to be deleted when buckets for different clients are ready; below line is added only for testing the corresponding DAG
-client_bucket = 'doczy-dev-infra-textract'
+client_bucket = 'doczyai-use2-d-cn1-s3-textract-processing-001'
batch_objects = s3_client.list_objects_v2(Bucket=client_bucket
- , Prefix="contracts-landing-zone/", Delimiter='/')
+ , Prefix="contracts-landing-zone/", Delimiter='/')
batch_list = []
for prefix in batch_objects['CommonPrefixes']:
@@ -102,7 +101,6 @@ for prefix in batch_objects['CommonPrefixes']:
if 'sorted_list' not in st.session_state:
st.session_state.sorted_list = batch_list
-
def sort_list(ex_list, sort_by, order):
if sort_by == 'Alphabetical':
ex_list = sorted(ex_list, reverse=(order == 'Descending'))
@@ -111,16 +109,16 @@ def sort_list(ex_list, sort_by, order):
return ex_list
-
col1, col2, col3, col4 = st.columns([0.5, 0.5, 0.5, 0.5])
-with col1:
+
+with col1:
sort_by = st.radio("**Sort Batch_IDs**", ('Alphabetical', 'Create Date'))
with col2:
- order = st.radio('', ('Ascending', 'Descending'))
+ order = st.radio('', ('Ascending','Descending'))
-with col3:
+with col3:
add_vertical_space(2)
if st.button('Apply'):
st.session_state.sorted_list = sort_list(batch_list, sort_by, order)
@@ -129,8 +127,7 @@ path_row = st.columns([0.1, 0.8])
with path_row[0]:
st.write("**Batch ID**")
with path_row[1]:
- batch_id = st.selectbox('**Batch ID**', st.session_state.sorted_list, label_visibility="collapsed",
- index=None) # MODIFIED for Ticket DOC-344
+ batch_id = st.selectbox('**Batch ID**', st.session_state.sorted_list, label_visibility = "collapsed", index = None)
if not batch_id:
batch_id = "None"
@@ -140,37 +137,37 @@ with checks[0]:
st.write("**Group No.**")
with checks[1]:
- a = st.checkbox('Unique Key', key=str(1), args="Unique")
+ a = st.checkbox('Unique Key', key = str(1), args="Unique")
with checks[2]:
- b = st.checkbox('Pricing Before Carveouts', key=str(2))
+ b = st.checkbox('Pricing Before Carveouts', key = str(2))
with checks[3]:
- c = st.checkbox('Contract Related', key=str(3))
+ c = st.checkbox('Contract Related', key = str(3))
with checks[4]:
- d = st.checkbox('Provider', key=str(4))
+ d = st.checkbox('Provider', key = str(4))
with checks[5]:
- e = st.checkbox('Timeline', key=str(5))
+ e = st.checkbox('Timeline', key = str(5))
with checks[6]:
- f = st.checkbox('Carveout Indicator', key=str(6))
+ f = st.checkbox('Carveout Indicator', key = str(6))
with checks[7]:
- g = st.checkbox('Carveout Methodology', key=str(7))
+ g = st.checkbox('Carveout Methodology', key = str(7))
add_vertical_space(1)
-df = pd.DataFrame(columns=['Contract Name', 'Unique Key', 'Pricing Before Carveouts'
+df = pd.DataFrame(columns=['Contract Name', 'Unique Key','Pricing Before Carveouts'
, 'Contract Related', 'Provider', 'Timeline', 'Carveout Indicator', 'Carveout Methodology'])
file_list = []
file_objects = s3_client.list_objects_v2(Bucket=client_bucket
- , Prefix="contracts-landing-zone/" + batch_id + "/", Delimiter='/')
+ , Prefix="contracts-landing-zone/"+batch_id+"/", Delimiter='/')
# Hardcoded file_list for testing purposes
# file_list = ['Boilerplate_TX Amendment Mission Health Network effective_040114 MU.pdf', 'Custom_TX - MP AMENDMENT - MISSION HEALTH NETWORK - MU.pdf',
# 'Delaware First Health_First State Homecare Agency_212260_7 MU.pdf', 'Molina Healthcare of Texas, Inc. Amendment 4 - HIX ACA__EFF 01012016_MU.pdf']
if st.button("Read the contracts from Path"):
- for obj in file_objects.get('Contents', []):
+ for obj in file_objects.get('Contents',[]):
if not obj['Key'].endswith('/'):
file_list.append(obj['Key'].split('/')[-1])
-
+
df['Contract Name'] = file_list
# df['Request ID'] = range(len(file_list))
# df['Contract ID'] = file_list
@@ -194,20 +191,17 @@ edited_df['LATEST_FLAG BOOLEAN'] = True
edited_df['PIPELINE_KICKOFF_DATETIME'] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
edited_df['REQUEST_DATETIME'] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
-@st.cache_data
+@st.cache_data
def convert_df(df):
return df.to_csv(index=False).encode('utf-8')
-
csv = convert_df(edited_df)
# edited_df = edited_df.reset_index() # make sure indexes pair with number of rows
# additional_info = pd.DataFrame(columns=['REQUEST_ID','T_DRIVE_PATH','CLIENT_NAME'
# , 'GROUP_NAME', 'REQUEST_USERNAME', 'REQUEST_DATETIME'])
additional_info = pd.DataFrame(columns=['CLIENT_NAME', 'BATCH_ID', 'REQUEST_USERNAME', 'REQUEST_DATETIME'])
-additional_info.loc[0] = [client, batch_id, st.session_state.user_info['mail'],
- datetime.now().strftime("%Y-%m-%d %H:%M:%S")]
+additional_info.loc[0] = [client, batch_id, st.session_state.user_info['mail'], datetime.now().strftime("%Y-%m-%d %H:%M:%S")]
st.write(additional_info)
st.session_state.contract_count = 0
@@ -240,7 +234,7 @@ for index, row in edited_df.iterrows():
entry_dict = {
"contract_name": row['Contract Name'],
"groups": group_list,
- "contract_source_path": "contracts_landing_zone/" + batch_id + "/" + row['Contract Name']
+ "contract_source_path": "contracts-landing-zone/"+batch_id+"/"+row['Contract Name']
}
contract_list.append(entry_dict)
@@ -260,7 +254,7 @@ with buttons[1]:
if not st.session_state.contract_count == len(edited_df):
st.error("Select at least one Group No. for every Contract")
else:
- with st.spinner('Running...'):
+ with st.spinner('Running...'):
# csv_buf = StringIO()
# additional_info.to_csv(csv_buf, header=True, index=False)
# csv_buf.seek(0)
@@ -273,10 +267,11 @@ with buttons[1]:
# save_to_sf('load_request_and_contract_submissions', request_submission_file_name = "request_submission.csv", contract_config_file_name = "contract_config.csv")
# except Exception as e:
# st.write(e)
- response = requests.post(doczy_pipeline, json=myobj)
+ response = requests.post(doczy_pipeline, json = myobj)
if response.status_code >= 200 and response.status_code < 300:
st.write("Success")
# st.write(myobj)
else:
st.write("Failed")
# st.write(response.text)
+
diff --git a/streamlit/interface_2.py b/streamlit/interface_2.py
index fba18b3..21e4f82 100644
--- a/streamlit/interface_2.py
+++ b/streamlit/interface_2.py
@@ -5,13 +5,12 @@ 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, USER_LIST
+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
from streamlit_extras.add_vertical_space import add_vertical_space
-from streamlit_pdf_viewer import pdf_viewer # needs to be installed on the server
+from streamlit_pdf_viewer import pdf_viewer # needs to be installed on the server
import os
import pandas as pd
import numpy as np
@@ -26,10 +25,10 @@ from sf_conn import get_client_names, get_secret, save_to_sf
import io
from util import logger
-(redirect_uri, create_batch_url, doczy_pipeline) = util.load_page_details(2)
+(REDIRECT_URI, create_batch_url, doczy_pipeline) = util.load_page_details(2)
user_list = USER_LIST
-st.set_page_config(layout="wide")
+st.set_page_config(layout = "wide")
# Sidebar contents
with st.sidebar:
st.title("Doczy.AI ™")
@@ -37,14 +36,14 @@ with st.sidebar:
"""
## About
This app extracts data from contracts
-
+
"""
)
# add_vertical_space(15)
# st.write("Doczy")
# AARETE LOGO
-x, y, z = st.columns([15, 2, 15])
+x,y,z = st.columns([15,2,15])
with y:
st.image('aaretelogo.png')
@@ -56,9 +55,9 @@ button[title="View fullscreen"]{
'''
st.markdown(hide_img_fs, unsafe_allow_html=True)
-_, c1 = st.columns([5, 1])
+_,c1= st.columns([5,1])
try:
- util.setup_page(redirect_uri)
+ util.setup_page(REDIRECT_URI)
except:
st.write("SSO Failed")
st.session_state['user_info'] = {'mail': 'maamseek@aarete.com', 'displayName': 'Mayank Aamseek'}
@@ -67,8 +66,8 @@ try:
user_mail = st.session_state.user_info['mail']
except KeyError as e:
st.write("Session Expired.")
- # st.write("Please sign-in to use this app.")
- auth_url = security.get_auth_url(redirect_uri)
+ #st.write("Please sign-in to use this app.")
+ auth_url = security.get_auth_url(REDIRECT_URI)
st.markdown(f"Sign In", unsafe_allow_html=True)
st.stop()
@@ -90,37 +89,35 @@ try:
cur.execute(query)
fields = pd.DataFrame.from_records(iter(cur), columns=[x[0] for x in cur.description])
- fields.rename(columns={'FIELD_DESC': 'Field Name'}, inplace=True)
- fields.rename(columns={'PROMPT': 'Interrogation Question?'}, inplace=True)
- fields.rename(columns={'GROUP_ID': 'PRIORITY'}, inplace=True)
- fields.rename(columns={'FIELD_NAME': 'SF_DB_COL_NAME'}, inplace=True)
- fields.rename(columns={'FM_MODEL_ID': 'llm_selected'}, inplace=True)
+ fields.rename(columns={'FIELD_DESC': 'Field Name'}, inplace = True)
+ fields.rename(columns={'PROMPT': 'Interrogation Question?'}, inplace = True)
+ fields.rename(columns={'GROUP_ID': 'PRIORITY'}, inplace = True)
+ fields.rename(columns={'FIELD_NAME': 'SF_DB_COL_NAME'}, inplace = True)
+ fields.rename(columns={'FM_MODEL_ID': 'llm_selected'}, inplace = True)
except Exception as e:
- st.write("Unable to fetch data from Snowflake: ", e)
+ st.write("Unable to fetch data from Snowflake: ",e)
# fields = pd.read_csv('contract_fields.csv', encoding='unicode_escape', skipinitialspace=True)
# fields = fields[~fields['SF_COL_NAME'].str.endswith('_PG', na=None)]
# change the code below if contract list is fetched from snowflake
s3_client = boto3.client('s3',
- region_name="us-east-2"
- )
+ region_name="us-east-2"
+)
client_list, s3_paths = get_client_names()
-logger.info(f"client_list={client_list}")
-logger.info(f"s3_paths={s3_paths}")
client_s3_paths = dict(zip(client_list, s3_paths))
client_row = st.columns([0.2, 0.7, 0.1])
with client_row[0]:
st.write("**Client Name**")
with client_row[1]:
- client = st.selectbox('Client Name', (client_list), label_visibility="collapsed", index=None)
+ client = st.selectbox('Client Name',(client_list), label_visibility = "collapsed", index= None)
# client_bucket = client_s3_paths.get(client)
-client_bucket = 'doczy-dev-infra-textract'
+client_bucket = 'doczyai-use2-d-cn1-s3-textract-processing-001'
batch_objects = s3_client.list_objects_v2(Bucket=client_bucket
- , Prefix="contracts-landing-zone/", Delimiter='/')
+ , Prefix="textract-receiver-processed-pdfs/", Delimiter='/')
batch_list = []
for prefix in batch_objects['CommonPrefixes']:
@@ -130,13 +127,13 @@ path_row = st.columns([0.2, 0.7, 0.1])
with path_row[0]:
st.write("**Batch ID**")
with path_row[1]:
- batch_id = st.selectbox('**Batch ID**', batch_list, label_visibility="collapsed", index=None)
+ batch_id = st.selectbox('**Batch ID**', batch_list, label_visibility = "collapsed", index = None)
if batch_id:
- objects = s3_client.list_objects_v2(Bucket=client_bucket, Prefix="contracts-landing-zone/" + batch_id + "/")
+ objects = s3_client.list_objects_v2(Bucket=client_bucket, Prefix="textract-receiver-processed-pdfs/"+batch_id+"/")
file_list = []
- if 'Contents' in objects:
+ if 'Contents' in objects:
for obj in objects['Contents']:
if not obj['Key'].endswith('/'):
file_list.append(obj['Key'])
@@ -149,20 +146,17 @@ if batch_id:
with file_row[0]:
st.write("**Contract Name**")
with file_row[1]:
- file_name = st.selectbox('Select a file', ['All'] + contract_list, label_visibility="collapsed", index=None)
+ file_name = st.selectbox('Select a file', ['All'] + contract_list, label_visibility = "collapsed", index= None)
field_row = st.columns([0.2, 0.7, 0.1])
with field_row[0]:
st.write("**Field Group**")
with field_row[1]:
- field_group = st.selectbox('Field Group', ('Unique Key', 'Contract Related', 'Pricing Before Carveouts - I'
- , 'Pricing Before Carveouts - II',
- 'Carveout Indicator, Code Type and Code #s - I'
- , 'Carveout Indicator, Code Type and Code #s - II',
- 'Carveout Indicator, Code Type and Code #s - III'
- , 'Optimize Carving Indic.', 'Carveout Method - I',
- 'Carveout Method - II', 'Provider'
- , 'Timeline'), label_visibility="collapsed", index=None)
+ field_group = st.selectbox('Field Group',('Unique Key', 'Contract Related', 'Pricing Before Carveouts - I'
+ , 'Pricing Before Carveouts - II', 'Carveout Indicator, Code Type and Code #s - I'
+ , 'Carveout Indicator, Code Type and Code #s - II', 'Carveout Indicator, Code Type and Code #s - III'
+ , 'Optimize Carving Indic.', 'Carveout Method - I', 'Carveout Method - II', 'Provider'
+ , 'Timeline'), label_visibility = "collapsed", index = None)
if field_group == 'Unique Key':
fields = fields[fields['PRIORITY'] == 'A']
@@ -225,9 +219,8 @@ if batch_id:
""",
unsafe_allow_html=True,
)
- s3_obj = s3_client.get_object(Bucket=client_bucket,
- Key=file_name)
- data = s3_obj['Body'].read()
+ s3_obj = s3_client.get_object(Bucket = client_bucket, Key = file_name)
+ data=s3_obj['Body'].read()
pdf_viewer(data, width=1500)
# if st.button("Show PDF"):
@@ -256,12 +249,10 @@ if batch_id:
df2['Imputed Value'] = ''
edited_df = st.data_editor(df2)
-
- @st.cache_data
+ @st.cache_data
def convert_df(df):
return df.to_csv(index=False).encode('utf-8')
-
csv = convert_df(edited_df)
buttons = st.columns(3)
@@ -273,4 +264,4 @@ if batch_id:
st.write("")
with buttons[2]:
if st.button("Kickoff Database Integration"):
- st.write("Stored in DB")
+ st.write("Stored in DB")
\ No newline at end of file
diff --git a/streamlit/multipage/Interface_0.py b/streamlit/multipage/Interface_0.py
index 6d363bd..74bb0c6 100644
--- a/streamlit/multipage/Interface_0.py
+++ b/streamlit/multipage/Interface_0.py
@@ -15,6 +15,7 @@ from io import StringIO, BytesIO
import time
from sf_conn import get_client_names, insert_upload_logs
from constants import USER_LIST
+from util import logger
(REDIRECT_URI, create_batch_url, doczy_pipeline) = util.load_page_details(5)
@@ -99,6 +100,8 @@ client_list = ['doczy-ai-client-1', 'Delaware First Health, Inc.', 'Community He
# TODO: Need to update the streamlit code to use the client names from this list
# And use the s3 paths to save the objects for the respective client
client_list, s3_paths = get_client_names()
+logger.info(f"client_list={client_list}")
+logger.info(f"s3_paths={s3_paths}")
client_s3_paths = dict(zip(client_list, s3_paths))
client_row = st.columns([0.1, 0.8])
diff --git a/streamlit/multipage/constants.py b/streamlit/multipage/constants.py
index 0603dec..254c509 100644
--- a/streamlit/multipage/constants.py
+++ b/streamlit/multipage/constants.py
@@ -203,9 +203,9 @@ USER_LIST = ['maamseek@aarete.com', 'smahdavian@aarete.com', 'ahinge@aarete.com'
# DOCZY DEV
-DOCZY_PIPELINE_URL_DEV = 'https://8ir4vi1ri4.execute-api.us-east-2.amazonaws.com/dev/'
+DOCZY_PIPELINE_URL_DEV = 'https://4lzhid1s0h.execute-api.us-east-2.amazonaws.com/dev/trigger-pipeline'
DOCZY_REDIRECT_URL_DEV = 'https://doczydev.aarete.com:850'
-DOCZY_CREATE_BATCH_URL_DEV = 'https://lfksus2t62.execute-api.us-east-2.amazonaws.com/dev/create-batch'
+DOCZY_CREATE_BATCH_URL_DEV = 'https://4lzhid1s0h.execute-api.us-east-2.amazonaws.com/dev/create-batch'
# DOCZY UAT
DOCZY_PIPELINE_URL_UAT = 'https://29gm8cek03.execute-api.us-east-2.amazonaws.com/dev/trigger-pipeline'
diff --git a/streamlit/multipage/pages/Interface_1.py b/streamlit/multipage/pages/Interface_1.py
index 32e9304..2afb4ab 100644
--- a/streamlit/multipage/pages/Interface_1.py
+++ b/streamlit/multipage/pages/Interface_1.py
@@ -12,6 +12,7 @@ import requests
import time
from sf_conn import get_client_names, get_secret, save_to_sf
from constants import USER_LIST
+from util import logger
(REDIRECT_URI, create_batch_url, doczy_pipeline) = util.load_page_details(5)
@@ -78,7 +79,7 @@ client_row = st.columns([0.1, 0.8])
with client_row[0]:
st.write("**Client Name**")
with client_row[1]:
- client = st.selectbox('Client Name',(client_list), label_visibility = "collapsed", index = None) # MODIFIED for Ticket DOC-344
+ client = st.selectbox('Client Name',(client_list), label_visibility = "collapsed", index = None)
client_bucket = client_s3_paths.get(client)
@@ -126,7 +127,7 @@ path_row = st.columns([0.1, 0.8])
with path_row[0]:
st.write("**Batch ID**")
with path_row[1]:
- batch_id = st.selectbox('**Batch ID**', st.session_state.sorted_list, label_visibility = "collapsed", index = None) # MODIFIED for Ticket DOC-344
+ batch_id = st.selectbox('**Batch ID**', st.session_state.sorted_list, label_visibility = "collapsed", index = None)
if not batch_id:
batch_id = "None"
@@ -233,7 +234,7 @@ for index, row in edited_df.iterrows():
entry_dict = {
"contract_name": row['Contract Name'],
"groups": group_list,
- "contract_source_path": "contracts_landing_zone/"+batch_id+"/"+row['Contract Name']
+ "contract_source_path": "contracts-landing-zone/"+batch_id+"/"+row['Contract Name']
}
contract_list.append(entry_dict)
diff --git a/streamlit/multipage/pages/Interface_2.py b/streamlit/multipage/pages/Interface_2.py
index b31d044..d22af25 100644
--- a/streamlit/multipage/pages/Interface_2.py
+++ b/streamlit/multipage/pages/Interface_2.py
@@ -23,6 +23,7 @@ import base64
from sf_conn import get_snowflake_conn
from sf_conn import get_client_names, get_secret, save_to_sf
import io
+from util import logger
(REDIRECT_URI, create_batch_url, doczy_pipeline) = util.load_page_details(5)
user_list = USER_LIST
@@ -263,8 +264,4 @@ if batch_id:
st.write("")
with buttons[2]:
if st.button("Kickoff Database Integration"):
- st.write("Stored in DB")
-
-
-
-
+ st.write("Stored in DB")
\ No newline at end of file
diff --git a/streamlit/multipage/sf_conn.py b/streamlit/multipage/sf_conn.py
index 199f1a5..ac2898f 100644
--- a/streamlit/multipage/sf_conn.py
+++ b/streamlit/multipage/sf_conn.py
@@ -91,6 +91,7 @@ def get_snowflake_conn(schema):
account=secret_dict['account_alias'],
warehouse=secret_dict['warehouse'],
database=secret_dict['database'],
+ role=secret_dict['ROLE'],
schema=schema
)
return conn
diff --git a/streamlit/sf_conn.py b/streamlit/sf_conn.py
index 199f1a5..ac2898f 100644
--- a/streamlit/sf_conn.py
+++ b/streamlit/sf_conn.py
@@ -91,6 +91,7 @@ def get_snowflake_conn(schema):
account=secret_dict['account_alias'],
warehouse=secret_dict['warehouse'],
database=secret_dict['database'],
+ role=secret_dict['ROLE'],
schema=schema
)
return conn