somewhat hacky fix but hopefully buttons work as expected

README.md

@@ -29,7 +29,9 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 [x] Dataset linking HF
 [x] prettify the context field with new lines and highlighting popularity etc. keywords in bold
 [x] Doing it for two models - combine datasets
+[ ] Exit & Resume later does not work
 [ ] Add check for ratings should not be 0 for Exit & Resume Later
 [x] Check the firebase DB rules
 [x] Add more descriptive titles for the queries
-[ ] Randomize the ordering
+[ ] Randomize the ordering
+[ ] Bug: In the DB config_id is always medium_easy

app.py

@@ -6,11 +6,10 @@ from dotenv import load_dotenv
 from views.intro_screen import welcome_screen
 from views.questions_screen import questions_screen
 from views.continue_survey import continue_survey_screen
-from views.ui_helpers import exit_screen, display_completion_message
 from css.layout import custom_css
-
 st.set_page_config(layout="wide")
 
+
 load_dotenv()
 VALIDATION_CODE = os.getenv("VALIDATION_CODE")
 
@@ -29,14 +28,34 @@ def initialization():
         st.session_state.show_questions = False
     if "survey_continued" not in st.session_state:
         st.session_state.survey_continued = None
-    # if "start_new_survey" not in st.session_state:
-    #     st.session_state.start_new_survey = False
+    if "start_new_survey" not in st.session_state:
+        st.session_state.start_new_survey = False
     if 'ratings' not in st.session_state:
         st.session_state.ratings = {}
     if 'previous_ratings' not in st.session_state:
         st.session_state.previous_ratings = {}
-    if 'screen' not in st.session_state:
-        st.session_state.screen = 'welcome'
+
+
+def exit_screen():
+    """Display exit screen"""
+    st.markdown("""
+        <div class='exit-container'>
+            <h1>Thank you for participating!</h1>
+            <p>Your responses have been saved successfully.</p>
+            <p>You can safely close this window or start a new survey.</p>
+        </div>
+    """, unsafe_allow_html=True)
+
+    # if st.button("Resume Survey"):
+    #     reset_survey()
+    #     st.rerun()
+
+
+def reset_survey():
+    """Reset the survey state to start over."""
+    st.session_state.responses = []
+    st.session_state.completed = True
+    st.session_state.start_new_survey = True
 
 
 def ui():
@@ -45,12 +64,11 @@ def ui():
     data = load_data()
     initialization()
 
-    if st.session_state.completed: \
-            # and not st.session_state.start_new_survey:
+    if st.session_state.completed and not st.session_state.start_new_survey:
         exit_screen()
         return
 
-    if st.session_state.username is None and st.session_state.screen == 'welcome':
+    if st.session_state.username is None:
         welcome_screen()
     else:
         # Check if user progress exists in Firebase
@@ -63,7 +81,7 @@ def ui():
                 if st.session_state.current_index >= len(data):
                     # If all questions have been answered, show the exit screen
                     print("survey completed")
-                    display_completion_message()
+                    survey_completed()
                 # Otherwise, show questions from where they left off
                 questions_screen(data)
         else:

views/continue_survey.py

@@ -34,8 +34,7 @@ def continue_survey_screen(data):
                 # Set session state values based on saved progress
                 st.session_state.current_index = saved_state.get("current_index", 0)
                 st.session_state.responses = saved_state.get("responses", [])
-                if len(st.session_state.responses) == len(data):
-                    st.session_state.completed = True
+
                 # Find the last answered config_id in responses
                 last_config_id = None
                 if st.session_state.responses:

views/intro_screen.py

@@ -1,6 +1,8 @@
 import streamlit as st
 import os
 from dotenv import load_dotenv
+from views.continue_survey import continue_survey_screen
+from db.crud import read
 
 load_dotenv()
 VALIDATION_CODE = os.getenv("VALIDATION_CODE")
@@ -33,7 +35,6 @@ def welcome_screen():
         if (username_input and validation_code_input) or next_button:
             if validate_username(username_input) and validate_code(validation_code_input):
                 st.session_state.username = username_input
-                st.session_state.screen = "questions"
             else:
                 if not validate_username(username_input):
                     st.warning("Invalid username. Please check and try again.")

views/nav_buttons.py

@@ -5,30 +5,24 @@ from datetime import datetime
 import os
 from dotenv import load_dotenv
 
-from views.ui_helpers import display_completion_message, exit_screen
-
 load_dotenv()
 VALIDATION_CODE = os.getenv("VALIDATION_CODE")
 
 
-def submit_feedback(current_index, all_ratings):
+def submit_feedback(current_index):
     """Handles feedback submission to the database."""
-    if any(rating == 0 for rating in all_ratings):
-        st.warning("Please provide all ratings before exiting.")
-        st.session_state.show_exit_screen = True
-    else:
-        feedback = Feedback(
-            id=current_index + 1,
-            user_id=st.session_state.username,
-            time_stamp=datetime.now().isoformat(),
-            responses=st.session_state.responses,
-        )
-        try:
-            save_feedback(feedback)
-            st.session_state.completed = True
-            st.session_state.screen = "exit"
-        except Exception as e:
-            st.error(f"An error occurred while submitting feedback: {e}")
+    feedback = Feedback(
+        id=current_index + 1,
+        user_id=st.session_state.username,
+        time_stamp=datetime.now().isoformat(),
+        responses=st.session_state.responses,
+    )
+    try:
+        save_feedback(feedback)
+        st.session_state.completed = True
+        st.rerun()
+    except Exception as e:
+        st.error(f"An error occurred while submitting feedback: {e}")
 
 
 def flatten_ratings(response):
