somewhat works

.gitignore

@@ -164,4 +164,5 @@ notebooks/.ipynb_checkpoints
 .DS_Store
 db/empty.json
 .config/user-evaluations-firebase-creds.json
-user-evaluations-default-rtdb-export.json
+user-evaluations-default-rtdb-export.json
+data/

app.py

@@ -3,26 +3,51 @@ from db.crud import ingest
 import pandas as pd
 import streamlit as st
 from datetime import datetime
+import os
+from dotenv import load_dotenv
+import json
+from typing import Dict, List
 
+load_dotenv()
 
-# Load Q&A data
-@st.cache_data
-def load_data():
-    return pd.read_csv("dummy_qa_data.csv")[:3]
 
+class SurveyState:
+    """Class to handle survey state management"""
 
-# Function to validate Prolific ID (customize this based on your format requirements)
-def validate_prolific_id(prolific_id: str) -> bool:
-    return bool(prolific_id.strip())  # Example: Check non-empty
+    def __init__(self):
+        self.state_file = "survey_states.json"
 
-    # Function to reset the survey
+    def save_state(self, prolific_id: str, current_state: Dict) -> None:
+        """Save current state to file"""
+        try:
+            if os.path.exists(self.state_file):
+                with open(self.state_file, 'r') as f:
+                    states = json.load(f)
+            else:
+                states = {}
 
+            states[prolific_id] = current_state
 
-def reset_survey():
-    st.session_state.prolific_id = None
-    st.session_state.current_index = 0
-    st.session_state.responses = []
-    st.session_state.completed = False
+            with open(self.state_file, 'w') as f:
+                json.dump(states, f)
+
+        except Exception as e:
+            st.error(f"Error saving state: {e}")
+
+    def load_state(self, prolific_id: str) -> Dict:
+        """Load state for a specific user"""
+        try:
+            if os.path.exists(self.state_file):
+                with open(self.state_file, 'r') as f:
+                    states = json.load(f)
+                return states.get(prolific_id, {})
+        except Exception as e:
+            st.error(f"Error loading state: {e}")
+        return {}
+
+
+def validate_prolific_id(prolific_id: str) -> bool:
+    return bool(prolific_id.strip())
 
 
 def initialization():
@@ -35,6 +60,8 @@ def initialization():
         st.session_state.responses = []
     if "completed" not in st.session_state:
         st.session_state.completed = False
+    if "survey_state" not in st.session_state:
+        st.session_state.survey_state = SurveyState()
 
 
 def prolific_id_screen():
@@ -45,7 +72,15 @@ def prolific_id_screen():
     if prolific_id_input:
         if validate_prolific_id(prolific_id_input):
             st.session_state.prolific_id = prolific_id_input
-            st.success("Prolific ID recorded! Now, proceed with the questions.")
+
+            # Load previous state if exists
+            saved_state = st.session_state.survey_state.load_state(prolific_id_input)
+            if saved_state:
+                st.session_state.current_index = saved_state.get('current_index', 0)
+                st.session_state.responses = saved_state.get('responses', [])
+                st.success("Previous progress loaded! Continuing from where you left off.")
+            else:
+                st.success("Prolific ID recorded! Starting new survey.")
             st.rerun()
         else:
             st.warning("Invalid Prolific ID. Please check and try again.")
@@ -54,47 +89,52 @@ def prolific_id_screen():
 def questions_screen(data):
     """Display the questions screen."""
     current_index = st.session_state.current_index
+    config = data.iloc[current_index]
 
