Update src/streamlit_app.py

src/streamlit_app.py

@@ -1,9 +1,11 @@
 import streamlit as st
 import requests
+import pandas as pd
 import gspread
 from oauth2client.service_account import ServiceAccountCredentials
-import json
 import traceback
+import json
+import io
 
 # Google Sheets configuration
 SHEET_ID = "1PCugIPyYM1lF6KOCPUY5hL8xbGI5PWd7gVvCyudrB5c"
@@ -31,7 +33,7 @@ OFYaSHo3HqcamuEMRYBDab5rzRsxQOk0FFjeB6d0Xt3X7MNgdXqfukMEAYaJ0cd+
 VWJJsJb/P8xuL64y8sI6NUdTGqTUxqB6CJOriMkLI0b6JVK/vTj3Hd88VthdYwNC
 FWvFi0ckT9Ab3Fp9+309oav6ZwKBgQC2bcTjuwsiXRKzTYoODoF/Z/+NIPCI4BZ5
 wUAwY/otQ0/dQB7B5+DruLnIWCVM4PzXoPvpLgrs/iiyFPDGTlYtUa2rBTfKHr13
-UA0Y97uRvBh6004RAbM/xHoWeX2uSRtD8kzs5TZGlzgPyS0FT7b9nb+1iWPrcMJy
+UA0Y97uRvBd6004RAbM/xHoWeX2uSRtD8kzs5TZGlzgPyS0FT7b9nb+1iWPrcMJy
 aoQI3hhWOwKBgAlqLrVfBvhi/HU9Zi/dF/OK5QmYkEEhawmOkE9uoKlgvTGyUV1v
 RMB7Qkp1GZjYIhVl5miW54osmsjef614pYetHivs6ypnNPEViSQdKR9EyWjbEN0Z
 4hs/AzaazAcLs5eFNxGurZrb024FM97NYfAefT2HC/DTzKqgM9XgpxBTAoGBAKEW
@@ -51,7 +53,7 @@ YMSoAW+xwwELc6a+5m8u60ZU
     "universe_domain": "googleapis.com"
 }
 
