Update app.py

app.py

@@ -1,39 +1,40 @@
 import os
 import io
 import time
+import json
 import tempfile
 from typing import Optional, Tuple, List
 
 import matplotlib.pyplot as plt
 import gradio as gr
 
-# Google Drive (service account)
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaIoBaseUpload
+from googleapiclient.errors import HttpError
 from google.oauth2.service_account import Credentials
 
 
-# --------- Config ---------
+# ---------------- Config ----------------
 DEFAULT_EXTENT = (119.0, 123.5, 21.5, 25.5)  # (min_lon, max_lon, min_lat, max_lat) ~ Taiwan region
-SCOPES = ["https://www.googleapis.com/auth/drive.file"]  # minimal scope to create files you own
+SCOPES = ["https://www.googleapis.com/auth/drive.file"]  # create & manage files created by the app
 
 
+# --------------- Helpers ----------------
 def _parse_points(csv_text: str) -> List[Tuple[float, float]]:
     """
     Accepts lines like:
         121.5,25.0
         120.9,24.5
-        121.0,23.9
-    (lon,lat). Ignores blank/comment lines.
+    (lon,lat). Ignores blank/comment lines and invalid rows.
     """
-    pts = []
+    pts: List[Tuple[float, float]] = []
     if not csv_text:
         return pts
     for ln in csv_text.strip().splitlines():
         ln = ln.strip()
         if not ln or ln.startswith("#"):
             continue
-        # allow "lon,lat" or "lat,lon" if user toggles a flag later (we keep lon,lat only here for simplicity)
+        # allow comma or tab
         parts = [p.strip() for p in ln.replace("\t", ",").split(",")]
         if len(parts) < 2:
             continue
@@ -42,7 +43,6 @@ def _parse_points(csv_text: str) -> List[Tuple[float, float]]:
             lat = float(parts[1])
             pts.append((lon, lat))
         except ValueError:
-            # skip invalid rows
             continue
     return pts
 
@@ -54,43 +54,34 @@ def _make_figure(
     dpi: int = 150,
 ) -> str:
     """
-    Draw a simple lon/lat scatter within the extent.
-    Returns path to the saved PNG.
+    Draw a simple lon/lat scatter within the extent and save to PNG.
+    Returns local file path.
     """
     min_lon, max_lon, min_lat, max_lat = extent
     fig, ax = plt.subplots(figsize=(6.5, 6.5), dpi=dpi)
     ax.set_title(title or "Map Plot", pad=10)
     ax.set_xlabel("Longitude")
     ax.set_ylabel("Latitude")
-
-    # Axes extent
     ax.set_xlim(min_lon, max_lon)
     ax.set_ylim(min_lat, max_lat)
     ax.grid(True, linestyle=":", linewidth=0.8)
 
-    # Light background box suggesting region
-    rect = plt.Rectangle(
-        (min_lon, min_lat),
-        max_lon - min_lon,
-        max_lat - min_lat,
-        fill=False,
-        linestyle="--",
-        linewidth=1.0,
-    )
-    ax.add_patch(rect)
+    # region frame
+    ax.add_patch(plt.Rectangle((min_lon, min_lat),
+                               max_lon - min_lon,
+                               max_lat - min_lat,
+                               fill=False, linestyle="--", linewidth=1.0))
 
-    # Plot points
     if points:
         xs = [p[0] for p in points]
         ys = [p[1] for p in points]
         ax.scatter(xs, ys, s=60, marker="*", label="Input points")
         ax.legend(loc="upper right")
 
-    # Save to a temporary PNG
     tmpdir = tempfile.gettempdir()
     ts = int(time.time())
-    filename = f"map_{ts}.png"
-    out_path = os.path.join(tmpdir, filename)
+    fname = f"map_{ts}.png"
+    out_path = os.path.join(tmpdir, fname)
     fig.tight_layout()
     fig.savefig(out_path)
     plt.close(fig)
