somewhat works with the new data

db/schema.py

@@ -3,12 +3,16 @@ from typing import List, Dict, Optional
 from datetime import datetime
 
 
+class ModelRatings(BaseModel):
+    query_v_ratings: Dict[str, int]
+    query_p0_ratings: Dict[str, int]
+    query_p1_ratings: Dict[str, int]
+
+
 class Response(BaseModel):
     config_id: str
-    query_v: Dict[str, int]
-    query_p0: Dict[str, int]
-    query_p1: Dict[str, int]
-    comment: Optional[str]
+    model_ratings: Dict[str, ModelRatings]
+    comment: Optional[str] = None
     timestamp: str
 
 

utils/loaders.py

@@ -1,6 +1,6 @@
 import pandas as pd
 import os
-
+import streamlit as st
 from datasets import load_dataset
 from dotenv import load_dotenv
 
@@ -9,7 +9,7 @@ HF_TOKEN = os.getenv("HF_TOKEN")
 REPO_NAME = os.getenv("DATA_REPO")
 DATA_FILES = os.getenv("GEMINI_DATA_FILES")
 
-
+@st.cache_data
 def load_data():
     try:
         data = pd.read_csv("data/user-evaluation/merged.csv")[:5]

views/nav_buttons.py

@@ -1,4 +1,4 @@
-from db.schema import Feedback
+from db.schema import Feedback, Response
 from db.crud import save_feedback, read
 import streamlit as st
 from datetime import datetime
@@ -32,8 +32,9 @@ def any_value_zero(response):
     )
 
 
-def navigation_buttons(data, ratings_v, ratings_p0, ratings_p1):
+def navigation_buttons(data, response: Response):
     """Display navigation buttons."""
+    #TODO change the function to accept the response object
     current_index = st.session_state.current_index
 
     col1, col2, col3 = st.columns([1, 1, 2])
@@ -44,8 +45,14 @@ def navigation_buttons(data, ratings_v, ratings_p0, ratings_p1):
             st.rerun()
 
     with col2:  # Next button
+        all_ratings = []
+        for model_ratings in response.model_ratings.values():
+            all_ratings.extend(model_ratings.query_v_ratings.values())
+            all_ratings.extend(model_ratings.query_p0_ratings.values())
+            all_ratings.extend(model_ratings.query_p1_ratings.values())
+
         if st.button("Next"):
-            if any(rating == 0 for rating in [ratings_v, ratings_p0, ratings_p1]):
+            if any(rating == 0 for rating in all_ratings):
                 st.warning("Please provide a rating before proceeding.")
             else:
                 if current_index < len(data) - 1:

views/questions_screen.py

@@ -1,9 +1,10 @@
-from db.schema import Response
+from db.schema import Response, ModelRatings
 import streamlit as st
 from datetime import datetime
 import os
 from dotenv import load_dotenv
 from views.nav_buttons import navigation_buttons
+
 st.set_page_config(layout="wide")
 load_dotenv()
 
@@ -80,23 +81,40 @@ def questions_screen(data):
             st.text_area("", config['context'], height=300, disabled=False)
 
         # Render queries and collect ratings
-        query_v_ratings = render_query_ratings("Query_v", config, "gemini_query_v", current_index)
-        query_p0_ratings = render_query_ratings("Query_p0",
-                                                config, "gemini_query_p0", current_index, has_persona_alignment=True)
-        query_p1_ratings = render_query_ratings("Query_p1",
-                                                config, "gemini_query_p1",
-                                                current_index, has_persona_alignment=True)
+        g_query_v_ratings = render_query_ratings("Query_v", config, "gemini_query_v", current_index)
+        g_query_p0_ratings = render_query_ratings("Query_p0",
+                                                  config, "gemini_query_p0", current_index, has_persona_alignment=True)
+        g_query_p1_ratings = render_query_ratings("Query_p1",
+                                                  config, "gemini_query_p1",
+                                                  current_index, has_persona_alignment=True)
+
+        l_query_v_ratings = render_query_ratings("Query_v", config, "llama_query_v", current_index)
+        l_query_p0_ratings = render_query_ratings("Query_p0",
+                                                  config, "llama_query_p0", current_index, has_persona_alignment=True)
+        l_query_p1_ratings = render_query_ratings("Query_p1",
+                                                  config, "llama_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")
+        if "persona_alignment" in g_query_v_ratings or "persona_alignment" in l_query_v_ratings:
+            g_query_v_ratings.pop("persona_alignment")
+            l_query_v_ratings.pop("persona_alignment")
         # Collecting the response data
         response = Response(
             config_id=config["config_id"],
-            query_v=query_v_ratings,
-            query_p0=query_p0_ratings,
-            query_p1=query_p1_ratings,
+            model_ratings={
+                "gemini": ModelRatings(
+                    query_v_ratings=g_query_v_ratings,
+                    query_p0_ratings=g_query_p0_ratings,
+                    query_p1_ratings=g_query_p1_ratings,
+                ),
+                "llama": ModelRatings(
+                    query_v_ratings=l_query_v_ratings,
+                    query_p0_ratings=l_query_p0_ratings,
+                    query_p1_ratings=l_query_p1_ratings,
+                )
+            },
             comment=comment,
             timestamp=datetime.now().isoformat()
         )
@@ -107,6 +125,6 @@ def questions_screen(data):
             st.session_state.responses.append(response)
 
         # Navigation buttons
-        navigation_buttons(data, query_v_ratings["clarity"], query_p0_ratings["clarity"], query_p1_ratings["clarity"])
+        navigation_buttons(data, response)
     except IndexError:
         print("Survey completed!")