Update app.py

app.py

@@ -4,100 +4,16 @@ import plotly.graph_objects as go
 import os
 from zipfile import ZipFile
 import plotly.io as pio
-from PIL import Image, ImageDraw
 from io import BytesIO
 import numpy as np
 import os
 import shutil
-import subprocess
-import tarfile
-import requests
 
 try:
     import kaleido
 except ImportError:
     st.error("請安裝 'kaleido' 套件以啟用圖像導出功能：\n\n    $ pip install kaleido")
 
-# 自動下載 orca
-if not os.path.exists("/usr/local/bin/orca"):
-    if not os.path.exists("orca.tar.gz"):
-        try:
-            st.write("Downloading orca...")
-            
-            # 使用最新的 orca 下載連結
-            orca_url = "https://github.com/plotly/orca/releases/download/v1.3.1/orca-1.3.1-x86_64.tar.gz"
-            
-            response = requests.get(orca_url, stream=True)
-            response.raise_for_status()  # 檢查下載是否成功
-            with open("orca.tar.gz", "wb") as f:
-                for chunk in response.iter_content(chunk_size=8192):
-                    f.write(chunk)
-            st.write("Orca download completed.")
-        except requests.exceptions.RequestException as e:
-            st.error(f"Orca download failed: {e}")
-            st.stop()
-
-    try:
-        if not os.path.exists("orca.tar.gz"):
-          st.write("Orca file does not exist, redownloading")
-          response = requests.get(orca_url, stream=True)
-          response.raise_for_status()
-          with open("orca.tar.gz", "wb") as f:
-            for chunk in response.iter_content(chunk_size=8192):
-              f.write(chunk)
-
-        st.write("Checking orca.tar.gz file size...")
-        file_size = os.path.getsize("orca.tar.gz")
-        st.write(f"Orca file size is {file_size} bytes")
-
-        if file_size < 1000000: # 任意設定一個最小檔案大小，防止網路錯誤檔案下載過小
-          st.error("Orca file size is too small, try to redownload")
-          os.remove("orca.tar.gz") #刪除壞掉的檔案
-          response = requests.get(orca_url, stream=True)
-          response.raise_for_status()
-          with open("orca.tar.gz", "wb") as f:
-            for chunk in response.iter_content(chunk_size=8192):
-              f.write(chunk)
-        
-        st.write("Extracting orca...")
-        with tarfile.open("orca.tar.gz", "r:gz") as tar:
-            tar.extractall()
-        st.write("Orca extraction completed.")
-    except Exception as e:
-        st.error(f"Orca extraction failed: {e}")
-        st.stop()
-
-    try:
-        # 檢查 orca 執行檔的位置
-        orca_dir = "orca-1.3.1-x86_64"
-        if not os.path.exists(orca_dir):
-          st.error(f"Orca directory does not exist {orca_dir}")
-          st.stop()
-        
-        
-        
-        for root, dirs, files in os.walk(orca_dir):
-            if "orca" in files:
-                orca_path = os.path.join(root, "orca")
-                st.write(f"Found orca at {orca_path}")
-                break
-        else:
-          st.error("Cannot find orca binary")
-          st.stop()
-                
-        st.write(f"Moving orca binary from {orca_path} to /usr/local/bin/orca")
-        shutil.move(orca_path, "/usr/local/bin/orca")
-        st.write("Orca binary moved.")
-
-        st.write("Setting execute permissions for orca...")
-        os.chmod("/usr/local/bin/orca", 0o755)
-        st.write("Orca permissions set.")
-
-    except Exception as e:
-        st.error(f"Orca installation failed: {e}")
-        st.stop()
-    st.write("Orca installation completed.")
-
 def load_data(uploaded_file):
     """載入並處理CSV檔案"""
     try:
