Update app.py

app.py

@@ -2,7 +2,7 @@ import gradio as gr
 import pandas as pd
 from atproto import Client
 import time
-from datetime import datetime
+from datetime import datetime, timedelta
 from collections import Counter
 import plotly.express as px
 import plotly.graph_objects as go
@@ -33,7 +33,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         posts_data = []
         reply_users_list = []    
         repost_users_list = []   
-        like_users_list = []     
         interactions_for_network = [] 
         interaction_data = {} # { handle: Counter }
 
@@ -51,22 +50,26 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
 
             for feed_view in response.feed:
                 post = feed_view.post
-                
-                # 投稿が正常に取得できている場合のみ処理 (NotFoundPost対策)
                 if not isinstance(post, PostView):
                     continue
 
-                # A. 投稿データの保存（本人のポストのみ）
+                # A. 投稿データの保存（日本時間に変換）
                 if post.author.handle == target_handle:
                     created_at_raw = getattr(post.record, 'created_at', None)
                     if created_at_raw:
+                        # UTCから日本時間(JST)へ変換 (+9時間)
+                        dt_utc = pd.to_datetime(created_at_raw)
+                        dt_jst = dt_utc + timedelta(hours=9)
+                        
                         posts_data.append({
                             'text': getattr(post.record, 'text', ""),
-                            'created_at': pd.to_datetime(created_at_raw),
+                            'created_at': dt_jst,
+                            'hour': dt_jst.hour,
+                            'weekday': dt_jst.day_name(),
+                            'weekday_num': dt_jst.weekday(), # 月=0, 日=6
                             'likes': getattr(post, 'like_count', 0),
                             'reposts': getattr(post, 'repost_count', 0),
-                            'score': getattr(post, 'like_count', 0) + getattr(post, 'repost_count', 0),
-                            'url': f"https://bsky.app/profile/{target_handle}/post/{post.uri.split('/')[-1]}"
+                            'score': getattr(post, 'like_count', 0) + getattr(post, 'repost_count', 0)
                         })
 
                 # B. リポストのカウント
@@ -81,7 +84,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
                 # C. リプライのカウント
                 elif post.author.handle == target_handle:
                     if getattr(feed_view, 'reply', None) and feed_view.reply.parent:
-                        # 親ポストが削除されている可能性をチェック
                         parent_post = feed_view.reply.parent
                         if isinstance(parent_post, PostView):
                             u = parent_post.author.handle
@@ -94,27 +96,12 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
             cursor = response.cursor
             if not cursor: break
 
-        # --- 3. いいねのカウント ---
-        try:
-            likes_resp = client.get_actor_likes(actor=profile.did, limit=50)
-            for l in likes_resp.feed:
-                # 投稿が削除されていない（PostViewである）ことを確認
-                if isinstance(l.post, PostView):
-                    u = l.post.author.handle
-                    if u != target_handle:
-                        if u not in interaction_data: interaction_data[u] = Counter()
-                        interaction_data[u]['like'] += 1
-                        like_users_list.append(u)
-                        interactions_for_network.append((target_handle, u))
-        except: pass
-
-        # --- 4. 解析とHTML作成 ---
+        # --- 3. 解析とHTML作成 ---
         if not posts_data:
-            return "データ取得失敗または投稿がありません", "", "", None, None, "失敗"
+            return "データがありません", "", "", None, None, None, None, "失敗"
 
         df = pd.DataFrame(posts_data)
-        df['created_at_dt'] = df['created_at'].dt.tz_localize(None)
-        days_active = max((datetime.now() - df['created_at_dt'].min()).days, 1)
+        days_active = max((datetime.now() - df['created_at'].min().replace(tzinfo=None)).days, 1)
 
         stats_html = f"""
         <div style='display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px;'>
@@ -138,9 +125,8 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
 
         rank_html = f"""
         <div style='background: #f9f9f9; padding: 15px; border-radius: 10px; font-size: 0.9em;'>
