Update app.py

app.py

@@ -23,42 +23,46 @@ if not os.path.exists("/usr/local/bin/orca"):
     if not os.path.exists("orca.tar.gz"):
         try:
             st.write("Downloading orca...")
-            response = requests.get("https://github.com/plotly/orca/releases/download/v1.3.1/orca-1.3.1-x86_64.tar.gz", stream=True)
+            
+            # 使用最新的 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)
+                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()
+            st.error(f"Orca download failed: {e}")
+            st.stop()
 
     try:
-      if not os.path.exists("orca.tar.gz"):
+        if not os.path.exists("orca.tar.gz"):
           st.write("Orca file does not exist, redownloading")
-          response = requests.get("https://github.com/plotly/orca/releases/download/v1.3.1/orca-1.3.1-x86_64.tar.gz", stream=True)
+          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("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("https://github.com/plotly/orca/releases/download/v1.3.1/orca-1.3.1-x86_64.tar.gz", 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.")
+            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()
@@ -94,7 +98,6 @@ if not os.path.exists("/usr/local/bin/orca"):
         st.stop()
     st.write("Orca installation completed.")
 
-
 def load_data(uploaded_file):
     """載入並處理CSV檔案"""
     try:
@@ -164,13 +167,12 @@ 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_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)
@@ -181,7 +183,7 @@ def save_all_radar_charts(df, selected_columns, comparison_rows):
             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預設字型
+                    draw.text((img.width / 2 + x, img.height / 2 + y - 25), str(trace.name), fill=(0, 0, 0)) # 直接使用PIL預設字型
         file_path = os.path.join(output_dir, f"{student}_comparison.png")
         composite.save(file_path)