Fix bugs

app.py

@@ -4,6 +4,8 @@ from save_data import add_new_data, get_sheet_service
 from instructions import *
 from user_groups import user_data
 
+
+
 class SessionManager:
     def __init__(self):
         self.sessions = []
@@ -58,19 +60,26 @@ def handle_create_sequential(task, human_input, session_manager, api_key, identi
     cooperate_style = "sequential"
     session_index = session_manager.add_session(task=task, cooperate_style=cooperate_style)
     session_manager.update(session_index, human_input, 'human_initial_answer')
-    output = merge_texts_sequential(task, human_input, api_key)
-    session_manager.update(session_index, output, 'ai_modificated_output')
     session_manager.update(session_index, identification_code, 'user_identification_code')
+    if word_limit_validation(human_input):
+        output = word_limit_validation(human_input)
+    else:
+        output = merge_texts_sequential(task, human_input, api_key)
+    session_manager.update(session_index, output, 'ai_modificated_output')
     return output, session_index
 
 
 def handle_create_parallel(task, human_input, session_manager, api_key, identification_code):
     cooperate_style = "parallel"
     session_index = session_manager.add_session(task=task, cooperate_style=cooperate_style)
-    ai_initial_answer = generate_ai_initial_answer(task, api_key)
+    if word_limit_validation(human_input):
+        ai_initial_answer = word_limit_validation(human_input)
+        final_answer = word_limit_validation(human_input)
+    else:
+        ai_initial_answer = generate_ai_initial_answer(task, api_key)
+        final_answer = merge_texts_parallel(task, human_input, ai_initial_answer, api_key)
     session_manager.update(session_index, human_input, 'human_initial_answer')
     session_manager.update(session_index, ai_initial_answer, 'ai_initial_answer')
-    final_answer = merge_texts_parallel(task, human_input, ai_initial_answer, api_key)
     session_manager.update(session_index, final_answer, 'merged_final_answer')
     session_manager.update(session_index, identification_code, 'user_identification_code')
     return ai_initial_answer, final_answer, session_index
@@ -87,7 +96,10 @@ def handle_create_reverse_sequential(task, session_manager, api_key, identificat
 def handle_modify_reverse_sequential(session_index, modification_suggestions, session_manager, api_key):
     session = session_manager.get_session(session_index)
     session_manager.update(session_index, modification_suggestions, 'human_modifications')
-    final_answer = modify_with_suggestion(session['task'], modification_suggestions, api_key)
+    if word_limit_validation(modification_suggestions):
+        final_answer = word_limit_validation(modification_suggestions)
+    else:
+        final_answer = modify_with_suggestion(session['task'], modification_suggestions, api_key)
     session_manager.update(session_index, final_answer, 'final_answer')
     return final_answer, session_index
 
@@ -114,37 +126,26 @@ def login(identification_code):
         return update_content(user_info["group"])
     else:
         return update_content(None)
-    
 
 def word_limit_validation(human_input):
     words = human_input.split()
     if len(words) < 50:
-        return "Error: Your input is less than 50 words."
-    return None  # No error
-
-def handle_create_with_limit(task, human_input, session_manager, api_key, id):
-    validation_error = word_limit_validation(human_input)
-    if validation_error:
-        return validation_error, None  # Return the error to ai_output and keep session_index None
-    # If valid, proceed with task handling
-    if group_a_content:
-        return handle_create_sequential(task, human_input, session_manager, api_key, id)
-    elif group_b_content:
-        return handle_create_parallel(task, human_input, session_manager, api_key, id)
-    else:
-        return "Error: Invalid group", None
+        return f"Error: Your input '{human_input}'is less than 50 words. Please enter at least 50 words."
+    return None
 
+def on_textbox_change(session_index, session_manager, service, SHEET_ID):
+    return save_data(session_index, session_manager, service, SHEET_ID)
 
 if __name__ == "__main__":
-    api_key = get_api_key(local=False)
-    service, SHEET_IDs = get_sheet_service(local=False)
+    api_key = get_api_key(local=True)
+    service, SHEET_IDs = get_sheet_service(local=True)
     SHEET_ID1, SHEET_ID2, SHEET_ID3 = SHEET_IDs
 
     session_manager = SessionManager()
 
     with gr.Blocks() as app:
         with gr.Row():
-            identification_code = gr.Textbox(label="Enter your identification code")
+            identification_code = gr.Textbox(label="Enter your identification")
             login_button = gr.Button("Login")
         login_status = gr.Textbox(label="Next Tasks", interactive=False)
         group = gr.State()
@@ -173,11 +174,10 @@ if __name__ == "__main__":
         login_button.click(login, inputs=identification_code, outputs=[task, group_a_content, group_b_content, group_c_content, login_status])
         
         
-        sheet_id = None
+        
         with group_a_content:
-            sheet_id = SHEET_ID1
             with gr.Row():
-                human_input = gr.Textbox(label="Human Input (preperably between 100 and 150 words)")
+                human_input = gr.Textbox(label="Human Input (At least 50 words)")
             with gr.Row():
                 submit_btn = gr.Button("Create")
             with gr.Row():
@@ -185,11 +185,16 @@ if __name__ == "__main__":
                 session_index = gr.Number(label="Session Index", visible=False)
 
             submit_btn.click(
-                fn=lambda task, human_input, id: handle_create_with_limit(task, human_input, session_manager, api_key, id),
+                fn=lambda task, human_input, id: handle_create_sequential(task, human_input, session_manager, api_key, id),
                 inputs=[task, human_input, identification_code],
                 outputs=[ai_output, session_index]
             )
 
+            ai_output.change(
+                fn = lambda session_index: on_textbox_change(session_index, session_manager, service, SHEET_ID1),
+                inputs = [session_index]
+            )
+
             # evaluate same for every group
             evaluate_btn = gr.Button("Evaluate")
             evaluation_result = gr.Textbox(label="Evaluation Result")
@@ -200,19 +205,24 @@ if __name__ == "__main__":
                 outputs=[evaluation_result]
             )
 
-            save_btn = gr.Button("Save Data")
+            evaluation_result.change(
+                fn = lambda session_index: on_textbox_change(session_index, session_manager, service, SHEET_ID1),
+                inputs = [session_index]
+            )
+
+            save_btn = gr.Button("Save Data", elem_id="save_btn")
             save_result = gr.Label()
 
+
             save_btn.click(
-                fn=lambda session_index, sheet_id: save_data(session_index, session_manager, service, sheet_id),
-                inputs=[session_index, sheet_id],
+                fn=lambda session_index: save_data(session_index, session_manager, service, SHEET_ID1),
+                inputs=[session_index],
                 outputs=[save_result]
             )
 
         with group_b_content:
-            sheet_id = SHEET_ID2
             with gr.Row():
-                human_input = gr.Textbox(label="Human Input (preperably between 100 and 150 words)")
+                human_input = gr.Textbox(label="Human Input(At least 50 words)")
             with gr.Row():
                 create_btn = gr.Button("Create")
             with gr.Row(): 
@@ -221,12 +231,15 @@ if __name__ == "__main__":
                 session_index = gr.Number(label="Session Index", visible=False)
 
             create_btn.click(
-                fn=lambda task, human_input, id: handle_create_with_limit(task, human_input, session_manager, api_key, id),
+                fn=lambda task, human_input, id: handle_create_parallel(task, human_input, session_manager, api_key, id),
                 inputs=[task, human_input, identification_code],
                 outputs=[ai_initial_output, final_output, session_index]
             )
 
-
+            ai_initial_output.change(
+                fn = lambda session_index: on_textbox_change(session_index, session_manager, service, SHEET_ID2),
+                inputs = [session_index]
+            )
 
 
             evaluate_btn = gr.Button("Evaluate")
@@ -238,24 +251,30 @@ if __name__ == "__main__":
                 outputs=[evaluation_result]
             )
 
