Update app.py

app.py

@@ -420,6 +420,34 @@ def show_model_type_selector():
         key='model_type_selector'
     )
 
+def show_tabular_data(df, co):
+    st.write("Data Table with Relevancy Scores and Competitor Analysis")
+    
+    for index, row in df.iterrows():
+        with st.expander(f"Query: {row['query']} | Page: {row['page']}"):
+            col1, col2 = st.columns(2)
+            
+            with col1:
+                st.write("GSC Data:")
+                st.write(f"URL: {row['page']}")
+                st.write(f"Query: {row['query']}")
+                st.write(f"Impressions: {row['impressions']}")
+                st.write(f"Clicks: {row['clicks']}")
+                st.write(f"Position: {row['position']}")
+                st.write(f"Relevancy Score: {row['relevancy_score']:.4f}")
+            
+            with col2:
+                st.write("Competitor Analysis:")
+                if st.button("Analyze Competitors", key=f"comp_{index}"):
+                    with st.spinner('Analyzing competitors...'):
+                        results_df = analyze_competitors(row, co)
+                        st.dataframe(results_df)
+                        
+                        our_rank = results_df.index[results_df['url'] == row['page']].tolist()[0] + 1
+                        st.write(f"Our page ranks {our_rank} out of {len(results_df)} in terms of relevancy score.")
+
+                        
+
 def show_date_range_selector():
     logging.info("Showing date range selector")
     return st.selectbox(
@@ -565,20 +593,13 @@ def main():
                     logger.info("Calculating relevancy scores for all rows")
                     st.session_state.report_data = calculate_relevancy_scores(st.session_state.report_data, model_type)
                 
-                for index, row in st.session_state.report_data.iterrows():
-                    logger.debug(f"Processing row {index}: Query: {row['query']}, Page: {row['page']}")
-                    st.write(f"Query: {row['query']}")
-                    st.write(f"Page: {row['page']}")
-                    st.write(f"Relevancy Score: {row['relevancy_score']:.4f}")
-                    show_competitor_analysis(row, co)
-                    st.divider()
+                show_tabular_data(st.session_state.report_data, co)
                 
                 download_csv_link(st.session_state.report_data)
             elif st.session_state.report_data is not None:
                 logger.warning("No data found for the selected criteria.")
                 st.warning("No data found for the selected criteria.")
 
-
 if __name__ == "__main__":
     logging.info("Running main function")
     main()