Update app.py

app.py

@@ -8,6 +8,7 @@ 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()
@@ -21,35 +22,39 @@ def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
         repost_users = []   
         like_users = []     
         
-        max_limit = 1000 
+        max_limit = 500 
         
-        # --- 1. 投稿フィードの分析 ---
+        # --- 2. 投稿フィードの分析 ---
         progress(0, desc="フィードを取得中...")
         cursor = None
-        while len(posts_data) < max_limit:
-            response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
+        
+        for _ in range(10): 
+            try:
+                response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
+            except Exception:
+                break
+
+            if not response or not hasattr(response, 'feed') or not response.feed:
+                break
+
             for feed_view in response.feed:
-                # 投稿と著者の存在チェック
-                if not feed_view.post or not hasattr(feed_view.post, 'author') or not feed_view.post.author:
-                    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)
+                if not getattr(feed_view, 'post', None): continue
+                post = feed_view.post
+
+                # リポスト分析
+                if feed_view.reason:
+                    if hasattr(post, 'author') and post.author:
+                        if post.author.handle != target_handle:
+                            repost_users.append(post.author.handle)
                     continue 
 
-                post = feed_view.post
-                if post.author.handle == target_handle:
-                    # recordの存在チェック
-                    if not hasattr(post, 'record') or post.record is None:
-                        continue
-                        
+                # 本人投稿分析
+                if hasattr(post, 'author') and post.author and post.author.handle == target_handle:
+                    if not hasattr(post, 'record'): continue
+                    
                     rkey = post.uri.split('/')[-1]
                     post_url = f"https://bsky.app/profile/{target_handle}/post/{rkey}"
                     
-                    # 各種カウント（None対策）
                     likes = getattr(post, 'like_count', 0) or 0
                     reposts = getattr(post, 'repost_count', 0) or 0
                     created_at_raw = getattr(post.record, 'created_at', None)
@@ -64,49 +69,43 @@ def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
                             'score': likes + reposts,
                             'url': post_url
                         })
-
                         if text:
                             hashtags.extend(re.findall(r'#(\w+)', text))
                     
                     # リプライ相手
-                    if feed_view.reply and feed_view.reply.parent:
+                    if getattr(feed_view, 'reply', None) and feed_view.reply.parent:
                         parent = feed_view.reply.parent
                         if hasattr(parent, 'author') and parent.author:
                             p_handle = parent.author.handle
                             if p_handle != target_handle:
                                 reply_users.append(p_handle)
 
-            cursor = response.cursor
+            cursor = getattr(response, 'cursor', None)
             if not cursor or len(posts_data) >= max_limit: break
             progress(min(len(posts_data)/max_limit * 0.5, 0.5), desc=f"{len(posts_data)}件取得中...")
 
-        # --- 2. いいね一覧の分析 ---
+        # --- 3. いいね一覧の分析 ---
         progress(0.6, desc="いいねを分析中...")
-        like_cursor = None
         try:
-            for _ in range(2): 
-                likes_resp = client.get_actor_likes(actor=profile.did, limit=100, cursor=like_cursor)
+            likes_resp = client.get_actor_likes(actor=profile.did, limit=50)
+            if likes_resp and hasattr(likes_resp, 'feed'):
                 for like_item in likes_resp.feed:
                     if like_item.post and hasattr(like_item.post, 'author') and like_item.post.author:
                         l_handle = like_item.post.author.handle
                         if l_handle != target_handle:
                             like_users.append(l_handle)
-                like_cursor = likes_resp.cursor
-                if not like_cursor: break
-        except Exception:
-            pass # いいねが取得できなくても続行
+        except:
+            pass 
 
-        if not posts_data: 
-            return "有効な投稿データが1件も見つかりませんでした。", "", "", "完了（データなし）"
+        # --- 4. 解析とHTML作成 ---
+        if not posts_data:
+            return "有効なデータが見つかりませんでした。", "", "", "完了（データ不足）"
 
-        # --- 3. 解析とHTML作成 ---
         df = pd.DataFrame(posts_data)
         df = df.sort_values('created_at', ascending=True)
-        first_post = df.iloc[0]
         
-        # 継続日数の計算
-        delta = datetime.now().replace(tzinfo=None) - first_post['created_at'].replace(tzinfo=None)
-        days_active = max(delta.days, 1)
+        first_post_time = df.iloc[0]['created_at'].replace(tzinfo=None)
+        days_active = max((datetime.now().replace(tzinfo=None) - first_post_time).days, 1)
 
         stats_html = f"""
         <div style='display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px; margin-bottom: 20px;'>
@@ -141,29 +140,42 @@ def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
         </div>
         """
 
-        # ベストポスト Top 3
         top_3 = df.sort_values('score', ascending=False).head(3)
-        posts_html = f"""
-        <div style='margin-bottom: 20px; padding: 12px; border-radius: 8px; background: #fff8e1; border: 1px solid #ffe082;'>
-            <small style='color: #ffa000; 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: #ff8f00;'>投稿をみる</a>
-        </div>
-        <h4 style='color: #d81b60; margin-bottom: 10px;'>🏆 ベストポスト Top 3</h4>
-        """
+        posts_html = f"<h4>🌱 初投稿 ({df.iloc[0]['created_at'].strftime('%Y/%m/%d')})</h4><p style='font-size: 0.9em; background:#f9f9f9; padding:10px; border-radius:5px;'>{df.iloc[0]['text']}</p><h4>🏆 ベストポスト Top 3</h4>"
+        
         for i, (_, row) in enumerate(top_3.iterrows(), 1):
             posts_html += f"""
-            <div style='border: 1px solid #f0f0f0; padding: 10px; margin-bottom: 10px; border-radius: 8px; background: white;'>
-                <div style='display: flex; justify-content: space-between;'>
-                    <b style='color: #ffb300;'>第{i}位</b>
-                    <span style='font-size: 0.8em; color: #999;'>❤️ {row['likes']}  🔄 {row['reposts']}</span>
-                </div>
-                <p style='font-size: 0.9em; margin: 8px 0;'>{row['text'][:100]}...</p>
-                <a href='{row['url']}' target='_blank' style='color: #d81b60; font-size: 0.85em;'>投稿をみる</a>
+            <div style='border: 1px solid #eee; padding: 10px; margin-bottom: 8px; border-radius: 8px; background: white;'>
+                <b>第{i}位</b> (❤️{row['likes']} 🔄{row['reposts']})<br>
+                <p style='margin:5px 0;'>{row['text'][:80]}...</p>
+                <a href='{row['url']}' target='_blank' style='color:#d81b60; font-size:0.8em;'>表示</a>
             </div>
             """
 
-        return stats_html, rank_html, posts_html, "すべての解析が完了しました！"
+        return stats_html, rank_html, posts_html, "解析が完了しました！"
 
     except Exception as e:
-        return f"実行エラー: {str(e)}", "", "", "解析に失敗しました"
+        return f"エラーが発生しました: {str(e)}", "", "", "失敗"
+
+# --- UI ---
+with gr.Blocks(title="Bluesky Analysis") 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()
+
+    btn.click(
+        fn=analyze_and_output, 
+        inputs=[in_id, in_pw, in_target], 
+        outputs=[out_stats, out_rank, out_posts, status]
+    )
+
+demo.launch()