Update app.py

app.py

@@ -13,269 +13,160 @@ 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;
+.gradio-container { max-width: 100% !important; padding: 10px !important; background-color: #f0f7ff; }
+.dashboard-container {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+    gap: 20px;
+    width: 100%;
 }
-.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;
-}
-.rank-item { display: flex; align-items: center; gap: 8px; margin-bottom: 6px; }
-.rank-avatar { width: 24px; height: 24px; border-radius: 50%; object-fit: cover; }
-button.primary {
-    background: linear-gradient(135deg, #0085ff 0%, #00bfff 100%) !important;
-    border: none !important; color: white !important;
+.card {
+    background: white; border-radius: 16px; padding: 20px;
+    box-shadow: 0 4px 12px rgba(0,0,0,0.08); width: 100%; box-sizing: border-box;
 }
+.kanji-card { background: linear-gradient(135deg, #0085ff 0%, #00bfff 100%); color: white; text-align: center; }
+.kanji-value { font-size: 5rem; font-weight: 900; line-height: 1; margin: 15px 0; }
+.stats-subgrid { display: grid; grid-template-columns: 1fr 1fr; gap: 10px; margin-top: 15px; }
+.stat-item { background: rgba(255,255,255,0.2); padding: 10px; border-radius: 10px; text-align: center; }
+.stat-num { font-size: 1.5rem; font-weight: bold; }
+.rank-section { margin-bottom: 20px; }
+.rank-header { font-size: 1.1rem; font-weight: bold; border-left: 4px solid #0085ff; padding-left: 10px; margin-bottom: 15px; color: #333; }
+.rank-entry { display: flex; justify-content: space-between; align-items: center; padding: 8px 0; border-bottom: 1px solid #eee; }
+.best-post-item { background: #f9f9f9; border-radius: 12px; padding: 15px; margin-bottom: 15px; border: 1px solid #eef; line-height: 1.6; }
+.post-meta { font-size: 0.85rem; color: #0085ff; margin-top: 10px; font-weight: bold; }
+button.primary { background: #0085ff !important; height: 60px !important; font-size: 1.2rem !important; color: white !important; }
 """
 
 def get_profile_info(client, did_or_handle):
     try:
         profile = client.get_profile(actor=did_or_handle)
-        return {
-            "avatar": profile.avatar if profile.avatar else "https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png",
-            "handle": profile.handle,
-            "display_name": profile.display_name or profile.handle
-        }
-    except Exception:
-        return None
+        return {"avatar": profile.avatar or "https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png", "handle": profile.handle}
+    except: return None
 
 def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress()):
     try:
         client = Client()
-        my_id = my_id.replace('@', '').strip()
+        client.login(my_id.replace('@', '').strip(), my_pw.strip())
         target_handle = target_id.replace('@', '').strip()
-        client.login(my_id, my_pw.strip())
         profile = client.get_profile(actor=target_handle)
         
-        posts_data = []
-        reply_users_list = []    
-        repost_users_list = []   
-        interaction_pairs = [] 
-        ends_list = [] 
+        posts_data, reply_users, repost_users, interaction_pairs, ends_list = [], [], [], [], []
+        all_text = ""
 
         total_posts_count = getattr(profile, 'posts_count', 0)
-        max_iterations = (total_posts_count // 100) + 1
+        max_iterations = min((total_posts_count // 100) + 1, 30) 
         
-        progress(0, desc=f"全 {total_posts_count} ポストを解析中...")
         cursor = None
-        
         for i in range(max_iterations):
-            try:
-                response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
-            except Exception: break
-            if not response or not response.feed: break
-
-            for feed_view in response.feed:
-                post = feed_view.post
-                if not isinstance(post, PostView): continue
+            response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
+            if not response.feed: break
+            
+            for f in response.feed:
+                p = f.post
+                # --- 修正ポイント：PostViewではない（削除済みなど）場合はスキップ ---
+                if not isinstance(p, PostView): continue
                 
-                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:
-                            ending = clean_text[-3:]
-                            if re.search(r'[ぁ-んーwWｗＷ]$', ending):
-                                ends_list.append(ending)
-
-                        posts_data.append({
-                            'text': text,
-                            'created_at': dt_jst,
-                            'hour': dt_jst.hour,
-                            'weekday': dt_jst.day_name(),
-                            'likes': getattr(post, 'like_count', 0),
-                            'reposts': getattr(post, 'repost_count', 0),
-                            'score': getattr(post, 'like_count', 0) + getattr(post, 'repost_count', 0)
-                        })
-
-                u_author = post.author.handle
-                if feed_view.reason: 
-                    interaction_pairs.append((target_handle, u_author))
-                    if u_author != target_handle: repost_users_list.append(u_author)
+                # 投稿内容の解析
+                if p.author.handle == target_handle:
+                    txt = getattr(p.record, 'text', "")
+                    all_text += txt
+                    clean = re.sub(r'[!\?！?。\n\s]+$', '', txt)
+                    if len(clean) >= 2:
+                        end = clean[-3:]; 
+                        if re.search(r'[ぁ-んーwWｗＷ]$', end): ends_list.append(end)
+                    
+                    posts_data.append({
+                        'text': txt, 'likes': getattr(p, 'like_count', 0),
+                        'reposts': getattr(p, 'repost_count', 0),
+                        'created_at': pd.to_datetime(getattr(p.record, 'created_at')) + timedelta(hours=9),
+                        'score': getattr(p, 'like_count', 0) + getattr(p, 'repost_count', 0)
+                    })
                 
-                if getattr(feed_view, 'reply', None) and feed_view.reply.parent:
-                    parent_post = feed_view.reply.parent
-                    if isinstance(parent_post, PostView):
-                        u_parent = parent_post.author.handle
-                        interaction_pairs.append((u_author, u_parent))
-                        if u_author == target_handle and u_parent != target_handle:
-                            reply_users_list.append(u_parent)
+                # 交流の解析
+                u_auth = p.author.handle
+                if f.reason: interaction_pairs.append((target_handle, u_auth))
+                
+                # リプライ先の安全な確認
+                if getattr(f, 'reply', None) and f.reply.parent:
+                    parent = f.reply.parent
+                    # リプライ先が削除されていないか確認
+                    if isinstance(parent, PostView):
+                        u_parent = parent.author.handle
+                        interaction_pairs.append((u_auth, u_parent))
+                        if u_auth == target_handle: reply_users.append(u_parent)
 
             cursor = response.cursor
-            progress((i + 1) / max_iterations)
+            progress((i+1)/max_iterations, desc="データを解析中...")
             if not cursor: break
 
-        if not posts_data: return "データなし", "", "", None, None, None, "失敗"
-
-        df = pd.DataFrame(posts_data)
-        # --- 重複ポストの排除 ---
-        df = df.drop_duplicates(subset=['text']).reset_index(drop=True)
-        
-        first_post_date = df['created_at'].min().strftime('%Y/%m/%d')
-        total_posts = getattr(profile, 'posts_count', 0)
-
-        stats_html = f"""
-        <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'>{total_posts}</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>
+        if not posts_data: return "有効なポストが見つかりませんでした。", None, None, "失敗"
+
+        df = pd.DataFrame(posts_data).drop_duplicates(subset=['text']).reset_index(drop=True)
+        kanjis = re.findall(r'[一-龠]', all_text)
+        rep_kanji = Counter(kanjis).most_common(1)[0][0] if kanjis else "魂"
+
+        # HTML構成（レスポンシブ）
+        html = f"""
+        <div class="dashboard-container">
+            <div class="card kanji-card">
+                <small>象徴する一文字</small><div class="kanji-value">{rep_kanji}</div>
+                <div class="stats-subgrid">
+                    <div class="stat-item"><small>総投稿</small><br><span class="stat-num">{total_posts_count}</span></div>
+                    <div class="stat-item"><small>解析数</small><br><span class="stat-num">{len(df)}</span></div>
+                </div>
+            </div>
+            <div class="card">
+                <div class="rank-section"><div class="rank-header">👥 主な交流相手</div>
+                {"".join([f"<div class='rank-entry'><span>{n}</span><b>{c}回</b></div>" for n,c in Counter(reply_users).most_common(3)])}</div>
+                <div class="rank-section"><div class="rank-header">🗣️ 特徴的な語尾</div>
+                {"".join([f"<div class='rank-entry'><span>{n}</span><b>{c}回</b></div>" for n,c in Counter(ends_list).most_common(3)])}</div>
+            </div>
+            <div class="card" style="grid-column: 1 / -1;"><div class="rank-header">🏆 ベストポスト</div>
         """
-        
-        def rank_box_styled(title, items, icon=""):
-            top = Counter(items).most_common(3)
-            res = f"<div class='rank-card'><div class='rank-header'>{icon} {title}</div>"
-            if top:
-                for n, c in top:
-                    info = get_profile_info(client, n) if "@" not in str(n) and "." in str(n) else None
-                    avatar_html = f"<img src='{info['avatar']}' class='rank-avatar'>" if info else ""
-                    res += f"<div class='rank-item'>{avatar_html} <b>{n}</b> <span style='margin-left:auto; color:#666;'>{c}回</span></div>"
-            else:
-                res += "<div style='color:#ccc;'>未検出</div>"
-            res += "</div>"
-            return res
+        for _, r in df.sort_values('score', ascending=False).head(3).iterrows():
+            html += f"<div class='best-post-item'>{r['text']}<div class='post-meta'>❤️ {r['likes']} 🔄 {r['reposts']} — {r['created_at'].strftime('%Y/%m/%d')}</div></div>"
+        html += "</div></div>"
 
-        rank_html = f"""
-        <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>
-        """
+        # グラフ生成
+        df_counts = df.set_index('created_at').resample(freq_map := {"日ごと": "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="投稿頻度")
         
-        top_posts = df.sort_values('score', ascending=False).head(3)
-        posts_html = "<div class='rank-card'><div class='rank-header'>🏆 ベストポスト</div>"
-        for _, row in top_posts.iterrows():
-            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'], 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, x=list(range(24)), y=heat_pt.index, color_continuous_scale='Blues', title="時間帯別アクティビティ")
-
-        # --- 相関図の修正 ---
-        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)]
-        nodes = list(set([target_handle] + top_10))
-        RELATIONSHIPS = ["家族", "恋人", "相棒", "ライバル", "師匠", "弟子", "癒やし", "腐れ縁", "憧れ", "守護霊"]
-        
-        # 各ノードにランダムな関係性を割り当て
-        node_labels = {}
-        for n in nodes:
-            rel = random.choice(RELATIONSHIPS) if n != target_handle else "（本人）"
-            node_labels[n] = f"<b>{n}</b><br>{rel}"
-
+        # 相関図
+        top_users = [u for u, c in Counter([p for pair in interaction_pairs for p in pair if p != target_handle]).most_common(10)]
+        nodes = list(set([target_handle] + top_users))
+        RELATIONSHIPS = ["運命の人", "相棒", "ライバル", "師匠", "���子", "癒やし", "犬猿の仲", "腐れ縁", "守護霊"]
         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=2.0, seed=42)
+        for u1, u2 in interaction_pairs:
+            if u1 in nodes and u2 in nodes and u1 != u2: G.add_edge(u1, u2)
+        pos = nx.spring_layout(G, k=1.5, seed=42)
         fig_net = go.Figure()
-
-        # エッジの描画
         for edge in G.edges():
-            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=1.5), 
-                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.18, sizey=0.18, 
-                    xanchor="center", yanchor="middle", layer="above"
-                ))
-        
-        # --- ラベルを確実に表示するための修正 ---
-        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', # markersも有効化
-            marker=dict(size=25, color='rgba(0,0,0,0)'), # 透明なマーカーで当たり判定を確保
-            text=[node_labels[n] for n in G.nodes()], 
-            textposition="bottom center", # 画像の下に配置
-            textfont=dict(color="black", size=12),
-            hoverinfo='text'
-        ))
-        
-        fig_net.update_layout(
-            images=node_images, 
-            showlegend=False, 
-            plot_bgcolor='white', 
-            height=700,
-            xaxis=dict(visible=False, range=[-1.5, 1.5]), 
-            yaxis=dict(visible=False, range=[-1.5, 1.5]),
-            margin=dict(l=0, r=0, t=40, b=0)
-        )
+            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=1), hoverinfo='none'))
+        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=[f"<b>{n}</b><br>{random.choice(RELATIONSHIPS) if n != target_handle else '（本人）'}" for n in nodes], 
+                                    textposition="bottom center", marker=dict(size=12, color='#0085ff'), textfont=dict(size=11)))
+        fig_net.update_layout(showlegend=False, xaxis=dict(visible=False), yaxis=dict(visible=False), margin=dict(l=0, r=0, t=40, b=0), plot_bgcolor='white', height=500)
 
