Enhance timezone handling in run_troubleshooting function: Import pytz for JST conversion and update timestamp filtering to ensure UTC consistency.

app.py

@@ -88,6 +88,8 @@ import gradio as gr
 import pandas as pd
 import supabase
 import datetime # Import datetime here as it's used in run_troubleshooting
+import pytz # Import pytz for timezone conversion
+
 
 # Assuming the data loading and check_thresholds function from the previous cell are available
 
@@ -95,21 +97,17 @@ import datetime # Import datetime here as it's used in run_troubleshooting
 def run_troubleshooting():
     try:
         # Get current time and calculate the time 24 hours ago
-        #current_time = datetime.datetime.now(datetime.timezone.utc)
-        #time_24_hours_ago = current_time - datetime.timedelta(hours=24)
-        # 現在のUTC時刻
-        current_time = datetime.datetime.now(datetime.timezone.utc)
+        current_time_utc = datetime.datetime.now(datetime.timezone.utc)
 
         # 24時間前のUTC
-        time_24_hours_ago = current_time - datetime.timedelta(hours=24)
+        time_24_hours_ago_utc = current_time_utc - datetime.timedelta(hours=24)
 
         # Filter sensor data for the last 24 hours
         # Use the globally available sensor_df and filter it each time the function is called
         global sensor_df
-        #recent_sensor_df = sensor_df[sensor_df['datetime'] < time_24_hours_ago].copy()
         recent_sensor_df = sensor_df[
-        (sensor_df['datetime'] >= time_24_hours_ago) &
-        (sensor_df['datetime'] <= current_time)
+        (sensor_df['datetime'] >= time_24_hours_ago_utc) &
+        (sensor_df['datetime'] <= current_time_utc)
         ].copy()
 
         # Ensure other dataframes are accessible (they are loaded globally once)
@@ -140,6 +138,12 @@ def run_troubleshooting():
         # 結果データフレームの作成
         result_df = pd.DataFrame(result_list)
 
+        # Convert timestamp to JST　時間変換
+        if not result_df.empty and 'timestamp' in result_df.columns:
+             JST = pytz.timezone('Asia/Tokyo')
+             result_df['timestamp'] = result_df['timestamp'].dt.tz_convert(JST)
+
+
         # If no alerts, return "異常ありません"
         if result_df.empty:
             return "過去24時間 異常ありません"