Update app.py

app.py

@@ -1,3 +1,4 @@
+# 1. Configuration
 import streamlit as st
 import pandas as pd
 import plotly.express as px
@@ -8,21 +9,21 @@ import re
 from datetime import datetime
 from streamlit_flow import streamlit_flow
 from streamlit_flow.elements import StreamlitFlowNode, StreamlitFlowEdge
-from streamlit_flow.layouts import TreeLayout
+from streamlit_flow.layouts import RadialLayout
 
-# 1. Configuration
+# Set page configuration to wide mode
 Site_Name = '🦁CatRider🐈'
 title="🦁CatRider🐈by👤Aaron Wacker"
 helpURL='https://huggingface.co/awacke1'
 bugURL='https://huggingface.co/spaces/awacke1'
 icons='🦁'
+
 useConfig=True
-if useConfig: # Component code - useConfig=False should allow it to work if re-evaluating UI elements due to code modify
+if useConfig:
     st.set_page_config(
         page_title=title,
         page_icon=icons,
         layout="wide",
-        #initial_sidebar_state="expanded",
         initial_sidebar_state="auto",
         menu_items={
             'Get Help': helpURL,
@@ -30,7 +31,7 @@ if useConfig: # Component code - useConfig=False should allow it to work if re-e
             'About': title
         }
     )
-    
+
 # 🐱 Cat Rider and Gear Data
 CAT_RIDERS = [
     {"name": "Whiskers", "type": "Speed", "emoji": "🐾", "strength": 3, "skill": 7},
@@ -146,6 +147,8 @@ def parse_history_markdown(markdown_text):
             stars = attempt_match.group(5)
             outcome = True if outcome_str == '✅ Success' else False
             score = len(stars)
+            conclusion_line_index = lines.index(line) + 1
+            conclusion = lines[conclusion_line_index] if conclusion_line_index < len(lines) else ''
             data.append({
                 'situation_name': situation_name,
                 'situation_emoji': situation_emoji,
@@ -153,7 +156,8 @@ def parse_history_markdown(markdown_text):
                 'action_name': action_name,
                 'action_emoji': action_emoji,
                 'outcome': outcome,
-                'score': score
+                'score': score,
+                'conclusion': conclusion
             })
     history_df = pd.DataFrame(data)
     return history_df
@@ -215,9 +219,21 @@ def process_journey_history(history_df):
 
     grouped = history_df.groupby(['situation_name'], sort=False)
 
+    # Main node to connect all situations
+    main_node_id = "main"
+    main_node = StreamlitFlowNode(
+        main_node_id,
+        pos=(0, 0),
+        data={'content': "# Your Journey"},
+        type='input',
+        target_position='bottom',
+        width=200
+    )
+    nodes.append(main_node)
+
     for situation_name, group in grouped:
         situation_emoji = group.iloc[0]['situation_emoji']
-        situation_id = group.iloc[0].get('situation_id', uuid.uuid4())
+        situation_id = group.iloc[0].get('situation_id', str(uuid.uuid4()))
         situation_node_id = f"situation_{situation_id}"
 
         markdown += f"### {situation_emoji} **{situation_name}**\n"
@@ -227,14 +243,24 @@ def process_journey_history(history_df):
             situation_node = StreamlitFlowNode(
                 situation_node_id,
                 pos=(0, 0),
-                data={'content': f"{situation_emoji} {situation_name}"},
+                data={'content': f"### {situation_emoji} {situation_name}"},
                 type='default',
-                shape='ellipse'
+                target_position='top',
+                source_position='bottom',
+                width=200
             )
             nodes.append(situation_node)
             node_ids[situation_node_id] = situation_node_id
 
-        for _, row in group.iterrows():
+            # Edge from main node to situation node
+            edges.append(StreamlitFlowEdge(
+                id=f"edge_{main_node_id}_{situation_node_id}",
+                source=main_node_id,
+                target=situation_node_id,
+                animated=True
+            ))
+
+        for idx, row in group.iterrows():
             attempt = row['attempt']
             action_emoji = row['action_emoji']
             action_name = row['action_name']
@@ -247,18 +273,17 @@ def process_journey_history(history_df):
             markdown += f"{conclusion}\n"
 
             # Create attempt node
-            attempt_node_id = f"attempt_{situation_id}_{attempt}_{uuid.uuid4()}"
-            if outcome:
-                attempt_content = f"Attempt {attempt}: {action_emoji} {action_name} - {outcome_str}\n{stars}"
-            else:
-                attempt_content = f"Attempt {attempt}: {action_emoji} {action_name} - {outcome_str}"
+            attempt_node_id = f"attempt_{situation_id}_{attempt}_{idx}"
+            attempt_content = f"Attempt {attempt}: {action_emoji} {action_name}\n{outcome_str} {stars}\n{conclusion}"
 
             attempt_node = StreamlitFlowNode(
                 attempt_node_id,
                 pos=(0, 0),
                 data={'content': attempt_content},
-                type='default',
-                shape='rectangle'
+                type='output',
+                target_position='top',
+                source_position='bottom',
+                width=250
             )
             nodes.append(attempt_node)
 
@@ -493,9 +518,9 @@ def main():
                 streamlit_flow('cat_rider_flow',
                                nodes,
                                edges,
-                               layout=TreeLayout(direction='down'),
+                               layout=RadialLayout(),
                                fit_view=True,
-                               height=600)
+                               height=1000)
             except Exception as e:
                 st.error(f"An error occurred while rendering the journey graph: {str(e)}")
                 st.markdown("Please try refreshing the page if the graph doesn't appear.")