Update app.py

app.py

@@ -8,78 +8,87 @@ from collections import Counter
 
 def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
     try:
-        # --- 1. ログインと初期設定 ---
         client = Client()
         my_id = my_id.replace('@', '').strip()
         target_handle = target_id.replace('@', '').strip()
         client.login(my_id, my_pw.strip())
         
         profile = client.get_profile(actor=target_handle)
-        total_count_on_profile = profile.posts_count
         
         posts_data = []
         hashtags = []
-        interactions = []
-        cursor = None
+        reply_users = []    # メンション・リプライ
+        repost_users = []   # リポストした相手
+        like_users = []     # いいねした相手
+        
         max_limit = 1000 
-
-        # --- 2. データ取得ループ ---
-        progress(0, desc="Blueskyからデータを取得中...")
         
+        # --- 1. 投稿フィードの分析 (リプライ・リポスト) ---
+        progress(0, desc="フィードを取得中...")
+        cursor = None
         while len(posts_data) < max_limit:
             response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
-            
             for feed_view in response.feed:
-                if not hasattr(feed_view.post, 'author') or feed_view.post is None:
-                    continue
+                # リポストの分析
+                if feed_view.reason and hasattr(feed_view.reason, 'by'):
+                    # 自分がリポストした投稿の、元の投稿者
+                    orig_author = feed_view.post.author.handle
+                    if orig_author != target_handle:
+                        repost_users.append(orig_author)
+                    continue # リポスト自体は本文解析から除外
 
                 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}"
                     
-                    # スコア計算 (いいね + リポスト)
-                    engagement_score = post.like_count + post.repost_count
-
                     posts_data.append({
                         'text': post.record.text,
                         'created_at': pd.to_datetime(post.record.created_at),
                         'likes': post.like_count,
                         'reposts': post.repost_count,
-                        'score': engagement_score,
+                        'score': post.like_count + post.repost_count,
                         'url': post_url
                     })
 
-                    # タグとインタラクション
                     hashtags.extend(re.findall(r'#(\w+)', post.record.text))
+                    
+                    # リプライ・メンション相手
                     if feed_view.reply and feed_view.reply.parent:
-                        parent = feed_view.reply.parent
-                        if hasattr(parent, 'author') and parent.author:
-                            if parent.author.handle != target_handle:
-                                interactions.append(parent.author.handle)
+                        if hasattr(feed_view.reply.parent, 'author'):
+                            parent_author = feed_view.reply.parent.author.handle
+                            if parent_author != target_handle:
+                                reply_users.append(parent_author)
 
-            progress(min(len(posts_data) / max_limit, 0.95), desc=f"{len(posts_data)}件取得済み...")
-            
             cursor = response.cursor
             if not cursor or len(posts_data) >= max_limit: break
-            time.sleep(0.1)
-
-        if not posts_data:
-            return "有効な投稿が見つかりませんでした", "", "", "終了"
-
-        # --- 3. 解析処理 ---
-        progress(0.95, desc="解析レポートを作成中...")
+            progress(len(posts_data)/max_limit * 0.5, desc=f"フィード解析中...")
+
+        # --- 2. いいね一覧の分析 ---
+        progress(0.6, desc="いいねした相手を分析中...")
+        like_cursor = None
+        # いいねは直近200件程度をサンプルとして取得（API負荷考慮）
+        for _ in range(2): 
+            likes_resp = client.get_actor_likes(actor=profile.did, limit=100, cursor=like_cursor)
+            for like_item in likes_resp.feed:
+                if like_item.post and like_item.post.author:
+                    l_author = like_item.post.author.handle
+                    if l_author != target_handle:
+                        like_users.append(l_author)
+            like_cursor = likes_resp.cursor
+            if not like_cursor: break
+
+        if not posts_data: return "データなし", "", "", "終了"
+
+        # --- 3. HTML作成 ---
         df = pd.DataFrame(posts_data)
-        
-        # スタッツ計算
         first_post = df.iloc[-1]
         days_active = max((datetime.now().replace(tzinfo=None) - first_post['created_at'].replace(tzinfo=None)).days, 1)
 
-        # HTML: 基本スタッツ
         stats_html = f"""
         <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; 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='color: #1565c0; font-size: 0.8em;'>総ポスト</div><div style='font-size: 1.5em; font-weight: bold;'>{profile.posts_count}</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>
@@ -90,62 +99,34 @@ def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
         </div>
         """
 
