From b4b25c830f71e8819d334890d87708b09bfdb339 Mon Sep 17 00:00:00 2001 From: Mayank Aamseek Date: Thu, 14 Mar 2024 22:53:13 +0530 Subject: [PATCH] null actual value fixed --- streamlit/interface_3.py | 42 +++++++++++++++++++++++----------------- streamlit/sf_conn.py | 4 ++-- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/streamlit/interface_3.py b/streamlit/interface_3.py index 769e366..a5f4a0a 100644 --- a/streamlit/interface_3.py +++ b/streamlit/interface_3.py @@ -22,23 +22,25 @@ import re import snowflake.connector from sf_conn import get_secret -sf_secrets = get_secret() +try: + sf_secrets = get_secret() + conn = snowflake.connector.connect( + user=sf_secrets['user'], + password=sf_secrets['password'], + account="aarete-doczyai", + role = sf_secrets['ROLE'], + warehouse=sf_secrets['warehouse'], + database=sf_secrets['database'], + schema="STG" + ) + cur = conn.cursor() -conn = snowflake.connector.connect( - user=sf_secrets['user'], - password=sf_secrets['password'], - account="aarete-doczyai", - role = sf_secrets['ROLE'], - warehouse=sf_secrets['warehouse'], - database=sf_secrets['database'], - schema="STG" - ) -cur = conn.cursor() + query = 'select * from "TRAINING_DATA_RAW"' + cur.execute(query) -query = 'select * from "TRAINING_DATA_RAW"' -cur.execute(query) - -df = pd.DataFrame(cur.fetchall()) + df = pd.DataFrame(cur.fetchall()) +except: + print("conn failed") REDIRECT_URI = 'https://doczy.aarete.com:8503' @@ -344,9 +346,11 @@ if user_mail in user_list: answer_list = [answer.rstrip(".") for answer in answer_list] # answer_list = [str(x).rsplit(':',1)[0] if len(str(x).rsplit(':',1)) < 2 else str(x).rsplit(':',1)[1] for x in answer_list] - df['Contract Name'] = contract_list + # to be deleted later - df['Contract Name'] = [contract.replace(' MU','').replace('_MU','').replace('.txt','') for contract in contract_list] + contract_list = [contract.replace(' MU','').replace('_MU','').replace('.txt','') for contract in contract_list] + + df['Contract Name'] = contract_list df['New Extracted value'] = answer_list df['Confidence Level'] = ' ' @@ -357,7 +361,9 @@ if user_mail in user_list: df = pd.merge(df, field_values, how ='left', on ='Contract Name') answer_list = list(df['New Extracted value']) - df['Actual Value Stored'] = pd.to_datetime(df['Actual Value Stored'],errors='coerce').dt.date + if 'Date' in field: + df['Actual Value Stored'] = pd.to_datetime(df['Actual Value Stored'],errors='coerce').dt.date + df.fillna(" ", inplace=True) actual_value_list = list(df['Actual Value Stored']) result_list = [i==j for i, j in zip(actual_value_list, answer_list)] diff --git a/streamlit/sf_conn.py b/streamlit/sf_conn.py index 6520175..2bc80dd 100644 --- a/streamlit/sf_conn.py +++ b/streamlit/sf_conn.py @@ -55,8 +55,8 @@ def save_to_sf(training_results_file, attempt_logs_file): # This section passes the payload to the MWAA CLI # The file parameters should be added dynamically in streamlit, once the file names are passed while triggering the dag, the data will be ingested - training_results_file = "training_results_sample.csv" - attempt_logs_file = "attempt_logs_sample.csv" + # training_results_file = "training_results_sample.csv" + # attempt_logs_file = "attempt_logs_sample.csv" # 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"""{{