Update app.py

app.py

@@ -3,6 +3,8 @@ import pandas as pd
 from atproto import Client
 import time
 from datetime import datetime
+import re
+from collections import Counter
 
 def fetch_all_posts(my_id, my_pw, target_id, progress=gr.Progress()):
     try:
@@ -15,8 +17,10 @@ def fetch_all_posts(my_id, my_pw, target_id, progress=gr.Progress()):
         total_count_on_profile = profile.posts_count
         
         posts = []
+        hashtags = []
+        interactions = []
         cursor = None
-        max_limit = 1000  # 必要に応じて増やせますが、まずは1000件で安定動作を確認
+        max_limit = 10000
 
         progress(0, desc="データ取得を開始します...")
         
@@ -25,124 +29,126 @@ def fetch_all_posts(my_id, my_pw, target_id, progress=gr.Progress()):
             
             for feed_view in response.feed:
                 post = feed_view.post
+                
+                # 本人の投稿のみを対象
                 if post.author.handle == target_handle:
                     rkey = post.uri.split('/')[-1]
                     post_url = f"https://bsky.app/profile/{target_handle}/post/{rkey}"
                     
-                    has_image = 1 if post.embed and hasattr(post.embed, 'images') else 0
-                    has_link = 1 if hasattr(post.record, 'facets') and post.record.facets else 0
-
+                    # 1. 基本データ
                     posts.append({
                         'text': post.record.text,
                         'created_at': pd.to_datetime(post.record.created_at),
                         'likes': post.like_count,
                         'reposts': post.repost_count,
-                        'url': post_url,
-                        'has_image': has_image,
-                        'has_link': has_link
+                        'url': post_url
                     })
-            
-            progress(min(len(posts) / max_limit, 0.95), desc=f"{len(posts)}件取得中...")
+
+                    # 2. ハッシュタグ抽出 (facets または テキストから)
+                    tags = re.findall(r'#(\w+)', post.record.text)
+                    hashtags.extend(tags)
+
+                    # 3. メンション・リプライ相手の抽出
+                    # リプライ
+                    if feed_view.reply and feed_view.reply.parent:
+                        parent_author = feed_view.reply.parent.author.handle
+                        if parent_author != target_handle:
+                            interactions.append(parent_author)
+                    
+                    # メンション (facetsから)
+                    if post.record.facets:
+                        for facet in post.record.facets:
+                            for feature in facet.features:
+                                if hasattr(feature, 'did'):
+                                    # DIDからハンドル名を取得するのは重いため、一旦カウント用
+                                    # ※ここでは簡易化のためリプライ相手を主軸にします
+                                    pass
+
+            progress(min(len(posts) / max_limit, 0.95), desc=f"{len(posts)}件分析中...")
             cursor = response.cursor
-            if not cursor: break
+            if not cursor or len(posts) >= max_limit: break
             time.sleep(0.1)
 
-        if not posts:
-            return "投稿が見つかりませんでした", "", "", "データなし"
+        if not posts: return "投稿なし", "", "", "終了"
 
         df = pd.DataFrame(posts)
         