-        return stats_html, rank_html, posts_html, fig_bar, fig_heat, fig_net, "解析完了しました！"
-        
+        return html, fig_bar, fig_net, "解析完了！"
     except Exception as e:
-        import traceback
-        print(traceback.format_exc())
-        return f"エラー: {str(e)}", "", "", None, None, None, "失敗"
+        return f"エラーが発生しました: {str(e)}", None, None, "失敗"
 
-# --- UI (そのまま) ---
-with gr.Blocks(css=CUSTOM_CSS, title="Bluesky Analysis Dashboard") as demo:
-    gr.Markdown("# <p style='text-align:center; color:#0085ff;'>🦋 Bluesky Ultimate Dashboard</p>")
-    
+with gr.Blocks(css=CUSTOM_CSS, title="Bluesky Analysis") as demo:
+    gr.Markdown("# <p style='text-align:center; color:#0085ff;'>🦋 Bluesky Analysis Dashboard</p>")
     with gr.Row():
-        with gr.Column(scale=1):
-            with gr.Group():
-                my_id = gr.Textbox(label="自分のハンドル", placeholder="user.bsky.social")
-                my_pw = gr.Textbox(label="アプリパスワード", type="password")
-                target_id = gr.Textbox(label="解析対象のハンドル")
-                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.Column():
+            m_id = gr.Textbox(label="自分のハンドル", placeholder="user.bsky.social")
+            m_pw = gr.Textbox(label="アプリパスワード", type="password")
+            t_id = gr.Textbox(label="解析したい相手")
+            frq = gr.Radio(["日ごと", "週ごと", "月ごと"], label="グラフ単位", value="日ごと")
+            btn = gr.Button("解析���開始", variant="primary")
+            st = gr.Markdown("準備完了")
+    
+    out_h = gr.HTML()
     with gr.Tabs():
-        with gr.TabItem("📊 活動データ"):
-            with gr.Row():
-                out_bar = gr.Plot()
-                out_heat = gr.Plot()
-        with gr.TabItem("🤝 マップ"):
-            out_net = gr.Plot()
+        with gr.TabItem("📊 活動"): out_b = gr.Plot()
+        with gr.TabItem("🤝 相関図"): out_n = 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])
+    btn.click(analyze_and_output, inputs=[m_id, m_pw, t_id, frq], outputs=[out_h, out_b, out_n, st])
 
-if __name__ == "__main__":
-    demo.launch()
+demo.launch()