Update app.py

app.py

@@ -54,10 +54,115 @@ def fetch_stock_data(ticker='TSLA', start='2010-01-01', end=None, interval='1d')
         return pd.DataFrame()
 
 def create_stock_chart(data, ticker, filename='chart.png', timeframe='1d', indicators=None):
-    # ... (keep the existing create_stock_chart function as is) ...
+    try:
+        logging.debug(f"Creating chart for {ticker} with timeframe {timeframe} and saving to {filename}")
+        title = f"{ticker.upper()} Price Data (Timeframe: {timeframe})"
+
+        plt.rcParams["axes.titlesize"] = 10
+        my_style = mpf.make_mpf_style(base_mpf_style='charles')
+
+        # Calculate indicators if selected
+        addplot = []
+        if indicators:
+            if 'RSI' in indicators:
+                delta = data['Close'].diff(1)
+                gain = delta.where(delta > 0, 0)
+                loss = -delta.where(delta < 0, 0)
+                avg_gain = gain.rolling(window=14).mean()
+                avg_loss = loss.rolling(window=14).mean()
+                rs = avg_gain / avg_loss
+                rsi = 100 - (100 / (1 + rs))
+                addplot.append(mpf.make_addplot(rsi, panel=2, color='orange', ylabel='RSI'))
+            if 'SMA21' in indicators:
+                logging.debug("Calculating SMA 21")
+                sma_21 = data['Close'].rolling(window=21).mean()
+                addplot.append(mpf.make_addplot(sma_21, color='purple', linestyle='dashed'))
+            if 'SMA50' in indicators:
+                logging.debug("Calculating SMA 50")
+                sma_50 = data['Close'].rolling(window=50).mean()
+                addplot.append(mpf.make_addplot(sma_50, color='orange', linestyle='dashed'))
+            if 'SMA200' in indicators:
+                logging.debug("Calculating SMA 200")
+                sma_200 = data['Close'].rolling(window=200).mean()
+                addplot.append(mpf.make_addplot(sma_200, color='brown', linestyle='dashed'))
+            if 'VWAP' in indicators:
+                logging.debug("Calculating VWAP")
+                vwap = (data['Volume'] * (data['High'] + data['Low'] + data['Close']) / 3).cumsum() / data['Volume'].cumsum()
+                addplot.append(mpf.make_addplot(vwap, color='blue', linestyle='dashed'))
+            if 'Bollinger Bands' in indicators:
+                logging.debug("Calculating Bollinger Bands")
+                sma = data['Close'].rolling(window=20).mean()
+                std = data['Close'].rolling(window=20).std()
+                upper_band = sma + (std * 2)
+                lower_band = sma - (std * 2)
+                addplot.append(mpf.make_addplot(upper_band, color='green', linestyle='dashed'))
+                addplot.append(mpf.make_addplot(lower_band, color='green', linestyle='dashed'))
+
+        fig, axlist = mpf.plot(data, type='candle', style=my_style, volume=True, addplot=addplot, returnfig=True)
+        fig.suptitle(title, y=0.98)
+
+        # Save chart image
+        fig.savefig(filename, dpi=300)
+        plt.close(fig)
+
+        # Open and add financial data to the image
+        image = Image.open(filename)
+        draw = ImageDraw.Draw(image)
+        font = ImageFont.load_default()  # Use default font, you can also use custom fonts if available
+
+        # Financial metrics to add
+        metrics = {
+            "Ticker": ticker,
+            "Latest Close": f"${data['Close'].iloc[-1]:,.2f}",
+            "Volume": f"{data['Volume'].iloc[-1]:,.0f}"
+        }
+
+        # Add additional metrics if indicators are present
+        if 'SMA21' in indicators:
+            metrics["SMA 21"] = f"${data['Close'].rolling(window=21).mean().iloc[-1]:,.2f}"
+        if 'SMA50' in indicators:
+            metrics["SMA 50"] = f"${data['Close'].rolling(window=50).mean().iloc[-1]:,.2f}"
+        if 'SMA200' in indicators:
+            metrics["SMA 200"] = f"${data['Close'].rolling(window=200).mean().iloc[-1]:,.2f}"
+
+        # Draw metrics on the image
+        y_text = image.height - 50  # Starting y position for text
+        for key, value in metrics.items():
+            text = f"{key}: {value}"
+            draw.text((10, y_text), text, font=font, fill=(255, 255, 255))  # White color text
+            y_text += 20
+
+        # Resize image
+        new_size = (image.width * 3, image.height * 3)
+        resized_image = image.resize(new_size, Image.LANCZOS)
+        resized_image.save(filename)
+
+        logging.debug(f"Resized image with timeframe {timeframe} and ticker {ticker} saved to {filename}")
+    except Exception as e:
+        logging.error(f"Error creating or resizing chart: {e}")
+        raise
 
 def combine_images(image_paths, output_path='combined_chart.png'):
-    # ... (keep the existing combine_images function as is) ...
+    try:
+        logging.debug(f"Combining images {image_paths} into {output_path}")
+        images = [Image.open(path) for path in image_paths]
+
+        # Calculate total width and max height for combined image
+        total_width = sum(img.width for img in images)
+        max_height = max(img.height for img in images)
+
+        combined_image = Image.new('RGB', (total_width, max_height))
+        x_offset = 0
+        for img in images:
+            combined_image.paste(img, (x_offset, 0))
+            x_offset += img.width
+
+        combined_image.save(output_path)
+        logging.debug(f"Combined image saved to {output_path}")
+        return output_path
+    except Exception as e:
+        logging.error(f"Error combining images: {e}")
+        raise
 
 def perform_trend_analysis(data):
     # Perform trend analysis
@@ -197,21 +302,4 @@ def gradio_app():
             interval = gr.Dropdown(label="Interval", choices=['1d', '5d', '1wk', '1mo', '3mo'], value='1d')
 
         with gr.Row():
-            indicators = gr.CheckboxGroup(label="Indicators", choices=['RSI', 'SMA21', 'SMA50', 'SMA200', 'VWAP', 'Bollinger Bands'], value=['SMA21', 'SMA50'])
-            analysis_type = gr.Radio(label="Analysis Type", choices=['Single Ticker', 'Comparative Analysis', 'Trend Analysis', 'Correlation Analysis'], value='Single Ticker')
-
-        query = gr.Textbox(label="Analysis Query", value="Analyze the price trends.")
-        analyze_button = gr.Button("Analyze")
-        output_image = gr.Image(label="Analysis Chart")
-        output_text = gr.Textbox(label="Generated Insights", lines=10)
-
-        analyze_button.click(
-            fn=gradio_interface,
-            inputs=[ticker1, ticker2, ticker3, ticker4, start_date, end_date, query, analysis_type, interval, indicators],
-            outputs=[output_text, output_image]
-        )
-
-    demo.launch()
-
-if __name__ == "__main__":
-    gradio_app()
+            indicators = gr.CheckboxGroup(