new changes

app.py

@@ -4,7 +4,7 @@ import os
 import uuid
 from datetime import datetime
 from pathlib import Path
-
+import fcntl
 import pandas as pd
 import pytz
 import streamlit as st
@@ -61,25 +61,38 @@ scheduler = CommitScheduler(
 
 def load_data(file_path):
     """
-    Load data from a JSON or CSV file.
+    Load data from a JSON or CSV file with better error handling.
     
     Args:
     file_path (str): The path to the file to load.
     
     Returns:
-    pd.DataFrame or dict: The loaded data.
+    dict or pd.DataFrame: The loaded data. Returns empty dict/DataFrame on error.
     """
     try:
         if file_path.endswith('.json'):
-            with open(file_path, 'r') as file:
-                return json.load(file)
+            with open(file_path, 'r', encoding='utf-8') as file:
+                try:
+                    return json.load(file)
+                except json.JSONDecodeError:
+                    st.error(f"Invalid JSON in {file_path}. Loading empty data.")
+                    return {}
         elif file_path.endswith('.csv'):
-            return pd.read_csv(file_path)
+            try:
+                return pd.read_csv(file_path)
+            except Exception as e:
+                st.error(f"Error reading CSV {file_path}: {e}")
+                return pd.DataFrame()
     except FileNotFoundError:
         if file_path.endswith('.json'):
             return {}
         elif file_path.endswith('.csv'):
             return pd.DataFrame()
+    except Exception as e:
+        st.error(f"Unexpected error loading {file_path}: {e}")
+        if file_path.endswith('.json'):
+            return {}
+        return pd.DataFrame()
 
 
 def get_base64_of_image(path):
@@ -211,49 +224,80 @@ def calculate_max_bid_points(user_name):
     return max_bid_points
 
 
-def load_users(USERS_JSON):
-    """Load users data with fallback to Hugging Face"""
+def load_users(users_json_path):
+    """Load users data with file locking to prevent corruption"""
     try:
-        # First try local file
-        if os.path.exists(USERS_JSON):
-            with open(USERS_JSON, 'r', encoding='utf-8') as file:
-                return json.load(file)
-        # If not found, load from Hugging Face
-        return load_and_process_users()
+        if not os.path.exists(users_json_path):
+            return {}
+            
+        with open(users_json_path, 'r', encoding='utf-8') as f:
+            # Acquire shared lock for reading
+            fcntl.flock(f, fcntl.LOCK_SH)
+            try:
+                data = json.load(f)
+                # Validate data structure
+                if not all(isinstance(v, dict) and 'points' in v for v in data.values()):
+                    st.error("Invalid users data structure")
+                    return {}
+                return data
+            except json.JSONDecodeError:
+                st.error("Invalid JSON in users file")
+                return {}
+            finally:
+                fcntl.flock(f, fcntl.LOCK_UN)
     except Exception as e:
-        st.error(f"Error loading users data: {e}")
+        st.error(f"Error loading users: {e}")
         return {}
 
 
 def user_selection_and_prediction():
-    users = list(load_data(USERS_JSON))
-    user_name = st.selectbox("Select User", ["Select a user..."] + users)
-
-    max_bid_points = None
-    if user_name != "Select a user...":
-        max_bid_points = calculate_max_bid_points(user_name)
-        st.write(f"Maximum bid points you can submit: {max_bid_points}")
-
-    matches = get_today_matches()
-    if matches:
-        match_choice = st.selectbox("Select Today's Match", matches, format_func=lambda match: f"{match['teams'][0]} vs {match['teams'][1]}")
-        match_id = match_choice['match_id']
-        teams = match_choice['teams']
-
-        predicted_winner = st.selectbox("Predicted Winner", teams)
-
-        player_list = load_data(PLAYERS_JSON)
-        predicted_motm = ""
-        if predicted_winner in player_list:
-            players = player_list[predicted_winner]
-            predicted_motm = st.selectbox("Predicted Man of the Match", players)
-
-        bid_points = st.number_input("Bid Points", min_value=0, value=100, format="%d")
-
-        if st.button("Submit Prediction"):
-            submit_prediction(user_name, match_id, predicted_winner, predicted_motm, bid_points, max_bid_points)
-    else:
-        st.write("No matches are scheduled for today.")
+    try:
+        users_data = load_users(USERS_JSON)  # Use our improved load_users function
+        if not users_data:
+            st.error("Failed to load users data. Please try again later.")
+            return
+            
+        users = list(users_data.keys())
+        user_name = st.selectbox("Select User", ["Select a user..."] + users)
+
+        max_bid_points = None
+        if user_name != "Select a user...":
+            max_bid_points = calculate_max_bid_points(user_name)
+            st.write(f"Maximum bid points you can submit: {max_bid_points}")
+
+        matches = get_today_matches()
+        if matches:
+            match_choice = st.selectbox(
+                "Select Today's Match", 
+                matches, 
+                format_func=lambda match: f"{match['teams'][0]} vs {match['teams'][1]}"
+            )
+            match_id = match_choice['match_id']
+            teams = match_choice['teams']
+
+            predicted_winner = st.selectbox("Predicted Winner", teams)
+
+            player_list = load_data(PLAYERS_JSON)
+            predicted_motm = ""
+            if predicted_winner in player_list:
+                players = player_list[predicted_winner]
+                predicted_motm = st.selectbox("Predicted Man of the Match", players)
+
+            bid_points = st.number_input("Bid Points", min_value=0, value=100, format="%d")
+
+            if st.button("Submit Prediction"):
+                submit_prediction(
+                    user_name, 
+                    match_id, 
+                    predicted_winner, 
+                    predicted_motm, 
+                    bid_points, 
+                    max_bid_points
+                )
+        else:
+            st.write("No matches are scheduled for today.")
+    except Exception as e:
+        st.error(f"Error in prediction submission: {e}")
 
 
 def display_predictions():