Update app.py

app.py

@@ -6,7 +6,7 @@ from PIL import Image, ImageDraw, ImageFont
 import gradio as gr
 import datetime
 import logging
-from transformers import AutoProcessor, PaliGemmaForConditionalGeneration
+from transformers import AutoProcessor, AutoModelForPreTraining
 import tempfile
 import os
 
@@ -14,8 +14,9 @@ import os
 logging.basicConfig(filename='debug.log', level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
 
 # Load the ChartGemma model and processor
-model = PaliGemmaForConditionalGeneration.from_pretrained("ahmed-masry/chartgemma")
-processor = AutoProcessor.from_pretrained("ahmed-masry/chartgemma")
+processor = AutoProcessor.from_pretrained("mobenta/chart_analysis")
+model = AutoModelForPreTraining.from_pretrained("mobenta/chart_analysis")
+
 
 def predict(image, input_text):
     device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
@@ -153,31 +154,27 @@ def combine_images(image_paths, output_path='combined_chart.png'):
 
         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 gradio_interface(ticker1, ticker2, ticker3, ticker4, start_date, end_date, query, analysis_type, interval, indicators):
     try:
-        logging.debug("Starting Gradio interface analysis")
-        tickers = [ticker1, ticker2, ticker3, ticker4]
-        tickers = [ticker for ticker in tickers if ticker]  # Remove empty tickers
-        logging.debug(f"Tickers provided for analysis: {tickers}")
+        logging.debug(f"Starting gradio_interface with tickers: {ticker1}, {ticker2}, {ticker3}, {ticker4}, start_date: {start_date}, end_date: {end_date}, query: {query}, analysis_type: {analysis_type}, interval: {interval}")
 
+        tickers = [ticker1, ticker2, ticker3, ticker4]
         chart_paths = []
 
-        # Create and save charts for each ticker
-        for ticker in tickers:
-            try:
-                data = fetch_stock_data(ticker, start_date, end_date, interval)
-                chart_file = f"{ticker}_chart.png"
-                create_stock_chart(data, ticker, chart_file, interval, indicators)
-                chart_paths.append(chart_file)
-            except Exception as e:
-                logging.error(f"Error processing ticker {ticker}: {e}")
-
-        # If comparative analysis is selected, combine charts
-        if analysis_type == "Comparative Analysis" and len(chart_paths) > 1:
+        for i, ticker in enumerate(tickers):
+            if ticker:
+                data = fetch_stock_data(ticker, start=start_date, end=end_date, interval=interval)
+                with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as temp_chart:
+                    chart_path = temp_chart.name
+                    create_stock_chart(data, ticker, chart_path, timeframe=interval, indicators=indicators)
+                    chart_paths.append(chart_path)
+
+        if analysis_type == 'Comparative Analysis' and len(chart_paths) > 1:
             with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as temp_combined_chart:
                 combined_chart_path = temp_combined_chart.name
                 combine_images(chart_paths, combined_chart_path)