-    # Display question and answer
-    question = data.loc[current_index, "Question"]
-    generated_answer = data.loc[current_index, "Generated Answer"]
-
-    st.subheader(f"Question {current_index + 1}")
-    st.markdown(f"***{question}***")
-    st.subheader("Generated Answer:")
-    st.write(generated_answer)
-
-    # Prefill responses if they exist
-    previous_rating = (
-        st.session_state.responses[current_index].ans
-        if len(st.session_state.responses) > current_index
-        else 0
-    )
-    previous_feedback = (
-        st.session_state.responses[current_index].feedback_text
-        if len(st.session_state.responses) > current_index
-        else ""
-    )
-
-    # Rating slider
-    rating = st.slider("Rate the answer (1 = Worst, 5 = Best)", 1, 5, value=previous_rating,
-                       key=f"rating_{current_index}")
-
-    # Free-text feedback
-    feedback_text = st.text_area("Any additional feedback?", value=previous_feedback, key=f"feedback_{current_index}")
-
-    # Store or update the response
-    response = Response(q_id=f"q{current_index + 1}", ans=rating, feedback_text=feedback_text)
+    # Progress bar
+    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']}")
+
+    # Create tabs for better organization
+    context_tab, questions_tab = st.tabs(["Context", "Questions"])
+
+    with context_tab:
+        st.write(f"**Persona:** {config['persona']}")
+        st.write(f"**Filters:** {config['filters']}")
+        st.write(f"**Cities:** {config['city']}")
+
+        # Expandable context
+        with st.expander("Show Context", expanded=False):
+            st.write(config['context'])
+
+    options = [0, 1, 2, 3, 4, 5]
+
+    with questions_tab:
+        st.write(f"**Query_v:** {config['query_v']}")
+        rating_v = st.radio("Rate this config:", options, key=f"rating_v_{current_index}")
+
+        st.write(f"**Query_p0:** {config['query_p0']}")
+        rating_p0 = st.radio("Rate this config:", options, key=f"rating_p0_{current_index}")
+
+        st.write(f"**Query_p1:** {config['query_p1']}")
+        rating_p1 = st.radio("Rate this config:", options,  key=f"rating_p1_{current_index}")
+
+        comment = st.text_area("Comments (Optional):")
+    response = Response(config_id=config["config_id"],
+                        rating_v=rating_v, rating_p0=rating_p0, rating_p1=rating_p1,
+                        comment=comment, timestamp=datetime.now().isoformat())
+    print(response)
     if len(st.session_state.responses) > current_index:
         st.session_state.responses[current_index] = response
     else:
         st.session_state.responses.append(response)
-
-    # Navigation buttons
-    navigation_buttons(data, rating, feedback_text)
+    navigation_buttons(data, rating_v, rating_p0, rating_p1)
 
 
-def navigation_buttons(data, rating, feedback_text):
+def navigation_buttons(data, rating_v, rating_p0, rating_p1):
     """Display navigation buttons."""
     current_index = st.session_state.current_index
 
@@ -107,7 +147,7 @@ def navigation_buttons(data, rating, feedback_text):
 
     with col2:  # Next button
         if st.button("Next"):
-            if not rating:
+            if rating_v == 0 or rating_p0 == 0 or rating_p1 ==0:
                 st.warning("Please provide a rating before proceeding.")
             else:
                 if current_index < len(data) - 1:
@@ -117,7 +157,7 @@ def navigation_buttons(data, rating, feedback_text):
                     feedback = Feedback(
                         id=current_index + 1,
                         user_id=st.session_state.prolific_id,
-                        time_stamp=datetime.now(),
+                        time_stamp=datetime.now().isoformat(),
                         responses=st.session_state.responses,
                     )
                     try:
@@ -128,6 +168,38 @@ def navigation_buttons(data, rating, feedback_text):
                         st.error(f"An error occurred while submitting feedback: {e}")
 
 
+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("Start New Survey"):
+        reset_survey()
+        st.rerun()
+
+
+def submit_survey():
+    """Submit the complete survey"""
+    try:
+        feedback = Feedback(
+            id=st.session_state.current_index,
+            user_id=st.session_state.prolific_id,
+            time_stamp=datetime.now().isoformat(),
+            responses=st.session_state.responses,
+        )
+        print(feedback)
+        ingest(feedback)
+        st.session_state.completed = True
+        st.rerun()
+    except Exception as e:
+        st.error(f"An error occurred while submitting feedback: {e}")
+
+
 def reset_survey():
     """Reset the survey state to start over."""
     st.session_state.prolific_id = None
@@ -138,15 +210,16 @@ def reset_survey():
 
 def ui():
     """Main function to control the survey flow."""
