broken state management but otherwise pretty

README.md

@@ -25,8 +25,9 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 [x] Implement save and continue later button
 [x] Implement questions with proper buttons (with text)
 [ ] 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
-[ ] Check the firebase DB rules
+[x] Check the firebase DB rules

db/crud.py

@@ -87,40 +87,4 @@ def reset_feedback_in_db(user_id: str):
         print(f"Feedback data for user '{user_id}' reset in Firebase.")
 
 
-def test():
-    # Create a feedback object
-    # 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)
-
-    # Read (Fetch)
-    feedback_data = read("cdSf")
-    if feedback_data:
-        print(feedback_data)
-
-    # Update (Modify)
-    # updated_feedback = Feedback(
-    #     id=1,
-    #     user_id="user123",
-    #     time_stamp=datetime.now(),
-    #     responses=[
-    #         {"q_id": "q1", "ans": 4},  # Updated answer
-    #         {"q_id": "q2", "ans": 3}
-    #     ]
-    # )
-    # update(1, updated_feedback)
-    #
-    # # Delete (Remove)
-    # delete(1)
+

run_crud.py

@@ -1,5 +1,55 @@
-from db.crud import test
+from db.crud import ingest, read, update, delete
+from db.schema import Feedback, Response, ModelRatings
+from datetime import datetime
+
+
+def test():
+    # Sample data for ModelRatings
+    model_ratings = ModelRatings(
+        query_v_ratings={'v1': 5, 'v2': 4},
+        query_p0_ratings={'p0_1': 3, 'p0_2': 4},
+        query_p1_ratings={'p1_1': 2, 'p1_2': 5}
+    )
+
+    # Sample data for Response
+    response = Response(
+        config_id='config_123',
+        model_ratings={'model_1': model_ratings},
+        comment='This is a sample response.',
+        timestamp='2025-02-01T18:13:48'
+    )
+
+    # Sample data for Feedback
+    feedback = Feedback(
+        id=1,
+        user_id='user_123',
+        time_stamp=datetime(2025, 2, 1, 18, 13, 48),
+        responses=[response]
+    )
+
+    ingest(feedback)
+    print(read("user_123"))
+
+    # Read (Fetch)
+    feedback_data = read("ashmi")
+    if feedback_data:
+        print(feedback_data)
+
+    # Update (Modify)
+    # updated_feedback = Feedback(
+    #     id=1,
+    #     user_id="user123",
+    #     time_stamp=datetime.now(),
+    #     responses=[
+    #         {"q_id": "q1", "ans": 4},  # Updated answer
+    #         {"q_id": "q2", "ans": 3}
+    #     ]
+    # )
+    # update(1, updated_feedback)
+    #
+    # # Delete (Remove)
+    # delete(1)
+
 
 if __name__ == "__main__":
     test()
-

utils/notebooks/Data Merging.ipynb

@@ -2,8 +2,8 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 2,
-   "id": "a16bb8a1",
+   "execution_count": 1,
+   "id": "9e43247d",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -12,8 +12,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
-   "id": "4fc12e60",
+   "execution_count": 2,
+   "id": "0ab32394",
    "metadata": {},
    "outputs": [
     {
@@ -66,7 +66,7 @@
        "      <td>['Adana', 'Adiyaman', 'Agri', 'Arad', 'Arkhang...</td>\n",
        "      <td>\"Less crowded European cities to visit in Febr...</td>\n",
        "      <td>\"European cities with ice hockey facilities, l...</td>\n",
-       "      <td>Based on the user's profile as a top-scoring p...</td>\n",
+       "      <td>Which European cities have ice hockey arenas a...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>1</th>\n",
@@ -78,7 +78,7 @@
        "      <td>['Coimbra', 'Brno', 'Braga']</td>\n",
        "      <td>'medium budget European city breaks with parks...</td>\n",
        "      <td>\"Medium budget European cities with parks and ...</td>\n",
-       "      <td>Based on the user's background as a former DJ ...</td>\n",
+       "      <td>Which European cities offer a mix of music fes...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
@@ -90,7 +90,7 @@
        "      <td>['Zagreb', 'Volgograd', 'Tirana', 'Tbilisi', '...</td>\n",
        "      <td>\"Looking for a popular and affordable European...</td>\n",
        "      <td>\"Low-budget European cities with museums and n...</td>\n",
-       "      <td>Based on the provided information, I'm going t...</td>\n",
+       "      <td>Which European cities offer a mix of historica...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>3</th>\n",
@@ -102,7 +102,7 @@
        "      <td>['Van', 'Uzhhorod', 'Trabzon', 'Thessaloniki',...</td>\n",
        "      <td>\"European cities with low popularity, monaster...</td>\n",
        "      <td>\"off the beaten path European city breaks in l...</td>\n",
-       "      <td>Based on the given information, I'll create a ...</td>\n",
+       "      <td>Which European cities offer a culturally rich ...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>4</th>\n",
@@ -114,7 +114,7 @@
        "      <td>['Aalborg', 'Astrakhan', 'Bari', 'Bremen', 'Ch...</td>\n",
        "      <td>\"European cities for a luxurious trip.\"</td>\n",
        "      <td>\"European cities with horse riding trails and ...</td>\n",
-       "      <td>Based on the user's background and interests, ...</td>\n",
+       "      <td>Which European cities have horse riding school...</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
@@ -171,14 +171,14 @@
        "4  \"European cities with horse riding trails and ...   \n",
        "\n",
        "                                      llama_query_p1  \n",
-       "0  Based on the user's profile as a top-scoring p...  \n",
-       "1  Based on the user's background as a former DJ ...  \n",
-       "2  Based on the provided information, I'm going t...  \n",
-       "3  Based on the given information, I'll create a ...  \n",
-       "4  Based on the user's background and interests, ...  "
+       "0  Which European cities have ice hockey arenas a...  \n",
+       "1  Which European cities offer a mix of music fes...  \n",
+       "2  Which European cities offer a mix of historica...  \n",
+       "3  Which European cities offer a culturally rich ...  \n",
+       "4  Which European cities have horse riding school...  "
       ]
      },
