some more cleanups

README.md

@@ -24,10 +24,12 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 [x] Check if user_id in database, then resume where they left off
 [x] Implement save and continue later button
 [x] Implement questions with proper buttons (with text)
-[ ] Back button
+[x] Back button
 [ ] Next button + overall state management
 [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
 [ ] Add check for ratings should not be 0 for Exit & Resume Later
-[x] Check the firebase DB rules
+[x] Check the firebase DB rules
+[x] Add more descriptive titles for the queries
+[ ] Randomize the ordering

views/continue_survey.py

@@ -7,8 +7,22 @@ def continue_survey_screen(data):
     """Screen for existing users to continue or restart their survey."""
     st.title("Resume Your Survey")
 
-    st.write("Welcome back! Would you like to continue from where you left off or restart the survey?")
-
+    st.markdown(
+        f"""
+                <div style="padding:1rem;">
+                     <h3 style="text-align:left;">
+                     Welcome back 
+                     {st.session_state.username.capitalize()}!
+                     </h3> 
+                    <p style="text-align:left;">
+                    Would you like to continue from where you left off
+                    or restart the survey?
+                    <br><b>Note that restarting will delete your previous progress.</b>
+                    </p>
+                 </div>
+            """,
+        unsafe_allow_html=True,
+    )
     # Fetch user progress from Firebase
     saved_state = read(st.session_state.username)
 
@@ -30,7 +44,7 @@ def continue_survey_screen(data):
                 if last_config_id is not None:
                     matching_index = data[data["config_id"] == last_config_id].index
                     if not matching_index.empty:
-                        st.session_state.current_index = matching_index[0]+1
+                        st.session_state.current_index = matching_index[0]
 
                 st.success("Resuming your survey!")
                 # Set survey_continued flag to True only when there's saved progress

views/nav_buttons.py

@@ -68,12 +68,4 @@ def navigation_buttons(data, response: Response):
 
     with col3:  # Save & Resume Later button
         if st.button("Exit & Resume Later"):
-            last_response = st.session_state.responses[-1]
-            all_last_ratings = flatten_ratings(last_response)
-            if not any(rating == 0 for rating in all_last_ratings):
-                print("Submitting feedback")
-                submit_feedback(current_index)
-            else:
-                st.warning("Please provide ratings before exiting.")
-                # st.session_state.completed = True
-                # st.rerun()
+            submit_feedback(current_index)

views/questions_screen.py

@@ -3,6 +3,7 @@ import streamlit as st
 from datetime import datetime
 from dotenv import load_dotenv
 from views.nav_buttons import navigation_buttons
+import random
 
 load_dotenv()
 
@@ -29,7 +30,7 @@ def get_previous_ratings(model_name, query_key, current_index):
     previous_ratings = {}
 
     if current_index < st.session_state.current_index and len(
-        st.session_state.responses
+            st.session_state.responses
     ) > current_index:
         if st.session_state.previous_ratings:
             previous_ratings = st.session_state.previous_ratings.get(
@@ -69,12 +70,12 @@ def get_previous_ratings(model_name, query_key, current_index):
 
 
 def render_single_rating(
-    label,
-    options,
-    format_func,
-    key_prefix,
-    stored_rating,
-    col,
+        label,
+        options,
+        format_func,
+        key_prefix,
+        stored_rating,
+        col,
 ):
     """Renders a single rating widget (radio)."""
     with col:
@@ -87,13 +88,21 @@ def render_single_rating(
         )
 
 
+def clean_query_text(query_text):
+    """Clean the query text for display."""
+    if query_text.startswith('"') or query_text.startswith("'") or query_text.endswith('"') or query_text.endswith("'"):
+        query_text = query_text.replace('"', '').replace("'", "")
+    if query_text[-1] not in [".", "?", "!", "\n"]:
+        query_text += "."
+    return query_text.capitalize()
+
+
 def render_query_ratings(
-    model_name,
-    query_label,
-    config,
-    query_key,
-    current_index,
-    has_persona_alignment=False,
+        model_name,
+        config,
+        query_key,
+        current_index,
+        has_persona_alignment=False,
 ):
     """Helper function to render ratings for a given query."""
     stored_query_ratings = get_previous_ratings(model_name, query_key, current_index)
@@ -106,13 +115,16 @@ def render_query_ratings(
         bg_color = "#e0f7fa"
     else:
         bg_color = "#f0f4c3"
-
+    query_text = clean_query_text(config[model_name + "_" + query_key])
     with st.container():
         st.markdown(
             f"""
-               <div style="background-color:{bg_color}; padding:1rem;"> 
-                    <h3 style="color:blue;">{query_label} </h3>
-                   <p style="text-align:left;">{config[model_name + "_" + query_key]}</p>
+               <div style="background-color:{bg_color}; padding:1rem;">
+                    <h3 style="text-align:left;">
+                    {config.index.get_loc(model_name + "_" + query_key) - 5}
+                    </h3> 
+                   <p style="text-align:left;">
+                   {query_text}</p>
                 </div>
            """,
             unsafe_allow_html=True,
@@ -161,13 +173,14 @@ def render_query_ratings(
 
 
 def display_ratings_row(model_name, config, current_index):
-    st.markdown(f"## {model_name.capitalize()} Ratings")
+    # st.markdown(f"## {model_name.capitalize()} Ratings")
 
     cols = st.columns(3)
+    # combinations = ["query_v", "query_p0", "query_p1"]
+    # random.shuffle(combinations)
     with cols[0]:
         query_v_ratings = render_query_ratings(
             model_name,
-            "Query_v",
             config,
             "query_v",
             current_index,
@@ -176,7 +189,6 @@ def display_ratings_row(model_name, config, current_index):
     with cols[1]:
         query_p0_ratings = render_query_ratings(
             model_name,
-            "Query_p0",
             config,
             "query_p0",
             current_index,
@@ -185,7 +197,6 @@ def display_ratings_row(model_name, config, current_index):
     with cols[2]:
         query_p1_ratings = render_query_ratings(
             model_name,
-            "Query_p1",
             config,
             "query_p1",
             current_index,
@@ -211,7 +222,7 @@ def questions_screen(data):
         progress = (current_index + 1) / len(data)
         st.progress(progress)
         st.write(f"Question {current_index + 1} of {len(data)}")
-        st.subheader(f"Config ID: {config['config_id']}")
+        # st.subheader(f"Config ID: {config['config_id']}")
 
         # Context information
         st.markdown("### Context Information")
@@ -260,4 +271,3 @@ def questions_screen(data):
         navigation_buttons(data, response)
     except IndexError:
         print("Survey completed!")
-