-            save_btn = gr.Button("Save Data")
+            evaluation_result.change(
+                fn = lambda session_index: on_textbox_change(session_index, session_manager, service, SHEET_ID2),
+                inputs = [session_index]
+            )
+
+            save_btn = gr.Button("Save Data",elem_id="save_btn")
             save_result = gr.Label()
 
             save_btn.click(
-                fn=lambda session_index, sheet_id: save_data(session_index, session_manager, service, sheet_id),
-                inputs=[session_index, sheet_id],
+                fn=lambda session_index: save_data(session_index, session_manager, service, SHEET_ID2),
+                inputs=[session_index],
                 outputs=[save_result]
             )
 
+
+
         with group_c_content:
-            sheet_id = SHEET_ID3
             with gr.Row():
                 create_initial_btn = gr.Button("Create")
             with gr.Row():
                 initial_answer = gr.Textbox(label="AI Initial Answer")
                 modification_suggestions = gr.Textbox(label="Modification Suggestions")
             with gr.Row():
-                create_final_btn = gr.Button("Modify")
+                create_final_btn = gr.Button("Modify(At least 50 words)")
             with gr.Row():
                 final_answer = gr.Textbox(label="Final Answer")
                 session_index = gr.Number(label="Session Index", visible=False)
@@ -267,12 +286,21 @@ if __name__ == "__main__":
                 outputs=[initial_answer, session_index]
             )
 
+            initial_answer.change(
+                fn = lambda session_index: on_textbox_change(session_index, session_manager, service, SHEET_ID3),
+                inputs = [session_index]
+            )
+
             create_final_btn.click(
                 fn=lambda session_index, modification_suggestions: handle_modify_reverse_sequential(session_index, modification_suggestions, session_manager, api_key),
                 inputs=[session_index, modification_suggestions],
                 outputs=[final_answer, session_index]
             )
 
+            final_answer.change(
+                fn = lambda session_index: on_textbox_change(session_index, session_manager, service, SHEET_ID3),
+                inputs = [session_index]
+            )
 
             evaluate_btn = gr.Button("Evaluate")
             evaluation_result = gr.Textbox(label="Evaluation Result")
@@ -283,48 +311,25 @@ if __name__ == "__main__":
                 outputs=[evaluation_result]
             )
 
