Update app.py

app.py

@@ -17,26 +17,27 @@ def get_profile_info(client, did_or_handle):
             "avatar": profile.avatar if profile.avatar else "https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png",
             "handle": profile.handle
         }
-    except Exception: return None
+    except Exception:
+        return None
 
 def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress()):
     try:
         client = Client()
-        client.login(my_id.replace('@', '').strip(), my_pw.strip())
+        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)
         
         posts_data = []
-        interaction_pairs = []
-        
-        # 感情分析用の簡易辞書
-        pos_words = ["嬉しい", "楽しい", "最高", "ありがとう", "感謝", "好き", "わーい", "おめでとう", "楽しみ", "美味しい"]
-        neg_words = ["疲れた", "最悪", "悲しい", "辛い", "苦しい", "嫌い", "しんどい", "ムリ", "残念", "ひどい"]
-        sentiment_counts = {"Positive": 0, "Negative": 0, "Neutral": 0}
+        interaction_pairs = [] 
+
+        # 感情キーワード
+        pos_words = ["嬉しい", "楽しい", "最高", "ありがとう", "感謝", "好き", "わーい", "おめでとう", "楽しみ", "美味しい", "良き", "かな", "笑", "w"]
+        neg_words = ["疲れた", "最悪", "悲しい", "辛い", "苦しい", "嫌い", "しんどい", "ムリ", "残念", "ひどい", "鬱", "おこ", "死ぬ", "ため息"]
 
-        progress(0, desc="フィードを解析中...")
+        progress(0, desc="フィードを深層解析中...")
         cursor = None
-        for _ in range(40): 
+        for _ in range(50): 
             try:
                 response = client.get_author_feed(actor=profile.did, limit=100, cursor=cursor)
             except Exception: break
@@ -46,26 +47,29 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
                 post = feed_view.post
                 if not isinstance(post, PostView): continue
                 
