Update app.py

app.py

@@ -11,6 +11,34 @@ import random
 import re
 from atproto_client.models.app.bsky.feed.defs import PostView
 
+# --- カスタムCSS ---
+CUSTOM_CSS = """
+body { background-color: #f0f7ff; }
+.gradio-container { font-family: 'Hiragino Kaku Gothic ProN', 'Meiryo', sans-serif; }
+.stat-card { 
+    background: white; padding: 20px; border-radius: 15px; 
+    box-shadow: 0 4px 6px rgba(0,0,0,0.05); text-align: center;
+    border-bottom: 4px solid #0085ff;
+}
+.stat-value { font-size: 1.8em; font-weight: bold; color: #0085ff; }
+.rank-card { 
+    background: #ffffff; padding: 15px; border-radius: 15px; 
+    border: 1px solid #e1e8ed; font-size: 0.9em;
+}
+.rank-header { 
+    color: #111; font-weight: bold; margin-bottom: 10px; 
+    border-bottom: 1px solid #eee; padding-bottom: 5px;
+}
+.best-post-card {
+    background: #f8f9fa; border-left: 5px solid #0085ff;
+    padding: 10px; margin-bottom: 10px; border-radius: 5px;
+}
+button.primary {
+    background: linear-gradient(135deg, #0085ff 0%, #00bfff 100%) !important;
+    border: none !important; color: white !important;
+}
+"""
+
 def get_profile_info(client, did_or_handle):
     try:
         profile = client.get_profile(actor=did_or_handle)
@@ -33,9 +61,9 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         reply_users_list = []    
         repost_users_list = []   
         interaction_pairs = [] 
-        ends_list = [] # 語尾コレクション用
+        ends_list = [] 
 
-        progress(0, desc="フィードを解析中...")
+        progress(0, desc="Blueskyの風を解析中...")
         cursor = None
         for _ in range(50): 
             try:
@@ -47,18 +75,14 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
                 post = feed_view.post
                 if not isinstance(post, PostView): continue
                 
-                # A. 投稿データ
                 created_at_raw = getattr(post.record, 'created_at', None)
                 if created_at_raw:
                     dt_jst = pd.to_datetime(created_at_raw) + timedelta(hours=9)
                     if post.author.handle == target_handle:
                         text = getattr(post.record, 'text', "")
                         
-                        # --- 口癖（語尾）抽出ロジック ---
-                        # 記号や改行を除去して文末を特定
                         clean_text = re.sub(r'[!\?！?。\n\s]+$', '', text)
                         if len(clean_text) >= 2:
-                            # 文末2〜3文字を抽出（ひらがな中心にヒットしやすく調整）
                             ending = clean_text[-3:]
                             if re.search(r'[ぁ-んーwWｗＷ]$', ending):
                                 ends_list.append(ending)
@@ -73,7 +97,6 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
                             'score': getattr(post, 'like_count', 0) + getattr(post, 'repost_count', 0)
                         })
 
-                # B. インタラクション抽出
                 u_author = post.author.handle
                 if feed_view.reason: 
                     interaction_pairs.append((target_handle, u_author))
@@ -95,112 +118,106 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
         df = pd.DataFrame(posts_data)
         first_post_date = df['created_at'].min().strftime('%Y/%m/%d')
 
-        # --- HTML作成 ---
+        # --- 新・HTMLレイアウト ---
         stats_html = f"""
-        <div style='display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px;'>
-            <div style='background: #e3f2fd; padding: 10px; border-radius: 8px; text-align: center;'>
-                <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>{first_post_date}</b>
-            </div>
-            <div style='background: #fff3e0; padding: 10px; border-radius: 8px; text-align: center;'>
-                <small>分析件数</small><br><b>{len(df)}件</b>
-            </div>
+        <div style='display: grid; grid-template-columns: repeat(3, 1fr); gap: 15px; margin-bottom: 20px;'>
+            <div class='stat-card'><small>総ポスト数</small><div class='stat-value'>{getattr(profile, 'posts_count', 0)}</div></div>
+            <div class='stat-card'><small>観測開始日</small><div class='stat-value' style='font-size:1.2em; padding: 6px 0;'>{first_post_date}</div></div>
+            <div class='stat-card'><small>分析サンプル</small><div class='stat-value'>{len(df)}</div></div>
         </div>
         """
         
-        def rank_box(title, items, icon=""):
+        def rank_box_styled(title, items, icon=""):
             top = Counter(items).most_common(3)
