Update app.py

app.py

@@ -31,45 +31,25 @@ CUSTOM_CSS = """
 button.primary { background: #0085ff !important; height: 60px !important; color: white !important; font-size: 1.2rem !important; }
 """
 
-# --- 文言リスト（各30個以上） ---
-ADJECTIVES = [
-    "光速の", "孤高の", "愛されし", "混沌の", "深淵なる", "情熱の", "癒やし系", "伝説の",
-    "流浪の", "極限の", "無邪気な", "麗しき", "鉄壁の", "幻想的な", "反逆の", "神速の",
-    "不屈の", "優雅な", "神秘の", "爆裂の", "純粋なる", "漆黒の", "黄金の", "悠久の",
-    "戦慄の", "微笑みの", "虚空の", "驚異の", "禁断の", "幸福な", "真実の", "暁の", "宵闇の"
-]
-
-TITLES = [
-    "投稿者", "クリエイター", "エンターテイナー", "哲学者", "自由人", "守護神",
-    "表現者", "観測者", "旅人", "語り部", "先駆者", "求道者", "職人", "策士",
-    "魔術師", "支配者", "住人", "伝道師", "蒐集家", "冒険者", "導き手", "革命家",
-    "異端児", "詩人", "鑑定士", "研究員", "巨匠", "隠者", "英雄", "新星", "重鎮"
-]
-
+# 文言リスト
+ADJECTIVES = ["光速の", "孤高の", "愛されし", "混沌の", "深淵なる", "情熱の", "癒やし系", "伝説の", "流浪の", "極限の", "無邪気な", "麗しき", "鉄壁の", "幻想的な", "反逆の", "神速の", "不屈の", "優雅な", "神秘の", "爆裂の", "純粋なる", "漆黒の", "黄金の", "悠久の", "戦慄の", "微笑みの", "虚空の", "驚異の", "禁断の", "幸福な", "真実の", "暁の", "宵闇の"]
+TITLES = ["投稿者", "クリエイター", "エンターテイナー", "哲学者", "自由人", "守護神", "表現者", "観測者", "旅人", "語り部", "先駆者", "求道者", "職人", "策士", "魔術師", "支配者", "住人", "伝道師", "蒐集家", "冒険者", "導き手", "革命家", "異端児", "詩人", "鑑定士", "研究員", "巨匠", "隠者", "英雄", "新星", "重鎮"]
 RELATIONSHIPS = ["家族", "恋人候補", "実は好き", "ペット", "宿命のライバル", "幼馴染", "憧れの人", "師匠", "弟子", "癒やし枠", "腐れ縁", "魂の双子", "前世での伴侶", "生涯の恩人", "運命の赤い糸", "行きつけの店の店主", "同志", "深夜の話し相手", "甘えたい", "影の守護者", "最強の刺客", "永遠のライバル", "喧嘩仲間", "裏切りの共犯者", "嫉妬", "だ～いすき♡", "軽蔑", "下僕", "裸の関係", "お抱え料理人"]
 
 def get_profile_safe(client, actor):
     try:
         p = client.get_profile(actor=actor)
         return {"handle": p.handle, "avatar": p.avatar or "https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png"}
-    except:
-        return {"handle": actor, "avatar": "https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png"}
+    except: return {"handle": actor, "avatar": "https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png"}
 
 def generate_catchphrase(kanji, posts_df):
     adj_list = ADJECTIVES[:]
     title_list = TITLES[:]
-    
-    # 簡易的な特徴分析
     if not posts_df.empty:
         avg_hour = posts_df['hour'].mean()
         if 0 <= avg_hour <= 5: adj_list.insert(0, "真夜中の")
-        elif 6 <= avg_hour <= 10: adj_list.insert(0, "早起きの")
-        
         if (posts_df['likes'] > 10).any(): title_list.insert(0, "カリスマ")
-
-    adj = random.choice(adj_list)
-    title = random.choice(title_list)
-    return f"── {adj} {kanji} を愛する {title} ──"
+    return f"── {random.choice(adj_list)} {kanji} を愛する {random.choice(title_list)} ──"
 
 def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress()):
     try:
@@ -78,7 +58,7 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         target_handle = target_id.replace('@', '').strip()
         profile = client.get_profile(actor=target_handle)
         
-        posts_data, interaction_pairs, ends_list = [], [], []
+        posts_data, interaction_pairs = [], []
         reply_counts = Counter()
         user_info_cache = {target_handle: {"avatar": profile.avatar, "handle": target_handle}}
         all_text = ""
@@ -89,50 +69,44 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
             for f in response.feed:
                 p = f.post
                 if not isinstance(p, PostView) or p.author.handle != target_handle: continue
-                
                 txt = getattr(p.record, 'text', "")
                 all_text += txt
-                post_id = p.uri.split('/')[-1]
-                post_url = f"https://bsky.app/profile/{target_handle}/post/{post_id}"
                 dt = pd.to_datetime(getattr(p.record, 'created_at')) + timedelta(hours=9)
+                posts_data.append({'text': txt, 'likes': p.like_count, 'reposts': p.repost_count, 'created_at': dt, 'url': f"https://bsky.app/profile/{target_handle}/post/{p.uri.split('/')[-1]}", 'score': p.like_count + p.repost_count, 'hour': dt.hour, 'weekday': dt.day_name()})
                 
