Update app.py

app.py

@@ -121,47 +121,80 @@ def update_character_stats(game_state, outcome):
 def create_heterogeneous_graph(history_df):
     nodes = []
     edges = []
+    node_ids = {}
     for index, row in history_df.iterrows():
-        scenario_id = f"scenario-{row['situation_id']}-{index}"
-        action_id = f"action-{row['action_id']}-{index}"
-        conclusion_id = f"conclusion-{index}"
-
-        # Scenario node
-        scenario_node = StreamlitFlowNode(scenario_id, (0, 0), {'content': f"{row['situation_emoji']} {row['situation_name']}"}, 'output', 'bottom', 'top', shape='ellipse')
-        nodes.append(scenario_node)
+        situation_node_id = f"situation_{row['situation_id']}_{index}"
+        action_node_id = f"action_{row['action_id']}_{index}"
+        outcome_node_id = f"outcome_{index}"
+
+        # Situation node
+        if situation_node_id not in node_ids:
+            situation_node = StreamlitFlowNode(
+                id=situation_node_id,
+                position=(0, 0),
+                data={'content': f"{row['situation_emoji']} {row['situation_name']}"},
+                type='default',
+                sourcePosition='bottom',
+                targetPosition='top',
+                shape='ellipse'
+            )
+            nodes.append(situation_node)
+            node_ids[situation_node_id] = situation_node_id
 
         # Action node
-        action_node = StreamlitFlowNode(action_id, (0, 0), {'content': f"{row['action_emoji']} {row['action_name']}"}, 'output', 'bottom', 'top', shape='ellipse')
+        action_node = StreamlitFlowNode(
+            id=action_node_id,
+            position=(0, 0),
+            data={'content': f"{row['action_emoji']} {row['action_name']}"},
+            type='default',
+            sourcePosition='bottom',
+            targetPosition='top',
+            shape='ellipse'
+        )
         nodes.append(action_node)
 
-        # Conclusion node with stars
+        # Outcome node with success celebration
+        outcome_content = '✅ Success' if row['outcome'] else '❌ Failure'
         stars = '⭐' * int(row['score'])
-        conclusion_node = StreamlitFlowNode(conclusion_id, (0, 0), {'content': f"{row['conclusion']}\n{stars}"}, 'output', 'bottom', 'top', shape='ellipse')
-        nodes.append(conclusion_node)
+        outcome_node = StreamlitFlowNode(
+            id=outcome_node_id,
+            position=(0, 0),
+            data={'content': f"{row['conclusion']}\n{outcome_content}\n{stars}"},
+            type='default',
+            sourcePosition='bottom',
+            targetPosition='top',
+            shape='ellipse'
+        )
+        nodes.append(outcome_node)
 
         # Edges
-        edges.append(StreamlitFlowEdge(f"{scenario_id}-{action_id}", scenario_id, action_id, animated=True))
-        edges.append(StreamlitFlowEdge(f"{action_id}-{conclusion_id}", action_id, conclusion_id, animated=True))
-
-        # Link to previous scenario
-        if index > 0:
-            prev_conclusion_id = f"conclusion-{index-1}"
-            edges.append(StreamlitFlowEdge(f"{prev_conclusion_id}-{scenario_id}", prev_conclusion_id, scenario_id, animated=True, dashed=True))
+        edges.append(StreamlitFlowEdge(
+            id=f"edge_{situation_node_id}_{action_node_id}_{index}",
+            source=situation_node_id,
+            target=action_node_id,
+            animated=True
+        ))
+        edges.append(StreamlitFlowEdge(
+            id=f"edge_{action_node_id}_{outcome_node_id}_{index}",
+            source=action_node_id,
+            target=outcome_node_id,
+            animated=True
+        ))
 
     return nodes, edges
 
-# 📝 Markdown Preview with Single Scenario Entry and Attempts
+# 📝 Markdown Preview with Subpoints for Each Action
 def create_markdown_preview(history_df):
     markdown = "## 🌳 Journey Preview\n\n"
-    grouped_scenarios = history_df.groupby('situation_name')
+    grouped = history_df.groupby('situation_name', sort=False)
 
-    for situation_name, group in grouped_scenarios:
-        markdown += f"🌟 **{situation_name}**\n"
+    for situation_name, group in grouped:
+        markdown += f"### {group.iloc[0]['situation_emoji']} **{situation_name}**\n"
         for _, row in group.iterrows():
+            outcome_str = '✅ Success' if row['outcome'] else '❌ Failure'
             stars = '⭐' * int(row['score'])
