Rooled back tab3

app.py

@@ -3,7 +3,6 @@ import pandas as pd
 import requests
 import json
 import time
-import io
 
 st.title("Transaction Summarizer")
 
@@ -20,14 +19,6 @@ elif model_selection == "Tinyllama":
 if "jobs" not in st.session_state:
     st.session_state.jobs = []
 
-# Retrieve API key from Streamlit secrets
-api_key = st.secrets["api_key"]
-
-headers = {
-    'Content-Type': 'application/json',
-    'Authorization': api_key
-}
-
 
 # Function to update the status of a job
 def update_job_status(job_id, status):
@@ -40,6 +31,13 @@ def update_job_status(job_id, status):
 def process_transactions(transactions, job_id):
     url = base_url + "runsync"
 
+    # Retrieve API key from Streamlit secrets
+    api_key = st.secrets["api_key"]
+
+    headers = {
+        'Content-Type': 'application/json',
+        'Authorization': api_key
+    }
     data = {
         'input': {
             'transaction': transactions
@@ -92,7 +90,7 @@ def process_transactions(transactions, job_id):
 
 
 # Creating tabs for different pages
-tab1, tab2, tab3 = st.tabs(["Submit Transactions", "Upload CSV", "Manage Jobs"])
+tab1, tab2 = st.tabs(["Submit Transactions", "Upload CSV"])
 
 # Tab 1: Submit Transactions
 with tab1:
@@ -108,10 +106,17 @@ with tab1:
 
         # Add the job to session state and set initial status
         job_id = str(len(st.session_state.jobs) + 1)
-        st.session_state.jobs.append({"id": job_id, "status": "SUBMITTED", "transactions": new_transactions})
+        st.session_state.jobs.append({"id": job_id, "status": "IN_QUEUE", "transactions": new_transactions})
 
-        # Process transactions without displaying the spinner or results here
-        st.write(f"New job {job_id} submitted successfully. Please check the 'Manage Jobs' tab for status.")
+        with st.spinner("Processing..."):
+            # Process the transactions and display the results
+            result_data = process_transactions(new_transactions, job_id)
+
+            if result_data:
+                st.write("Transaction Summaries:")
+                st.write(result_data)
+            else:
+                st.write("The job was cancelled or encountered an error.")
 
 # Tab 2: Upload CSV
 with tab2:
@@ -132,47 +137,21 @@ with tab2:
 
             # Add the job to session state and set initial status
             job_id = str(len(st.session_state.jobs) + 1)
-            st.session_state.jobs.append({"id": job_id, "status": "SUBMITTED", "transactions": transactions})
+            st.session_state.jobs.append({"id": job_id, "status": "IN_QUEUE", "transactions": transactions})
+
+            with st.spinner("Processing..."):
+                # Process the transactions and display the results
+                result_data = process_transactions(transactions, job_id)
 
-            # Process transactions without displaying the spinner or results here
-            st.write(f"New job {job_id} submitted successfully. Please check the 'Manage Jobs' tab for status.")
+                if result_data:
+                    st.write("Transaction Summaries:")
+                    st.write(result_data)
+                else:
+                    st.write("The job was cancelled or encountered an error.")
 
         except Exception as e:
             st.error(f"An error occurred while processing the CSV file: {e}")
 
-# Tab 3: Manage Jobs
-with tab3:
-    st.header("Manage Jobs")
-
-    # Display job details and provide cancel option
-    if st.session_state.jobs:
-        for job in st.session_state.jobs:
-            st.write(f"Job ID: {job['id']} - Status: {job['status']}")
-
-            # Display spinner if the job is in queue or processing
-            if job["status"] == "IN_QUEUE":
-                with st.spinner("Processing..."):
-                    result_data = process_transactions(job['transactions'], job["id"])
-
-            # Display results if the job is completed
-            if job["status"] == "COMPLETED":
-                st.write("Transaction Summaries:")
-                st.write(job.get("result", "No result available"))
-
-            # Cancel button for each job
-            if job["status"] in ["IN_QUEUE", "SUBMITTED"]:
-                if st.button(f"Cancel Job {job['id']}", key=f"cancel_{job['id']}"):
-                    cancel_url = f"{base_url}cancel/{job['id']}"
-                    try:
-                        cancel_response = requests.post(cancel_url, headers=headers)
-                        cancel_response.raise_for_status()
-                        update_job_status(job["id"], "CANCELLED")
-                        st.write(f"Job {job['id']} has been cancelled.")
-                    except requests.exceptions.RequestException as e:
-                        st.error(f"An error occurred while cancelling: {e}")
-    else:
-        st.write("No active jobs.")
-
     # Reset button
     if st.button("Reset All Jobs"):
         st.session_state.jobs = []