-                posts_data.append({'text': txt, 'likes': p.like_count, 'reposts': p.repost_count, 'created_at': dt, 'url': post_url, 'score': p.like_count + p.repost_count, 'hour': dt.hour, 'weekday': dt.day_name()})
-                
-                clean = re.sub(r'[!\?！?。\n\s]+$', '', txt)
-                if len(clean) >= 2:
-                    end = clean[-3:]; 
-                    if re.search(r'[ぁ-んーwWｗＷ]$', end): ends_list.append(end)
-
                 if getattr(f, 'reply', None) and isinstance(f.reply.parent, PostView):
                     u_parent = f.reply.parent.author.handle
                     reply_counts[u_parent] += 1
                     interaction_pairs.append((target_handle, u_parent))
-                    if u_parent not in user_info_cache:
-                        user_info_cache[u_parent] = {"avatar": f.reply.parent.author.avatar, "handle": u_parent}
-
+                    if u_parent not in user_info_cache: user_info_cache[u_parent] = {"avatar": f.reply.parent.author.avatar, "handle": u_parent}
             cursor = response.cursor
             if not cursor: break
             progress((i+1)/20)
 
         df = pd.DataFrame(posts_data).drop_duplicates(subset=['text'])
-        kanjis = re.findall(r'[一-龠]', all_text)
-        rep_kanji = Counter(kanjis).most_common(1)[0][0] if kanjis else "魂"
-        catchphrase = generate_catchphrase(rep_kanji, df)
-
-        # HTML
+        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">{catchphrase}</div></div>
+            <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="card stat-card"><div class="stat-label">🚀 総投稿数</div><div class="stat-value">{profile.posts_count}</div></div>
             <div class="card stat-card"><div class="stat-label">🔍 今回の解析数</div><div class="stat-value">{len(df)}</div></div>
-            <div class="card"><div class="rank-header">👥 よく絡む人</div>
-            {"".join([f"<div class='rank-entry'><img src='{user_info_cache.get(h, get_profile_safe(client, h))['avatar']}' class='rank-avatar'><b>{h}</b><span style='margin-left:auto'>{c}回</span></div>" for h,c in reply_counts.most_common(3)])}</div>
+            <div class="card"><div class="rank-header">👥 よく絡む人</div>{"".join([f"<div class='rank-entry'><img src='{user_info_cache.get(h, get_profile_safe(client, h))['avatar']}' class='rank-avatar'><b>{h}</b><span style='margin-left:auto'>{c}回</span></div>" for h,c in reply_counts.most_common(3)])}</div>
             <div class="card" style="grid-column: 1 / -1;"><div class="rank-header">🏆 ベストポスト</div>"""
         for _, r in df.sort_values('score', ascending=False).head(3).iterrows():
             html += f"<a href='{r['url']}' target='_blank' class='post-link'><div class='best-post-item'>{r['text']}<div class='post-meta'>❤️ {r['likes']} 🔄 {r['reposts']} — {r['created_at'].strftime('%Y/%m/%d')}</div></div></a>"
         html += "</div></div>"
 
-        fig_bar = px.bar(df.set_index('created_at').resample({"日ごと":"D","週ごと":"W","月ごと":"M"}[freq_type]).size().reset_index(name='count'), x='created_at', y='count', color_discrete_sequence=['#0085ff'], template="plotly_white")
+        # グラフ: 活動ログ
+        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", title="投稿頻度")
         
+        # グラフ: ヒートマップ
+        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', title="活動時間帯（JST）")
+
         # 相関図
         nodes = list(set([target_handle] + [u for u, _ in reply_counts.most_common(8)]))
         G = nx.Graph()
@@ -141,36 +115,35 @@ 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)
         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 = []
+        node_imgs, node_texts = [], []
         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.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>"
             node_texts.append(f"<b>{n}</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=50, 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.3, 1.3]), yaxis=dict(visible=False, range=[-1.3, 1.3]), plot_bgcolor='white', height=650, margin=dict(t=20, b=20, l=0, r=0))
 
-        return html, fig_bar, fig_net, "解析完了！"
-    except Exception as e: return f"エラー: {e}", None, None, "失敗"
+        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:
     gr.Markdown("# <p style='text-align:center; color:#0085ff; font-size:2rem;'>🦋 Bluesky Analyzer</p>")
     with gr.Row():
         with gr.Column():
             m_id, m_pw, t_id = gr.Textbox(label="自分のハンドル"), gr.Textbox(label="アプリパスワード", type="password"), gr.Textbox(label="解析対象")
-            frq = gr.Radio(["日ごと", "週ごと", "月ごと"], label="グラフ単位", value="日ごと")
+            frq = gr.Radio(["週ごと", "月ごと"], label="グラフ単位", value="週ごと")
             btn = gr.Button("解析実行", variant="primary")
             st = gr.Markdown("認証情報を入力してください")
     out_h = gr.HTML()
     with gr.Tabs():
-        with gr.TabItem("📊 活動ログ"): out_b = gr.Plot()
-        with gr.TabItem("🤝 魂の相関図"): out_n = gr.Plot()
-    btn.click(analyze_and_output, inputs=[m_id, m_pw, t_id, frq], outputs=[out_h, out_b, out_n, st])
+        with gr.TabItem("📊 活動ログ"): 
+            out_b = gr.Plot()
+            out_heat = gr.Plot()
+        with gr.TabItem("🤝 魂の相関図"): 
+            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()