Update app.py

app.py

@@ -1,31 +1,6 @@
-import streamlit as st
-from services.claude_service import ClaudeService
-from services.chart_analysis import ChartAnalysisService
-from ui.components import (
-    create_sidebar,
-    show_analysis_section,
-    show_chat_history,
-    show_follow_up_section,
-    show_save_options,
-    create_expertise_selector
-)
-from utils.file_handlers import save_chat_history
-from utils.learning_module import LearningModule
+# app.py
 
-def init_session_state():
-    """Initialize session state variables"""
-    if 'chat_history' not in st.session_state:
-        st.session_state.chat_history = []
-    if 'current_image' not in st.session_state:
-        st.session_state.current_image = None
-    if 'current_analysis' not in st.session_state:
-        st.session_state.current_analysis = None
-    if 'current_images' not in st.session_state:
-        st.session_state.current_images = []
-    if 'conversation_context' not in st.session_state:
-        st.session_state.conversation_context = []
-    if 'current_conversation_id' not in st.session_state:
-        st.session_state.current_conversation_id = Noneimport streamlit as st
+import streamlit as st
 from services.claude_service import ClaudeService
 from services.chart_analysis import ChartAnalysisService
 from ui.components import (
@@ -38,6 +13,10 @@ from ui.components import (
 )
 from utils.file_handlers import save_chat_history
 from utils.learning_module import LearningModule
+from auth.auth_manager import AuthManager
+from storage.storage_manager import UserStorageManager
+from pages.login import show_login_page, show_logout_button
+from pages.previous_chats import show_previous_chats_tab
 
 def init_session_state():
     """Initialize session state variables"""
@@ -53,10 +32,10 @@ def init_session_state():
         st.session_state.conversation_context = []
     if 'current_conversation_id' not in st.session_state:
         st.session_state.current_conversation_id = None
+    if 'analysis_results' not in st.session_state:
+        st.session_state.analysis_results = []
 
-
-
-def show_chart_analysis_tab(claude_service, analysis_service):
+def show_chart_analysis_tab(claude_service, analysis_service, storage_manager):
     """Display chart analysis functionality"""
     # Get user expertise level
     expertise_level = create_expertise_selector()
@@ -82,10 +61,6 @@ def show_chart_analysis_tab(claude_service, analysis_service):
             st.session_state.current_images = [file.getvalue() for file in uploaded_files]
             
         analyze_clicked = show_analysis_section(uploaded_files)
-        
-        # Store analysis results in session state
-        if 'analysis_results' not in st.session_state:
-            st.session_state.analysis_results = []
             
         if analyze_clicked:
             if not uploaded_files:
@@ -128,6 +103,8 @@ def show_chart_analysis_tab(claude_service, analysis_service):
                                 if response:
                                     st.session_state.chat_history.append(response)
                                     st.markdown(response['analysis'])
+                                    # Save to storage
+                                    storage_manager.save_chat(st.session_state.chat_history)
             
             # Then show individual analyses
             individual_analyses = [r for r in results if r.get('analysis_type') == 'Individual']
@@ -149,6 +126,8 @@ def show_chart_analysis_tab(claude_service, analysis_service):
                             if response:
                                 st.session_state.chat_history.append(response)
                                 st.markdown(response['analysis'])
+                                # Save to storage
+                                storage_manager.save_chat(st.session_state.chat_history)
             
             # Risk warning at the bottom
             st.warning(
@@ -163,7 +142,7 @@ def show_chart_analysis_tab(claude_service, analysis_service):
         # Save options
         save_name = show_save_options()
         if save_name and st.session_state.chat_history:
-            filename = save_chat_history(
+            filename = storage_manager.save_chat(
                 st.session_state.chat_history,
                 st.session_state.current_images[0] if st.session_state.current_images else None,
                 f"{save_name}.json" if save_name else None
@@ -171,8 +150,7 @@ def show_chart_analysis_tab(claude_service, analysis_service):
             if filename:
                 st.success(f"Chat saved as {filename}")
             else:
-                st.info("Chat saved to session state")# app.py
-
+                st.info("Chat saved to session state")
 
 def show_learning_tab(learning_module):
     """Display learning center functionality"""
@@ -196,57 +174,58 @@ def main():
         initial_sidebar_state="expanded"
     )
     
-    # Initialize authentication
-    auth_manager = AuthManager()
-    
-    # Show login page if not authenticated
-    if not auth_manager.is_authenticated():
-        show_login_page(auth_manager)
-        return
-        
-    # Get user's storage paths
-    storage_paths = auth_manager.get_user_storage_paths()
-    storage_manager = UserStorageManager(storage_paths)
-    
-    # Initialize services
     try:
+        # Initialize authentication
+        auth_manager = AuthManager()
+        
+        # Show login page if not authenticated
+        if not auth_manager.is_authenticated():
+            show_login_page(auth_manager)
+            return
+        
+        # Get user's storage paths and initialize storage
+        storage_paths = auth_manager.get_user_storage_paths()
+        storage_manager = UserStorageManager(storage_paths)
+        
+        # Initialize services
         claude_service = ClaudeService()
         analysis_service = ChartAnalysisService(claude_service)
         learning_module = LearningModule(claude_service)
-    except ValueError as e:
-        st.error(str(e))
-        return
-    
-    # Initialize session state
-    init_session_state()
-    
-    # Show logout button in sidebar
-    show_logout_button(auth_manager)
-    
-    # Load previous context if available
-    if 'chat_history' not in st.session_state:
-        context = storage_manager.get_context()
-        if context:
-            st.session_state.chat_history = context.get('chat_history', [])
-            st.session_state.current_analysis = context.get('current_analysis')
-            
-    # Main application tabs
-    tab1, tab2, tab3 = st.tabs(["Chart Analysis", "Learning Center", "Previous Chats"])
-    
-    with tab1:
-        show_chart_analysis_tab(claude_service, analysis_service, storage_manager)
         
-    with tab2:
-        show_learning_tab(learning_module)
+        # Initialize session state
+        init_session_state()
+        
+        # Show logout button in sidebar
+        show_logout_button(auth_manager)
+        
+        # Load previous context if available
+        if 'chat_history' not in st.session_state:
+            context = storage_manager.get_context()
+            if context:
+                st.session_state.chat_history = context.get('chat_history', [])
+                st.session_state.current_analysis = context.get('current_analysis')
+        
+        # Main application tabs
+        tab1, tab2, tab3 = st.tabs(["Chart Analysis", "Learning Center", "Previous Chats"])
+        
+        with tab1:
+            show_chart_analysis_tab(claude_service, analysis_service, storage_manager)
+            
+        with tab2:
+            show_learning_tab(learning_module)
+            
+        with tab3:
+            show_previous_chats_tab(storage_manager)
         
-    with tab3:
-        show_previous_chats_tab(storage_manager)
+        # Save context before closing
+        storage_manager.save_context({
+            'chat_history': st.session_state.chat_history,
+            'current_analysis': st.session_state.current_analysis
+        })
         
-    # Save context before closing
-    storage_manager.save_context({
-        'chat_history': st.session_state.chat_history,
-        'current_analysis': st.session_state.current_analysis
-    })
+    except Exception as e:
+        st.error(f"An error occurred: {str(e)}")
+        st.warning("Please try refreshing the page. If the error persists, contact support.")
 
 if __name__ == "__main__":
     main()