@@ -144,15 +60,15 @@ def create_radar_chart(df, selected_rows, selected_columns):
             radialaxis=dict(
                 visible=True,
                 range=[0, df[selected_columns].values.max() * 1.1],
-                tickfont=dict(size=12, color='black')
+                tickfont=dict(size=12, color='black', family="Microsoft JhengHei, Noto Sans CJK, Arial")
             ),
             angularaxis=dict(
-                tickfont=dict(size=16, color='black')
+                tickfont=dict(size=16, color='black', family="Microsoft JhengHei, Noto Sans CJK, Arial")
             )
         ),
         showlegend=True,
         legend=dict(
-            font=dict(size=14, color='black')
+            font=dict(size=14, color='black', family="Microsoft JhengHei, Noto Sans CJK, Arial")
         ),
         title='學生成績雷達圖',
         plot_bgcolor='white',
@@ -162,30 +78,46 @@ def create_radar_chart(df, selected_rows, selected_columns):
 
     return fig
 
+def apply_font_to_all_text(fig):
+    """強制設定圖表內所有文字元素的字型"""
+    for trace in fig.data:
+        if hasattr(trace, 'textfont'):
+            trace.textfont.family = "Microsoft JhengHei, Noto Sans CJK, Arial"
+        if hasattr(trace, 'marker') and hasattr(trace.marker, 'textfont'):
+            trace.marker.textfont.family = "Microsoft JhengHei, Noto Sans CJK, Arial"
+    fig.update_layout(
+        font=dict(
+            family="Microsoft JhengHei, Noto Sans CJK, Arial"
+        )
+    )
+
+    if hasattr(fig, 'layout') and hasattr(fig.layout, 'xaxis'):
+        fig.layout.xaxis.tickfont.family = "Microsoft JhengHei, Noto Sans CJK, Arial"
+    if hasattr(fig, 'layout') and hasattr(fig.layout, 'yaxis'):
+        fig.layout.yaxis.tickfont.family = "Microsoft JhengHei, Noto Sans CJK, Arial"
+    if hasattr(fig, 'layout') and hasattr(fig.layout, 'polar') and hasattr(fig.layout.polar, 'radialaxis'):
+        fig.layout.polar.radialaxis.tickfont.family = "Microsoft JhengHei, Noto Sans CJK, Arial"
+    if hasattr(fig, 'layout') and hasattr(fig.layout, 'polar') and hasattr(fig.layout.polar, 'angularaxis'):
+        fig.layout.polar.angularaxis.tickfont.family = "Microsoft JhengHei, Noto Sans CJK, Arial"
+
+    return fig
+
+
 def save_all_radar_charts(df, selected_columns, comparison_rows):
     """批次生成並儲存每個學生與指定比較對象的雷達圖"""
     output_dir = "radar_charts"
     os.makedirs(output_dir, exist_ok=True)
 
+
     for student in df['姓名']:
         if student in comparison_rows:
             continue
 
         fig = create_radar_chart(df, [student] + comparison_rows, selected_columns)
-        img_bytes = pio.to_image(fig, format="png", engine="orca")  # 使用 orca
-        img = Image.open(BytesIO(img_bytes)).convert("RGBA")
-        background = Image.new('RGBA', img.size, (255, 255, 255, 255))
-        composite = Image.alpha_composite(background, img)
-        draw = ImageDraw.Draw(composite)
-        
-        # 手動繪製圖表標籤文字
-        for trace in fig.data:
-            if isinstance(trace, go.Scatterpolar):
-                for i, theta in enumerate(trace.theta):
-                    x, y = fig.layout.polar.radialaxis.range[1] * (0.5 - 0.5*trace.r[i] / fig.layout.polar.radialaxis.range[1]) * np.cos(np.radians(90-theta)), fig.layout.polar.radialaxis.range[1] * (0.5 - 0.5*trace.r[i] / fig.layout.polar.radialaxis.range[1]) * np.sin(np.radians(90-theta))
-                    draw.text((img.width / 2 + x, img.height / 2 + y - 25), str(trace.name), fill=(0, 0, 0)) # 直接使用PIL預設字型
+        fig = apply_font_to_all_text(fig)
         file_path = os.path.join(output_dir, f"{student}_comparison.png")
-        composite.save(file_path)
+        fig.write_image(file_path, engine="kaleido")
+
 
     # 壓縮所有圖表
     zip_path = "radar_charts.zip"