somewhat works

README.md

@@ -23,9 +23,10 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 ### TODO List (Human Eval)
 [x] Check if user_id in database, then resume where they left off
 [x] Implement save and continue later button
-[ ] Implement questions with proper buttons (with text)
+[x] Implement questions with proper buttons (with text)
 [ ] Back button
 [ ] Dataset linking HF
-[ ] prettify the context field with new lines and highlighting popularity etc. keywords in bold
-[ ] Doing it for two models
-[ ] Add check for ratings should not be 0 for Exit & Resume Later
+[x] prettify the context field with new lines and highlighting popularity etc. keywords in bold
+[ ] Doing it for two models - combine datasets
+[ ] Add check for ratings should not be 0 for Exit & Resume Later
+[ ] Check the firebase DB rules

app.py

@@ -18,31 +18,6 @@ from css.layout import custom_css
 load_dotenv()
 VALIDATION_CODE = os.getenv("VALIDATION_CODE")
 
-
-# class SurveyState:
-#     """Class to handle survey state management"""
-#
-#     def __init__(self):
-#         pass
-#
-#     def save_state(self, username: str, current_state: Dict) -> None:
-#         """Save current state to Firebase"""
-#         try:
-#             """Handles feedback submission to the database."""
-#             feedback = Feedback(
-#                 id=st.session_state.current_index + 1,
-#                 user_id=st.session_state.username,
-#                 time_stamp=datetime.now().isoformat(),
-#                 responses=st.session_state.responses,
-#             )
-#             save_feedback(feedback)
-#             st.success("Your progress has been saved! You can continue later.")
-#             st.session_state.completed = True
-#             st.rerun()
-#         except Exception as e:
-#             st.error(f"An error occurred while submitting feedback: {e}")
-#
-
 def initialization():
     """Initialize session state variables."""
     if "current_index" not in st.session_state:
@@ -59,8 +34,6 @@ def initialization():
         st.session_state.survey_continued = None
     if "start_new_survey" not in st.session_state:
         st.session_state.start_new_survey = False
-    # if "survey_state" not in st.session_state:
-    #     st.session_state.survey_state = SurveyState()
 
 
 def exit_screen():
@@ -73,7 +46,7 @@ def exit_screen():
         </div>
     """, unsafe_allow_html=True)
 
-    if st.button("Start New Survey"):
+    if st.button("Resume Survey"):
         reset_survey()
         st.rerun()
 

css/layout.py

@@ -1,4 +1,6 @@
 import streamlit as st
+
+
 def custom_css():
     """Add custom CSS for layout"""
     st.markdown("""
@@ -30,4 +32,4 @@ def custom_css():
             max-width: 600px;
         }
         </style>
-    """, unsafe_allow_html=True)
+    """, unsafe_allow_html=True)

views/questions_screen.py

@@ -24,11 +24,47 @@ def survey_completed():
     st.session_state.show_questions = False
     st.session_state.completed = True
     st.session_state.start_new_survey = True
-    # st.rerun()
+
+
+def render_query_ratings(query_label, config, query_key, current_index, has_persona_alignment=False):
+    """Helper function to render ratings for a given query."""
+    st.markdown(f"### {query_label}")
+    st.write(config[query_key])
+    columns = st.columns(3 if has_persona_alignment else 2)
+    columns = st.columns(3)
+    options = [0, 1, 2, 3, 4]
+
+    persona_alignment_rating = None
+    if has_persona_alignment:
+        with columns[0]:
+            persona_alignment_rating = st.radio(
+                "Persona Alignment:", options=[0, 1, 2, 3, 4],
+                format_func=lambda x: ["N/A", "Not Aligned", "Partially Aligned", "Aligned", "Unclear"][x],
+                key=f"rating_{query_key}_persona_alignment_{current_index}"
+            )
+
+    with columns[1]:
+        relevance_rating = st.radio("Relevance:",
+                                    options, key=f"rating_{query_key}_relevance_{current_index}",
+                                    format_func=lambda x:
+                                    ["N/A", "Not Relevant", "Somewhat Relevant", "Relevant", "Unclear"][x],)
+    with columns[2]:
+        clarity_rating = st.radio("Clarity:",
+                                  options = [0, 1, 2, 3],
+                                  key=f"rating_{query_key}_clarity_{current_index}",
+                                  format_func=lambda x: ["N/A", "Not Clear", "Somewhat Clear", "Very Clear"][x])
+
+
+
+
+    return {
+        "clarity": clarity_rating,
+        "relevance": relevance_rating,
+        "persona_alignment": persona_alignment_rating if has_persona_alignment else None
+    }
 
 
 def questions_screen(data):
-    # TODO: refactor to avoid code duplication
     """Display the questions screen with split layout"""
     current_index = st.session_state.current_index
     try:
@@ -42,111 +78,36 @@ def questions_screen(data):
 
         # Context information
         st.markdown("### Context Information")
-
         with st.expander("Persona", expanded=True):
             st.write(config['persona'])
-
         with st.expander("Filters & Cities", expanded=True):
             st.write("**Filters:**", config['filters'])
             st.write("**Cities:**", config['city'])
-
         with st.expander("Full Context", expanded=False):
