Update app.py

app.py

@@ -3,7 +3,6 @@ import pandas as pd
 from atproto import Client
 import time
 from datetime import datetime
-import re
 from collections import Counter
 import plotly.express as px
 import plotly.graph_objects as go
@@ -31,19 +30,17 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         profile = client.get_profile(actor=target_handle)
         
         posts_data = []
-        hashtags = []
         reply_users_list = []    
         repost_users_list = []   
         like_users_list = []     
         interactions_for_network = [] 
+        interaction_data = {} # { handle: Counter }
 
-        max_limit = 500 
-        
         # --- 2. 投稿フィードの分析 ---
         progress(0, desc="フィードを取得中...")
         cursor = None
         
-        for _ in range(10): 
+        for _ in range(50): 
             try:
                 response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
             except Exception:
@@ -53,62 +50,58 @@ 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
-
-                # リポスト分析
-                if feed_view.reason:
-                    if hasattr(post, 'author'):
-                        orig_author = post.author.handle
-                        if orig_author != target_handle:
-                            repost_users_list.append(orig_author)
-                            interactions_for_network.append((target_handle, orig_author))
-                    continue 
-
-                # 本人投稿分析
+                
+                # A. 投稿データの保存（本人のポストのみ）
                 if post.author.handle == target_handle:
-                    rkey = post.uri.split('/')[-1]
-                    post_url = f"https://bsky.app/profile/{target_handle}/post/{rkey}"
-                    likes = getattr(post, 'like_count', 0) or 0
-                    reposts = getattr(post, 'repost_count', 0) or 0
                     created_at_raw = getattr(post.record, 'created_at', None)
-                    text = getattr(post.record, 'text', "") or ""
-
                     if created_at_raw:
                         posts_data.append({
-                            'text': text,
+                            'text': getattr(post.record, 'text', ""),
                             'created_at': pd.to_datetime(created_at_raw),
-                            'likes': likes,
-                            'reposts': reposts,
-                            'score': likes + reposts,
-                            'url': post_url
+                            '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]}"
                         })
-                        if text:
-                            hashtags.extend(re.findall(r'#(\w+)', text))
-                    
-                    # リプライ相手
+
+                # B. リポストのカウント
+                if feed_view.reason and hasattr(post, 'author'):
+                    u = post.author.handle
+                    if u != target_handle:
+                        if u not in interaction_data: interaction_data[u] = Counter()
+                        interaction_data[u]['repost'] += 1
+                        repost_users_list.append(u)
+                        interactions_for_network.append((target_handle, u))
+                        
+                # C. リプライのカウント
+                elif post.author.handle == target_handle:
                     if getattr(feed_view, 'reply', None) and feed_view.reply.parent:
-                        parent = feed_view.reply.parent
-                        if hasattr(parent, 'author'):
-                            p_handle = parent.author.handle
-                            if p_handle != target_handle:
-                                reply_users_list.append(p_handle)
-                                interactions_for_network.append((target_handle, p_handle))
+                        u = feed_view.reply.parent.author.handle
+                        if u != target_handle:
+                            if u not in interaction_data: interaction_data[u] = Counter()
+                            interaction_data[u]['reply'] += 1
+                            reply_users_list.append(u)
+                            interactions_for_network.append((target_handle, u))
 
             cursor = response.cursor
-            if not cursor or len(posts_data) >= max_limit: break
-            progress(0.4, desc=f"{len(posts_data)}件取得済み...")
+            if not cursor: break
 
-        # --- 3. いいねの取得 ---
+        # --- 3. いいねのカウント ---
         try:
-            likes_resp = client.get_actor_likes(actor=profile.did, limit=40)
-            for like_item in likes_resp.feed:
-                l_handle = like_item.post.author.handle
-                if l_handle != target_handle:
-                    like_users_list.append(l_handle)
+            likes_resp = client.get_actor_likes(actor=profile.did, limit=50)
+            for l in likes_resp.feed:
+                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作成 ---
         if not posts_data:
-            return "データ不足", "", "", None, None, "失敗"
+            return "データ取得失敗または投稿がありません", "", "", None, None, "失敗"
 
         df = pd.DataFrame(posts_data)
         df['created_at_dt'] = df['created_at'].dt.tz_localize(None)
@@ -120,7 +113,7 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
                 <small>総ポスト</small><br><b>{getattr(profile, 'posts_count', 0)}</b>
             </div>
             <div style='background: #f1f8e9; padding: 10px; border-radius: 8px; text-align: center;'>
-                <small>継続日数</small><br><b>{days_active}日</b>
+                <small>解析期間</small><br><b>{days_active}日分</b>
             </div>
             <div style='background: #fff3e0; padding: 10px; border-radius: 8px; text-align: center;'>
                 <small>1日平均</small><br><b>{len(df)/days_active:.2f}</b>
