Version 1 hotfix #16 for merge

app.py

@@ -194,9 +194,29 @@ def merge_forecast_data(actual, predicted, future):
     # merged_dataframe = pd.merge_ordered(actual, predicted, on='Date', suffixes=('_Actual', '_Predicted'))
     # merged_dataframe = pd.merge_ordered(merged_dataframe, future, on='Date')
     merged_dataframe = pd.concat([actual, predicted, future], axis=1)
-    merged_dataframe = merged_dataframe.set_index('Date')
+    # merged_dataframe = merged_dataframe.set_index('Date')
     return merged_dataframe
 
+@st.cache_data
+def get_combined_date(actual, predicted, future):
+  actual = actual.to_frame()
+  predicted = predicted.to_frame()
+  future = future.to_frame()
+  future = future.rename_axis('Date')
+
+  actual = actual.reset_index()
+  predicted = predicted.reset_index()
+  future = future.reset_index()
+
+  actual_date = actual['Date'].to_frame()
+  predicted_date = predicted['Date'].to_frame()
+  future_date = future['Date'].to_frame()
+
+  combined_date = pd.concat([actual_date, predicted_date, future_date])
+  combined_date = combined_date.reset_index()
+  combined_date = combined_date.drop(columns='index')
+  return combined_date
+
 # TAPAS Model
 
 @st.cache_resource
@@ -348,16 +368,19 @@ if (st.session_state.uploaded):
 
     test_y, predictions = np.array(test_y), np.array(fitted)
     acc = forecast_accuracy(predictions, test_y)
-    
+
     col = st.columns(2)
     with col[0]:
-       col[0].header("Sales Forecast")
-       merged_data = merge_forecast_data(df['Sales'], fitted_series, future_fitted_series)
-       col[0].line_chart(merged_data)
-       col[0].write(f"MAPE score: {acc['mape']} (lower is better)")
+      col[0].header("Sales Forecast")
+      #  merged_data = plot_data(df['Sales'], fitted_series, future_fitted_series)
+      # date = get_combined_date(df['Sales'], fitted_series, future_fitted_series)
+      # col[0].line_chart(x=date, y=[df['Sales'], fitted_series], color='blue', key='actual')
+      merged_data = merge_forecast_data(df['Sales'], fitted_series, future_fitted_series)
+      col[0].line_chart(merged_data, x="Date", y=["Actual Sales", "Predicted Sales", "Future Forecasted Sales"], key='actual')
+      col[0].write(f"MAPE score: {acc['mape']} (lower is better)")
     with col[1]:
-       col[1].subheader(f"Forecasted sales in the next {period} days")
-       col[1].write(df)
+      col[1].subheader(f"Forecasted sales in the next {period} days")
+      col[1].write(df)
     st.session_state.forecasted = True