-            {rank_box("💬 リプライ相手", reply_users_list)}<hr>
-            {rank_box("🔄 リポスト相手", repost_users_list)}<hr>
-            {rank_box("❤️ いいね相手", like_users_list)}
+            {rank_box("💬 よくリプライする相手", reply_users_list)}<hr>
+            {rank_box("🔄 よくリポストする相手", repost_users_list)}
         </div>
         """
 
@@ -149,15 +135,32 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         for _, row in top_posts.iterrows():
             posts_html += f"<div style='margin-bottom:8px; font-size:0.85em; border-left:3px solid #0085ff; padding-left:5px;'>{row['text'][:60]}... (❤️{row['likes']})</div>"
 
-        # --- 5. 投稿頻度グラフ ---
+        # --- 4. グラフ作成 ---
+        # A. アクティビティ推移
         freq_map = {"日ごと": "D", "週ごと": "W", "月ごと": "M"}
-        df_counts = df.set_index('created_at_dt').resample(freq_map[freq_type]).size().reset_index(name='count')
-        fig_bar = px.bar(df_counts, x='created_at_dt', y='count', title="アクティビティ推移")
-
-        # --- 6. アイコン付きネットワーク図の生成 ---
+        df_counts = df.set_index('created_at').resample(freq_map[freq_type]).size().reset_index(name='count')
+        fig_bar = px.bar(df_counts, x='created_at', y='count', title="投稿数の推移", color_discrete_sequence=['#0085ff'])
+
+        # B. 時間帯ヒートマップ
+        hour_counts = df['hour'].value_counts().reindex(range(24), fill_value=0).reset_index()
+        hour_counts.columns = ['hour', 'count']
+        fig_hour = px.bar(hour_counts, x='hour', y='count', title="時間帯別アクティビティ (日本時間)",
+                          labels={'hour':'時間 (24h)', 'count':'投稿数'}, color='count', color_continuous_scale='Viridis')
+        fig_hour.update_layout(xaxis=dict(tickmode='linear', tick0=0, dtick=2))
+
+        # C. 曜日別アクティビティ
+        week_order = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
+        week_ja = {'Monday':'月', 'Tuesday':'火', 'Wednesday':'水', 'Thursday':'木', 'Friday':'金', 'Saturday':'土', 'Sunday':'日'}
+        df['weekday_ja'] = df['weekday'].map(week_ja)
+        week_counts = df['weekday'].value_counts().reindex(week_order, fill_value=0).reset_index()
+        week_counts['weekday_ja'] = week_counts['weekday'].map(week_ja)
+        fig_week = px.pie(week_counts, values='count', names='weekday_ja', title="曜日別比率",
+                          color_discrete_sequence=px.colors.qualitative.Pastel)
+
+        # --- 5. ネットワーク図 ---
         progress(0.8, desc="ネットワーク図を生成中...")
         G = nx.Graph()
-        top_interactors = [u for u, c in Counter(reply_users_list + repost_users_list + like_users_list).most_common(12)]
+        top_interactors = [u for u, c in Counter(reply_users_list + repost_users_list).most_common(12)]
         nodes = list(set([target_handle] + top_interactors))
         
         for (s, t) in interactions_for_network:
@@ -168,21 +171,21 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         pos = nx.spring_layout(G, k=0.6, seed=42)
         fig_net = go.Figure()
 
-        # エッジ（線）
+        # エッジ
         edge_x, edge_y = [], []
         for edge in G.edges():
             edge_x += [pos[edge[0]][0], pos[edge[1]][0], None]
             edge_y += [pos[edge[0]][1], pos[edge[1]][1], None]
         fig_net.add_trace(go.Scatter(x=edge_x, y=edge_y, mode='lines', line=dict(color='#ccc', width=1), hoverinfo='none'))
 
-        # ホバー用の透明な点
+        # ホバー層（透明マーカー）
         node_hover_texts = []
         for node in G.nodes():
             if node == target_handle:
                 node_hover_texts.append(f"<b>{node} (解析対象)</b>")
             else:
                 c = interaction_data.get(node, Counter())
-                node_hover_texts.append(f"<b>@{node}</b><br>❤️ いいね: {c['like']}<br>🔄 リポスト: {c['repost']}<br>💬 リプライ: {c['reply']}")
+                node_hover_texts.append(f"<b>@{node}</b><br>🔄 被リポスト数: {c['repost']}<br>💬 リプライ回数: {c['reply']}")
 
         fig_net.add_trace(go.Scatter(
             x=[pos[n][0] for n in G.nodes()], y=[pos[n][1] for n in G.nodes()],
@@ -190,8 +193,7 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
             text=[n if n != target_handle else "" for n in G.nodes()],
             textposition="bottom center",
             marker=dict(size=40, color='rgba(0,0,0,0)'),
-            hovertext=node_hover_texts,
-            hoverinfo='text'
+            hovertext=node_hover_texts, hoverinfo='text'
         ))
 
         # アイコン画像
@@ -211,24 +213,24 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
             margin=dict(t=40, b=0, l=0, r=0)
         )
 
-        return stats_html, rank_html, posts_html, fig_bar, fig_net, "解析完了！"
+        return stats_html, rank_html, posts_html, fig_bar, fig_hour, fig_week, fig_net, "解析完了！"
         
     except Exception as e:
         import traceback
         print(traceback.format_exc())
-        return f"エラー: {str(e)}", "", "", None, None, "失敗"
+        return f"エラー: {str(e)}", "", "", None, None, None, None, "失敗"
 
 # --- UI定義 ---
-with gr.Blocks(title="Bluesky Dashboard") as demo:
-    gr.Markdown("# 🦋 Bluesky インタラクション・ダッシュボード")
+with gr.Blocks(title="Bluesky Active Analyzer") as demo:
+    gr.Markdown("# 🦋 Bluesky アクティビティ解析ダッシュボード")
     
     with gr.Row():
         with gr.Column(scale=1):
             my_id = gr.Textbox(label="自分のハンドル", placeholder="me.bsky.social")
             my_pw = gr.Textbox(label="アプリパスワード", type="password")
-            target_id = gr.Textbox(label="解析対象", placeholder="target.bsky.social")
-            freq = gr.Radio(["日ごと", "週ごと", "月ごと"], label="グラフ単位", value="日ごと")
-            btn = gr.Button("分析開始", variant="primary")
+            target_id = gr.Textbox(label="解析対象のハンドル", placeholder="target.bsky.social")
+            freq = gr.Radio(["日ごと", "週ごと", "月ごと"], label="推移グラフの単位", value="日ごと")
+            btn = gr.Button("解析を開始する", variant="primary")
             status = gr.Textbox(label="ステータス", interactive=False)
         
         with gr.Column(scale=2):
@@ -238,11 +240,15 @@ with gr.Blocks(title="Bluesky Dashboard") as demo:
                 out_posts = gr.HTML()
 
     with gr.Row():
-        out_bar = gr.Plot(label="投稿頻度")
-        out_net = gr.Plot(label="ユーザーネットワーク (ホバーで詳細表示)")
+        out_bar = gr.Plot(label="投稿頻度の推移")
+        out_net = gr.Plot(label="ユーザーネットワーク")
+
+    with gr.Row():
+        out_hour = gr.Plot(label="時間帯別アクティビティ")
+        out_week = gr.Plot(label="曜日別アクティビティ")
 
     btn.click(analyze_and_output, inputs=[my_id, my_pw, target_id, freq], 
-              outputs=[out_stats, out_rank, out_posts, out_bar, out_net, status])
+              outputs=[out_stats, out_rank, out_posts, out_bar, out_hour, out_week, out_net, status])
 
 if __name__ == "__main__":
     demo.launch()