-            markdown += f"  ↪ {row['action_emoji']} {row['action_name']}: "
-            markdown += "✅ Success\n" if row['outcome'] else "❌ Failure\n"
-            markdown += f"    📜 {row['conclusion']} {stars} 💪 Gear: {row['gear_strength']:.2f} | 🏋️ Skill: {row['rider_skill']:.2f}\n"
+            markdown += f"- {row['action_emoji']} **{row['action_name']}**: {outcome_str} {stars}\n"
+            markdown += f"  - {row['conclusion']}\n"
         markdown += "\n"
     return markdown
 
@@ -260,7 +293,6 @@ def main():
         st.markdown("## Choose Your Cat Rider:")
         cols = st.columns(len(CAT_RIDERS))
         for i, rider in enumerate(CAT_RIDERS):
-            # Adding unique key for each button
             if cols[i].button(f"{rider['emoji']} {rider['name']} ({rider['type']})", key=f"rider_{i}"):
                 st.session_state.game_state['cat_rider'] = rider
                 st.session_state.game_state['rider_skill'] = rider['skill']
@@ -270,7 +302,6 @@ def main():
         st.markdown("## Select Your Riding Gear:")
         cols = st.columns(len(RIDING_GEAR))
         for i, gear in enumerate(RIDING_GEAR):
-            # Adding unique key for each button
             if cols[i].button(f"{gear['name']} ({gear['type']})", key=f"gear_{i}"):
                 st.session_state.game_state['riding_gear'] = gear
                 st.session_state.game_state['gear_strength'] = gear['strength']
@@ -286,7 +317,6 @@ def main():
 
         cols = st.columns(3)
         for i, action in enumerate(actions):
-            # Adding unique key for each button
             if cols[i].button(f"{action['emoji']} {action['name']} ({action['type']})", key=f"action_{i}"):
                 outcome, success_chance = evaluate_action(situation, action, st.session_state.game_state['gear_strength'], st.session_state.game_state['rider_skill'], st.session_state.game_state['history'])
                 timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -320,31 +350,31 @@ def main():
                 # 🏅 Display Scoreboard
                 display_scoreboard(st.session_state.game_state)
 
-        # 📝 Display Markdown Preview
-        if not st.session_state.game_state['history_df'].empty:
-            st.markdown(create_markdown_preview(st.session_state.game_state['history_df']))
-
-        # 🌳 Display Heterogeneous Journey Graph
-        if not st.session_state.game_state['history_df'].empty:
-            st.markdown("## 🌳 Your Journey (Heterogeneous Graph)")
-            nodes, edges = create_heterogeneous_graph(st.session_state.game_state['history_df'])
-            try:
-                streamlit_flow('cat_rider_flow', 
-                               nodes, 
-                               edges, 
-                               layout=TreeLayout(direction='down'),
-                               fit_view=True, 
-                               height=600)
-            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.")
-
-        # 📊 Character Stats Visualization
-        data = {"Stat": ["Gear Strength 🛡️", "Rider Skill 🏇"],
-                "Value": [st.session_state.game_state['gear_strength'], st.session_state.game_state['rider_skill']]}
-        df = pd.DataFrame(data)
-        fig = px.bar(df, x='Stat', y='Value', title="Cat Rider Stats 📊")
-        st.plotly_chart(fig)
+                # Integration point for both functions
+                if not st.session_state.game_state['history_df'].empty:
+                    # 📝 Display Markdown Preview
+                    st.markdown(create_markdown_preview(st.session_state.game_state['history_df']))
+
+                    # 🌳 Display Heterogeneous Journey Graph
+                    st.markdown("## 🌳 Your Journey (Heterogeneous Graph)")
+                    nodes, edges = create_heterogeneous_graph(st.session_state.game_state['history_df'])
+                    try:
+                        streamlit_flow('cat_rider_flow',
+                                       nodes,
+                                       edges,
+                                       layout=TreeLayout(direction='down'),
+                                       fit_view=True,
+                                       height=600)
+                    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.")
+
+                # 📊 Character Stats Visualization
+                data = {"Stat": ["Gear Strength 🛡️", "Rider Skill 🏇"],
+                        "Value": [st.session_state.game_state['gear_strength'], st.session_state.game_state['rider_skill']]}
+                df = pd.DataFrame(data)
+                fig = px.bar(df, x='Stat', y='Value', title="Cat Rider Stats 📊")
+                st.plotly_chart(fig)
 
 if __name__ == "__main__":
     main()