From a8409befe2ec3db2a920465d551e23babac102b1 Mon Sep 17 00:00:00 2001 From: Mayank Aamseek Date: Fri, 29 Mar 2024 15:36:46 +0530 Subject: [PATCH] bug fixes --- streamlit/interface_2.py | 1 + streamlit/interface_3.py | 7 ++++--- streamlit/sf_conn.py | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/streamlit/interface_2.py b/streamlit/interface_2.py index 2e6fbac..46197f3 100644 --- a/streamlit/interface_2.py +++ b/streamlit/interface_2.py @@ -437,6 +437,7 @@ if user_mail in user_list: st.download_button("Download Table", csv, "file.csv", "text/csv", key='download-csv') with buttons[1]: # st.download_button("Download Table", csv, "file.csv", "text/csv", key='download-csv') + st.write("") with buttons[2]: st.button("Kickoff Database Integration") diff --git a/streamlit/interface_3.py b/streamlit/interface_3.py index 60b251d..013db79 100644 --- a/streamlit/interface_3.py +++ b/streamlit/interface_3.py @@ -78,6 +78,7 @@ except: st.write("Local copy of TRAINING_DATA_RAW table loaded") try: + error('table is not updated') query = 'select * from "BUSINESS_CONFIG"' cur.execute(query) fields = pd.DataFrame.from_records(iter(cur), columns=[x[0] for x in cur.description]) @@ -93,7 +94,7 @@ except: fields = fields.drop_duplicates(subset='Field Name', keep="first").sort_values('Field Name') fields['Field Name'] = fields['SF_DB_COL_NAME'] fields = fields[~fields['Field Name'].isnull()] - st.write("Local copy of BUSINESS_CONFIG table loaded") + # st.write("Local copy of BUSINESS_CONFIG table loaded") try: query = 'select * from "TRAINING_ATTEMPT_LOGS"' @@ -501,7 +502,7 @@ if user_mail in user_list: field_values_1 = pd.merge(field_values_p1, field_values_p2, how ='left', on =['SF_DB_COL_NAME']) field_values_1['Contract Name'] = document_name field_values_2 = pd.concat([field_values_2, field_values_1], ignore_index = True) - + df = pd.merge(df, field_values_2, how ='left', on =['Contract Name', 'SF_DB_COL_NAME']) answer_list = list(df['New Extracted value']) @@ -580,7 +581,7 @@ if user_mail in user_list: st.write(raw_response_text) try: - save_to_sf('load_training_results', "training_results_file_name", "results.csv", "attempt_logs_file_name", "history.csv") + save_to_sf('load_training_results', "results.csv", "history.csv") except: st.write("running locally") diff --git a/streamlit/sf_conn.py b/streamlit/sf_conn.py index ccf8678..f60fdf4 100644 --- a/streamlit/sf_conn.py +++ b/streamlit/sf_conn.py @@ -36,7 +36,7 @@ def get_secret(): # get_secret() -def save_to_sf(dag_name, config_1, value_1, config_2, value_2): +def save_to_sf(dag_name, training_results_file, attempt_logs_file): mwaa_env_name = 'doczy-dev-infra-mwaa' dag_name = dag_name @@ -60,8 +60,8 @@ def save_to_sf(dag_name, config_1, value_1, config_2, value_2): # conf = "{\"" + "training_results_file_name" + "\":\"" + {training_results_file} + "\", \"" + "attempt_logs_file_name" + "\":\"" + {attempt_logs_file} + "\"}".format(training_results_file=training_results_file, attempt_logs_file=attempt_logs_file) conf = f"""{{ - {config_1}: "{value_1}", - {config_2}: "{value_2}" + "training_results_file_name": "{training_results_file}", + "attempt_logs_file_name": "{attempt_logs_file}" }}"""