Update app.py

app.py

@@ -29,77 +29,89 @@ def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
         while len(posts_data) < max_limit:
             response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
             for feed_view in response.feed:
-                # 安全策1: 投稿自体が存在するか
-                if not feed_view.post or not hasattr(feed_view.post, 'author'):
+                # 投稿と著者の存在チェック
+                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'):
-                    # 安全策2: リポスト元の投稿者が存在するか
-                    if hasattr(feed_view.post, 'author') and feed_view.post.author:
-                        orig_author = feed_view.post.author.handle
-                        if orig_author != target_handle:
-                            repost_users.append(orig_author)
+                    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:
+                    # recordの存在チェック
+                    if not hasattr(post, 'record') or post.record is None:
+                        continue
+                        
                     rkey = post.uri.split('/')[-1]
                     post_url = f"https://bsky.app/profile/{target_handle}/post/{rkey}"
                     
-                    posts_data.append({
-                        'text': post.record.text if hasattr(post.record, 'text') else "",
-                        'created_at': pd.to_datetime(post.record.created_at),
-                        'likes': post.like_count,
-                        'reposts': post.repost_count,
-                        'score': (post.like_count or 0) + (post.repost_count or 0),
-                        'url': post_url
-                    })
+                    # 各種カウント（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)
+                    text = getattr(post.record, 'text', "") or ""
 
-                    if hasattr(post.record, 'text'):
-                        hashtags.extend(re.findall(r'#(\w+)', post.record.text))
+                    if created_at_raw:
+                        posts_data.append({
+                            'text': text,
+                            'created_at': pd.to_datetime(created_at_raw),
+                            'likes': likes,
+                            'reposts': reposts,
+                            'score': likes + reposts,
+                            'url': post_url
+                        })
+
+                        if text:
+                            hashtags.extend(re.findall(r'#(\w+)', text))
                     
-                    # 安全策3: リプライ相手の存在チェック
+                    # リプライ相手
                     if feed_view.reply and feed_view.reply.parent:
                         parent = feed_view.reply.parent
                         if hasattr(parent, 'author') and parent.author:
-                            parent_author = parent.author.handle
-                            if parent_author != target_handle:
-                                reply_users.append(parent_author)
+                            p_handle = parent.author.handle
+                            if p_handle != target_handle:
+                                reply_users.append(p_handle)
 
             cursor = response.cursor
             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. いいね一覧の分析 ---
-        progress(0.6, desc="いいねした相手を分析中...")
+        progress(0.6, desc="いいねを分析中...")
         like_cursor = None
-        for _ in range(2): 
-            try:
+        try:
+            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:
-                    # 安全策4: いいね先の投稿者が存在するか
                     if like_item.post and hasattr(like_item.post, 'author') and like_item.post.author:
-                        l_author = like_item.post.author.handle
-                        if l_author != target_handle:
-                            like_users.append(l_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:
-                break # いいね取得でエラーが出ても止まらないようにする
+        except Exception:
+            pass # いいねが取得できなくても続行
 
-        if not posts_data: return "有効な投稿データが見つかりませんでした", "", "", "終了"
+        if not posts_data: 
+            return "有効な投稿データが1件も見つかりませんでした。", "", "", "完了（データなし）"
 
-        # --- 3. HTML作成 ---
+        # --- 3. 解析とHTML作成 ---
         df = pd.DataFrame(posts_data)
-        df = df.sort_values('created_at', ascending=True) # 古い順にして初投稿を確定
+        df = df.sort_values('created_at', ascending=True)
         first_post = df.iloc[0]
-        days_active = max((datetime.now().replace(tzinfo=None) - first_post['created_at'].replace(tzinfo=None)).days, 1)
+        
+        # 継続日数の計算
+        delta = datetime.now().replace(tzinfo=None) - first_post['created_at'].replace(tzinfo=None)
+        days_active = max(delta.days, 1)
 
         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;'>{profile.posts_count}</div>
+                <div style='color: #1565c0; font-size: 0.8em;'>総ポスト</div><div style='font-size: 1.5em; font-weight: bold;'>{getattr(profile, 'posts_count', 0)}</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>
@@ -111,9 +123,10 @@ def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
         """
 
         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;'>"
+            html = f"<b>{icon} {title}</b><div style='font-size: 0.85em; color: #444; margin: 5px 0 12px 0;'>"
             if not counter_list: return html + "データなし</div>"
-            for name, count in Counter(counter_list).most_common(3):
+            items = Counter(counter_list).most_common(3)
+            for name, count in items:
                 html += f"<div>@{name} ({count}回)</div>"
             return html + "</div>"
 
@@ -122,18 +135,35 @@ def analyze_and_output(my_id, my_pw, target_id, progress=gr.Progress()):
             {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;'>
+            <b>#️⃣ よく使うタグ</b><div style='display: flex; flex-wrap: wrap; gap: 5px; margin-top: 8px;'>
             {"".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>
         """
 
+        # ベストポスト Top 3
         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>"
+        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>
+        """
         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>"
+            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>
+            """
 
-        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)}", "", "", "解析に失敗しました"