Update src/streamlit_app.py

src/streamlit_app.py

@@ -238,47 +238,51 @@ if movie_id:
 elif page:
     st.title("Rate Random Movies")
 
-    all_genres = sorted(set(genre.strip() for sublist in movie_df["genres"].dropna().str.split("|") for genre in sublist))
+    # Genres extrahieren
+    all_genres = sorted(set(
+        genre.strip()
+        for sublist in movie_df["genres"].dropna().str.split("|")
+        for genre in sublist
+    ))
     selected_genres = st.multiselect("Select genres:", options=all_genres, placeholder="All genres")
 
-    genre_filter = movie_df["genres"].apply(lambda g: any(genre in g.split("|") for genre in selected_genres)) if selected_genres else True
+    # Initialer Zustand
+    if "rating_mode_state" not in st.session_state:
+        st.session_state.rating_mode_state = {
+            "movie_pool": [],
+            "index": 0,
+            "genre_filter": []
+        }
 
-    if isinstance(genre_filter, pd.Series):
+    # Filter neu anwenden, wenn sich Genres geändert haben
+    if st.session_state.rating_mode_state["genre_filter"] != selected_genres:
+        genre_filter = movie_df["genres"].apply(
+            lambda g: any(genre in g.split("|") for genre in selected_genres)
+        ) if selected_genres else pd.Series([True] * len(movie_df))
+        
         filtered_df = movie_df[genre_filter].copy()
-    else:
-        filtered_df = movie_df.copy()
-
-    if filtered_df.empty:
-        st.warning("No movies match the selected filters.")
-        st.stop()
 
-    if "last_filter_state" not in st.session_state or st.session_state.last_filter_state != tuple(selected_genres):
-        st.session_state.movie_pool = filtered_df.sample(frac=1).reset_index(drop=True)
-        st.session_state.random_index = 0
-        st.session_state.last_filter_state = tuple(selected_genres)
-        st.session_state.current_random_movie = None
+        if filtered_df.empty:
+            st.warning("No movies match the selected filters.")
+            st.stop()
 
-    if "movie_pool" not in st.session_state or st.session_state.movie_pool.empty:
-        st.warning("Movie pool is empty. Try adjusting your filters.")
-        st.stop()
+        st.session_state.rating_mode_state = {
+            "movie_pool": filtered_df.sample(frac=1).reset_index(drop=True),
+            "index": 0,
+            "genre_filter": selected_genres
+        }
 
-    movie_pool = st.session_state.movie_pool
-    index = st.session_state.get("random_index", 0)
+    # Hole aktuellen Film
+    movie_pool = st.session_state.rating_mode_state["movie_pool"]
+    index = st.session_state.rating_mode_state["index"]
 
     if index >= len(movie_pool):
         st.info("No more movies to rate.")
         st.stop()
 
-    try:
-        movie = movie_pool.iloc[index]
-    except IndexError:
-        st.error("Could not load a movie. Please try again.")
-        st.stop()
-
-    if movie is None or pd.isna(movie["clean_title"]):
-        st.error("Invalid movie data.")
-        st.stop()
+    movie = movie_pool.iloc[index]
 
+    # Poster abrufen (nutze ggf. gecachte Version)
     poster_url, tmdb_link = get_tmdb_data(movie["clean_title"], movie["year"])
 
     col1, col2 = st.columns([1, 2])
@@ -300,30 +304,25 @@ elif page:
             st.markdown(f"<a href='{tmdb_link}' target='_blank'>View on TMDb</a>", unsafe_allow_html=True)
 
         st.markdown(f"### Movie {index + 1} of {len(movie_pool)}")
-        st.markdown("### Your Rating")
         rating_key = f"rating_{movie['movieId']}"
-        if rating_key not in st.session_state:
-            st.session_state[rating_key] = None
-        st.session_state[rating_key] = st.radio(
-            "Rate this movie:", [1, 2, 3, 4, 5], horizontal=True, index=None, key=f"radio_{movie['movieId']}")
+        rating = st.radio("Rate this movie:", [1, 2, 3, 4, 5], horizontal=True, key=rating_key)
 
         col_submit, col_skip = st.columns([1, 1])
         with col_submit:
-            rating = st.session_state[rating_key]
             if st.button("Submit Rating") and rating:
                 save_rating_to_json({
                     "movie_id": int(movie["movieId"]),
                     "rating": rating,
                     "timestamp": datetime.now().isoformat()
                 })
-                st.session_state["random_index"] = index + 1
-                st.session_state["just_submitted"] = True
-                #st.rerun()
+                st.session_state.rating_mode_state["index"] += 1
+                st.rerun()
+
         with col_skip:
             if st.button("Didn't Watch"):
-                st.session_state["random_index"] = index + 1
-                st.session_state["just_submitted"] = True
-                #st.rerun()
+                st.session_state.rating_mode_state["index"] += 1
+                st.rerun()
+
 
 elif search_query:
     st.title(f"Search Results for '{search_query}'")