Update app.py

app.py

@@ -2,62 +2,80 @@
 import os, math, numpy as np, matplotlib.pyplot as plt, gradio as gr
 import openai
 
-### 0. OpenAI 키 설정 ---------------------------------------------------------
+# ──────────────────────────────────────────────────────────────
+# 0. OpenAI key
+# ──────────────────────────────────────────────────────────────
 if "OPENAI_API_KEY" not in os.environ:
     os.environ["OPENAI_API_KEY"] = input("🔑 Enter your OpenAI API key: ").strip()
-
 openai.api_key = os.environ["OPENAI_API_KEY"]
 
-### 1. 주기 차트 함수 ----------------------------------------------------------
+# ──────────────────────────────────────────────────────────────
+# 1. Cycle-chart utilities
+# ──────────────────────────────────────────────────────────────
 CYCLES = {
-    "테크 사이클 (50 년)": 50,
-    "재무 사이클 (80 년)": 80,
-    "패권 사이클 (250 년)": 250,
+    "Tech Cycle (50 yr)": 50,
+    "Finance Cycle (80 yr)": 80,
+    "Hegemony Cycle (250 yr)": 250,
 }
-CENTER = 2025  # 기준점
+CENTER = 2025  # reference year
 
 def make_cycle_points(period, start, end):
     n_min = math.floor((start - CENTER) / period)
     n_max = math.ceil((end   - CENTER) / period)
     return [CENTER + n * period for n in range(n_min, n_max + 1)]
 
-def plot_cycles(range_start, range_end):
-    plt.figure(figsize=(10, 4))
-    y_positions = np.arange(len(CYCLES))
-    align_years = None
+def build_chart_and_summary(start, end):
+    # --------- build figure (tower style) ----------
+    fig, ax = plt.subplots(figsize=(7, 5))
+    align_years, summaries = None, []
 
-    for i, (name, period) in enumerate(CYCLES.items()):
-        years = make_cycle_points(period, range_start, range_end)
-        plt.scatter(years, [y_positions[i]] * len(years), label=name, s=60)
+    for idx, (name, period) in enumerate(CYCLES.items()):
+        years = make_cycle_points(period, start, end)
+        ax.scatter([idx] * len(years), years, s=60)
         for y in years:
-            plt.text(y, y_positions[i] + 0.1, str(y), ha="center", fontsize=7)
+            ax.text(idx, y + 5, str(y), ha="center", va="bottom", fontsize=7)
+        summaries.append(f"{name.replace(' ', ' ')}: {years}")
         align_years = set(years) if align_years is None else align_years & set(years)
 
     if align_years:
         for y in sorted(align_years):
