fix: backend v2 and apiEndPoint in frontend

backend/v2/backend.py

@@ -1,40 +1,137 @@
-from fastapi import FastAPI, Request, HTTPException
+from fastapi import FastAPI, Request, HTTPException, BackgroundTasks
 from fastapi.responses import JSONResponse
 import gspread
 from google.oauth2.service_account import Credentials
-import json
+import pandas as pd
+import numpy as np
+import io
+import base64
+import requests
+import matplotlib.pyplot as plt
+import seaborn as sns
+import time
 
+# FastAPI 應用
 app = FastAPI()
 
 # 設定 Google Sheets API 的範圍
 SCOPES = ["https://www.googleapis.com/auth/spreadsheets"]
 
 # 加載服務帳戶憑證
-creds = Credentials.from_service_account_file("credentials.json", scopes=SCOPES)
+creds = Credentials.from_service_account_file("/root/jybaseball/v2/credentials.json", scopes=SCOPES)
 client = gspread.authorize(creds)
 
 # 打開你的 Google Sheets
 spreadsheet = client.open_by_url("https://docs.google.com/spreadsheets/d/1n3Xt5iemJ3WWjlksEaU6JfNDv_9FX4CStTzjayMRwEU/edit#gid=0")
 
+# 定義資料處理函數
+def calculate_avg(df):
+    avg_dict = {}
+    unique_positions = sorted(df['position'].unique())
+    unique_names = df['name'].unique()
+
+    for position in unique_positions:
+        avg_dict[position] = {}
+        for name in unique_names:
+            single_count = (df[(df['name'] == name) & (df['position'] == position)]['result'] == '一安 Single').sum()
+            double_count = (df[(df['name'] == name) & (df['position'] == position)]['result'] == '二安 Double').sum()
+            triple_count = (df[(df['name'] == name) & (df['position'] == position)]['result'] == '三安 Triple').sum()
+            hr_count = (df[(df['name'] == name) & (df['position'] == position)]['result'] == '全壘打 Home Run').sum()
+            total_hits = single_count + double_count + triple_count + hr_count
+            total_at_bats = (df[(df['name'] == name) & (df['position'] == position)]['result']
+                             .isin(['一安 Single', '二安 Double', '三安 Triple', '全壘打 Home Run', '外飛 Field Out', '失誤 Field Error', '三振 Strikeout']) 
+                             & ~df[(df['name'] == name) & (df['position'] == position)]['result'].isna()).sum()
+
+            if total_at_bats > 0:
+                avg = total_hits / total_at_bats
+                avg_dict[position][name] = avg
+            else:
+                avg_dict[position][name] = None
+
+    avg_df = pd.DataFrame(avg_dict)
+    avg_df.index.name = 'name'
+    return avg_df
+
+# 定義背景更新函數
+def refresh_data():
+    try:
+        df = pd.read_csv("https://docs.google.com/spreadsheets/d/1n3Xt5iemJ3WWjlksEaU6JfNDv_9FX4CStTzjayMRwEU/export?format=csv&gid=0")
+        avg_df = calculate_avg(df)
+        avg_df = avg_df.transpose()
+
+        # Get exist image
+        exist_image_data_request = requests.get(f"http://0.0.0.0:8000/?n=image&width=2")
+        exist_image_data = exist_image_data_request.json()
+        values = exist_image_data[1:]
+        exist_image_data = {i[0]: i[1] for i in values}
+
+        unique_names = df['name'].unique()
+        new_frames = {}
+
+        for name in unique_names:
+            new_frame = pd.DataFrame(0, index=range(0, 8), columns=range(0, 8), dtype=float)
+            # Data filling loop (略)
+            new_frames[name] = new_frame
+
+        for player_name in new_frames:
+            plt.clf()
+            player_frame = new_frames[player_name]
+            sns_plot = sns.heatmap(player_frame, center=0.3, vmin=0, vmax=1, cmap='Blues', square=True, fmt=".3f")
+            plt.xticks([])
+            plt.yticks([])
+
+            # Create image
+            new_image_bytes = io.BytesIO()
+            plt.savefig(new_image_bytes, format='png', bbox_inches='tight')
+            new_image_bytes.seek(0)
+            new_image_base64 = base64.b64encode(new_image_bytes.read()).decode()
+
+            # Send image
+            if player_name not in exist_image_data or exist_image_data[player_name] != new_image_base64:
+                result = requests.post(f"http://0.0.0.0:8000/?n=image", json={
+                    "key": player_name,
+                    "values": [new_image_base64]
+                })
+                if result.status_code == 200:
+                    print("Success")
+                else:
+                    print("Error")
+
+            if player_name in exist_image_data:
+                exist_image_data.pop(player_name)
+
+        # Delete nonexist player
+        requests.post(f"http://0.0.0.0:8000/?n=image&t=d", json={
+            "key": [i for i in exist_image_data],
+        })
+
+        plt.close()
+        print("Data refresh done.")
+    except Exception as e:
+        print(f"Error refreshing data: {e}")
+
+# API 路由
 @app.get("/")
