diff --git a/streamlit/interface_0.py b/streamlit/interface_0.py index ccd461b..77a247e 100644 --- a/streamlit/interface_0.py +++ b/streamlit/interface_0.py @@ -90,7 +90,7 @@ if user_mail in user_list: # , Prefix="batches/batch_1/"+client+"/"+Directory+"/", Delimiter='/') add_vertical_space(2) - + file_names = [] buttons = st.columns([0.4, 0.4, 0.2]) with buttons[1]: if st.button("Create Batch"): @@ -102,12 +102,14 @@ if user_mail in user_list: stringio.seek(0) s3_client.put_object(Bucket='doczy-dev-infra-raw-data-ingestion', Body=stringio.getvalue(), Key= 'config_interface/'+str(uploaded_file.name)) + file_names.append(str(uploaded_file.name)) add_vertical_space(1) try: - save_to_sf('load_request_and_contract_submissions', "results.csv", "history.csv") + save_to_sf('load_request_and_contract_submissions', "request_submission_file_name", file_names[0] + , "contract_config_file_name", file_names[0]) except: st.write("running locally") diff --git a/streamlit/interface_3.py b/streamlit/interface_3.py index 82b9a71..d4283d3 100644 --- a/streamlit/interface_3.py +++ b/streamlit/interface_3.py @@ -44,7 +44,7 @@ with st.sidebar: # st.write("Doczy") try: - util.setup_page(REDIRECT_URI) + # util.setup_page(REDIRECT_URI) _,c1= st.columns([4,1]) c1.write(f"User: **{st.session_state.user_info['displayName']}**") user_mail = st.session_state.user_info['mail'] @@ -479,7 +479,7 @@ if user_mail in user_list: df['Snippet'] = snippet_list df['New Page Number'] = page_no_list df['Revised Prompt'] = [prompt] * len(contract_list_f) - + st.write(df) df = pd.merge(df, fields[['Field Name', 'SF_DB_COL_NAME']], how ='left', on ='Field Name') field_values_2 = pd.DataFrame(columns=['Contract Name', 'SF_DB_COL_NAME', 'Actual Value Stored']) @@ -534,7 +534,7 @@ if user_mail in user_list: csv_buf.seek(0) s3_client.put_object(Bucket='doczy-dev-infra-raw-data-ingestion', Body=csv_buf.getvalue(), Key='training_interface/results.csv') csv_buf = StringIO() - history.to_csv(csv_buf, header=True, index=False) + history.tail(1).to_csv(csv_buf, header=True, index=False) csv_buf.seek(0) s3_client.put_object(Bucket='doczy-dev-infra-raw-data-ingestion', Body=csv_buf.getvalue(), Key='training_interface/history.csv') df = df[['Contract Name','Contract ID', 'SF_DB_COL_NAME', 'Actual Value Stored','New Extracted value','Confidence Level' @@ -568,7 +568,7 @@ if user_mail in user_list: st.write(raw_response_text) try: - save_to_sf('load_training_results', "results.csv", "history.csv") + save_to_sf('load_training_results', "training_results_file_name", "results.csv", "attempt_logs_file_name", "history.csv") except: st.write("running locally") diff --git a/streamlit/sf_conn.py b/streamlit/sf_conn.py index f60fdf4..3cf1cd1 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, training_results_file, attempt_logs_file): +def save_to_sf(dag_name, config_1, value_1, config_2, value_2): mwaa_env_name = 'doczy-dev-infra-mwaa' dag_name = dag_name @@ -60,8 +60,8 @@ def save_to_sf(dag_name, training_results_file, attempt_logs_file): # 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"""{{ - "training_results_file_name": "{training_results_file}", - "attempt_logs_file_name": "{attempt_logs_file}" + config_1: "{value_1}", + config_2: "{value_2}" }}"""