Update core/plot.py

core/plot.py

@@ -2,6 +2,7 @@ import matplotlib.pyplot as plt
 import seaborn as sns
 import pandas as pd
 
+
 def plot_forecast(result):
     forecast = result["forecast"]
     actual = result["actual"]
@@ -14,7 +15,12 @@ def plot_forecast(result):
     if next_pred:
         ax.scatter(range(len(actual), len(actual) + len(next_pred)), next_pred, color="red", label="Next Prediction(s)", zorder=5)
         for i, val in enumerate(next_pred):
-            ax.text(len(actual) + i, val, f"{val:.2f}", color="red")
+            # Adjusted label positioning with background for clarity
+            ax.text(
+                len(actual) + i, val, f"{val:.2f}",
+                color="red", fontsize=8, ha='center', va='bottom',
+                bbox=dict(facecolor='white', alpha=0.8, edgecolor='red', boxstyle='round,pad=0.3')
+            )
 
     ax.legend()
     ax.set_title("Actual vs Forecasted Values")
@@ -44,12 +50,24 @@ def plot_future_forecast(df, result):
     return fig
 
 
-def plot_metrics(result):
+def plot_metrics_r2(result):
+    fig, ax = plt.subplots(figsize=(6, 4))
+    metrics = {k: v for k, v in result['metrics'].items() if k in ['R2', 'MAPE']}
+    sns.barplot(x=list(metrics.keys()), y=list(metrics.values()), ax=ax, palette="Blues_d")
+    ax.set_title("R² and MAPE Metrics")
+    ax.set_ylim(-1, 1)  # R² range, MAPE typically small
+    ax.grid(True)
+    plt.tight_layout()
+    return fig
+
+
+def plot_metrics_errors(result):
     fig, ax = plt.subplots(figsize=(6, 4))
-    metrics = result['metrics']
-    sns.barplot(x=list(metrics.keys()), y=list(metrics.values()), ax=ax)
-    ax.set_title("Error Metrics")
+    metrics = {k: v for k, v in result['metrics'].items() if k in ['RMSE', 'MAE']}
+    sns.barplot(x=list(metrics.keys()), y=list(metrics.values()), ax=ax, palette="Reds_d")
+    ax.set_title("RMSE and MAE Metrics")
     ax.grid(True)
+    plt.tight_layout()
     return fig