diff --git a/streamlit/interface_0.py b/streamlit/interface_0.py index 5d44ce6..ba0558f 100644 --- a/streamlit/interface_0.py +++ b/streamlit/interface_0.py @@ -37,8 +37,12 @@ try: util.setup_page(REDIRECT_URI) except: st.session_state['user_info'] = {'mail': 'ahinge@aarete.com', 'displayName': 'Ankit Hinge'} -c1.write(f"User: **{st.session_state.user_info['displayName']}**") -user_mail = st.session_state.user_info['mail'] +try: + c1.write(f"User: **{st.session_state.user_info['displayName']}**") + user_mail = st.session_state.user_info['mail'] +except KeyError as e: + st.write("Session Expired.") + st. stop() if user_mail in user_list: diff --git a/streamlit/interface_1.py b/streamlit/interface_1.py index 7b015ae..2137108 100644 --- a/streamlit/interface_1.py +++ b/streamlit/interface_1.py @@ -33,8 +33,12 @@ try: util.setup_page(REDIRECT_URI) except: st.session_state['user_info'] = {'mail': 'ahinge@aarete.com', 'displayName': 'Ankit Hinge'} -c1.write(f"User: **{st.session_state.user_info['displayName']}**") -user_mail = st.session_state.user_info['mail'] +try: + c1.write(f"User: **{st.session_state.user_info['displayName']}**") + user_mail = st.session_state.user_info['mail'] +except KeyError as e: + st.write("Session Expired.") + st. stop() if user_mail in user_list: diff --git a/streamlit/interface_2.py b/streamlit/interface_2.py index beb2f12..4204038 100644 --- a/streamlit/interface_2.py +++ b/streamlit/interface_2.py @@ -43,8 +43,12 @@ try: util.setup_page(REDIRECT_URI) except: st.session_state['user_info'] = {'mail': 'ahinge@aarete.com', 'displayName': 'Ankit Hinge'} -c1.write(f"User: **{st.session_state.user_info['displayName']}**") -user_mail = st.session_state.user_info['mail'] +try: + c1.write(f"User: **{st.session_state.user_info['displayName']}**") + user_mail = st.session_state.user_info['mail'] +except KeyError as e: + st.write("Session Expired.") + st. stop() try: sf_secrets = json.loads(get_secret()) diff --git a/streamlit/interface_3.py b/streamlit/interface_3.py index 8e5c09c..a3ece7b 100644 --- a/streamlit/interface_3.py +++ b/streamlit/interface_3.py @@ -48,8 +48,12 @@ try: util.setup_page(REDIRECT_URI) except: st.session_state['user_info'] = {'mail': 'ahinge@aarete.com', 'displayName': 'Ankit Hinge'} -c1.write(f"User: **{st.session_state.user_info['displayName']}**") -user_mail = st.session_state.user_info['mail'] +try: + c1.write(f"User: **{st.session_state.user_info['displayName']}**") + user_mail = st.session_state.user_info['mail'] +except KeyError as e: + st.write("Session Expired.") + st. stop() try: sf_secrets = json.loads(get_secret()) @@ -208,11 +212,13 @@ if st.session_state.user_info['mail'] in user_list: # column_name = fields.loc[fields['Field Name'] == field, 'SF_DB_COL_NAME'].iloc[0] # else: - # to be deleted later # df = pd.DataFrame({'col':contract_list}) # st.write(df) - contract_list = [contract for contract in contract_list if contract.rsplit('/',1)[1].replace(' MU','').replace('_MU','').replace('.txt','') in list(field_values['Document_Name'])] - + st.write(len(contract_list)) + # contract_list = [contract for contract in contract_list if contract.rsplit('/',1)[1].replace(' MU','').replace('_MU','').replace('.txt','') in list(field_values['Document_Name'])] + contract_list = [contract for contract in contract_list if contract.rsplit('/',1)[1].replace('.txt','.pdf') in list(field_values['Document_Name'])] + st.write(len(contract_list)) + if contract_count == 'All': contract_count = len(contract_list) @@ -477,7 +483,8 @@ if st.session_state.user_info['mail'] in user_list: df['Contract ID'] = range(len(contract_list_f)) # to be deleted later - contract_list_f = [contract.rsplit('/',1)[1].replace(' MU','').replace('_MU','').replace('.txt','') for contract in contract_list_f] + # contract_list_f = [contract.rsplit('/',1)[1].replace(' MU','').replace('_MU','').replace('.txt','') for contract in contract_list_f] + contract_list_f = [contract.rsplit('/',1)[1].replace('.txt','pdf') for contract in contract_list_f] df['Contract Name'] = contract_list_f df['New Extracted value'] = answer_list @@ -490,8 +497,9 @@ if st.session_state.user_info['mail'] in user_list: field_values_2 = pd.DataFrame(columns=['Contract Name', 'SF_DB_COL_NAME', 'Actual Value Stored', 'Original Page Number']) for file_name in contract_list: - document_name = [x for x in list(field_values['Contract Name']) if not pd.isna(x) and file_name.rsplit('/',1)[1].replace(' MU','').replace( - '_MU','').replace('.txt','') in x][0] + # document_name = [x for x in list(field_values['Contract Name']) if not pd.isna(x) and file_name.rsplit('/',1)[1].replace(' MU','').replace( + # '_MU','').replace('.txt','') in x][0] + document_name = [x for x in list(field_values['Contract Name']) if not pd.isna(x) and file_name.rsplit('/',1)[1].replace('.txt','.pdf') in x][0] field_values_1 = field_values[field_values['Contract Name'] == document_name].head(1).transpose().reset_index() field_values_1.columns = ['SF_DB_COL_NAME', 'Actual Value Stored'] field_values_p1 = field_values_1[~field_values_1['SF_DB_COL_NAME'].str.endswith('_PG')]