Update app.py

app.py

@@ -107,7 +107,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         kanjis = re.findall(r'[一-龠]', all_text)
         rep_kanji = Counter(kanjis).most_common(1)[0][0] if kanjis else "魂"
 
-        # HTML: 交流相手
         reply_html = ""
         for handle, count in reply_counts.most_common(3):
             info = user_info_cache.get(handle, get_profile_safe(client, handle))
@@ -117,7 +116,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
                 <span><b>{handle}</b></span><span style='margin-left:auto'>{count}回</span>
             </div>"""
 
-        # HTML: 全体構造
         html = f"""
         <div class="dashboard-container">
             <div class="card kanji-card">
@@ -141,7 +139,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
             </a>"""
         html += "</div></div>"
 
-        # グラフ作成
         df_counts = df.set_index('created_at').resample({"日ごと":"D","週ごと":"W","月ごと":"M"}[freq_type]).size().reset_index(name='count')
         fig_bar = px.bar(df_counts, x='created_at', y='count', color_discrete_sequence=['#0085ff'], template="plotly_white", title="投稿頻度")
 
@@ -150,7 +147,7 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         heat_data.index = ['月','火','水','木','金','土','日']
         fig_heat = px.imshow(heat_data, color_continuous_scale='Blues', title="活動時間帯（JST）", labels=dict(x="時間", y="曜日", color="投稿数"))
 
-        # 相関図作成
+        # --- 相関図の修正箇所 ---
         top_interactors = [u for u, _ in reply_counts.most_common(8)]
         nodes = list(set([target_handle] + top_interactors))
         G = nx.Graph()
@@ -159,23 +156,54 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         
         pos = nx.spring_layout(G, k=1.5, seed=42)
         fig_net = go.Figure()
+
+        # エッジの描画
         for e in G.edges():
             fig_net.add_trace(go.Scatter(x=[pos[e[0]][0], pos[e[1]][0]], y=[pos[e[0]][1], pos[e[1]][1]], mode='lines', line=dict(color='#ccc', width=1), hoverinfo='none'))
         
         node_imgs = []
-        node_labels = []
+        node_texts = []
+        
+        # アイコンの大きさを定義
+        img_size = 0.18
+
         for n in G.nodes():
             info = user_info_cache.get(n, {"avatar": ""})
             if info["avatar"]:
-                node_imgs.append(dict(source=info["avatar"], xref="x", yref="y", x=pos[n][0], y=pos[n][1], sizex=0.2, sizey=0.2, xanchor="center", yanchor="middle", layer="above"))
+                node_imgs.append(dict(
+                    source=info["avatar"], xref="x", yref="y",
+                    x=pos[n][0], y=pos[n][1],
+                    sizex=img_size, sizey=img_size,
+                    xanchor="center", yanchor="middle", layer="above"
+                ))
             
-            # 本人以外には関係性ラベルを付与
-            rel = f"<br><span style='color:#0085ff;'>◆{random.choice(RELATIONSHIPS)}</span>" if n != target_handle else "<br><b>(本人)</b>"
-            node_labels.append(f"<br><br><br><b>{n}</b>{rel}")
+            # 関係性ラベル
+            rel = f"<span style='color:#0085ff;'>◆{random.choice(RELATIONSHIPS)}</span>" if n != target_handle else "<b>(本人)</b>"
+            # アイコンの下に潜り込まないよう、適度な空白を調整
+            node_texts.append(f"<b>{n}</b><br>{rel}")
         
-        fig_net.add_trace(go.Scatter(x=[pos[n][0] for n in nodes], y=[pos[n][1] for n in nodes], mode='text', 
-                                    text=node_labels, textposition="bottom center", textfont=dict(size=11, color="black")))
-        fig_net.update_layout(images=node_imgs, showlegend=False, xaxis=dict(visible=False), yaxis=dict(visible=False), plot_bgcolor='white', height=600, margin=dict(t=40, b=0, l=0, r=0))
+        # ノード（透明なマーカー + テキスト）の描画
+        fig_net.add_trace(go.Scatter(
+            x=[pos[n][0] for n in nodes], 
+            y=[pos[n][1] for n in nodes], 
+            mode='markers+text', 
+            text=node_texts,
+            # markerのsizeを調整することで、textposition="bottom center"の開始位置をアイコンの外側に逃がす
+            marker=dict(size=45, color='rgba(0,0,0,0)'), 
+            textposition="bottom center",
+            textfont=dict(size=11, color="black"),
+            hoverinfo='none'
+        ))
+
+        fig_net.update_layout(
+            images=node_imgs, 
+            showlegend=False, 
+            xaxis=dict(visible=False, range=[-1.2, 1.2]), 
+            yaxis=dict(visible=False, range=[-1.2, 1.2]), 
+            plot_bgcolor='white', 
+            height=600, 
+            margin=dict(t=40, b=40, l=0, r=0)
+        )
 
         return html, fig_bar, fig_heat, fig_net, "解析完了！"
     except Exception as e: return f"エラー: {e}", None, None, None, "失敗"