Update app.py

app.py

@@ -12,125 +12,89 @@ stop_flag = False
 # Authenticate using the service account credentials
 def authenticate_google_sheets():
     print("Authenticating with Google Sheets...")
-    # Define the scope and authenticate the client
     scope = [
-        "https://www.googleapis.com/auth/spreadsheets",  # Access Google Sheets
-        "https://www.googleapis.com/auth/drive"          # Access Google Drive
+        "https://www.googleapis.com/auth/spreadsheets",
+        "https://www.googleapis.com/auth/drive"
     ]
-    
-    # Load the service account credentials from the JSON file
     creds = Credentials.from_service_account_file('credentials.json', scopes=scope)
     client = gspread.authorize(creds)
     print("Authentication successful.")
     return client
 
-# Main function to upload the Excel data to Google Sheets, respecting delay between rows
+# Main function to upload Excel data to Google Sheets
 def upload_to_google_sheets(excel_file, spreadsheet_id, delay):
     global stop_flag
     stop_flag = False  # Reset stop flag when process starts
+    logs = []  # To store logs for each row
     
-    # Authenticate and open the Google Spreadsheet
     try:
         client = authenticate_google_sheets()
-        sheet = client.open_by_key(spreadsheet_id).sheet1  # Open the first sheet
-        print(f"Connected to Google Sheet: {spreadsheet_id}")
+        sheet = client.open_by_key(spreadsheet_id).sheet1
+        logs.append(f"Connected to Google Sheet: {spreadsheet_id}")
     except Exception as e:
-        print(f"Error connecting to Google Sheets: {e}")
-        return f"Error: {e}"
+        logs.append(f"Error connecting to Google Sheets: {e}")
+        return "\n".join(logs)
 
-    # Read the Excel file
     try:
-        print("Reading the Excel file...")
         df = pd.read_excel(excel_file.name)
-        print("Excel file content:")
-        print(df.head())  # Print the first few rows to verify content
+        logs.append("Excel file read successfully.")
     except Exception as e:
-        print(f"Error reading the Excel file: {e}")
-        return f"Error: {e}"
-    
-    # Replace NaN and infinite values with None to make them JSON-compliant
-    df = df.replace([float('inf'), float('-inf')], None)  # Handle infinity values
-    df = df.where(pd.notnull(df), None)  # Replace NaN values with None
+        logs.append(f"Error reading the Excel file: {e}")
+        return "\n".join(logs)
+
+    df = df.replace([float('inf'), float('-inf')], None).where(pd.notnull(df), None)
     
-    # Iterate through each row of the DataFrame
     for index, row in df.iterrows():
         if stop_flag:
-            return "Process interrupted by the user."
-        
+            logs.append("Process interrupted by the user.")
+            return "\n".join(logs)
         try:
-            # Convert only the first two columns of the row to a list
-            row_data = row.iloc[:2].tolist()  # Get the first and second columns
-            print(f"Uploading row {index}: {row_data}")
-            
-            # Append the first two columns to Google Sheets
+            row_data = row.tolist()
             sheet.append_row(row_data)
-            print(f"Row {index} uploaded successfully.")
-            
+            logs.append(f"Row {index} uploaded successfully: {row_data}")
         except Exception as e:
-            # Print the problematic row and the error
-            print(f"Error processing row {index}: {row_data}")
-            print(f"Error message: {e}")
-            continue  # Skip the current row and continue with the next one
-        
-        # Wait for the specified delay before processing the next row
+            logs.append(f"Error processing row {index}: {row_data}, Error: {e}")
         time.sleep(delay)
+    
+    logs.append("All rows processed.")
+    return "\n".join(logs)
 
-    return "Excel rows have been successfully uploaded to the Google Sheet."
-
-# Function to stop the process
+# Stop the process
 def stop_process():
     global stop_flag
     stop_flag = True
-    print("Stop process signal received.")
-    return "Process will stop after the current row is uploaded."
+    return "Process will stop after the current row."
 
-# Function to handle scheduling the upload process and respect both target time and delay per row
+# Schedule upload with delay and target time
 def schedule_upload(excel_file, spreadsheet_id, delay, target_time):
-    # Convert the input time to a Pacific Time (PST/PDT) datetime object
     pacific = pytz.timezone("America/Los_Angeles")
     current_time = datetime.now(pacific)
-
-    # Parse the target time
     target_time = pacific.localize(datetime.strptime(target_time, '%Y-%m-%d %H:%M:%S'))
-
-    # Calculate the time difference
     time_difference = (target_time - current_time).total_seconds()
 
     if time_difference > 0:
-        # Wait until the target time
-        print(f"Waiting {time_difference} seconds until the scheduled time...")
         time.sleep(time_difference)
     
-    # Once the time is reached, call the upload_to_google_sheets function
     return upload_to_google_sheets(excel_file, spreadsheet_id, delay)
 
 # Gradio Interface
 def gradio_interface(excel_file, spreadsheet_id, delay, target_time):
     return schedule_upload(excel_file, spreadsheet_id, int(delay), target_time)
 
-# Use gr.Blocks to combine multiple components
+# Gradio app
 with gr.Blocks() as demo:
-    excel_file_input = gr.File(label="Upload Excel File")  # File upload input for Excel
-    spreadsheet_id_input = gr.Textbox(label="Google Spreadsheet ID")  # Textbox for Spreadsheet ID
-    delay_input = gr.Number(label="Delay between rows (in seconds)", value=300)  # Number input for delay (default: 300 seconds)
-    target_time_input = gr.Textbox(label="Enter time to start (Pacific Time, format: YYYY-MM-DD HH:MM:SS)", 
-                                   placeholder="2024-09-25 14:30:00")
-
-    # Create the interface for uploading the file
+    excel_file_input = gr.File(label="Upload Excel File")
+    spreadsheet_id_input = gr.Textbox(label="Google Spreadsheet ID")
+    delay_input = gr.Number(label="Delay between rows (in seconds)", value=300)
+    target_time_input = gr.Textbox(label="Start time (Pacific Time, format: YYYY-MM-DD HH:MM:SS)", placeholder="2024-09-25 14:30:00")
     result_output = gr.Textbox(label="Result")
     upload_button = gr.Button("Schedule Upload")
-    
-    # Add the stop button within the same context
     stop_button = gr.Button("Stop Process")
     stop_status_output = gr.Textbox(label="Status")
 
-    # Bind the upload button to start the process
     upload_button.click(fn=gradio_interface, 
                         inputs=[excel_file_input, spreadsheet_id_input, delay_input, target_time_input], 
                         outputs=result_output)
-    
-    # Bind the stop button to stop the process
     stop_button.click(fn=stop_process, inputs=[], outputs=stop_status_output)
 
-# Launch the demo
 demo.launch()