-            st.write(config['context'])
-
-        # Split layout for questions and ratings
-        col11, col12, col13, col14 = st.columns([1, 1, 1, 1])  # Sub-columns for query ratings
-        options = [0, 1, 2, 3, 4, 5]
-
-        # Query_v and its ratings
-        st.markdown("### Query_v")
-        st.write(config['query_v'])
-        col_v_1, col_v_2, col_v_3 = st.columns(3)
-        with col_v_1:
-            clarity_rating = st.radio("Clarity:", options, key=f"rating_v_clarity_{current_index}")
-
-        with col_v_2:
-            relevance_rating = st.radio("Relevance:", options, key=f"rating_v_relevance_{current_index}")
-
-        with col_v_3:
-            coverage_rating = st.radio("Coverage:", options, key=f"rating_v_coverage_{current_index}")
-
-        query_v_ratings = {
-            "clarity": clarity_rating,
-            "relevance": relevance_rating,
-            "coverage": coverage_rating,
-        }
+            st.text_area("", config['context'], height=300, disabled=False)
 
-        # Query_p0 and its ratings
-        st.markdown("### Query_p0")
-        st.write(config['query_p0'])
-        col_p0_1, col_p0_2, col_p0_3, col_p0_4 = st.columns(4)
-
-        with col_p0_1:
-            clarity_rating = st.radio("Clarity:", options, key=f"rating_p0_clarity_{current_index}")
-
-        with col_p0_2:
-            relevance_rating = st.radio("Relevance:", options, key=f"rating_p0_relevance_{current_index}")
-
-        with col_p0_3:
-            coverage_rating = st.radio("Coverage:", options, key=f"rating_p0_coverage_{current_index}")
-
-        with col_p0_4:
-            persona_alignment_rating = st.radio(
-                "Persona Alignment:", options=[0, 1, 2, 3, 4],  # These are the values
-                format_func=lambda x: ["N/A", "Not Aligned", "Partially Aligned", "Aligned", "Unclear"][x],
-                key=f"rating_p0_persona_alignment_{current_index}"
-            )
-
-        # Collecting the ratings for query_p0
-        query_p0_ratings = {
-            "clarity": clarity_rating,
-            "relevance": relevance_rating,
-            "coverage": coverage_rating,
-            "persona_alignment": persona_alignment_rating
-        }
-
-        # Query_p1 and its ratings
-        st.markdown("### Query_p1")
-        st.write(config['query_p1'])
-        # Split the layout into 4 columns for query_p1 ratings
-        col_p1_1, col_p1_2, col_p1_3, col_p1_4 = st.columns(4)
-
-        with col_p1_1:
-            clarity_rating_p1 = st.radio("Clarity:", options, key=f"rating_p1_clarity_{current_index}")
-
-        with col_p1_2:
-            relevance_rating_p1 = st.radio("Relevance:", options, key=f"rating_p1_relevance_{current_index}")
-
-        with col_p1_3:
-            coverage_rating_p1 = st.radio("Coverage:", options, key=f"rating_p1_coverage_{current_index}")
-
-        with col_p1_4:
-            persona_alignment_rating_p1 = st.radio(
-                "Persona Alignment:", options=[0, 1, 2, 3, 4],  # These are the values
-                format_func=lambda x: ["N/A", "Not Aligned", "Partially Aligned", "Aligned", "Unclear"][x],
-                key=f"rating_p1_persona_alignment_{current_index}"
-            )
-
-        # Collecting the ratings for query_p1
-        query_p1_ratings = {
-            "clarity": clarity_rating_p1,
-            "relevance": relevance_rating_p1,
-            "coverage": coverage_rating_p1,
-            "persona_alignment": persona_alignment_rating_p1
-        }
+        # Render queries and collect ratings
+        query_v_ratings = render_query_ratings("Query_v", config, "query_v", current_index)
+        query_p0_ratings = render_query_ratings("Query_p0",
+                                                config, "query_p0", current_index, has_persona_alignment=True)
+        query_p1_ratings = render_query_ratings("Query_p1",
+                                                config, "query_p1",
+                                                current_index, has_persona_alignment=True)
 
         # Additional comments
         comment = st.text_area("Additional Comments (Optional):")
-
+        if "persona_alignment" in query_v_ratings:
+            query_v_ratings.pop("persona_alignment")
         # Collecting the response data
         response = Response(
             config_id=config["config_id"],
-            query_v=query_v_ratings,  # Use the ratings dictionary for query_v
-            query_p0=query_p0_ratings,  # Use the ratings dictionary for query_p0
-            query_p1=query_p1_ratings,  # Use the ratings dictionary for query_p1
+            query_v=query_v_ratings,
+            query_p0=query_p0_ratings,
+            query_p1=query_p1_ratings,
             comment=comment,
             timestamp=datetime.now().isoformat()
         )
+
         if len(st.session_state.responses) > current_index:
             st.session_state.responses[current_index] = response
         else:
@@ -156,4 +117,4 @@ def questions_screen(data):
         navigation_buttons(data, query_v_ratings["clarity"], query_p0_ratings["clarity"], query_p1_ratings["clarity"])
     except IndexError:
         print("Survey completed!")
-        # st.stop()
+