Update app.py

app.py

@@ -1,188 +1,179 @@
-# cycles_chat_app.py  —  CycleNavigator (4-Cycle 버전)
-import os, math, numpy as np, matplotlib.pyplot as plt, gradio as gr
+# -------- app_final.py --------
+import os, json, math, pathlib
+import numpy as np
+import plotly.graph_objects as go
+import gradio as gr
 import openai
 
-# ──────────────────────────────────────────────────────────────
+# ──────────────────────────
 # 0. OpenAI API 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. Wave-style chart utilities
-# ──────────────────────────────────────────────────────────────
+# ──────────────────────────
+# 1. Cycle config
+# ──────────────────────────
+CENTER = 2025
 CYCLES = {
-    "K-Wave (50 yr)":               50,   # 장기 콘드라티에프 파동
-    "Business Cycle (Juglar 9 yr)":  9,   # 설비투자·신용 경기순환
-    "Finance Cycle (80 yr)":        80,   # 신용·금융 장주기
-    "Hegemony Cycle (250 yr)":     250,   # 패권 흥망
+    "K-Wave":   50,   # Kondratiev long wave
+    "Business":  9,   # Juglar investment cycle
+    "Finance":  80,   # Long credit cycle
+    "Hegemony": 250   # Power-shift cycle
 }
-COLOR_MAP     = {50: "#ff3333",  9: "#66ff66", 80: "#ffcc00", 250: "#66ccff"}
-AMPLITUDE_MAP = {50: 1.0,        9: 0.6,      80: 1.6,        250: 4.0}
-CENTER = 2025  # alignment reference
-
-def _half_sine(xs, period, amp):
+ORDERED_PERIODS = sorted(CYCLES.values())            # [9, 50, 80, 250]
+COLOR = {9:"#66ff66", 50:"#ff3333", 80:"#ffcc00", 250:"#66ccff"}
+AMPL  = {9:0.6,        50:1.0,      80:1.6,        250:4.0}
+PERIOD_BY_CYCLE = {k:v for k,v in CYCLES.items()}
+
+# ──────────────────────────
+# 2. Load events JSON
+# ──────────────────────────
+EVENTS_PATH = pathlib.Path(__file__).with_name("cycle_events.json")
+with open(EVENTS_PATH, encoding="utf-8") as f:
+    EVENTS = {int(item["year"]): item["events"] for item in json.load(f)}
+
+# ──────────────────────────
+# 3. Helper functions
+# ──────────────────────────
+def half_sine(xs, period, amp):
     phase = np.mod(xs - CENTER, period)
     y = amp * np.sin(np.pi * phase / period)
     y[y < 0] = 0
     return y
 
-def build_wave_chart_and_summary(start: int, end: int):
-    xs = np.linspace(start, end, (end - start) * 4)
-    fig, ax = plt.subplots(figsize=(14, 6))
-    fig.subplots_adjust(top=0.9)
-
-    summaries, align_years, all_year_labels = [], None, set()
-
-    for period in sorted(set(CYCLES.values())):  # iterate periods in ascending order
-        col, amp = COLOR_MAP[period], AMPLITUDE_MAP[period]
-        for frac in np.linspace(amp / 30, amp, 30):
-            ax.plot(xs, _half_sine(xs, period, frac),
-                    color=col, alpha=0.85, lw=0.6)
-
-        years = [CENTER + n * period for n in range(
-                 math.ceil((start - CENTER) / period),
-                 math.floor((end   - CENTER) / period) + 1)]
-        name = [k for k, v in CYCLES.items() if v == period][0]
-        summaries.append(f"{name} peaks: {years}")
-        align_years = set(years) if align_years is None else align_years & set(years)
-        all_year_labels.update(years)
-
-    # small baseline labels
-    for y in sorted(all_year_labels):
-        if start <= y <= end:
-            ax.text(y, -0.1, str(y), ha="center", va="top",
-                    fontsize=6, color="white", rotation=90)
-
-    ax.set_facecolor("black"); fig.patch.set_facecolor("black")
-    ax.set_xlim(start, end)
-    ax.set_ylim(-0.2, max(AMPLITUDE_MAP.values()) + 0.2)
-    ax.set_xlabel("Year", color="white")
-    ax.set_ylabel("Relative Amplitude", color="white")
-    ax.tick_params(colors="white")
-    for spine in ax.spines.values():
-        spine.set_color("white")
-    ax.grid(axis="y", color="white", ls="--", lw=.3, alpha=.3)
-
-    # alignment marker
-    ax.axvline(CENTER, color="white", ls="--", lw=1, alpha=.6)
-    arrow_y = AMPLITUDE_MAP[250] * 1.05
-    ax.annotate("", xy=(CENTER - 125, arrow_y), xytext=(CENTER + 125, arrow_y),
-                arrowprops=dict(arrowstyle="<|-|>", color="white", lw=1.2))
-    ax.text(CENTER, arrow_y + .15, "250 yr", color="white",
-            ha="center", va="bottom", fontsize=10, fontweight="bold")
-
-    summary = (f"Range {start}-{end}\n"
-               + "\n".join(summaries)
-               + "\nAlignment year inside range: "
-               + (", ".join(map(str, sorted(align_years))) if align_years else "None"))
+def build_chart(start: int, end: int):
+    xs = np.linspace(start, end, max(1000, (end-start)*4))
+    fig = go.Figure()
+
+    # draw half-sine “towers”
+    for period in ORDERED_PERIODS:
+        ys = half_sine(xs, period, AMPL[period])
+        fig.add_trace(go.Scatter(
+            x=xs, y=ys, mode="lines",
+            line=dict(color=COLOR[period], width=1),
+            hoverinfo="skip", showlegend=False))
+
+    # annotate events with hover
+    for year, evs in EVENTS.items():
+        if start <= year <= end:
+            cycle_name = evs[0]["cycle"]
+            period = PERIOD_BY_CYCLE.get(cycle_name, 50)
+            y = float(half_sine(np.array([year]), period, AMPL[period]))
+            txt_en = "<br>".join(e["event_en"] for e in evs)
+            txt_ko = "<br>".join(e["event_ko"] for e in evs)
+            fig.add_trace(go.Scatter(
+                x=[year], y=[y], mode="markers",
+                marker=dict(color="white", size=6),
+                customdata=[[cycle_name, txt_en, txt_ko]],
+                hovertemplate=(
+                    "Year %{x} • %{customdata[0]} cycle"
+                    "<br>%{customdata[1]}"
+                    "<br>%{customdata[2]}<extra></extra>"
+                ),
+                showlegend=False
+            ))
+
+    # styling
+    fig.update_layout(
+        template="plotly_dark",
+        height=450,
+        margin=dict(t=30, l=40, r=40, b=40),
+        hoverlabel=dict(bgcolor="#222", font_size=11)
+    )
+    fig.update_xaxes(title="Year", range=[start, end])
+    fig.update_yaxes(title="Relative amplitude", showticklabels=False)
+
+    summary = f"Range {start}-{end} | Events plotted: {sum(1 for y in EVENTS if start<=y<=end)}"
     return fig, summary
 