-        # --- 1. 基本スタッツと経過日数計算 ---
-        # 取得した中で一番古い投稿（リストの最後）を「初投稿」とする
-        first_post_obj = df.iloc[-1]
-        first_date = first_post_obj['created_at']
-        days_active = (datetime.now().replace(tzinfo=None) - first_date.replace(tzinfo=None)).days
-        days_active = max(days_active, 1) # 0日回避
-        avg_freq = len(df) / days_active
-
+        # --- 統計計算 ---
+        first_post = df.iloc[-1]
+        days_active = max((datetime.now().replace(tzinfo=None) - first_post['created_at'].replace(tzinfo=None)).days, 1)
+        
+        # --- A. 基本スタッツ (HTML) ---
         stats_html = f"""
-        <div style='display: grid; grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); gap: 10px; margin-bottom: 20px;'>
-            <div style='background: #e3f2fd; padding: 15px; border-radius: 10px; text-align: center; border: 1px solid #90caf9;'>
-                <div style='color: #1565c0; font-size: 0.8em;'>総投稿数</div>
-                <div style='font-size: 1.5em; font-weight: bold;'>{total_count_on_profile}</div>
+        <div style='display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px; margin-bottom: 20px;'>
+            <div style='background: #e3f2fd; padding: 15px; border-radius: 10px; text-align: center;'>
+                <div style='color: #1565c0; font-size: 0.8em;'>総ポスト</div><div style='font-size: 1.5em; font-weight: bold;'>{total_count_on_profile}</div>
             </div>
-            <div style='background: #f1f8e9; padding: 15px; border-radius: 10px; text-align: center; border: 1px solid #c5e1a5;'>
-                <div style='color: #33691e; font-size: 0.8em;'>アカウント経過</div>
-                <div style='font-size: 1.5em; font-weight: bold;'>{days_active}日</div>
+            <div style='background: #f1f8e9; padding: 15px; border-radius: 10px; text-align: center;'>
+                <div style='color: #33691e; font-size: 0.8em;'>継続日数</div><div style='font-size: 1.5em; font-weight: bold;'>{days_active}日</div>
             </div>
-            <div style='background: #fff3e0; padding: 15px; border-radius: 10px; text-align: center; border: 1px solid #ffcc80;'>
-                <div style='color: #e65100; font-size: 0.8em;'>平均投稿頻度</div>
-                <div style='font-size: 1.5em; font-weight: bold;'>{avg_freq:.2f} <span style='font-size: 0.5em;'>回/日</span></div>
+            <div style='background: #fff3e0; padding: 15px; border-radius: 10px; text-align: center;'>
+                <div style='color: #e65100; font-size: 0.8em;'>1日平均</div><div style='font-size: 1.5em; font-weight: bold;'>{len(df)/days_active:.2f}</div>
             </div>
         </div>
         """
 
-        # --- 2. 記念すべき初投稿 (分析範囲内) ---
-        first_post_html = f"""
-        <div style='background: #ffffff; border: 2px solid #0085ff; padding: 15px; border-radius: 12px; margin-bottom: 20px;'>
-            <div style='color: #0085ff; font-weight: bold; font-size: 0.9em; margin-bottom: 5px;'>🌱 記念すべき初投稿 ({first_date.strftime('%Y/%m/%d')})</div>
-            <p style='margin: 5px 0; font-size: 1em; line-height: 1.4;'>{first_post_obj['text']}</p>
-            <a href='{first_post_obj['url']}' target='_blank' style='color: #0085ff; text-decoration: none; font-size: 0.9em;'>🔗 当時の投稿を開く</a>
-        </div>
-        """
+        # --- B. ハッシュタグランキング ---
+        tag_counts = Counter(hashtags).most_common(5)
+        tag_html = "<h4>#️⃣ よく使うタグ</h4><div style='display: flex; flex-wrap: wrap; gap: 5px; margin-bottom: 20px;'>"
+        if tag_counts:
+            for tag, count in tag_counts:
+                tag_html += f"<span style='background: #eee; padding: 4px 10px; border-radius: 15px; font-size: 0.9em;'>#{tag} ({count})</span>"
+        else:
+            tag_html += "<span style='color: #999;'>なし</span>"
+        tag_html += "</div>"
 