-                text = getattr(post.record, 'text', "")
-                if post.author.handle == target_handle:
-                    # 簡易感情分析
-                    is_pos = any(w in text for w in pos_words)
-                    is_neg = any(w in text for w in neg_words)
-                    if is_pos: sentiment_counts["Positive"] += 1
-                    elif is_neg: sentiment_counts["Negative"] += 1
-                    else: sentiment_counts["Neutral"] += 1
-
-                    dt_jst = pd.to_datetime(getattr(post.record, 'created_at')) + timedelta(hours=9)
-                    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)
-                    })
-
-                # インタラクション (自分以外同士もペアにする)
+                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', "")
+                        
+                        # 感情スコアリング
+                        s_val = "Neutral"
+                        if any(w in text for w in pos_words): s_val = "Positive"
+                        elif any(w in text for w in neg_words): s_val = "Negative"
+
+                        posts_data.append({
+                            'created_at': dt_jst,
+                            'sentiment': s_val,
+                            'text': text,
+                            '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 feed_view.reason: interaction_pairs.append((u_author, target_handle))
                 if getattr(feed_view, 'reply', None) and feed_view.reply.parent:
                     u_parent = feed_view.reply.parent.author.handle
                     interaction_pairs.append((u_author, u_parent))
@@ -73,81 +77,97 @@ def analyze_and_output(my_id, my_pw, target_id, freq_type, progress=gr.Progress(
             cursor = response.cursor
             if not cursor: break
 
-        if not posts_data: return "データなし", "", "", None, None, None, "失敗"
-        df = pd.DataFrame(posts_data)
+        if not posts_data: return "データなし", "", "", None, None, None, None, "失敗"
 
-        # --- 1. 感情色パレット (Pie Chart) ---
-        fig_aura = px.pie(
-            names=list(sentiment_counts.keys()), 
-            values=list(sentiment_counts.values()),
-            title="現在の感情オーラ・パレット",
-            color=list(sentiment_counts.keys()),
-            color_discrete_map={'Positive': '#ff99cc', 'Negative': '#9999ff', 'Neutral': '#dddddd'}
+        df = pd.DataFrame(posts_data)
+        
+        # --- 新・感情パレット（オーラ・タイムライン） ---
+        # 日ごとの感情比率を計算
+        df['date'] = df['created_at'].dt.date
+        aura_df = df.groupby(['date', 'sentiment']).size().reset_index(name='count')
+        
+        fig_aura = px.area(
+            aura_df, x="date", y="count", color="sentiment",
+            title="✨ 心のオーラ・パレット（感情の推移）",
+            color_discrete_map={'Positive': '#FFADAD', 'Negative': '#A0C4FF', 'Neutral': '#E2E2E2'},
+            line_group="sentiment", template="plotly_white"
         )
+        fig_aura.update_layout(hovermode="x unified", yaxis_title="感情の強さ")
 
-        # --- 2. 曜日×時間 ヒートマップ ---
-        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, color_continuous_scale='Blues', title="週間アクティビティ")
+        # --- 他のグラフ ---
+        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=['#4CC9F0'])
 
-        # --- 3. 相関図 (関係性上書き & 自分以外同士) ---
-        RELATIONSHIPS = ["家族", "恋人候補", "実は好き", "ペット", "宿命のライバル", "幼馴染", "憧れの人", "師匠", "弟子", "癒やし枠", "腐れ縁", "魂の双子", "前世での伴侶", "生涯の恩人", "運命の赤い糸", "行きつけの店の店主", "同じ趣味の同志", "深夜の話し相手", "甘えたい", "影の守護者", "最強の刺客", "永遠のライバル", "喧嘩仲間", "裏切りの共犯者", "嫉妬", "だ～いすき♡", "軽蔑", "下僕", "裸の関係", "お抱えの料理人"]
-        
+        # --- 相関図 (DiGraph) ---
         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 = ["家族", "恋人候補", "実は好き", "ペット", "宿命のライバル", "幼馴染", "憧れの人", "師匠", "弟子", "癒やし枠", "腐れ縁", "魂の双子", "前世での伴侶", "生涯の恩人", "運命の赤い糸", "行きつけの店の店主", "同じ趣味 of 同志", "深夜の話し相手", "甘えたい", "影の守護者", "最強の刺客", "永遠のライバル", "喧嘩仲間", "裏切りの共犯者", "嫉妬", "だ～いすき♡", "軽蔑", "下僕", "裸の関係", "お抱えの料理人"]
         node_attrs = {n: (random.choice(RELATIONSHIPS) if n != target_handle else "（本人）") for n in nodes}
 
-        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)
+        G = nx.DiGraph()
+        for (u_f, u_t) in interaction_pairs:
+            if u_f in nodes and u_t in nodes and u_f != u_t:
+                if G.has_edge(u_f, u_t): G[u_f][u_t]['weight'] += 1
+                else: G.add_edge(u_f, u_t, weight=1)
 
-        pos = nx.spring_layout(G, k=0.9, seed=42)
+        pos = nx.spring_layout(G, k=1.1, seed=42)
         fig_net = go.Figure()
+
         for edge in G.edges():
-            w = G[edge[0]][edge[1]]['weight']
-            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=min(w, 5)), hoverinfo='none'))
+            start, end = edge
+            w = G[start][end]['weight']
+            fig_net.add_trace(go.Scatter(x=[pos[start][0], pos[end][0], None], y=[pos[start][1], pos[end][1], None],
+                                         mode='lines', line=dict(width=min(w, 5), color='rgba(200,200,200,0.6)'), hoverinfo='none'))
 
         node_labels = [f"<b>{n}</b>" if n == target_handle else f"@{n}<br><span style='color:red;'>【{node_attrs[n]}】</span>" for n in G.nodes()]
-        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', text=node_labels, textposition="bottom center", marker=dict(size=45, color='rgba(0,0,0,0)')))
+        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', text=node_labels, textposition="bottom center",
+                                     marker=dict(size=40, color='rgba(0,0,0,0)'), 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.2, sizey=0.2, xanchor="center", yanchor="middle", layer="above"))
-        fig_net.update_layout(images=node_images, showlegend=False, plot_bgcolor='white', xaxis=dict(showgrid=False, zeroline=False, showticklabels=False), yaxis=dict(showgrid=False, zeroline=False, showticklabels=False), height=650, title="🦋 ドラマチック相関図 (自分以外も繋がります)")
+            if info:
+                node_images.append(dict(source=info['avatar'], xref="x", yref="y", x=pos[node][0], y=pos[node][1], sizex=0.2, sizey=0.2, xanchor="center", yanchor="middle", layer="above"))
+        fig_net.update_layout(images=node_images, showlegend=False, plot_bgcolor='white', xaxis=dict(showgrid=False, zeroline=False, showticklabels=False), yaxis=dict(showgrid=False, zeroline=False, showticklabels=False), height=650)
 