-            res = f"<b>{icon} {title}</b><br>"
-            res += "<br>".join([f"{n} ({c}回)" if "@" not in str(n) else f"@{n} ({c}回)" for n, c in top]) if top else "なし"
+            res = f"<div class='rank-card'><div class='rank-header'>{icon} {title}</div>"
+            if top:
+                res += "".join([f"<div style='margin-bottom:4px;'><b>{n}</b> <span style='color:#666; float:right;'>{c}回</span></div>" for n, c in top])
+            else:
+                res += "<div style='color:#ccc;'>未検出</div>"
+            res += "</div>"
             return res
 
         rank_html = f"""
-        <div style='background: #f9f9f9; padding: 15px; border-radius: 10px; font-size: 0.9em;'>
-            {rank_box('リプライ相手TOP3', reply_users_list, '💬')}
-            <hr>
-            {rank_box('リポスト相手TOP3', repost_users_list, '🔄')}
-            <hr>
-            {rank_box('よく使う語尾', ends_list, '🗣️')}
+        <div style='display: flex; flex-direction: column; gap: 10px;'>
+            {rank_box_styled('リプライ相手', reply_users_list, '💬')}
+            {rank_box_styled('リポスト相手', repost_users_list, '🔄')}
+            {rank_box_styled('よく使う語尾', ends_list, '🗣️')}
         </div>
         """
         
         top_posts = df.sort_values('score', ascending=False).head(3)
-        posts_html = "<b>🏆 ベストポスト</b><br>"
+        posts_html = "<div class='rank-card'><div class='rank-header'>🏆 ベストポスト</div>"
         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]}...<br><small>❤️ {row['likes']}  🔄 {row['reposts']}</small></div>"
+            posts_html += f"<div class='best-post-card'>{row['text'][:80]}...<br><small style='color:#0085ff;'>❤️ {row['likes']} &nbsp; 🔄 {row['reposts']}</small></div>"
+        posts_html += "</div>"
 
         # --- グラフ作成 ---
         freq_map = {"日ごと": "D", "週ごと": "W", "月ごと": "M"}
         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'])
+        fig_bar = px.bar(df_counts, x='created_at', y='count', title="投稿エネルギーの推移", color_discrete_sequence=['#0085ff'], template="plotly_white")
 
         week_order = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
         heat_pt = df.groupby(['weekday', 'hour']).size().reset_index(name='count').pivot(index='weekday', columns='hour', values='count').reindex(week_order).fillna(0)
         heat_pt.index = ['月', '火', '水', '木', '金', '土', '日']
-        fig_heat = px.imshow(heat_pt, labels=dict(x="時間 (24h)", y="曜日", color="投稿数"), x=list(range(24)), y=heat_pt.index, color_continuous_scale='Blues', title="週間アクティビティ")
+        fig_heat = px.imshow(heat_pt, x=list(range(24)), y=heat_pt.index, color_continuous_scale='Blues', title="時間帯別アクティビティ")
 
         # --- 相関図 ---
-        progress(0.8, desc="相関図を生成中...")
-        RELATIONSHIPS = ["家族", "恋人候補", "実は好き", "ペット", "宿命のライバル", "幼馴染", "憧れの人", "師匠", "弟子", "癒やし枠", "腐れ縁", "魂の双子", "前世での伴侶", "生涯の恩人", "運命の赤い糸", "行きつけの店の店主", "同じ趣味 of 同志", "深夜の話し相手", "甘えたい", "影の守護者", "最強の刺客", "永遠のライバル", "喧嘩仲間", "裏切りの共犯者", "嫉妬", "だ～いすき♡", "軽蔑", "下僕", "裸の関係", "お抱えの料理人"]
-        
         all_interactors = [p for pair in interaction_pairs for p in pair if p != target_handle]
-        top_10 = [u for u, c in Counter(all_interactors).most_common(10)]
+        top_10 = [u for u, c in Counter(all_interactors).most_common(12)]
         nodes = list(set([target_handle] + top_10))
-        node_attrs = {n: (random.choice(RELATIONSHIPS) if n != target_handle else "（本人）") for n in nodes}
-
+        
         G = nx.Graph()
         for (u1, u2) in interaction_pairs:
             if u1 in nodes and u2 in nodes and u1 != u2:
                 if G.has_edge(u1, u2): G[u1][u2]['weight'] += 1
                 else: G.add_edge(u1, u2, weight=1)
 
