Update app.py

app.py

@@ -47,9 +47,6 @@ def generate_catchphrase(kanji, posts_df):
         if 0 <= avg_hour <= 5: adj_list.insert(0, "真夜中の")
     return f"── {random.choice(adj_list)} {kanji} を愛する {random.choice(title_list)} ──"
 
-# グラフ設定（静止画のように固定）
-PLOT_CONFIG = {'staticPlot': True, 'displayModeBar': False}
-
 def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress()):
     try:
         client = Client()
@@ -62,10 +59,9 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         user_info_cache = {target_handle: {"avatar": profile.avatar, "handle": target_handle}}
         all_text = ""
 
-        # ポスト解析ループ（投稿数に応じた回数を実行）
         total_posts = profile.posts_count
-        max_loops = (total_posts // 100) + 2  # 安全策として+100件分多く回す
-        max_loops = min(max_loops, 50) # 最大5000件までの安全上限
+        max_loops = (total_posts // 100) + 2
+        max_loops = min(max_loops, 50) 
         
         cursor = None
         for i in range(max_loops):
@@ -91,7 +87,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         df = pd.DataFrame(posts_data).drop_duplicates(subset=['text'])
         rep_kanji = Counter(re.findall(r'[一-龠]', all_text)).most_common(1)[0][0] if re.findall(r'[一-龠]', all_text) else "魂"
         
-        # HTML生成
         html = f"""<div class="dashboard-container">
             <div class="card kanji-card"><small>あなたを象徴する一文字</small><div class="kanji-value">{rep_kanji}</div><div class="catchphrase">{generate_catchphrase(rep_kanji, df)}</div></div>
             <div class="stat-row">
@@ -104,16 +99,17 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
             html += f"<a href='{r['url']}' target='_blank' style='text-decoration:none; color:inherit;'><div class='best-post-item'>{r['text'][:80]}...<div style='color:#0085ff; font-weight:bold; margin-top:5px;'>❤️ {r['likes']} 🔄 {r['reposts']}</div></div></a>"
         html += "</div></div>"
 
-        # グラフ作成（インタラクション無効化を適用）
+        # 投稿頻度グラフ
         df_counts = df.set_index('created_at').resample({"週ごと":"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", height=300)
-        fig_bar.update_layout(margin=dict(l=10, r=10, t=30, b=10))
+        fig_bar.update_layout(margin=dict(l=10, r=10, t=30, b=10), dragmode=False) # 触れないように設定
         
+        # ヒートマップ
         week_order = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
         heat_data = df.groupby(['weekday', 'hour']).size().unstack(fill_value=0).reindex(week_order).fillna(0)
         heat_data.index = ['月','火','水','木','金','土','日']
         fig_heat = px.imshow(heat_data, color_continuous_scale='Blues', height=300)
-        fig_heat.update_layout(margin=dict(l=10, r=10, t=30, b=10))
+        fig_heat.update_layout(margin=dict(l=10, r=10, t=30, b=10), dragmode=False) # 触れないように設定
 
         # 相関図
         nodes = list(set([target_handle] + [u for u, _ in reply_counts.most_common(7)]))
@@ -123,28 +119,44 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         pos = nx.spring_layout(G, k=1.3, seed=42)
         cx, cy = pos[target_handle]
         for n in pos: pos[n] = (pos[n][0] - cx, pos[n][1] - cy)
+        
         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_texts = [], []
+        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_texts, node_x, node_y = [], [], [], []
         for n in nodes:
             img = user_info_cache.get(n, {"avatar": ""})["avatar"]
-            node_imgs.append(dict(source=img, xref="x", yref="y", x=pos[n][0], y=pos[n][1], sizex=0.2, sizey=0.2, xanchor="center", yanchor="middle", layer="above"))
-            rel = "<br><b style='color:#ff4b4b;'>(本人)</b>" if n == target_handle else f"<br><span style='color:#0085ff;'>◆{random.choice(RELATIONSHIPS)}</span>"
-            node_texts.append(f"<b>{n[:12]}</b>{rel}")
-        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=dict(size=40, color='rgba(0,0,0,0)'), textposition="bottom center", 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=500, margin=dict(t=10, b=10, l=0, r=0))
+            nx_val, ny_val = pos[n]
+            node_x.append(nx_val)
+            node_y.append(ny_val)
+            node_imgs.append(dict(source=img, xref="x", yref="y", x=nx_val, y=ny_val, sizex=0.22, sizey=0.22, xanchor="center", yanchor="middle", layer="above"))
+            rel = "<br><b style='color:#ff4b4b;'>本人</b>" if n == target_handle else f"<br><span style='color:#0085ff;'>◆{random.choice(RELATIONSHIPS)}</span>"
+            display_name = n[:12] + '..' if len(n) > 12 else n
+            node_texts.append(f"<b>{display_name}</b>{rel}")
+            
+        fig_net.add_trace(go.Scatter(
+            x=node_x, y=node_y, mode='markers+text', text=node_texts, 
+            textposition="bottom center", textfont=dict(size=11, color='#333'),
+            marker=dict(size=40, color='rgba(0,0,0,0)'), hoverinfo='none'
+        ))
+        fig_net.update_layout(
+            images=node_imgs, showlegend=False, 
+            xaxis=dict(visible=False, range=[-1.3, 1.3]), yaxis=dict(visible=False, range=[-1.3, 1.3]), 
+            plot_bgcolor='white', height=500, margin=dict(t=10, b=10, l=0, r=0),
+            dragmode=False # 触れないように設定
+        )
 
-        # GradioのPlotコンポーネントにConfigを渡すことはできないため、戻り値の段階で制限をかけたグラフを返します
         return html, fig_bar, fig_heat, fig_net, "解析完了！"
     except Exception as e: return f"エラー: {e}", None, None, None, "失敗"
 
-with gr.Blocks(css=CUSTOM_CSS) as demo:
+with gr.Blocks() as demo:
     gr.Markdown("# <p style='text-align:center; color:#0085ff; font-size:1.6rem;'>🦋 Bluesky Analyzer</p>")
     with gr.Row():
         with gr.Column():
-            m_id = gr.Textbox(label="自分のID", placeholder="example.bsky.social", lines=1)
-            m_pw = gr.Textbox(label="パスワード", type="password", lines=1)
-            t_id = gr.Textbox(label="解析対象", placeholder="target.bsky.social", lines=1)
+            m_id = gr.Textbox(label="自分のID", placeholder="example.bsky.social")
+            m_pw = gr.Textbox(label="パスワード", type="password")
+            t_id = gr.Textbox(label="解析対象", placeholder="target.bsky.social")
             frq = gr.Radio(["週ごと", "月ごと"], label="グラフ単位", value="週ごと")
             btn = gr.Button("解析実行", variant="primary")
             st = gr.Markdown("<p style='text-align:center;'>IDとパスワードを入力してください</p>")
@@ -153,12 +165,12 @@ with gr.Blocks(css=CUSTOM_CSS) as demo:
     
     with gr.Tabs():
         with gr.TabItem("📊 活動ログ"): 
-            # show_label=False と config を適用
-            out_b = gr.Plot(label="投稿頻度", config=PLOT_CONFIG)
-            out_heat = gr.Plot(label="時間帯ヒートマップ", config=PLOT_CONFIG)
+            out_b = gr.Plot(label="投稿頻度")
+            out_heat = gr.Plot(label="時間帯ヒートマップ")
         with gr.TabItem("🤝 魂の相関図"): 
-            out_n = gr.Plot(config=PLOT_CONFIG)
+            out_n = gr.Plot()
             
     btn.click(analyze_and_output, inputs=[m_id, m_pw, t_id, frq], outputs=[out_h, out_b, out_heat, out_n, st])
 
-demo.launch()
+# Gradio 6.0仕様: launch時にcssを渡す
+demo.launch(css=CUSTOM_CSS)