Merged Aryan's and Pratham's changes in the local/ folder. Modified interface_0.py to include all changes and continue working on the server including all dependencies.

2024-06-04 10:28:15 -05:00
parent 56b7657a74
commit b7c1c22d3d
3 changed files with 102 additions and 256 deletions
@@ -18,6 +18,22 @@ create_batch_url = 'https://lfksus2t62.execute-api.us-east-2.amazonaws.com/dev/c

 REDIRECT_URI = 'https://doczydev.aarete.com:8500'
 user_list = USER_LIST
+if 'uploading' not in st.session_state:
+    st.session_state.uploading = False
+
+
+
+def insert_upload_logs(batch_id, client_name, file_name, upload_datetime, upload_user):
+    """
+    Input: batch_id, client_name, file_name, upload_datetime, upload_user
+    Output: status of the insert query
+    """
+    try:
+        return 'Log inserted successfully'
+    except Exception as e:
+        return e
+
+
 st.set_page_config(layout = "wide")
 # # Sidebar contents
 # with st.sidebar:
@@ -31,6 +47,7 @@ st.set_page_config(layout = "wide")
 #     )
 #     add_vertical_space(15)
 #     # st.write("Doczy")
+#

 _,c1= st.columns([5,1])
 try:
@@ -45,7 +62,7 @@ except KeyError as e:
    st.write("Session Expired.")
    st.stop()

-
+print(st.session_state)

 s3_client = boto3.client('s3',
    region_name="us-east-2",
@@ -65,7 +82,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")
+    client = st.selectbox('Client Name',(client_list), label_visibility = "collapsed", index = None) # MODIFIED for Ticket DOC-344

 client_bucket = client_s3_paths.get(client)

@@ -76,42 +93,54 @@ file_row = st.columns([0.1, 0.8])
 with file_row[0]:
    st.write("**Upload Files**")
 with file_row[1]:
-    file_list = st.file_uploader("Upload", type=None, accept_multiple_files=True, label_visibility = "collapsed")
+    file_list = st.file_uploader("Upload", type=['csv','pdf'], accept_multiple_files=True, label_visibility = "collapsed", help="Only .csv and .pdf file formats are supported.", disabled=st.session_state.uploading)

 add_vertical_space(2)
 df = pd.DataFrame(columns=['Contract Name'])
 df['Contract Name'] = file_list
 file_names = []
 buttons = st.columns([0.4, 0.4, 0.2])
-with buttons[1]:
-    if st.button("Create Batch"):

-        myobj = { "client-bucket-name": client_bucket }
-        response = requests.post(create_batch_url, json = myobj)
-        if response.status_code >= 200 and response.status_code < 300:
-            try:
-                batch_id = json.loads(json.loads(response.text)['body'])['batch_id']
-                landing_zone = json.loads(json.loads(response.text)['body'])['landing_zone']
-            except:
-                st.write(myobj)
-                st.write(response.text)
-                batch_id = 'failed_cases'
-                landing_zone = 'contracts_landing_zone'
+def set_uploading_state():
+    if not client == None and not len(file_list) == 0:
+        st.session_state.uploading = True
+
+with buttons[1]:
+    if st.button("Create Batch", on_click = set_uploading_state):
+        if client == None:
+            st.error("No Client Name Selected.")
+        elif len(file_list) == 0:
+            st.error("No Files Selected.")
        else:
-            st.write("Failed")
-        for uploaded_file in file_list:
-            stringio = BytesIO(uploaded_file.getvalue())
-            stringio.seek(0)
-            s3_client.put_object(Bucket=client_bucket, Body=stringio.getvalue(), Key=
-                landing_zone+batch_id+'/'+str(uploaded_file.name))
-            
-            # TODO: Test this insert function with snowflake 
-            upload_log = insert_upload_logs(batch_id, client, str(uploaded_file.name), datetime.now().strftime("%Y-%m-%d %H:%M:%S"), user_mail)
-            st.write(upload_log)
-            
-            file_names.append(str(uploaded_file.name))
-        st.write(f"{batch_id} created")
-        st.write(f"Files uploaded to s3://{client_bucket}/{landing_zone}{batch_id}")
+            myobj = { "client-bucket-name": client_bucket }
+            response = requests.post(create_batch_url, json = myobj)
+            if response.status_code >= 200 and response.status_code < 300:
+                try:
+                    batch_id = json.loads(json.loads(response.text)['body'])['batch_id']
+                    landing_zone = json.loads(json.loads(response.text)['body'])['landing_zone']
+                except:
+                    st.write(myobj)
+                    st.write(response.text)
+                    batch_id = 'failed_cases'
+                    landing_zone = 'contracts_landing_zone'
+            else:
+                st.write("Failed")
+            for uploaded_file in file_list:
+                stringio = BytesIO(uploaded_file.getvalue())
+                stringio.seek(0)
+                s3_client.put_object(Bucket=client_bucket, Body=stringio.getvalue(), Key=
+                    landing_zone+batch_id+'/'+str(uploaded_file.name))
+                
+                # TODO: Test this insert function with snowflake 
+                upload_log = insert_upload_logs(batch_id, client, str(uploaded_file.name), datetime.now().strftime("%Y-%m-%d %H:%M:%S"), user_mail)
+                st.write(upload_log)
+                
+                file_names.append(str(uploaded_file.name))
+            st.session_state.uploading = False
+            st.write(f"{batch_id} created")
+            st.write(f"Files uploaded to s3://{client_bucket}/{landing_zone}{batch_id}")
+
+


    # @st.cache_data