-            plt.axvline(y, color="black", linestyle="--")
-            plt.text(y, y_positions[-1] + 0.35, f"공동 정렬 → {y}",
-                     ha="center", va="bottom", fontsize=9, fontweight="bold")
-
-    plt.yticks(y_positions, list(CYCLES.keys()))
-    plt.ylim(-0.5, len(CYCLES) - 0.2)
-    plt.grid(axis="x", alpha=0.3)
-    plt.xlabel("Year")
-    plt.title("주기별 발생 연도와 공동 정렬 지점")
-    plt.tight_layout()
-    return plt.gcf()
-
-### 2. GPT 채팅 함수 -----------------------------------------------------------
-SYSTEM_PROMPT = (
-    "당신은 친절하고 분석적인 어시스턴트입니다. "
-    "사용자의 질문에 한국어로 간결하고 정확하게 답변하세요."
+            ax.axhline(y, color="black", linestyle="--", linewidth=1)
+            ax.text(-0.4, y + 8, f"Alignment → {y}", fontsize=9, fontweight="bold")
+
+    ax.set_xticks(range(len(CYCLES)), CYCLES.keys(), rotation=15)
+    ax.set_ylabel("Year")
+    ax.set_xlabel("Cycle")
+    ax.set_title("Cycle Events and Alignment")
+    ax.set_ylim(start - 10, end + 10)
+    ax.invert_yaxis()               # older years at bottom, newer at top
+    ax.grid(axis="y", alpha=0.3)
+
+    # --------- build textual summary ----------
+    align_txt = ", ".join(map(str, sorted(align_years))) if align_years else "None"
+    summary = (
+        f"Range: {start}-{end}\n"
+        + "\n".join(summaries)
+        + f"\nAlignment years: {align_txt}"
+    )
+    return fig, summary
+
+# ──────────────────────────────────────────────────────────────
+# 2. GPT chat
+# ──────────────────────────────────────────────────────────────
+BASE_PROMPT = (
+    "You are a concise, accurate assistant who answers in Korean. "
+    "If the chart summary is provided, take it into account."
 )
 
-def chat_with_gpt(history, user_message):
-    messages = [{"role": "system", "content": SYSTEM_PROMPT}]
+def chat_with_gpt(history, user_message, chart_summary):
+    messages = [{"role": "system", "content": BASE_PROMPT}]
+    if chart_summary and chart_summary != "No chart yet.":
+        messages.append({"role": "system", "content": f"[Chart summary]\n{chart_summary}"})
+
     for u, a in history:
-        messages.append({"role": "user", "content": u})
-        messages.append({"role": "assistant", "content": a})
+        messages.extend([{"role": "user", "content": u},
+                         {"role": "assistant", "content": a}])
+
     messages.append({"role": "user", "content": user_message})
 
     response = openai.chat.completions.create(
@@ -66,52 +84,53 @@ def chat_with_gpt(history, user_message):
         max_tokens=600,
         temperature=0.7,
     )
-    assistant_reply = response.choices[0].message.content.strip()
-    return assistant_reply
+    return response.choices[0].message.content.strip()
 
-### 3. Gradio 인터페이스 -------------------------------------------------------
+# ──────────────────────────────────────────────────────────────
+# 3. Gradio UI
+# ──────────────────────────────────────────────────────────────
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("## 📊 3-Cycle Timeline & 💬 GPT Chat")
+    gr.Markdown("## 📊 Three-Cycle Timeline & 💬 GPT Chat")
+
+    chart_summary_state = gr.State(value="No chart yet.")
 
     with gr.Tabs():
-        ## Tab 1 — Chart
-# --- Tab 1 — Chart -------------------------------------------
-        with gr.TabItem("🗓️ 주기 차트"):
-            start_year = gr.Number(label="범위 시작(Year)", value=1500)
-            end_year   = gr.Number(label="범위 끝(Year)",   value=2500)
+        # ---------- Tab 1: Chart ----------
+        with gr.TabItem("Timeline Chart"):
+            start_year = gr.Number(label="Start Year", value=1500)
+            end_year   = gr.Number(label="End Year",   value=2500)
 
-    # 처음부터 기본 차트를 보여주도록 value 지정
-            plot_out   = gr.Plot(value=plot_cycles(1500, 2500))
+            fig0, summary0 = build_chart_and_summary(1500, 2500)
+            plot_out = gr.Plot(value=fig0)
 
             def update_chart(s, e):
-                return plot_cycles(int(s), int(e))
-
-            start_year.change(update_chart, [start_year, end_year], plot_out)
-            end_year.change(update_chart,   [start_year, end_year], plot_out)
-            # ❌ plot_out.render()  ← 삭제
-
-
+                fig, summ = build_chart_and_summary(int(s), int(e))
+                return fig, summ
 
+            start_year.change(update_chart, [start_year, end_year],
+                              [plot_out, chart_summary_state])
+            end_year.change(update_chart,   [start_year, end_year],
+                              [plot_out, chart_summary_state])
 
-        ## Tab 2 — GPT Chat
-        with gr.TabItem("💬 GPT 채팅"):
-            chatbot = gr.Chatbot(label="GPT Assistant")
+        # ---------- Tab 2: GPT Chat ----------
+        with gr.TabItem("GPT Chat"):
+            chatbot = gr.Chatbot(label="Assistant")
             user_in = gr.Textbox(placeholder="메시지를 입력하세요...", lines=3)
             send_btn = gr.Button("Send", variant="primary")
 
-            def respond(chat_history, user_msg):
-                assistant_msg = chat_with_gpt(chat_history, user_msg)
+            def respond(chat_history, user_msg, chart_summary):
+                assistant_msg = chat_with_gpt(chat_history, user_msg, chart_summary)
                 chat_history.append((user_msg, assistant_msg))
                 return chat_history, gr.Textbox(value="", interactive=True)
 
             send_btn.click(
                 respond,
-                inputs=[chatbot, user_in],
+                inputs=[chatbot, user_in, chart_summary_state],
                 outputs=[chatbot, user_in],
             )
             user_in.submit(
                 respond,
-                inputs=[chatbot, user_in],
+                inputs=[chatbot, user_in, chart_summary_state],
                 outputs=[chatbot, user_in],
             )