-     "execution_count": 6,
+     "execution_count": 2,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -195,8 +195,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
-   "id": "a651f27b",
+   "execution_count": 3,
+   "id": "aed0fba7",
    "metadata": {},
    "outputs": [
     {
@@ -361,7 +361,7 @@
        "4  European cities with renowned veterinary or ag...  "
       ]
      },
-     "execution_count": 7,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -377,8 +377,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
-   "id": "dfd8102c",
+   "execution_count": 4,
+   "id": "7a0bbd7e",
    "metadata": {},
    "outputs": [
     {
@@ -391,10 +391,10 @@
     {
      "data": {
       "text/plain": [
-       "['filters', 'city', 'context', 'config_id', 'persona', 'persona_id']"
+       "['config_id', 'persona_id', 'filters', 'persona', 'city', 'context']"
       ]
      },
-     "execution_count": 8,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -407,8 +407,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
-   "id": "32344df6",
+   "execution_count": 5,
+   "id": "ca123dd4",
    "metadata": {},
    "outputs": [
     {
@@ -467,7 +467,7 @@
        "      <td>Best European cities for intense physical trai...</td>\n",
        "      <td>\"Less crowded European cities to visit in Febr...</td>\n",
        "      <td>\"European cities with ice hockey facilities, l...</td>\n",
-       "      <td>Based on the user's profile as a top-scoring p...</td>\n",
+       "      <td>Which European cities have ice hockey arenas a...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>1</th>\n",
@@ -482,7 +482,7 @@
        "      <td>Best European cities for live music, especiall...</td>\n",
        "      <td>'medium budget European city breaks with parks...</td>\n",
        "      <td>\"Medium budget European cities with parks and ...</td>\n",
-       "      <td>Based on the user's background as a former DJ ...</td>\n",
+       "      <td>Which European cities offer a mix of music fes...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
@@ -497,7 +497,7 @@
        "      <td>Where can I find inspiring European cities wit...</td>\n",
        "      <td>\"Looking for a popular and affordable European...</td>\n",
        "      <td>\"Low-budget European cities with museums and n...</td>\n",
-       "      <td>Based on the provided information, I'm going t...</td>\n",
+       "      <td>Which European cities offer a mix of historica...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>3</th>\n",
@@ -512,7 +512,7 @@
        "      <td>Best European cities for unique, artistic expe...</td>\n",
        "      <td>\"European cities with low popularity, monaster...</td>\n",
        "      <td>\"off the beaten path European city breaks in l...</td>\n",
-       "      <td>Based on the given information, I'll create a ...</td>\n",
+       "      <td>Which European cities offer a culturally rich ...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>4</th>\n",
@@ -527,7 +527,7 @@
        "      <td>European cities with renowned veterinary or ag...</td>\n",
        "      <td>\"European cities for a luxurious trip.\"</td>\n",
        "      <td>\"European cities with horse riding trails and ...</td>\n",
-       "      <td>Based on the user's background and interests, ...</td>\n",
+       "      <td>Which European cities have horse riding school...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>...</th>\n",
@@ -572,7 +572,7 @@
        "      <td>European cities with a grand, futuristic feel ...</td>\n",
        "      <td>'medium budget trip in April to a popular Euro...</td>\n",
        "      <td>\"Medium budget trip to a popular European city...</td>\n",
-       "      <td>Based on the user's interest in Sins of a Sola...</td>\n",
+       "      <td>Which European cities have a rich history of e...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>197</th>\n",
@@ -587,7 +587,7 @@
        "      <td>Where can I find European cities rich in histo...</td>\n",
        "      <td>\"Less crowded European destinations with water...</td>\n",
        "      <td>\"Less crowded European destinations for a pric...</td>\n",
-       "      <td>Based on the provided information, I would gue...</td>\n",
+       "      <td>European cities with rich history of philosoph...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>198</th>\n",
@@ -602,7 +602,7 @@
        "      <td>Which European cities offer glimpses into the ...</td>\n",
        "      <td>\"European cities with great walkability and lo...</td>\n",
        "      <td>\"European cities with industrial heritage site...</td>\n",
-       "      <td>Based on the user's interest in technological ...</td>\n",
+       "      <td>Which European cities showcase historic indust...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>199</th>\n",
@@ -617,7 +617,7 @@
        "      <td>Affordable, safe European cities with historic...</td>\n",
        "      <td>'medium budget european city breaks in popular...</td>\n",
        "      <td>\"Medium budget city breaks in Europe for a sch...</td>\n",
-       "      <td>Based on the information provided, I'll make a...</td>\n",
+       "      <td>Which European cities offer a mix of cultural ...</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
@@ -756,22 +756,22 @@
        "199  \"Medium budget city breaks in Europe for a sch...   \n",
        "\n",
        "                                        llama_query_p1  \n",
-       "0    Based on the user's profile as a top-scoring p...  \n",
-       "1    Based on the user's background as a former DJ ...  \n",
-       "2    Based on the provided information, I'm going t...  \n",
-       "3    Based on the given information, I'll create a ...  \n",
-       "4    Based on the user's background and interests, ...  \n",
+       "0    Which European cities have ice hockey arenas a...  \n",
+       "1    Which European cities offer a mix of music fes...  \n",
+       "2    Which European cities offer a mix of historica...  \n",
+       "3    Which European cities offer a culturally rich ...  \n",
+       "4    Which European cities have horse riding school...  \n",
        "..                                                 ...  \n",
        "195  Which European cities offer a mix of cultural ...  \n",
-       "196  Based on the user's interest in Sins of a Sola...  \n",
-       "197  Based on the provided information, I would gue...  \n",
-       "198  Based on the user's interest in technological ...  \n",
-       "199  Based on the information provided, I'll make a...  \n",
+       "196  Which European cities have a rich history of e...  \n",
+       "197  European cities with rich history of philosoph...  \n",
+       "198  Which European cities showcase historic indust...  \n",
+       "199  Which European cities offer a mix of cultural ...  \n",
        "\n",
        "[200 rows x 12 columns]"
       ]
      },
-     "execution_count": 9,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -784,8 +784,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
-   "id": "ed6dca09",
+   "execution_count": 7,
+   "id": "53314432",
    "metadata": {},
    "outputs": [
     {
@@ -806,7 +806,7 @@
        "dtype: int64"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -817,8 +817,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
-   "id": "9693f553",
+   "execution_count": 8,
+   "id": "b4e05bdc",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -828,7 +828,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "93dba3ec",
+   "id": "7abcac32",
    "metadata": {},
    "outputs": [],
    "source": []

views/intro_screen.py

@@ -23,10 +23,14 @@ def welcome_screen():
         st.markdown("""<style> .st-emotion-cache-1jicfl2 {width: 50%;} </style>""", unsafe_allow_html=True)
         st.title("Welcome to the Feedback Survey")
 
-        username_input = st.text_input("Enter your First name and press TAB:")
+        username_input = st.text_input("Enter your first name and press TAB:")
         validation_code_input = st.text_input("Enter the validation code to proceed and press ENTER:")
 
         next_button = st.button("Next")
+        footer_html = """<div style='text-align: center; background-color:#ECECEC;padding:3rem;'> <p 
+        style='font-size: large;'>⚠️ Note: This is still a work in progress. <br> If you encounter bugs or issues 
+        please create a Pull Request and we will look into it.</br></p> </div> """
+        st.markdown(footer_html, unsafe_allow_html=True)
 
         if (username_input and validation_code_input) or next_button:
             if validate_username(username_input) and validate_code(validation_code_input):

views/nav_buttons.py

@@ -46,7 +46,7 @@ def navigation_buttons(data, response: Response):
             if current_index > 0:
                 st.session_state.current_index -= 1
                 previous_ratings = st.session_state.ratings.get(st.session_state.current_index, {})
-                st.session_state.previous_ratings = previous_ratings
+                # st.session_state.previous_ratings = previous_ratings
                 # st.session_state.previous_gemini_ratings = previous_ratings.get("gemini", {})
                 # st.session_state.previous_llama_ratings = previous_ratings.get("llama", {})
                 st.rerun()
@@ -62,6 +62,7 @@ def navigation_buttons(data, response: Response):
             else:
                 if current_index < len(data) - 1:
                     st.session_state.current_index += 1
+                    # st.session_state.previous_ratings = {}
                     st.rerun()
                 else:
                     submit_feedback(current_index)

views/questions_screen.py

@@ -49,7 +49,10 @@ def display_ratings_row(model_name, config, current_index):
 def render_query_ratings(model_name, query_label, config, query_key, current_index, has_persona_alignment=False):
     """Helper function to render ratings for a given query."""
     # Get stored ratings if they exist
-    previous_ratings = st.session_state.get("previous_ratings", {}).get(model_name, {})
+    if current_index < st.session_state.current_index:
+        previous_ratings = st.session_state.get("previous_ratings", {}).get(model_name, None)
+    else:
+        previous_ratings = None  # Ensure new questions start fresh
     stored_query_ratings = {}
     if previous_ratings:
         if "query_v" in query_key: