Refactor analysis execution to streamline threading and improve error handling for SEM/PPC, Marketplace, and Target Market analyses

pages/analyzing_page.py

@@ -26,9 +26,9 @@ def run_analysis():
     lld_pm_ln_status = st.empty()
     pull_through_offers_status = st.empty()
     content_status = st.empty()
-    sem_ppc_status = st.empty()
-    marketplace_status = st.empty()
-    target_market_status = st.empty()
+    sem_ppc = st.empty()
+    marketplace = st.empty()
+    target_market = st.empty()
     executive_summary_status = st.empty()
     snapshot_status = st.empty()
 
@@ -59,7 +59,7 @@ def run_analysis():
             website_and_tools_status.success("Website and Tools completed successfully.")
             return result
         except Exception as e:
-            website_and_tools_status.error(f"Website and Tools Analysis failed: {e}")
+            on_page_status.error(f"Website and Tools Analysis failed: {e}")
             return None
         
     def run_seo_analysis():
@@ -114,101 +114,102 @@ def run_analysis():
         
     def run_sem_ppc_analysis():
         try:
-            sem_ppc_status.info("Starting SEM/PPC Analysis...")
+            sem_ppc.info("Starting SEM/PPC Analysis...")
             result = Sem_PPC(os.getenv('Model_SEM_PPC_Analyst'))
-            sem_ppc_status.success("SEM/PPC Analysis completed successfully.")
+            sem_ppc.success("SEM/PPC Analysis completed successfully.")
             return result
         except Exception as e:
-            sem_ppc_status.error(f"SEM/PPC Analysis failed: {e}")
+            sem_ppc.error(f"SEM/PPC Analysis failed: {e}")
             return None
         
     def run_marketplace_analysis():
         try:
-            marketplace_status.info("Starting Marketplace Analysis...")
+            marketplace.info("Starting Marketplace Analysis...")
             result = Marketplace(os.getenv('Model_SEM_PPC_Analyst'))
-            marketplace_status.success("Marketplace Analysis completed successfully.")
+            marketplace.success("Marketplace Analysis completed successfully.")
             return result
         except Exception as e:
-            marketplace_status.error(f"Marketplace Analysis failed: {e}")
+            marketplace.error(f"Marketplace Analysis failed: {e}")
             return None
     
     def run_target_market_analysis():
         try:
-            target_market_status.info("Starting Target Market Analysis...")
+            target_market.info("Starting Target Market Analysis...")
             result = TargetMarket(os.getenv('Model_Target_Market_Analyst'))
-            target_market_status.success("Target Market Analysis completed successfully.")
+            target_market.success("Target Market Analysis completed successfully.")
             return result
         except Exception as e:
-            target_market_status.error(f"Target Market Analysis failed: {e}")
-            return None
-
-    def run_snapshot_analysis():
-        try:
-            snapshot_status.info("Starting Snapshot by Channel Analysis...")
-            result = Snapshot(os.getenv('Model_Snapshot_by_Channel_Analyst'))
-            snapshot_status.success("Snapshot by Channel Analysis completed successfully.")
-            return result
-        except Exception as e:
-            snapshot_status.error(f"Snapshot by Channel Analysis failed: {e}")
-            return None
-
-    def run_executive_summary_analysis():
-        try:
-            executive_summary_status.info("Starting Executive Summary Analysis...")
-            result = ExecutiveSummary(os.getenv('Model_Executive_Summary_Analyst'))
-            executive_summary_status.success("Executive Summary Analysis completed successfully.")
-            return result
-        except Exception as e:
-            executive_summary_status.error(f"Executive Summary Analysis failed: {e}")
+            target_market.error(f"Target Market Analysis failed: {e}")
             return None
     
-    # Create threads for first batch of concurrent execution
-    first_batch_threads = [
-        threading.Thread(target=run_off_page_analysis),
-        threading.Thread(target=run_on_page_analysis),
-        threading.Thread(target=run_website_and_tools_analysis),
-        threading.Thread(target=run_seo_analysis),
-        threading.Thread(target=run_social_media_analysis),
-        threading.Thread(target=run_lld_pm_ln),
-        threading.Thread(target=run_pull_through_offers),
-        threading.Thread(target=run_content),
-        threading.Thread(target=run_sem_ppc_analysis),
-        threading.Thread(target=run_marketplace_analysis),
-        threading.Thread(target=run_target_market_analysis)
-    ]
-
-    # Attach Streamlit context to first batch threads
-    for thread in first_batch_threads:
-        add_script_run_ctx(thread)
-
-    # Start first batch threads
-    for thread in first_batch_threads:
-        thread.start()
-
-    # Wait for first batch threads to complete
-    for thread in first_batch_threads:
-        thread.join()
+    # Create threads for concurrent execution
+    off_page_thread = threading.Thread(target=run_off_page_analysis)
+    on_page_thread = threading.Thread(target=run_on_page_analysis)
+    website_and_tools_thread = threading.Thread(target=run_website_and_tools_analysis)
+    seo_thread = threading.Thread(target=run_seo_analysis)
+    social_media_thread = threading.Thread(target=run_social_media_analysis)
+    llm_pm_ln_thread = threading.Thread(target=run_lld_pm_ln)
+    pull_through_offers_thread = threading.Thread(target=run_pull_through_offers)
+    content_thread = threading.Thread(target=run_content)
+    content_sem_ppc_thread = threading.Thread(target=run_sem_ppc_analysis)
+    marketplace_thread = threading.Thread(target=run_marketplace_analysis)
+    target_market_thread = threading.Thread(target=run_target_market_analysis)
+
+    # Attach Streamlit context to threads
+    add_script_run_ctx(off_page_thread)
+    add_script_run_ctx(on_page_thread)
+    add_script_run_ctx(website_and_tools_thread)
+    add_script_run_ctx(seo_thread)
+    add_script_run_ctx(social_media_thread)
+    add_script_run_ctx(llm_pm_ln_thread)
+    add_script_run_ctx(pull_through_offers_thread)
+    add_script_run_ctx(content_thread)
+    add_script_run_ctx(content_sem_ppc_thread)
+    add_script_run_ctx(marketplace_thread)
+    add_script_run_ctx(target_market_thread)
+
+    # Start threads
+    off_page_thread.start()
+    on_page_thread.start()
+    website_and_tools_thread.start()
+    seo_thread.start()
+    social_media_thread.start()
+    llm_pm_ln_thread.start()
+    pull_through_offers_thread.start()
+    content_thread.start()
+    content_sem_ppc_thread.start()
+    marketplace_thread.start()
+    target_market_thread.start()
+
+    # Wait for threads to complete
+    off_page_thread.join()
+    on_page_thread.join()
+    website_and_tools_thread.join()
+    seo_thread.join()
+    social_media_thread.join()
+    llm_pm_ln_thread.join()
+    pull_through_offers_thread.join()
+    content_thread.join()
+    content_sem_ppc_thread.join()
+    marketplace_thread.join()
+    target_market_thread.join()
 
     st.markdown("---")
-    st.info("Initial analyses completed. Now generating Summary reports...")
-
-    # Create threads for second batch of concurrent execution (Snapshot and Executive Summary)
-    second_batch_threads = [
-        threading.Thread(target=run_snapshot_analysis),
-        threading.Thread(target=run_executive_summary_analysis)
-    ]
-
-    # Attach Streamlit context to second batch threads
-    for thread in second_batch_threads:
-        add_script_run_ctx(thread)
-
-    # Start second batch threads
-    for thread in second_batch_threads:
-        thread.start()
-
-    # Wait for second batch threads to complete
-    for thread in second_batch_threads:
-        thread.join()
+    snapshot_status.info("Starting Snapshot by Channel Analysis...")
+    try:
+        snapshot = Snapshot(os.getenv('Model_Snapshot_by_Channel_Analyst'))
+        snapshot_status.success("Snapshot by Channel Analysis completed successfully.")
+    except Exception as e:
+        snapshot_status.error(f"Snapshot by Channel Analysis failed: {e}")    
+
+    executive_summary_status.info("Starting Executive Summary Analysis...")
+    try:
+        executive_summary = ExecutiveSummary(os.getenv('Model_Executive_Summary_Analyst'))
+        executive_summary_status.success("Executive Summary Analysis completed successfully.")
+    except Exception as e:
+        executive_summary_status.error(f"Executive Summary Analysis failed: {e}")    
+        st.success("🎉 All analyses completed!") # Final success message
+    
 
     st.success("🎉 All analyses completed!") # Final success message
 
@@ -218,5 +219,5 @@ def run_analysis():
 
 # Execute the analysis
 if st.button("Back"):
-    st.switch_page("pages/home.py")
-run_analysis()
+        st.switch_page("pages/home.py")
+run_analysis()