-        # --- 3. コンテンツ割合 ---
-        img_ratio = (df['has_image'].sum() / len(df)) * 100
-        link_ratio = (df['has_link'].sum() / len(df)) * 100
-        content_html = f"""
-        <div style='display: flex; gap: 10px; margin-bottom: 20px;'>
-            <div style='flex: 1; background: #fafafa; padding: 10px; border-radius: 8px; border: 1px solid #eee; text-align: center;'>
-                <div style='font-size: 0.8em; color: #666;'>画像投稿率: {img_ratio:.1f}%</div>
-            </div>
-            <div style='flex: 1; background: #fafafa; padding: 10px; border-radius: 8px; border: 1px solid #eee; text-align: center;'>
-                <div style='font-size: 0.8em; color: #666;'>リンク共有率: {link_ratio:.1f}%</div>
-            </div>
+        # --- C. 仲良しユーザーランキング ---
+        user_counts = Counter(interactions).most_common(5)
+        user_html = "<h4>🤝 よく交流する相手</h4><div style='margin-bottom: 20px;'>"
+        if user_counts:
+            for user, count in user_counts:
+                user_html += f"<div style='font-size: 0.9em; margin-bottom: 3px;'>@{user} <span style='color: #666;'>({count}回)</span></div>"
+        else:
+            user_html += "<div style='color: #999;'>なし</div>"
+        user_html += "</div>"
+
+        # --- D. 初投稿 & ベストポスト ---
+        top_post = df.sort_values('likes', ascending=False).iloc[0]
+        
+        main_content_html = f"""
+        <div style='background: #fff; border: 1px solid #0085ff; padding: 15px; border-radius: 12px; margin-bottom: 15px;'>
+            <div style='color: #0085ff; font-weight: bold;'>🌱 分析範囲内の最古ポスト</div>
+            <p style='font-size: 0.9em;'>{first_post['text']}</p>
+            <a href='{first_post['url']}' target='_blank' style='font-size: 0.8em;'>🔗 投稿を見る</a>
+        </div>
+        <div style='background: #fff; border: 1px solid #ff4081; padding: 15px; border-radius: 12px;'>
+            <div style='color: #ff4081; font-weight: bold;'>🏆 最大いいねポスト</div>
+            <p style='font-size: 0.9em;'>{top_post['text']}</p>
+            <span style='font-size: 0.8em; color: #666;'>❤️ {top_post['likes']}</span> | 
+            <a href='{top_post['url']}' target='_blank' style='font-size: 0.8em;'>🔗 投稿を見る</a>
         </div>
         """
 
-        # --- 4. ベストポスト Top 3 ---
-        df['score'] = df['likes'] + df['reposts']
-        top_posts = df.sort_values(by='score', ascending=False).head(3)
-        best_posts_html = "<h3>🏆 ベストポスト Top 3</h3>"
-        for i, (_, row) in enumerate(top_posts.iterrows(), 1):
-            truncated_text = (row['text'][:80] + '...') if len(row['text']) > 80 else row['text']
-            best_posts_html += f"""
-            <div style='border: 1px solid #ddd; padding: 12px; border-radius: 8px; margin-bottom: 10px; background: #fff;'>
-                <div style='display: flex; justify-content: space-between; align-items: center;'>
-                    <span style='background: #ffd700; padding: 2px 8px; border-radius: 4px; font-weight: bold;'>第{i}位</span>
-                    <span style='color: #666; font-size: 0.8em;'>❤️ {row['likes']}  🔄 {row['reposts']}</span>
-                </div>
-                <p style='margin: 8px 0; font-size: 0.9em; color: #333;'>{truncated_text}</p>
-                <a href='{row['url']}' target='_blank' style='color: #0085ff; text-decoration: none; font-size: 0.8em;'>🔗 投稿を見る</a>
-            </div>
-            """
-
-        return stats_html, first_post_html, content_html + best_posts_html, "解析完了！"
+        return stats_html, tag_html + user_html, main_content_html, "解析完了！"
 
     except Exception as e:
-        return f"<div style='color: red;'>エラー: {str(e)}</div>", "", "", "エラー発生"
+        return f"エラー: {str(e)}", "", "", "失敗"
 
-# --- UI構成 ---
-with gr.Blocks(css=".gradio-container {background-color: #f9f9f9}") as demo:
-    gr.Markdown("# 🦋 Bluesky 自己分析ダッシュボード")
-    
+# --- UI ---
+with gr.Blocks(title="Bluesky Summary") as demo:
+    gr.Markdown("# 🦋 Bluesky 自己分析くん")
     with gr.Row():
         with gr.Column(scale=1):
-            in_id = gr.Textbox(label="自分のID (example.bsky.social)")
+            in_id = gr.Textbox(label="自分のハンドル", placeholder="example.bsky.social")
             in_pw = gr.Textbox(label="アプリパスワード", type="password")
-            in_target = gr.Textbox(label="解析対象のID")
-            btn = gr.Button("分析を実行", variant="primary")
-            out_status = gr.Textbox(label="ステータス")
-            
+            in_target = gr.Textbox(label="解析したいID")
+            btn = gr.Button("分析開始", variant="primary")
+            status = gr.Textbox(label="状況")
         with gr.Column(scale=2):
-            out_stats = gr.HTML()      # 基本スタッツ（3列カード）
-            out_first = gr.HTML()      # 初投稿ハイライト
-            out_main = gr.HTML()       # コンテンツ割合 + ベストポスト
+            out_stats = gr.HTML() # 基本数字
+            out_rank = gr.HTML()  # タグ・ユーザー
+            out_posts = gr.HTML() # 注目ポスト
 
-    btn.click(
-        fn=fetch_all_posts,
-        inputs=[in_id, in_pw, in_target],
-        outputs=[out_stats, out_first, out_main, out_status]
-    )
+    btn.click(fn=fetch_all_posts, inputs=[in_id, in_pw, in_target], outputs=[out_stats, out_rank, out_posts, status])
 
 demo.launch()