Update app.py

app.py

@@ -2,60 +2,77 @@ import sqlite3
 import pandas as pd
 import gradio as gr
 
-# 一個直接查詢資料庫的函式，不再需要 MCP Tool
-async def fetch_earthquake_data(date, lat_min, lat_max, lon_min, lon_max, depth_min, depth_max, ML_min, ML_max):
+# 後端資料查詢函式，已更新以支援日期時間區間
+async def fetch_earthquake_data(
+    start_date, start_time, end_date, end_time,
+    lat_min, lat_max, lon_min, lon_max,
+    depth_min, depth_max, ML_min, ML_max
+):
     try:
+        # 組合日期和時間，如果時間為空，則使用預設值
+        start_datetime_str = f"{start_date.strip()} {start_time.strip() if start_time and start_time.strip() else '00:00:00'}"
+        end_datetime_str = f"{end_date.strip()} {end_time.strip() if end_time and end_time.strip() else '23:59:59'}"
+
         conn = sqlite3.connect('earthquake_data.db')
         
-        query = "SELECT * FROM earthquakes WHERE 1=1"
-        params = []
+        # 使用 SQLite 的 `date || ' ' || time` 來組合欄位進行比較
+        query = "SELECT * FROM earthquakes WHERE (date || ' ' || time) BETWEEN ? AND ?"
+        params = [start_datetime_str, end_datetime_str]
 
-        # 建立篩選條件
+        # 處理其他數值範圍篩選條件
         filters = {
-            "date": date,
-            "lat >= ?": lat_min, "lat <= ?": lat_max,
-            "lon >= ?": lon_min, "lon <= ?": lon_max,
-            "depth >= ?": depth_min, "depth <= ?": depth_max,
-            "ML >= ?": ML_min, "ML <= ?": ML_max,
+            "lat BETWEEN ? AND ?": (lat_min, lat_max),
+            "lon BETWEEN ? AND ?": (lon_min, lon_max),
+            "depth BETWEEN ? AND ?": (depth_min, depth_max),
+            "ML BETWEEN ? AND ?": (ML_min, ML_max),
         }
         
-        for condition, value in filters.items():
-            if value is not None and value != '':
+        for condition, values in filters.items():
+            # 確保兩個值都存在才加入篩選
+            if values[0] is not None and values[1] is not None:
                 query += f" AND {condition}"
-                params.append(value)
+                params.extend(values)
 
         df = pd.read_sql_query(query, conn, params=tuple(params))
         conn.close()
 
-        # 如果沒有結果，顯示一個空的 DataFrame 而不是錯誤
         if df.empty:
             return pd.DataFrame()
             
         return df
     except Exception as e:
-        # 在介面上顯示錯誤訊息
         return pd.DataFrame({"Error": [str(e)]})
 
 
-# 建立 Gradio 使用者介面
+# 建立 Gradio 使用者介面，已更新欄位和預設值
 with gr.Blocks() as demo:
     gr.Markdown("# Earthquake Data Explorer")
     gr.Markdown("Use the filters below to search the earthquake catalog.")
     
     with gr.Row():
-        date_input = gr.Textbox(label="Date (YYYY-MM-DD)")
+        with gr.Column():
+            gr.Markdown("### 起訖日期與時間")
+            start_date_input = gr.Textbox(label="開始日期 (Start Date)", value="2024-01-01")
+            start_time_input = gr.Textbox(label="開始時間 (Start Time, HH:MM:SS)", placeholder="00:00:00")
+        with gr.Column():
+            gr.Markdown("### (空白)") # 佔位，讓排版好看
+            end_date_input = gr.Textbox(label="結束日期 (End Date)", value="2024-12-31")
+            end_time_input = gr.Textbox(label="結束時間 (End Time, HH:MM:SS)", placeholder="23:59:59")
+    
+    with gr.Row():
+        gr.Markdown("### 經緯度、深度、規模")
     with gr.Row():
-        lat_min_input = gr.Number(label="Min Latitude")
-        lat_max_input = gr.Number(label="Max Latitude")
+        lon_min_input = gr.Number(label="經度 (Longitude) From", value=119)
+        lon_max_input = gr.Number(label="To", value=123)
     with gr.Row():
-        lon_min_input = gr.Number(label="Min Longitude")
-        lon_max_input = gr.Number(label="Max Longitude")
+        lat_min_input = gr.Number(label="緯度 (Latitude) From", value=21)
+        lat_max_input = gr.Number(label="To", value=26)
     with gr.Row():
-        depth_min_input = gr.Number(label="Min Depth")
-        depth_max_input = gr.Number(label="Max Depth")
+        depth_min_input = gr.Number(label="深度 (Depth) From", value=0)
+        depth_max_input = gr.Number(label="To", value=100)
     with gr.Row():
-        ML_min_input = gr.Number(label="Min Magnitude (ML)")
-        ML_max_input = gr.Number(label="Max Magnitude (ML)")
+        ML_min_input = gr.Number(label="規模 (Magnitude) From", value=4.5)
+        ML_max_input = gr.Number(label="To", value=8)
     
     filter_button = gr.Button("Filter Data")
     
@@ -64,7 +81,8 @@ with gr.Blocks() as demo:
     filter_button.click(
         fn=fetch_earthquake_data,
         inputs=[
-            date_input, lat_min_input, lat_max_input, lon_min_input, lon_max_input, 
+            start_date_input, start_time_input, end_date_input, end_time_input,
+            lat_min_input, lat_max_input, lon_min_input, lon_max_input, 
             depth_min_input, depth_max_input, ML_min_input, ML_max_input
         ],
         outputs=output_df