-    data = load_data()
+    data = pd.read_csv("data/gemini_results_subset.csv")[:3]
     initialization()
 
     if st.session_state.completed:
-        st.title("Survey Completed")
-        st.success("You have completed all questions and your answers have been recorded.")
-        if st.button("Retake Survey"):
-            reset_survey()
-            st.rerun()
+        # st.title("Survey Completed")
+        # st.success("Thank you! Your survey has been submitted successfully.")
+        # if st.button("Start New Survey"):
+        #     reset_survey()
+        #     st.rerun()
+        exit_screen()
         return
 
     if st.session_state.prolific_id is None:

db/crud.py

@@ -1,23 +1,27 @@
 from datetime import datetime
 
-from db.schema import Feedback
+from db.schema import Feedback, Response
 from db.setup import db_setup
 
 
 # Create operation (Ingest data into Firebase with unique user_id check)
 def ingest(data: Feedback):
     ref = db_setup()  # Ensure Firebase is initialized
-
+    print(f"Attempting to ingest feedback data from user '{data.user_id}'...")
     # Check if the user_id already exists in the feedback data
-    existing_feedback = ref.child('feedback').order_by_child('user_id').equal_to(data.user_id).get()
-
-    # TODO: This should probably change. If the same user has multiple feedbacks, we should allow it. -> change to update
-    if existing_feedback:
-        print(f"Feedback from user '{data.user_id}' already exists. Ingestion aborted.")
-    else:
-        feedback_data = data.dict()  # Convert Pydantic model to a dictionary
-        ref.child('feedback').push(feedback_data)
-        print(f"Feedback data from user '{data.user_id}' pushed to Firebase!")
+    # user_id_str = str(data.user_id)
+    # existing_feedback = ref.child('feedback').order_by_child('user_id').equal_to(user_id_str).get()
+    #
+    #
+    # # TODO: This should probably change. If the same user has multiple feedbacks, we should allow it. -> change to update
+    # if existing_feedback:
+    #     print(f"Feedback from user '{data.user_id}' already exists. Ingestion aborted.")
+    # else:
+    #     # feedback_data = data.dict()  # Convert Pydantic model to a dictionary
+    feedback_data = data.model_dump()
+    feedback_data["time_stamp"] = feedback_data['time_stamp'].isoformat()
+    ref.child('feedback').push(feedback_data)
+    print(f"Feedback data from user '{data.user_id}' pushed to Firebase!")
 
 
 # Read operation (Fetch feedback data from Firebase)
@@ -71,9 +75,21 @@ def test():
             {"q_id": "q2", "ans": 3}
         ]
     )
-
+    feedback = Feedback(
+        id=2,
+        user_id='tt',
+        time_stamp=datetime(2025, 1, 30, 21, 25, 15, 581994),
+        responses=[
+            Response(config_id='c_p_0_pop_low_easy', rating_v=1, rating_p0=1, rating_p1=1, comment='',
+                     timestamp='2025-01-30T21:25:12.642038'),
+            Response(config_id='c_p_1_pop_medium_medium', rating_v=1, rating_p0=1, rating_p1=1, comment='',
+                     timestamp='2025-01-30T21:25:13.854227'),
+            Response(config_id='c_p_2_pop_high_hard', rating_v=1, rating_p0=1, rating_p1=1, comment='',
+                     timestamp='2025-01-30T21:25:15.581948'),
+        ]
+    )
     # Create (Ingest)
-    ingest(feedback_example)
+    ingest(feedback)
 
     # Read (Fetch)
     feedback_data = read(1)

db/schema.py

@@ -1,12 +1,15 @@
 from pydantic import BaseModel
-from typing import List, Dict
+from typing import List, Dict, Optional
 from datetime import datetime
 
 
 class Response(BaseModel):
-    q_id: str
-    ans: int
-    feedback_text: str | None = None
+    config_id: str
+    rating_v: int
+    rating_p0: int
+    rating_p1: int
+    comment: Optional[str]
+    timestamp: str
 
 
 class Feedback(BaseModel):