-            save_btn = gr.Button("Save Data")
+            evaluation_result.change(
+                fn = lambda session_index: on_textbox_change(session_index, session_manager, service, SHEET_ID3),
+                inputs = [session_index]
+            )
+
+            save_btn = gr.Button("Save Data", elem_id="save_btn")
             save_result = gr.Label()
 
             save_btn.click(
-                fn=lambda session_index, sheet_id: save_data(session_index, session_manager, service, sheet_id),
-                inputs=[session_index, sheet_id],
+                fn=lambda session_index: save_data(session_index, session_manager, service, SHEET_ID3),
+                inputs=[session_index],
                 outputs=[save_result]
             )
         
-
-            # Add auto-save button
-
-        with gr.Row():
-            auto_save_btn = gr.Button("Auto Save", visible=False)
-            auto_save_result = gr.Label(visible=False)
-
-        def auto_save(session_index, sheet_id):
-            return save_data(session_index, session_manager, service, sheet_id)
-
-        auto_save_btn.click(
-            fn=lambda session_index: auto_save(session_index, sheet_id),
-            inputs=[session_index, sheet_id],
-            outputs=[auto_save_result]
-        )
-
-            # Inject JavaScript to trigger the hidden save button every 30 seconds
-        auto_save_js = """
+        gr.HTML("""
         <script>
-        // Function to trigger the hidden save button
-        function triggerAutoSave() {
-            const saveButton = document.querySelector('button[title="Auto Save"]');
-            if (saveButton) {
-                saveButton.click();
-            }
-        }
-
-        // Trigger auto-save every 30 seconds
-        setInterval(triggerAutoSave, 30000); // 30000 milliseconds = 30 seconds
+            setInterval(function() {
+                document.getElementById('save_btn').click();
+            }, 5000); // Auto-clicks every 30 seconds
         </script>
-        """
-
-        gr.HTML(auto_save_js)
-
-
-        app.launch(share=True)
+        """)
+    app.launch()

save_data.py

@@ -19,7 +19,6 @@ def load_envs(local=False):
     return service_account_info, SHEET_IDs
 
 
-
 def get_sheet_service(local=False):
     """Get the google sheet service object."""
     service_account_info, SHEET_ID = load_envs(local=local)
@@ -41,8 +40,13 @@ def col_letter(col_num):
         letter = chr(65 + remainder) + letter
     return letter
 
-def is_redudant_data(new_row, last_row):
-    return new_row[0] == last_row[0] #compare vertification id
+def col_letter(col_num):
+    """Convert a column number to its corresponding Excel-style letter."""
+    letter = ''
+    while col_num > 0:
+        col_num, remainder = divmod(col_num - 1, 26)
+        letter = chr(65 + remainder) + letter
+    return letter
 
 def add_new_data(new_row, service, SPREADSHEET_ID, num_of_columns = 5):
     """Add new data to the spreadsheet.
@@ -54,29 +58,49 @@ def add_new_data(new_row, service, SPREADSHEET_ID, num_of_columns = 5):
         spreadsheetId=SPREADSHEET_ID,
         range=range_to_read
     ).execute()
-    values = result.get('values', [])
-
-    if values:
-        last_row = values[-1]
-        if is_redudant_data(new_row, last_row):
-            return
+ 
+
+    # search for first columns match
+    match_found = False
+    update_idx = None
+    for idx, row in enumerate(result.get('values', [])):
+        if row[0] == new_row[0]:
+            match_found = True
+            range_to_write = f'Sheet1!A{idx + 1}:{col_letter(num_of_columns)}{idx + 1}'
+            update_idx = idx + 1
+            break
 
+    values = result.get('values', [])
     number_of_rows = len(values)
     new_row = [new_row]
-    range_to_write = f'Sheet1!A{number_of_rows + 1}'
+    if not match_found:
+        range_to_write = f'Sheet1!A{number_of_rows + 1}'
 
     request_body = {
         'values': new_row
     }
-    response = service.spreadsheets().values().append(
-        spreadsheetId=SPREADSHEET_ID,
-        range=range_to_write,
-        valueInputOption='RAW',
-        insertDataOption='INSERT_ROWS',
-        body=request_body
-    ).execute()
-
-    print(f"Added new row at position {number_of_rows + 1}")
+    if match_found:
+        service.spreadsheets().values().clear(
+            spreadsheetId=SPREADSHEET_ID,
+            range=range_to_write,
+            body={},
+        ).execute()
+        response = service.spreadsheets().values().update(
+            spreadsheetId=SPREADSHEET_ID,
+            range=range_to_write,
+            valueInputOption='RAW',
+            body=request_body
+        ).execute()
+        print(f"Updated row at position {update_idx}")
+    else:
+        response = service.spreadsheets().values().append(
+            spreadsheetId=SPREADSHEET_ID,
+            range=range_to_write,
+            valueInputOption='RAW',
+            insertDataOption='INSERT_ROWS',
+            body=request_body
+        ).execute()
+        print(f"Added new row at position {number_of_rows + 1}")