@@ -99,34 +90,30 @@ def _make_figure(
 
 def _drive_service_from_env() -> Optional[object]:
     """
-    Build a Google Drive service using a service account JSON
-    provided via the Hugging Face Space secret `SERVICE_ACCOUNT_JSON`.
+    Build Google Drive service using Space secret `SERVICE_ACCOUNT_JSON`.
     """
     sa_json = os.environ.get("SERVICE_ACCOUNT_JSON", "").strip()
     if not sa_json:
         return None
-
-    # In Spaces secrets, you typically paste the **full** JSON string of the service account.
-    # Load it into Credentials directly via from_service_account_info.
-    import json
     try:
         info = json.loads(sa_json)
+        creds = Credentials.from_service_account_info(info, scopes=SCOPES)
+        # cache_discovery=False avoids warning on server
+        service = build("drive", "v3", credentials=creds, cache_discovery=False)
+        return service
     except Exception:
         return None
 
-    creds = Credentials.from_service_account_info(info, scopes=SCOPES)
-    service = build("drive", "v3", credentials=creds, cache_discovery=False)
-    return service
-
 
 def _upload_to_drive(
     local_path: str,
     service,
     folder_id: Optional[str] = None,
+    make_public_link: bool = False,
 ) -> Tuple[str, str]:
     """
-    Uploads local file to Google Drive.
-    Returns (file_id, webViewLink)
+    Upload file to Google Drive. Returns (file_id, webViewLink).
+    Supports Shared Drives. Optionally sets "anyone with the link: reader".
     """
     fname = os.path.basename(local_path)
     file_metadata = {"name": fname}
@@ -137,15 +124,35 @@ def _upload_to_drive(
         media = MediaIoBaseUpload(f, mimetype="image/png", resumable=False)
         created = (
             service.files()
-            .create(body=file_metadata, media_body=media, fields="id, webViewLink, webContentLink")
+            .create(
+                body=file_metadata,
+                media_body=media,
+                fields="id, webViewLink, webContentLink",
+                supportsAllDrives=True,
+            )
             .execute()
         )
 
     file_id = created.get("id", "")
-    web_view_link = created.get("webViewLink", "")
-    return file_id, web_view_link
+    view_link = created.get("webViewLink", "")
+
+    # (Optional) Make it publicly readable via link
+    if make_public_link and file_id:
+        try:
+            service.permissions().create(
+                fileId=file_id,
+                body={"role": "reader", "type": "anyone"},
+                fields="id",
+                supportsAllDrives=True,
+            ).execute()
+        except HttpError:
+            # ignore if permission change fails (e.g., domain policy)
+            pass
+
+    return file_id, view_link
 
 
+# --------------- Gradio logic ---------------
 def generate_and_upload(
     points_text: str,
     title: str,
@@ -154,38 +161,49 @@ def generate_and_upload(
     min_lat: float,
     max_lat: float,
     drive_folder_id_input: str,
+    make_public: bool,
 ):
     """
-    Gradio handler:
-      1) parse points
-      2) make figure
-      3) upload to Drive (if configured)
-      4) return preview image and link
+    1) parse points
+    2) render map & save PNG
+    3) upload to Drive (if configured)
+    4) return preview + link / diagnostics
     """
-    points = _parse_points(points_text)
-    extent = (min_lon, max_lon, min_lat, max_lat)
-    local_png = _make_figure(points, title, extent=extent)
+    try:
+        points = _parse_points(points_text)
+        extent = (min_lon, max_lon, min_lat, max_lat)
+        local_png = _make_figure(points, title, extent=extent)
+    except Exception as e:
+        return None, f"❌ Failed to render figure: {e}"
 
-    # Build Drive service from env
     service = _drive_service_from_env()
     if service is None:
-        # Tell user how to set up secrets
         msg = (
-            "⚠️ Google Drive upload is not configured. "
-            "Please add a Hugging Face Space secret named `SERVICE_ACCOUNT_JSON` "
-            "with your service account JSON. Optionally add `DRIVE_FOLDER_ID`."
+            "⚠️ Google Drive upload is not configured.\n"
+            "請在 Space 的 Settings → Secrets 新增 `SERVICE_ACCOUNT_JSON`（貼完整 JSON）。\n"
+            "（可選）新增 `DRIVE_FOLDER_ID` 指定上傳資料夾。"
         )
-        # Return just the preview, no link
         return local_png, msg
 
-    # Determine folder ID (priority: user input > env)
     folder_id_env = os.environ.get("DRIVE_FOLDER_ID", "").strip()
     folder_id = (drive_folder_id_input or folder_id_env or "").strip() or None
 
     try:
-        file_id, view_link = _upload_to_drive(local_png, service, folder_id=folder_id)
-        link_text = f"✅ Uploaded to Google Drive.\n• File ID: `{file_id}`\n• Open: {view_link}"
-        return local_png, link_text
+        file_id, view_link = _upload_to_drive(
+            local_png, service, folder_id=folder_id, make_public_link=make_public
+        )
+        details = [
+            "✅ Uploaded to Google Drive.",
+            f"• File ID: `{file_id}`",
+        ]
+        if view_link:
+            details.append(f"• Open: {view_link}")
+        if not make_public:
+            details.append("• Note: 檔案遵循資料夾/雲端硬碟原有的分享權限（未自動公開）。")
+        return local_png, "\n".join(details)
+    except HttpError as e:
+        # Common causes: folder not shared to SA, insufficient permissions, shared drive policy
+        return local_png, f"❌ Upload failed (HttpError): {e}"
     except Exception as e:
         return local_png, f"❌ Upload failed: {e}"
 
@@ -195,10 +213,13 @@ with gr.Blocks(title="Map → Google Drive Uploader") as demo:
     gr.Markdown(
         """
 # 🗺️ Map → Google Drive Uploader
-Paste lon,lat pairs (one per line), set the extent, and click **Generate & Upload**.
+貼上 `lon,lat`（每行一組），設定視窗範圍並上傳至 Google Drive。
 
-**Note:** To enable Google Drive upload in this Space, add the secret `SERVICE_ACCOUNT_JSON` (full service account JSON)  
-and optionally `DRIVE_FOLDER_ID` in the Space settings.
+**設定提醒：**
+- 到 Space **Settings → Secrets** 新增：
+  - `SERVICE_ACCOUNT_JSON`：貼完整的 Service Account JSON
+  - （可選）`DRIVE_FOLDER_ID`：Google Drive 資料夾 ID
+- 若要上傳到特定資料夾，請先在 Google Drive 將該資料夾**分享給** Service Account 的 email（編輯者）。
         """
     )
 
@@ -219,9 +240,12 @@ and optionally `DRIVE_FOLDER_ID` in the Space settings.
                 max_lat_in = gr.Number(label="max_lat", value=DEFAULT_EXTENT[3])
 
             folder_id_in = gr.Textbox(
-                label="Google Drive Folder ID (optional — overrides Space secret)",
+                label="Google Drive Folder ID（可選，會覆蓋 Space Secret）",
                 placeholder="e.g. 1AbCdEfGhIJKlmnopQRstuVWxyz",
             )
+            make_public_in = gr.Checkbox(
+                label="建立公開連結（anyone with the link, reader）", value=False
+            )
 
             run_btn = gr.Button("🚀 Generate & Upload")
 
@@ -231,7 +255,16 @@ and optionally `DRIVE_FOLDER_ID` in the Space settings.
 
     run_btn.click(
         fn=generate_and_upload,
-        inputs=[points_in, title_in, min_lon_in, max_lon_in, min_lat_in, max_lat_in, folder_id_in],
+        inputs=[
+            points_in,
+            title_in,
+            min_lon_in,
+            max_lon_in,
+            min_lat_in,
+            max_lat_in,
+            folder_id_in,
+            make_public_in,
+        ],
         outputs=[out_image, out_msg],
     )