-# Corrected URL
+# URL and headers (no caching headers)
 URL = "https://www.rugbypremierleague.in/feeds/live/MatchCenter_MatchID-43.json"
 HEADERS = {
     "accept": "*/*",
@@ -67,63 +69,91 @@ HEADERS = {
     "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36"
 }
 
+# Excel data as a string (from provided DOCUMENT)
+EXCEL_DATA = """id	name	short_name	jersey_no	position_id	position	is_substitute	is_substituted	isPlaying	minutes_played	jersey	starter	captain	is_Injured	offloads	line_breaks	defenders_beaten	points	try_assists	tries	tackles	turnovers_won	yellow_cards	red_cards	handling_errors	knock_ons	conversions	penalty_goals	points_scored	tries_scored	conversions	penalty_goals
+165	Pol Pla	Pol Pla	7	4	Back	0	0	0	18	7	1	1	0	0	0	0	0	1	0	3	0	0	0	0	0	0	0	0	0	0	0
+191	Tone Ng Shiu	Tone Ng Shiu	3	3	Hybrid	0	0	0	12	3	1	0	0	1	0	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0
+245	Iowane Teba	Iowane Teba	10	4	Back	1	0	1	6	10	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	0	0	0	0
+370	Liam Poulton	Liam Poulton	14	4	Back	0	0	1	19	14	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0
+371	Mak Kwai Chung	Mak Kwai Chung	99	4	Back	1	0	1	14	99	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0
+372	Akuila Rokolisoa	Akuila Rokolisoa	4	4	Back	0	0	1	25	4	1	0	0	0	2	2	16	0	2	3	0	0	0	0	0	3	0	16	2	3	0
+373	Scott Curry	Scott Curry	37	5	Forward	1	0	1	13	37	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+374	Mohit Khatri	Mohit Khatri	6	3	Hybrid	1	0	1	14	6	0	0	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0
+375	Karan Rajbhar	Karan Rajbhar	1	3	Hybrid	1	0	1	13	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+376	Arpan Chhetri	Arpan Chhetri	12	5	Forward	1	0	0	1	12	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+377	Suresh Kumar	Suresh Kumar	2	5	Forward	0	0	0	10	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+378	Prashant Singh	Prashant Singh	5	3	Hybrid	0	1	0	10	5	1	0	0	0	0	3	0	0	0	2	0	0	0	1	0	0	0	0	0	0	0
+1575	Philip Wokorach	Philip Wokorach	15	4	Back	0	0	0	17	15	1	0	0	2	1	2	5	1	1	2	0	0	0	0	0	0	0	5	1	0	0
+1589	Govind Gupta	Govind Gupta	17	5	Forward	0	0	0	0	17	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+140	Matteo Graziano	Matteo Graziano	1	5	Forward	1	0	1	9	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+144	Matias Osadczuk	Matias Osadczuk	97	5	Forward	0	0	1	22	97	1	1	0	0	1	2	9	0	1	0	0	1	0	0	0	2	0	9	1	2	0
+168	Alejandro Laforga	Alejandro Laforga	19	4	Back	0	0	1	25	19	1	0	0	0	0	0	0	1	0	1	0	0	0	0	0	0	0	0	0	0	0
+270	Patrick Odongo Okongo	Patrick Odongo Okongo	11	4	Back	0	0	1	25	11	1	0	0	0	2	2	10	0	2	2	0	0	0	0	0	0	0	10	2	0	0
+284	Jordan Conroy	Jordan Conroy	7	4	Back	1	0	0	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+410	Michael Coverdale	Michael Coverdale	25	5	Forward	0	0	0	19	25	1	0	0	0	0	0	0	1	0	1	1	0	0	0	0	0	0	0	0	0	0
+411	Moritz Noll	Moritz Noll	77	4	Back	1	0	0	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+413	Rajdeep Saha	Rajdeep Saha	4	4	Back	0	0	1	25	4	1	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0
+414	Deepak Punia	Deepak Punia	10	4	Back	0	0	1	25	10	1	0	0	0	0	0	2	0	0	0	1	0	0	2	0	1	0	2	0	1	0
+416	Sunil Chawan	Sunil Chawan	20	4	Back	1	0	0	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+417	Raj Kumar	Raj Kumar	5	3	Hybrid	1	0	0	0	5	0	0	0	0	0	0	0	1	0	0	0	0	0	1	0	0	0	0	0	0	0
+1578	Robin Plumpe	Robin Plumpe	27	3	Hybrid	0	0	1	25	27	1	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0
+1584	Mohit	Mohit	9	4	Back	1	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0"""
+
+def load_excel_data():
+    try:
+        # Read Excel data from string
+        df = pd.read_csv(io.StringIO(EXCEL_DATA), sep='\t')
+        # Select required columns
+        columns = ['id', 'name', 'short_name', 'jersey_no', 'position', 'is_substitute', 'is_substituted', 
+                   'isPlaying', 'minutes_played', 'starter', 'captain', 'is_Injured', 'offloads', 
+                   'line_breaks', 'defenders_beaten', 'points', 'try_assists', 'tries', 'tackles', 
+                   'turnovers_won', 'yellow_cards', 'red_cards', 'handling_errors', 'knock_ons', 
+                   'conversions', 'penalty_goals', 'points_scored', 'tries_scored', 'conversions', 
+                   'penalty_goals']
+        df = df[columns]
+        st.session_state["excel_data"] = df
+        return df
+    except Exception as e:
+        st.error(f"Error loading Excel data: {str(e)}\n{traceback.format_exc()}")
+        return None
+
 def fetch_json_data():
     try:
         response = requests.get(URL, headers=HEADERS)
         if response.status_code == 200:
-            st.success("Data fetched successfully!")
-            st.session_state["last_data"] = response.json()
-            st.write(f"Data size: {len(json.dumps(st.session_state['last_data']))} characters")
-            return st.session_state["last_data"]
+            st.success("JSON data fetched successfully!")
+            st.session_state["json_data"] = response.json()
+            return st.session_state["json_data"]
         else:
-            st.error(f"Failed to fetch data: Status code {response.status_code}")
+            st.error(f"Failed to fetch JSON data: Status code {response.status_code}")
             return None
     except Exception as e:
-        st.error(f"Error fetching data: {str(e)}")
+        st.error(f"Error fetching JSON data: {str(e)}\n{traceback.format_exc()}")
         return None
 
 def write_to_google_sheet(data):
     try:
         with st.spinner("Writing to Google Sheet..."):
             st.write("Debug: Starting Google Sheets write operation")
+            # Authenticate
             scope = ["https://spreadsheets.google.com/feeds", "https://www.googleapis.com/auth/drive"]
             creds = ServiceAccountCredentials.from_json_keyfile_dict(SERVICE_ACCOUNT_INFO, scope)
             st.write("Debug: Authentication successful")
             client = gspread.authorize(creds)
+
+            # Open sheet
             st.write("Debug: Opening Google Sheet")
             sheet = client.open_by_key(SHEET_ID).worksheet(SHEET_NAME)
+
+            # Clear existing data
             st.write("Debug: Clearing existing data")
             sheet.clear()
 
-            # Write key fields (adjust based on actual JSON structure)
-            st.write("Debug: Writing key fields")
-            headers = ["Match ID", "Team 1", "Team 2", "Team 1 Score", "Team 2 Score"]
-            try:
-                values = [
-                    [
-                        data.get("match", {}).get("id", "N/A"),
-                        data.get("match", {}).get("team1", "N/A"),
-                        data.get("match", {}).get("team2", "N/A"),
-                        data.get("match", {}).get("score", {}).get("team1", "N/A"),
-                        data.get("match", {}).get("score", {}).get("team2", "N/A")
-                    ]
-                ]
-            except Exception as e:
-                st.error(f"Error parsing JSON: {str(e)}")
-                return False
-
-            sheet.append_row(headers)
-            for row in values:
-                sheet.append_row(row)
-
-            # Optional: Write JSON in chunks
-            st.write("Debug: Writing JSON chunk")
-            json_str = json.dumps(data, indent=2)
-            chunk_size = 40000  # Below Google Sheets cell limit
-            if len(json_str) > chunk_size:
-                st.warning(f"JSON is too large ({len(json_str)} characters). Writing first {chunk_size} characters.")
-                json_str = json_str[:chunk_size]
-            sheet.update('A10', json_str)
+            # Write data (pandas DataFrame)
+            st.write("Debug: Writing Excel data")
+            # Convert DataFrame to list of lists (including headers)
+            data_values = [data.columns.tolist()] + data.values.tolist()
+            sheet.update('A1', data_values)
 
             st.success("Data written to Google Sheet successfully!")
             return True
@@ -134,25 +164,37 @@ def write_to_google_sheet(data):
 
 def main():
     st.title("Rugby Premier League Data Fetcher")
-    st.write("Fetching data for match ID 43 (Bengaluru Bravehearts vs. Delhi Redz) at 05:07 PM IST, June 23, 2025")
+    st.write("Processing data for match ID 43 (Bengaluru Bravehearts vs. Delhi Redz) at 05:17 PM IST, June 23, 2025")
+
+    # Load Excel data
+    st.subheader("Excel Data (Squad)")
+    excel_data = load_excel_data()
+    if excel_data is not None:
+        st.dataframe(excel_data)
+    else:
+        st.warning("No Excel data loaded.")
 
-    if st.button("Fetch Data"):
+    # Fetch JSON data
+    st.subheader("Fetch JSON Data")
+    if st.button("Fetch JSON Data"):
         json_data = fetch_json_data()
         if json_data:
-            st.subheader("Fetched Data")
+            st.subheader("Fetched JSON Data")
             st.json(json_data)
         else:
-            st.warning("No data fetched. Please try again or check the URL.")
+            st.warning("No JSON data fetched. Please try again or check the URL.")
 
-    if st.button("Write to Google Sheet"):
+    # Write to Google Sheet
+    st.subheader("Write to Google Sheet")
+    if st.button("Write Excel Data to Google Sheet"):
         st.write("Debug: Write to Google Sheet button clicked")
-        if "last_data" in st.session_state:
-            if write_to_google_sheet(st.session_state["last_data"]):
+        if "excel_data" in st.session_state:
+            if write_to_google_sheet(st.session_state["excel_data"]):
                 st.write(f"View the updated sheet [here](https://docs.google.com/spreadsheets/d/{SHEET_ID})")
             else:
                 st.error("Failed to write to Google Sheet. See error details above.")
         else:
-            st.error("No data available to write. Please fetch data first.")
+            st.error("No Excel data available to write. Please ensure data is loaded.")
 
 if __name__ == "__main__":
     main()