-        pos = nx.spring_layout(G, k=1.0, seed=42)
+        pos = nx.spring_layout(G, k=1.2, seed=42)
         fig_net = go.Figure()
-
         for edge in G.edges():
             w = G[edge[0]][edge[1]]['weight']
-            fig_net.add_trace(go.Scatter(x=[pos[edge[0]][0], pos[edge[1]][0], None], y=[pos[edge[0]][1], pos[edge[1]][1], None], mode='lines', line=dict(color='#ddd', width=min(w, 5)), hoverinfo='none'))
-
-        node_labels = [f"<b>{n}</b>" if n == target_handle else f"@{n}<br><span style='color:red;'>【{node_attrs[n]}】</span>" for n in G.nodes()]
-        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=node_labels, textposition="bottom center", marker=dict(size=45, color='rgba(0,0,0,0)'), hoverinfo='none'))
+            fig_net.add_trace(go.Scatter(x=[pos[edge[0]][0], pos[edge[1]][0], None], y=[pos[edge[0]][1], pos[edge[1]][1], None], mode='lines', line=dict(color='#cfd8dc', width=min(w, 4)), hoverinfo='none'))
 
         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.22, sizey=0.22, 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), height=700, title="🦋 脳内ユーザー相関図 (自分以外も繋がります)")
+                node_images.append(dict(source=info['avatar'], xref="x", yref="y", x=pos[node][0], y=pos[node][1], sizex=0.2, sizey=0.2, xanchor="center", yanchor="middle", layer="above"))
+        
+        fig_net.update_layout(images=node_images, showlegend=False, plot_bgcolor='rgba(0,0,0,0)', paper_bgcolor='rgba(0,0,0,0)', xaxis=dict(showgrid=False, zeroline=False, showticklabels=False), yaxis=dict(showgrid=False, zeroline=False, showticklabels=False), height=700)
 
-        return stats_html, rank_html, posts_html, fig_bar, fig_heat, fig_net, "解析完了！"
+        return stats_html, rank_html, posts_html, fig_bar, fig_heat, fig_net, "解析完了しました！"
         
     except Exception as e:
-        return f"エラー: {str(e)}", "", "", None, None, None, "失敗"
+        return f"エラーが発生しました: {str(e)}", "", "", None, None, None, "失敗"
 
-with gr.Blocks(title="Bluesky Ultimate Analyzer") as demo:
-    gr.Markdown("# 🦋 Bluesky アクティビティ & 脳内相関図")
+# --- インターフェース ---
+with gr.Blocks(css=CUSTOM_CSS, title="Bluesky Ultimate Dashboard") as demo:
+    gr.Markdown("# <p style='text-align:center; color:#0085ff;'>🦋 Bluesky Ultimate Dashboard</p>")
+    
     with gr.Row():
         with gr.Column(scale=1):
-            my_id = gr.Textbox(label="自分のハンドル")
-            my_pw = gr.Textbox(label="アプリパスワード", type="password")
-            target_id = gr.Textbox(label="解析対象")
-            freq = gr.Radio(["日ごと", "週ごと", "月ごと"], label="推移グラフの単位", value="日ごと")
-            btn = gr.Button("解析を開始する", variant="primary")
-            status = gr.Textbox(label="ステータス", interactive=False)
+            with gr.Group():
+                my_id = gr.Textbox(label="自分のハンドル (@なし)", placeholder="example.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")
+            status = gr.Markdown("待機中...")
+            
         with gr.Column(scale=2):
             out_stats = gr.HTML()
             with gr.Row():
                 out_rank = gr.HTML()
                 out_posts = gr.HTML()
 
-    with gr.Tab("アクティビティ推移"):
-        out_bar = gr.Plot(label="投稿頻度の推移")
-        out_heat = gr.Plot(label="曜日×時間ヒートマップ")
-    
-    with gr.Tab("ユーザー相関図"):
-        out_net = gr.Plot(label="脳内相関図")
+    with gr.Tabs():
+        with gr.TabItem("📊 活動データ"):
+            with gr.Row():
+                out_bar = gr.Plot()
+                out_heat = gr.Plot()
+        with gr.TabItem("🤝 人間関係マップ"):
+            out_net = gr.Plot()
 
     btn.click(analyze_and_output, inputs=[my_id, my_pw, target_id, freq], 
               outputs=[out_stats, out_rank, out_posts, out_bar, out_heat, out_net, status])