Update app.py

app.py

@@ -1,6 +1,5 @@
 import yfinance as yf
 import pandas as pd
-import plotly.express as px
 import plotly.graph_objects as go
 import gradio as gr
 import timesfm
@@ -55,84 +54,36 @@ def stock_forecast(ticker, start_date, end_date):
             num_jobs=-1,
         )
 
-        # Combine actual and forecasted data for plotting
-        combined_df = pd.concat([df, forecast_df], axis=0)
-
-        # Filter the last 90 days of data
-        last_90_days = combined_df['ds'].max() - pd.Timedelta(days=90)
-        filtered_df = combined_df[combined_df['ds'] >= last_90_days]
+        # Ensure forecast_df has the correct columns
+        forecast_df.rename(columns={"timesfm": "forecast"}, inplace=True)
 
         # Create an interactive plot with Plotly
-        fig = px.line(filtered_df, x='ds', y=['y', 'timesfm'], labels={'value': 'Price', 'ds': 'Date'}, 
-                      title=f'{ticker} Stock Price Forecast (Last 90 Days)')
-        
-        # Customize the plot for a dark theme
-        fig.update_layout(
-            template="plotly_dark",  # Use a dark theme
-            plot_bgcolor='rgba(0, 0, 0, 0)',  # Transparent plot background
-            paper_bgcolor='rgba(0, 0, 0, 0)',  # Transparent paper background
-            font=dict(color='white'),  # White font color
-            legend_title_text='Type',
-            hovermode='x unified',  # Show hover info for all series at the same x-value
-            xaxis=dict(
-                rangeselector=dict(
-                    buttons=list([
-                        dict(count=1, label="1m", step="month", stepmode="backward"),
-                        dict(count=6, label="6m", step="month", stepmode="backward"),
-                        dict(count=1, label="YTD", step="year", stepmode="todate"),
-                        dict(count=1, label="1y", step="year", stepmode="backward"),
-                        dict(step="all")
-                    ]),
-                    bgcolor='black',  # Dark background for range selector
-                    font=dict(color='white')  # White font for range selector
-                ),
-                rangeslider=dict(visible=True),  # Add a range slider
-                type="date",
-                gridcolor='gray',  # Grid lines color
-                linecolor='gray',  # Axis line color
-                tickfont=dict(color='white')  # White tick labels
-            ),
-            yaxis=dict(
-                title="Price (USD)",
-                gridcolor='gray',  # Grid lines color
-                linecolor='gray',  # Axis line color
-                tickfont=dict(color='white')  # White tick labels
-            )
-        )
+        fig = go.Figure()
 
-        # Customize line colors
-        fig.update_traces(
-            line=dict(width=3),  # Thicker lines for better visibility
-            selector=dict(name='y'),  # Actual prices
-            line_color='blue'  # Blue for actual prices
-        )
-        fig.update_traces(
-            line=dict(width=4),  # Thicker lines for better visibility
-            selector=dict(name='timesfm'),  # Forecasted prices
-            line_color='red'  # Purple for forecasted prices
-        )
+        # Add Actual Prices Line
+        fig.add_trace(go.Scatter(x=df["ds"], y=df["y"], 
+                                 mode="lines", name="Actual Prices", 
+                                 line=dict(color="cyan", width=2)))
 
-        # Add custom hover data
-        fig.update_traces(
-            hovertemplate="<b>Date:</b> %{x}<br><b>Price:</b> %{y:.2f}<extra></extra>"
-        )
+        # Add Forecasted Prices Line
+        fig.add_trace(go.Scatter(x=forecast_df["ds"], y=forecast_df["forecast"], 
+                                 mode="lines", name="Forecasted Prices", 
+                                 line=dict(color="magenta", width=2, dash="dash")))
 
-        return fig
-
-    except Exception as e:
-        # Return an empty Plotly figure with an error message
-        error_fig = go.Figure()
-        error_fig.update_layout(
-            template="plotly_dark",  # Use a dark theme
-            title=f"Error: {str(e)}",
+        # Layout Customization
+        fig.update_layout(
+            title=f"{ticker} Stock Price Forecast (Interactive)",
             xaxis_title="Date",
             yaxis_title="Price",
-            annotations=[dict(text="No data available", x=0.5, y=0.5, showarrow=False, font=dict(color='white'))],
-            plot_bgcolor='rgba(0, 0, 0, 0)',  # Transparent plot background
-            paper_bgcolor='rgba(0, 0, 0, 0)',  # Transparent paper background
-            font=dict(color='white')  # White font color
+            template="plotly_dark",  # Dark Theme
+            hovermode="x unified",  # Show all values on hover
+            legend=dict(bgcolor="black", bordercolor="white"),
         )
-        return error_fig
+
+        return fig  # Return the Plotly figure for Gradio
+    
+    except Exception as e:
+        return f"Error: {str(e)}"
 
 # Create Gradio interface with an "Enter" button
 with gr.Blocks() as demo:
@@ -155,4 +106,4 @@ with gr.Blocks() as demo:
     )
 
 # Launch the Gradio app
-demo.launch()
+demo.launch()