Update sozo_gen.py

sozo_gen.py

@@ -366,12 +366,24 @@ def animate_chart(spec: ChartSpecification, df: pd.DataFrame, dur: float, out: P
     plt.tight_layout(pad=3.0)
     ctype = spec.chart_type
 
-    # Animation logic remains the same, only the final call to FuncAnimation changes
-    if ctype == "pie":
-        wedges, _, _ = ax.pie(plot_data, labels=plot_data.index, startangle=90, autopct='%1.1f%%')
-        ax.set_title(spec.title); ax.axis('equal')
-        def init(): [w.set_alpha(0) for w in wedges]; return wedges
-        def update(i): [w.set_alpha(i / (frames - 1)) for w in wedges]; return wedges
+    init_func, update_func = None, None
+
+    if ctype == "line":
+        plot_data = plot_data.sort_index()
+        x_full, y_full = plot_data.index, plot_data.values
+        def init():
+            ax.set_xlim(x_full.min(), x_full.max())
+            ax.set_ylim(y_full.min() * 0.9, y_full.max() * 1.1)
+            return []
+        def update(i):
+            ax.clear()
+            ax.set_xlim(x_full.min(), x_full.max())
+            ax.set_ylim(y_full.min() * 0.9, y_full.max() * 1.1)
+            ax.set_title(spec.title); ax.grid(alpha=.3); ax.set_xlabel(spec.x_col); ax.set_ylabel(spec.y_col)
+            k = max(2, int(len(x_full) * (i / (frames - 1))))
+            ax.plot(x_full[:k], y_full[:k], lw=2, color='#A23B72', marker='o', markersize=5)
+            return []
+        init_func, update_func = init, update
     elif ctype == "bar":
         bars = ax.bar(plot_data.index.astype(str), np.zeros_like(plot_data.values, dtype=float), color="#1f77b4")
         ax.set_ylim(0, plot_data.max() * 1.1 if not pd.isna(plot_data.max()) and plot_data.max() > 0 else 1)
@@ -380,6 +392,7 @@ def animate_chart(spec: ChartSpecification, df: pd.DataFrame, dur: float, out: P
         def update(i):
             for b, h in zip(bars, plot_data.values): b.set_height(h * (i / (frames - 1)))
             return bars
+        init_func, update_func = init, update
     elif ctype == "scatter":
         x_full, y_full = plot_data.iloc[:, 0], plot_data.iloc[:, 1]
         slope, intercept, _, _, _ = stats.linregress(x_full, y_full)
@@ -402,25 +415,36 @@ def animate_chart(spec: ChartSpecification, df: pd.DataFrame, dur: float, out: P
                 current_x = reg_line_x[0] + (reg_line_x[1] - reg_line_x[0]) * (line_frame / line_total_frames)
                 line.set_data([reg_line_x[0], current_x], [reg_line_y[0], slope * current_x + intercept])
             return [scat, line]
-    else: # line, area, hist, etc.
-        # This is a simplified representation; the full logic from previous steps is assumed here
-        # For brevity, we'll just show the line chart example
-        line, = ax.plot([], [], lw=2, color='#A23B72')
-        plot_data = plot_data.sort_index()
-        x_full, y_full = plot_data.index, plot_data.values
-        ax.set_xlim(x_full.min(), x_full.max()); ax.set_ylim(y_full.min() * 0.9, y_full.max() * 1.1)
-        ax.set_title(spec.title); ax.grid(alpha=.3); ax.set_xlabel(spec.x_col); ax.set_ylabel(spec.y_col)
-        def init(): line.set_data([], []); return [line]
-        def update(i):
-            k = max(2, int(len(x_full) * (i / (frames - 1))))
-            line.set_data(x_full[:k], y_full[:k]); return [line]
-
-    # The key change: blit=False
-    anim = FuncAnimation(fig, update, init_func=init, frames=frames, blit=False, interval=1000 / fps)
+        init_func, update_func = init, update
+    elif ctype == "pie":
+        wedges, _, _ = ax.pie(plot_data, labels=plot_data.index, startangle=90, autopct='%1.1f%%')
+        ax.set_title(spec.title); ax.axis('equal')
+        def init(): [w.set_alpha(0) for w in wedges]; return wedges
+        def update(i): [w.set_alpha(i / (frames - 1)) for w in wedges]; return wedges
+        init_func, update_func = init, update
+    elif ctype == "hist":
+        _, _, patches = ax.hist(plot_data, bins=20, alpha=0)
+        ax.set_title(spec.title); ax.set_xlabel(spec.x_col); ax.set_ylabel("Frequency")
+        def init(): [p.set_alpha(0) for p in patches]; return patches
+        def update(i): [p.set_alpha((i / (frames - 1)) * 0.7) for p in patches]; return patches
+        init_func, update_func = init, update
+    elif ctype == "heatmap":
+        sns.heatmap(plot_data, annot=True, cmap="viridis", ax=ax, alpha=0)
+        ax.set_title(spec.title)
+        def init(): ax.collections[0].set_alpha(0); return [ax.collections[0]]
+        def update(i): ax.collections[0].set_alpha(i / (frames - 1)); return [ax.collections[0]]
+        init_func, update_func = init, update
+    else:
+        ax.text(0.5, 0.5, f"'{ctype}' animation not implemented", ha='center', va='center')
+        def init(): return []
+        def update(i): return []
+        init_func, update_func = init, update
+
+    anim = FuncAnimation(fig, update_func, init_func=init_func, frames=frames, blit=False, interval=1000 / fps)
     anim.save(str(out), writer=FFMpegWriter(fps=fps), dpi=144)
     plt.close(fig)
     return str(out)
-
+    
 def animate_image_fade(img: np.ndarray, dur: float, out: Path, fps: int = 24) -> str:
     fourcc = cv2.VideoWriter_fourcc(*'mp4v'); video_writer = cv2.VideoWriter(str(out), fourcc, fps, (WIDTH, HEIGHT))
     total_frames = max(1, int(dur * fps))
@@ -674,7 +698,7 @@ def generate_video_from_project(df: pd.DataFrame, raw_md: str, data_context: Dic
         audio_parts.append(str(mp3)); temps.append(mp3)
         total_audio_duration += audio_dur
         
-        video_dur = audio_dur + 0.5 
+        video_dur = audio_dur + 1.5 
         
         try:
             # --- Primary Visual Generation ---