-        # 統計とベストポスト
-        stats_html = f"<div style='background:#f0f8ff;padding:10px;border-radius:10px;text-align:center;'><b>{target_handle}</b> の解析結果<br><small>活動開始(初ポスト): {df['created_at'].min().strftime('%Y/%m/%d')}</small></div>"
-        top_posts = df.sort_values(by='score', ascending=False).head(3)
+        # HTML
+        stats_html = f"<div style='text-align:center; background:#f9f9f9; padding:15px; border-radius:15px;'><b>{target_handle}</b> の深層プロフィール<br><small>初ポスト日: {df['created_at'].min().strftime('%Y/%m/%d')}</small></div>"
+        top_posts = df.sort_values('score', ascending=False).head(3)
         posts_html = "<b>🏆 ベストポスト</b><br>"
-        for _, r in top_posts.iterrows(): posts_html += f"<div style='border-left:3px solid #0085ff;padding-left:5px;margin-bottom:8px;'>{r['text'][:55]}...<br><small>❤️ {r['likes']}  🔄 {r['reposts']}</small></div>"
+        for _, row in top_posts.iterrows():
+            posts_html += f"<div style='margin-bottom:8px; border-left:4px solid #4CC9F0; padding-left:8px; font-size:0.9em;'>{row['text'][:60]}...<br><small>❤️ {row['likes']} 🔄 {row['reposts']}</small></div>"
 
-        return stats_html, posts_html, fig_aura, fig_heat, fig_net, "解析完了！"
+        return stats_html, "", posts_html, fig_bar, None, fig_aura, fig_net, "解析完了！"
         
-    except Exception as e: return f"エラー: {str(e)}", "", None, None, None, "失敗"
+    except Exception as e:
+        return f"エラー: {str(e)}", "", "", None, None, None, None, "失敗"
 
-with gr.Blocks() as demo:
-    gr.Markdown("# 🦋 Bluesky アクティビティ & 感情色パレット相関図")
+with gr.Blocks(title="Bluesky Aura & Relationship") as demo:
+    gr.Markdown("# 🦋 Bluesky 深層オーラ & ドラマチック相関図")
     with gr.Row():
         with gr.Column(scale=1):
-            my_id, my_pw = gr.Textbox(label="自分のID"), gr.Textbox(label="パスワード", type="password")
+            my_id = gr.Textbox(label="自分のハンドル")
+            my_pw = gr.Textbox(label="アプリパスワード", type="password")
             target_id = gr.Textbox(label="解析対象")
-            btn = gr.Button("解析開始", variant="primary")
-            status = gr.Textbox(label="状態", interactive=False)
+            btn = gr.Button("フル解析スタート", variant="primary")
+            status = gr.Textbox(label="ステータス", interactive=False)
         with gr.Column(scale=2):
-            out_stats, out_posts = gr.HTML(), gr.HTML()
-    
+            out_stats = gr.HTML()
+            out_posts = gr.HTML()
+
     with gr.Tabs():
-        with gr.TabItem("人間関係相関図"): out_net = gr.Plot()
-        with gr.TabItem("活動リズム & 感情パレット"):
-            with gr.Row():
-                out_heat = gr.Plot()
-                out_aura = gr.Plot()
+        with gr.TabItem("✨ 心のオーラ"):
+            out_aura = gr.Plot()
+            out_bar = gr.Plot()
+        with gr.TabItem("🤝 人間関係相関図"):
+            out_net = gr.Plot()
 
-    btn.click(analyze_and_output, inputs=[my_id, my_pw, target_id, gr.State("日ごと")], outputs=[out_stats, out_posts, out_aura, out_heat, out_net, status])
+    btn.click(analyze_and_output, inputs=[my_id, my_pw, target_id, gr.State("日ごと")], 
+              outputs=[out_stats, gr.State(""), out_posts, out_bar, gr.State(None), out_aura, out_net, status])
 
-if __name__ == "__main__": demo.launch()
+if __name__ == "__main__":
+    demo.launch()