@@ -128,7 +121,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         </div>
         """
 
-        # ランキングHTML
         def rank_box(title, items):
             top = Counter(items).most_common(3)
             res = f"<b>{title}</b><br>"
@@ -137,71 +129,90 @@ 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)}<hr>
+            {rank_box("❤️ いいね相手", like_users_list)}
         </div>
         """
 
-        # ベスト投稿
         top_posts = df.sort_values('score', ascending=False).head(3)
         posts_html = "<b>🏆 ベストポスト</b><br>"
         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. グラフ作成 ---
+        # --- 5. 投稿頻度グラフ ---
         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. アイコン付きネットワーク図 ---
+        # --- 6. アイコン付きネットワーク図の生成 ---
         progress(0.8, desc="ネットワーク図を生成中...")
         G = nx.Graph()
-        top_interactors = [u for u, c in Counter(reply_users_list + repost_users_list).most_common(9)]
-        nodes = [target_handle] + top_interactors
+        # 交流のある上位ユーザーを抽出
+        top_interactors = [u for u, c in Counter(reply_users_list + repost_users_list + like_users_list).most_common(12)]
+        nodes = list(set([target_handle] + top_interactors))
         
-        # 相互作用の重み付け
-        for s, t in interactions_for_network:
+        for (s, t) in interactions_for_network:
             if s in nodes and t in nodes:
                 if G.has_edge(s, t): G[s][t]['weight'] += 1
                 else: G.add_edge(s, t, weight=1)
 
-        pos = nx.spring_layout(G, k=0.5)
-        
-        # アイコンURLの取得
-        node_images = []
-        for node in G.nodes():
-            info = get_profile_info(client, node)
-            img_url = info['avatar'] if info else ""
-            node_images.append(dict(
-                source=img_url, xref="x", yref="y", x=pos[node][0], y=pos[node][1],
-                sizex=0.15, sizey=0.15, xanchor="center", yanchor="middle", layer="above"
-            ))
+        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 = go.Figure()
         fig_net.add_trace(go.Scatter(x=edge_x, y=edge_y, mode='lines', line=dict(color='#ccc', width=1), hoverinfo='none'))
-        fig_net.add_trace(go.Scatter(x=[pos[n][0] for n in G.nodes()], y=[pos[n][1] for n in G.nodes()],
-                                     mode='markers+text', text=list(G.nodes()), textposition="bottom center",
-                                     marker=dict(size=30, color='rgba(0,0,0,0)')))
-        
-        fig_net.update_layout(images=node_images, showlegend=False, 
-                              xaxis=dict(showgrid=False, zeroline=False, showticklabels=False),
-                              yaxis=dict(showgrid=False, zeroline=False, showticklabels=False),
-                              plot_bgcolor='white', margin=dict(t=40, b=0, l=0, r=0))
 
-        return stats_html, rank_html, posts_html, fig_bar, fig_net, "解析完了！"
+        # ホバー用の透明な点（データ内訳）
+        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']}")
+
+        fig_net.add_trace(go.Scatter(
+            x=[pos[n][0] for n in G.nodes()], y=[pos[n][1] for n in G.nodes()],
+            mode='markers+text',
+            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'
+        ))
+
+        # アイコン画像
+        node_images = []
+        for node in G.nodes():
+            info = get_profile_info(client, node)
+            if info:
+                node_images.append(dict(
+                    source=info['avatar'], xref="x", yref="y", x=pos[node][0], y=pos[node][1],
+                    sizex=0.18, sizey=0.18, xanchor="center", yanchor="middle", layer="above"
+                ))
+
+        fig_net.update_layout(
+            images=node_images, showlegend=False, plot_bgcolor='white',
+            xaxis=dict(showgrid=False, zeroline=False, showticklabels=False),
+            yaxis=dict(showgrid=False, zeroline=False, showticklabels=False),
+            margin=dict(t=40, b=0, l=0, r=0)
+        )
 
+        return stats_html, rank_html, posts_html, fig_bar, fig_net, "解析完了！"
+        
     except Exception as e:
+        import traceback
+        print(traceback.format_exc())
         return f"エラー: {str(e)}", "", "", None, None, "失敗"
 
 # --- UI定義 ---
 with gr.Blocks(title="Bluesky Dashboard") as demo:
-    gr.Markdown("# 🦋 Bluesky 全機能統合ダッシュボード")
+    gr.Markdown("# 🦋 Bluesky インタラクション・ダッシュボード")
     
     with gr.Row():
         with gr.Column(scale=1):
@@ -220,9 +231,10 @@ with gr.Blocks(title="Bluesky Dashboard") as demo:
 
     with gr.Row():
         out_bar = gr.Plot(label="投稿頻度")
-        out_net = gr.Plot(label="ユーザーネットワーク（アイコン付）")
+        out_net = 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])
 
-demo.launch()
+if __name__ == "__main__":
+    demo.launch()