-        # HTML: ランキング (タグ上位3つ)
-        tag_counts = Counter(hashtags).most_common(3)
-        user_counts = Counter(interactions).most_common(5)
-        
-        rank_html = "<h4>#️⃣ よく使うタグ (Top 3)</h4><div style='display: flex; flex-wrap: wrap; gap: 5px; margin-bottom: 15px;'>"
-        rank_html += "".join([f"<span style='background: #eee; padding: 4px 10px; border-radius: 15px; font-size: 0.8em;'>#{t} ({c})</span>" for t, c in tag_counts]) or "なし"
-        rank_html += "</div><h4>🤝 よく交流する相手</h4>"
-        rank_html += "".join([f"<div style='font-size: 0.9em;'>@{u} ({c}回)</div>" for u, c in user_counts]) or "なし"
-
-        # HTML: 初投稿 & ベストポスト Top 3
-        top_3_posts = df.sort_values('score', ascending=False).head(3)
-        
-        posts_html = f"""
-        <div style='background: #e8f5e9; padding: 12px; border-radius: 8px; margin-bottom: 20px; border-left: 5px solid #4caf50;'>
-            <small style='color: #2e7d32; font-weight: bold;'>🌱 取得範囲内の初投稿 ({first_post['created_at'].strftime('%Y/%m/%d')})</small>
-            <p style='font-size: 0.9em; margin: 5px 0;'>{first_post['text']}</p>
-            <a href='{first_post['url']}' target='_blank' style='font-size: 0.8em; color: #4caf50;'>投稿を見る</a>
+        # ランキングHTML
+        def make_rank_list(title, icon, counter_list):
+            html = f"<b>{icon} {title}</b><div style='font-size: 0.85em; color: #444; margin: 5px 0 15px 0;'>"
+            if not counter_list: return html + "データなし</div>"
+            for name, count in Counter(counter_list).most_common(3):
+                html += f"<div>@{name} ({count}回)</div>"
+            return html + "</div>"
+
+        rank_html = f"""
+        <div style='background: #fafafa; padding: 15px; border-radius: 10px; border: 1px solid #eee;'>
+            {make_rank_list("よくリプライする相手", "💬", reply_users)}
+            {make_rank_list("よくリポストする相手", "🔄", repost_users)}
+            {make_rank_list("よくいいねする相手", "❤️", like_users)}
+            <b>#️⃣ よく使うタグ</b><div style='display: flex; flex-wrap: wrap; gap: 5px; margin-top: 5px;'>
+            {"".join([f"<span style='background: #eee; padding: 3px 8px; border-radius: 10px; font-size: 0.75em;'>#{t}</span>" for t, _ in Counter(hashtags).most_common(3)]) or "なし"}
+            </div>
         </div>
-        <h4 style='margin-bottom: 10px; color: #ff4081;'>🏆 ベストポスト Top 3</h4>
         """
-        
-        for i, (_, row) in enumerate(top_3_posts.iterrows(), 1):
-            posts_html += f"""
-            <div style='background: #fff; padding: 12px; border-radius: 8px; margin-bottom: 10px; border: 1px solid #ffc107; position: relative;'>
-                <span style='position: absolute; top: 10px; right: 10px; font-size: 0.75em; color: #666;'>❤️ {row['likes']}  🔄 {row['reposts']}</span>
-                <small style='font-weight: bold; color: #ffb300;'>第{i}位</small>
-                <p style='font-size: 0.9em; margin: 5px 0; padding-right: 60px;'>{row['text'][:100]}{'...' if len(row['text']) > 100 else ''}</p>
-                <a href='{row['url']}' target='_blank' style='font-size: 0.8em; color: #ff4081;'>投稿を見る</a>
-            </div>
-            """
-
-        progress(1.0, desc="完了！")
-        return stats_html, rank_html, posts_html, "解析が完了しました！"
 
-    except Exception as e:
-        return f"エラー: {str(e)}", "", "", "失敗しました"
+        # ベストポスト等 (前回同様)
+        top_3 = df.sort_values('score', ascending=False).head(3)
+        posts_html = f"<h4>🌱 初投稿 ({first_post['created_at'].strftime('%Y/%m/%d')})</h4><p style='font-size: 0.9em; background:#f9f9f9; padding:10px; border-radius:5px;'>{first_post['text']}</p><h4 style='color: #ff4081;'>🏆 ベストポスト Top 3</h4>"
+        for i, (_, row) in enumerate(top_3.iterrows(), 1):
+            posts_html += f"<div style='border: 1px solid #ffc107; padding: 10px; margin-bottom: 8px; border-radius: 8px; font-size: 0.9em;'><b>第{i}位</b> (❤️{row['likes']} 🔄{row['reposts']})<br>{row['text'][:80]}...<br><a href='{row['url']}' target='_blank' style='color:#ff4081;'>投稿を見る</a></div>"
 
-# --- 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="自分のハンドル", placeholder="example.bsky.social")
-            in_pw = gr.Textbox(label="アプリパスワード", type="password")
-            in_target = gr.Textbox(label="解析したいID")
-            btn = gr.Button("分析を開始", variant="primary")
-            status = gr.Textbox(label="ステータス", interactive=False)
-        with gr.Column(scale=2):
-            out_stats = gr.HTML()
-            out_rank = gr.HTML()
-            out_posts = gr.HTML()
+        return stats_html, rank_html, posts_html, "解析完了！"
 
-    btn.click(
-        fn=analyze_and_output, 
-        inputs=[in_id, in_pw, in_target], 
-        outputs=[out_stats, out_rank, out_posts, status]
-    )
+    except Exception as e:
+        return f"エラー: {str(e)}", "", "", "失敗"
 
-demo.launch()
+# (Gradio UI部分は変更なし)