@@ -65,18 +59,13 @@ def navigation_buttons(data, response: Response):
                 st.warning("Please provide all ratings before proceeding.")
             else:
                 if current_index < len(data) - 1:
-                    st.session_state.previous_ratings[
-                        data.iloc[st.session_state.current_index]['config_id']] = response.model_ratings
+                    st.session_state.previous_ratings[data.iloc[st.session_state.current_index]['config_id']] = response.model_ratings
                     st.session_state.current_index += 1
                     st.rerun()
-
-                if st.button("Finish", disabled=st.session_state.current_index != len(data) - 1):
-                    st.session_state.screen = "exit"
-                    submit_feedback(current_index, all_ratings)
+                else:
+                    if st.button("Finish"):
+                        submit_feedback(current_index)
 
     with col3:  # Save & Resume Later button
         if st.button("Exit & Resume Later"):
-            all_ratings = flatten_ratings(response)
-            submit_feedback(current_index, all_ratings)
-            st.session_state.screen = "exit"
-            # st.rerun()
+            submit_feedback(current_index)

views/questions_screen.py

@@ -3,10 +3,28 @@ import streamlit as st
 from datetime import datetime
 from dotenv import load_dotenv
 from views.nav_buttons import navigation_buttons
+import random
 
 load_dotenv()
 
 
+def display_completion_message():
+    """Display a standardized survey completion message."""
+    st.markdown(
+        """
+        <div class='exit-container'>
+            <h1>You have already completed the survey! Thank you for participating!</h1>
+            <p>Your responses have been saved successfully.</p>
+            <p>You can safely close this window or start a new survey.</p>
+        </div>
+        """,
+        unsafe_allow_html=True,
+    )
+    st.session_state.show_questions = False
+    st.session_state.completed = True
+    st.session_state.start_new_survey = True
+
+
 def get_previous_ratings(model_name, query_key, current_index):
     """Retrieve previous ratings from session state."""
     previous_ratings = {}
@@ -27,8 +45,7 @@ def get_previous_ratings(model_name, query_key, current_index):
         response_from_session = st.session_state.responses[current_index]
         try:
             previous_ratings = response_from_session.model_ratings.get(model_name, {})
-        except (AttributeError, KeyError):
-            print("Error in getting previous ratings from session state.")
+        except AttributeError:
             previous_ratings = response_from_session["model_ratings"].get(model_name, {})
 
     stored_query_ratings = {}
@@ -36,17 +53,17 @@ def get_previous_ratings(model_name, query_key, current_index):
         if "query_v" in query_key:
             try:
                 stored_query_ratings = previous_ratings.query_v_ratings
-            except (AttributeError, KeyError):
+            except AttributeError:
                 stored_query_ratings = previous_ratings["query_v_ratings"]
         elif "query_p0" in query_key:
             try:
                 stored_query_ratings = previous_ratings.query_p0_ratings
-            except (AttributeError, KeyError):
+            except AttributeError:
                 stored_query_ratings = previous_ratings["query_p0_ratings"]
         elif "query_p1" in query_key:
             try:
                 stored_query_ratings = previous_ratings.query_p1_ratings
-            except (AttributeError, KeyError):
+            except AttributeError:
                 stored_query_ratings = previous_ratings["query_p1_ratings"]
 
     return stored_query_ratings if stored_query_ratings else {}

views/ui_helpers.py

@@ -1,48 +0,0 @@
-import streamlit as st
-
-from views.intro_screen import welcome_screen
-
-
-def exit_screen():
-    """Display exit screen"""
-    st.markdown("""
-        <div class='exit-container'>
-            <h1>Thank you for participating!</h1>
-            <p>Your responses have been saved successfully.</p>
-            <p>You can safely close this window or start a new survey.</p>
-        </div>
-    """, unsafe_allow_html=True)
-    st.session_state.completed = True
-    st.session_state.show_exit_screen = True
-    # btn = st.button("Resume Survey")
-    # if btn:
-    #     reset_survey()
-    #     st.session_state.screen ="welcome"
-        # st.rerun()
-
-
-def reset_survey():
-    """Reset the survey state to start over."""
-    st.session_state.responses = []
-    st.session_state.completed = True
-    # st.session_state.start_new_survey = True
-    st.show_exit_screen = False
-
-
-def display_completion_message():
-    """Display a standardized survey completion message."""
-    st.markdown(
-        """
-        <div class='exit-container'>
-            <h1>You have already completed the survey! Thank you for participating!</h1>
-            <p>Your responses have been saved successfully.</p>
-            <p>You can safely close this window or start a new survey.</p>
-        </div>
-        """,
-        unsafe_allow_html=True,
-    )
-    print("trying to show completion message agian")
-    st.session_state.show_questions = False
-    st.session_state.completed = True
-    st.session_state.start_new_survey = True
-    st.rerun()