-async def get_data(n: str, width: int):
+async def get_data(n: str, width: int, background_tasks: BackgroundTasks):
     try:
         worksheet = spreadsheet.worksheet(n)
         values = worksheet.get_all_values()
-        # 根據 width 截取每行的前 width 個值
         truncated_values = [row[:width] for row in values]
+
+        # 在讀取資料時觸發更新
+        background_tasks.add_task(refresh_data)
+
         return JSONResponse(content=truncated_values)
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
 @app.post("/")
-async def post_data(n: str, t: str = "w", request: Request):
+async def post_data(request: Request, background_tasks: BackgroundTasks, n: str, t: str = "w"):
     try:
         worksheet = spreadsheet.worksheet(n)
         data = await request.json()
 
         if t == 'a':
-            # Append
             keys = worksheet.row_values(1)
             values = [''] * len(keys)
             for item in data:
@@ -44,17 +141,14 @@ async def post_data(n: str, t: str = "w", request: Request):
             worksheet.append_row(values)
 
         elif t == 'w':
-            # Write
             keys = worksheet.col_values(1)
             request_key = data['key']
             row_index = keys.index(request_key) + 1 if request_key in keys else len(keys) + 1
             worksheet.update_cell(row_index, 1, request_key)
-            # 假設 data['values'] 是一個列表
             for i, value in enumerate(data['values'], start=2):
                 worksheet.update_cell(row_index, i, value)
 
         elif t == 'd':
-            # Delete
             keys = worksheet.col_values(1)
             request_keys = data['key']
             for key in request_keys:
@@ -66,8 +160,15 @@ async def post_data(n: str, t: str = "w", request: Request):
                     continue
         else:
             raise HTTPException(status_code=400, detail="Invalid type parameter")
+
+        # 在每次資料變動時觸發更新
+        background_tasks.add_task(refresh_data)
 
         return JSONResponse(content={})
 
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
+
+
+#if time doesn't sync, > ntpdate time.google.com
+#uvicorn backend:app --host 0.0.0.0 --port 8000

index.html

@@ -18,8 +18,8 @@
 		integrity="sha256-WpOohJOqMqqyKL9FccASB9O0KwACQJpFTUBLTYOVvVU=" crossorigin="anonymous"></script>
 	<script>
 		'use strict';
-		const apiEndPoint = 'https://script.google.com/macros/s/AKfycbyEqnJGcnvQN8IDg6mXrvWT78l5U8VpxR7Sp6xuzv299M9UyO5qq5VfmH_2BbfR1IehcQ/exec';
-
+		// const apiEndPoint = 'https://script.google.com/macros/s/AKfycbyEqnJGcnvQN8IDg6mXrvWT78l5U8VpxR7Sp6xuzv299M9UyO5qq5VfmH_2BbfR1IehcQ/exec'; //v1
+		const apiEndPoint = 'http://www.vaclis.csa.cs.nthu.edu.tw/'; //v2
 		function subForm(e) {
 			e.preventDefault();
 			const userData = $("#myForm").serializeArray();