-# ──────────────────────────────────────────────────────────────
-# 2. GPT chat helper
-# ──────────────────────────────────────────────────────────────
+# ──────────────────────────
+# 4. GPT chat helper
+# ──────────────────────────
 BASE_PROMPT = (
     "You are a concise and accurate Korean assistant. "
-    "Always incorporate the provided [Chart summary] when replying."
+    "If a chart summary is provided, incorporate it in your answer."
 )
 
 def chat_with_gpt(history, user_msg, chart_summary):
-    msgs = [{"role": "system", "content": BASE_PROMPT}]
-    if chart_summary != "No chart yet.":
-        msgs.append({"role": "system", "content": f"[Chart summary]\n{chart_summary}"})
-
+    messages = [{"role": "system", "content": BASE_PROMPT}]
+    if chart_summary not in ("", "No chart yet."):
+        messages.append({"role": "system", "content": f"[Chart summary]\n{chart_summary}"})
     for u, a in history:
-        msgs += [{"role": "user", "content": u}, {"role": "assistant", "content": a}]
-    msgs.append({"role": "user", "content": user_msg})
-
-    reply = openai.chat.completions.create(
+        messages.extend([{"role":"user","content":u},{"role":"assistant","content":a}])
+    messages.append({"role":"user","content":user_msg})
+    res = openai.chat.completions.create(
         model="gpt-3.5-turbo",
-        messages=msgs,
+        messages=messages,
         max_tokens=600,
         temperature=0.7
-    ).choices[0].message.content.strip()
-    return reply
-
-# ──────────────────────────────────────────────────────────────
-# 3. Gradio UI
-# ──────────────────────────────────────────────────────────────
-custom_css = """
-#wave_plot {width: 100% !important;}
-#wave_plot canvas {width: 100% !important; height: auto !important;}
-"""
-
-with gr.Blocks(css=custom_css, theme=gr.themes.Soft()) as demo:
-    # ── 서비스 제목 ────────────────────────────────────────────
-    gr.Markdown("## 🔭 **CycleNavigator**")
-
-    # ── 네 사이클 간단 설명 (작은 글씨) ────────────────────────
-    gr.Markdown(
-        "<sub>"
-
-        "**Business (Juglar 9 yr)** – Credit-driven capital investment booms & busts. "
-        "**K-Wave (50 yr)** – Long-wave industrial & technological shifts. "        
-        "**Finance (80 yr)** – Extended credit cycles culminating in crises. "
-        "**Hegemony (250 yr)** – Rise & decline of world powers."
-        "</sub>"
     )
-
-    chart_summary_state = gr.State(value="No chart yet.")
-
-    with gr.Tabs():
-        # ▸ Tab 1 — Timeline Chart
-        with gr.TabItem("Timeline Chart"):
-            fig0, summ0 = build_wave_chart_and_summary(1500, 2500)
-            plot_out = gr.Plot(value=fig0, elem_id="wave_plot")
-
-            with gr.Row():
-                start_year = gr.Number(label="Start Year", value=1500)
-                end_year   = gr.Number(label="End Year",   value=2500)
-                zoom_in_btn  = gr.Button("🔍 Zoom In")
-                zoom_out_btn = gr.Button("🔎 Zoom Out")
-
-            def refresh_chart(s, e):
-                fig, summ = build_wave_chart_and_summary(int(s), int(e))
-                return fig, summ
-
-            start_year.change(refresh_chart, [start_year, end_year],
-                              [plot_out, chart_summary_state])
-            end_year.change(refresh_chart,   [start_year, end_year],
-                              [plot_out, chart_summary_state])
-
-            def zoom(s, e, factor):
-                mid  = (s + e) / 2
-                span = (e - s) * factor / 2
-                new_s, new_e = int(mid - span), int(mid + span)
-                fig, summ = build_wave_chart_and_summary(new_s, new_e)
-                return new_s, new_e, fig, summ
-
-            zoom_in_btn.click(
-                lambda s, e: zoom(s, e, 0.5),
-                inputs=[start_year, end_year],
-                outputs=[start_year, end_year, plot_out, chart_summary_state],
-            )
-            zoom_out_btn.click(
-                lambda s, e: zoom(s, e, 2.0),
-                inputs=[start_year, end_year],
-                outputs=[start_year, end_year, plot_out, chart_summary_state],
-            )
-
-        # ▸ Tab 2 — GPT Chat
-        with gr.TabItem("GPT Chat"):
-            chatbot = gr.Chatbot(label="Assistant")
-            user_in = gr.Textbox(lines=3, placeholder="메시지를 입력하세요…")
-            send_btn = gr.Button("Send", variant="primary")
-
-            def respond(chat_hist, user_msg, summary):
-                ans = chat_with_gpt(chat_hist, user_msg, summary)
-                chat_hist.append((user_msg, ans))
-                return chat_hist, gr.Textbox(value="", interactive=True)
-
-            send_btn.click(respond, [chatbot, user_in, chart_summary_state],
-                                       [chatbot, user_in])
-            user_in.submit(respond, [chatbot, user_in, chart_summary_state],
-                                       [chatbot, user_in])
+    return res.choices[0].message.content.strip()
+
+# ──────────────────────────
+# 5. Gradio UI
+# ──────────────────────────
+def create_app():
+    with gr.Blocks(theme=gr.themes.Soft()) as demo:
+        gr.Markdown("## 🔭 **CycleNavigator (Interactive)**")
+        gr.Markdown(
+            "<sub>"
+            "K-Wave 50y • Business 9y • Finance 80y • Hegemony 250y"
+            "</sub>"
+        )
+
+        chart_summary_state = gr.State(value="No chart yet.")
+
+        with gr.Tabs():
+            # ── Chart Tab ───────────────
+            with gr.TabItem("Timeline Chart"):
+                with gr.Row():
+                    start_year = gr.Number(label="Start Year", value=1775, precision=0)
+                    end_year   = gr.Number(label="End Year",   value=2025, precision=0)
+                    zoom_in  = gr.Button("🔍 Zoom In")
+                    zoom_out = gr.Button("🔎 Zoom Out")
+
+                fig0, summ0 = build_chart(1775, 2025)
+                plot = gr.Plot(value=fig0)
+                chart_summary_state.value = summ0
+
+                def refresh(s, e):
+                    fig, summ = build_chart(int(s), int(e))
+                    return fig, summ
+                start_year.change(refresh, [start_year, end_year], [plot, chart_summary_state])
+                end_year.change(refresh,   [start_year, end_year], [plot, chart_summary_state])
+
+                def zoom(s, e, factor):
+                    mid = (s+e)/2
+                    span = (e-s)*factor/2
+                    ns, ne = int(mid-span), int(mid+span)
+                    fig, summ = build_chart(ns, ne)
+                    return ns, ne, fig, summ
+                zoom_in.click(lambda s,e: zoom(s,e,0.5),
+                              inputs=[start_year,end_year],
+                              outputs=[start_year,end_year,plot,chart_summary_state])
+                zoom_out.click(lambda s,e: zoom(s,e,2.0),
+                               inputs=[start_year,end_year],
+                               outputs=[start_year,end_year,plot,chart_summary_state])
+
+                gr.File(value=str(EVENTS_PATH), label="Download cycle_events.json")
+
+            # ── GPT Chat Tab ────────────
+            with gr.TabItem("GPT Chat"):
+                chatbot = gr.Chatbot(label="Assistant")
+                user_input = gr.Textbox(lines=3, placeholder="메시지를 입력하세요…")
+                send_btn = gr.Button("Send")
+
+                def respond(history, msg, summ):
+                    reply = chat_with_gpt(history, msg, summ)
+                    history.append((msg, reply))
+                    return history, gr.Textbox(value="")
+                send_btn.click(respond, [chatbot, user_input, chart_summary_state],
+                               [chatbot, user_input])
+                user_input.submit(respond, [chatbot, user_input, chart_summary_state],
+                                  [chatbot, user_input])
+    return demo
 
 if __name__ == "__main__":
-    demo.launch()
+    create_app().launch()