Upload app.py

app.py

@@ -1,234 +1,54 @@
 import os
 import sys
 import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
 from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
 import ollama
-from PIL import Image
+from lightweight_charts import Chart
 
 # Add ai-analyzer's src to path
 current_dir = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, current_dir)
 
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
+# Initialize both AI models
+vision_client = ollama.Client()
+code_client = ollama.Client()
 
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
+VISION_MODEL = "llama3.2-vision:latest"
+CODE_MODEL = "codellama:latest"
 
 # Local imports
 from src.model.vision_model import ChartVisionModel
+from src.model.chart_generator import ChartGeneratorModel
 from src.analysis.chart_processor import ChartProcessor
 from src.analysis.pattern_generator import PatternGenerator
 from src.analysis.indicator_generator import IndicatorGenerator
 from src.analysis.chart_analyzer import ChartAnalyzer
 from src.data.market_data import MarketData
 
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-import os
-import sys
-import gradio as gr
-import ollama
-from PIL import Image
-
-# Add ai-analyzer's src to path
-current_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, current_dir)
-
-# Local imports
-from src.model.vision_model import ChartVisionModel
-from src.analysis.chart_processor import ChartProcessor
-from src.analysis.pattern_generator import PatternGenerator
-from src.analysis.indicator_generator import IndicatorGenerator
-from src.analysis.chart_analyzer import ChartAnalyzer
-from src.data.market_data import MarketData
-
-
 def analyze_full_chart(chart_image, symbol):
+    # Vision analysis using ChartVisionModel
+    vision_model = ChartVisionModel()
+    vision_analysis = vision_model.analyze_chart(chart_image)
+    
+    # Chart generation using ChartGeneratorModel
+    chart_generator = ChartGeneratorModel()
+    
     market_data = MarketData()
     historical_data = market_data.fetch_ohlcv(symbol)
     
+    # Pattern Generation
     pattern_gen = PatternGenerator()
     pattern_images = pattern_gen.generate_all_patterns(chart_image, historical_data)
     
+    # Indicator Generation
     indicator_gen = IndicatorGenerator()
     indicator_charts = indicator_gen.generate_all_indicators(historical_data)
     
-
+    # Process chart
     processor = ChartProcessor()
-    results = processor.process_chart(chart_image)
-
+    processed_results = processor.process_chart(chart_image)
+    
+    # Full chart analysis
     analyzer = ChartAnalyzer()
     analysis_results = analyzer.analyze_full(
         chart_image=chart_image,
@@ -242,7 +62,8 @@ def analyze_full_chart(chart_image, symbol):
         'indicator_analysis': analysis_results.indicators,
         'predictions': analysis_results.predictions,
         'interactive_charts': indicator_charts,
-        'chart_analysis':results,
+        'chart_analysis': processed_results,
+        'vision_results': vision_analysis
     }
 
 interface = gr.Interface(
@@ -259,4 +80,5 @@ interface = gr.Interface(
     ]
 )
 
-interface.launch()
+if __name__ == "__main__":
+    interface.launch()