Update app.py

app.py

@@ -1,5 +1,5 @@
 # app.py
-# @title Beer Game Final Version (v4.19 - Fixed TypeError, Removed Costs, Highlighted Player)
+# @title Beer Game Final Version (v4.20 - Fixed UI Incoming Order Timing & Input Defaults)
 
 # -----------------------------------------------------------------------------
 # 1. Import Libraries
@@ -57,7 +57,7 @@ else:
 
 
 # -----------------------------------------------------------------------------
-# 3. Core Game Logic Functions (Using stable v4.17 logic)
+# 3. Core Game Logic Functions
 # -----------------------------------------------------------------------------
 
 def get_customer_demand(week: int) -> int:
@@ -87,8 +87,7 @@ def init_game_state(llm_personality: str, info_sharing: str):
         else: shipping_weeks = SHIPPING_DELAY
 
         st.session_state.game_state['echelons'][name] = {
-            'name': name,
-            'inventory': INITIAL_INVENTORY, 'backlog': INITIAL_BACKLOG,
+            'name': name, 'inventory': INITIAL_INVENTORY, 'backlog': INITIAL_BACKLOG,
             'incoming_shipments': deque([0] * shipping_weeks, maxlen=shipping_weeks),
             'incoming_order': 0, 'order_placed': 0, 'shipment_sent': 0,
             'weekly_cost': 0, 'total_cost': 0, 'upstream_name': upstream, 'downstream_name': downstream,
@@ -302,7 +301,7 @@ def save_logs_and_upload(state: dict):
     except Exception as e_save: st.error(f"Error processing or saving log data: {e_save}")
 
 # -----------------------------------------------------------------------------
-# 4. Streamlit UI (Removed Costs, Highlighted Player)
+# 4. Streamlit UI (Adjusted Dashboard Labels & Logic)
 # -----------------------------------------------------------------------------
 st.title("🍺 The Beer Game: A Human-AI Collaboration Challenge")
 
@@ -332,12 +331,37 @@ else:
             st.markdown(f"* **Week 10 (You):** You place an order for **50**.\n* **Week 11 (System):** Your order arrives at the Factory (**{ORDER_PASSING_DELAY}w Order Delay**). Factory AI decides to produce 50.\n* **Week 12 (System):** Factory finishes producing 50 (**{FACTORY_LEAD_TIME}w Production Delay**) & ships it.\n* **Week 13 (System):** The 50 units arrive at your warehouse (**{FACTORY_SHIPPING_DELAY}w Shipping Delay**).\n**Conclusion:** Think 3 weeks ahead! Your order in Week 10 arrives at the start of Week 13.")
         st.subheader("4. Understanding Inventory & Backlog")
         st.markdown("Managing your inventory and backlog is key to minimizing costs. Here's how they work:\n* **Effective \"Orders to Fill\":** Each week, the total demand you need to satisfy is your `Incoming Order` for the week PLUS any `Backlog` carried over from the previous week.\n* **If you DON'T have enough inventory:**\n    * You ship **all** the inventory you have (after receiving any arrivals for the week).\n    * The remaining unfilled \"Orders to Fill\" becomes your **new Backlog** for next week.\n    * **Backlog is cumulative!** If you start Week 10 with a backlog of 5, get an order for 8 (total needed = 13), receive 10 units, and ship those 10 units, your new backlog for Week 11 is `13 - 10 = 3`.\n* **If you DO have enough inventory:**\n    * You ship all the \"Orders to Fill\".\n    * Your Backlog becomes 0.\n    * The remaining inventory is carried over to next week (and incurs holding costs).")
-        st.subheader("5. The Bullwhip Effect (What to Avoid)")
+        st.subheader("5. The Bullwhisp Effect (What to Avoid)")
         st.markdown("The \"Bullwhip Effect\" happens when small changes in customer demand cause **amplified**, chaotic swings in orders further up the supply chain (like you and the Factory). This often leads to cycles of **panic ordering** (ordering too much when out of stock) followed by **massive inventory pile-ups** (when late orders arrive). This cycle is very expensive. Try to order smoothly.")
+
+        # =============== UPDATED: How Each Week Works & Dashboard Explanation ===============
         st.subheader("6. How Each Week Works & Understanding Your Dashboard")
-        st.markdown(f"Your main job is simple: place one order each week based on the dashboard presented to you.\n\n**A) At the start of every week, BEFORE your turn:**\n* **(Step 1) Shipments Arrive:** Beer you ordered {ORDER_PASSING_DELAY + FACTORY_LEAD_TIME + FACTORY_SHIPPING_DELAY} weeks ago arrives.\n* **(Step 2) New Orders Arrive:** You receive a new order from the Wholesaler (their order from *last* week).\n* **(Step 3) You Ship Beer (Automatically):** The system ships beer *immediately* based on your inventory *after* Step 1 and the total demand *after* Step 2.\n\n**B) Your Dashboard (What You See for Your Turn):**\nThe dashboard shows your status **at the start of the week, BEFORE Steps 1, 2, and 3 happen**:\n* `Inventory (Opening)`: Your stock **at the beginning of the week**.\n* `Backlog (Opening)`: Unfilled orders **carried over from the end of last week**.\n* `Incoming Order (This Week)`: The specific order quantity that **will arrive** from the Wholesaler *during* this week (Step 2). Use this for your planning.\n* `Arriving Next Week`: The quantity scheduled to arrive at the start of the **next week**. Use this for your planning.\n\n**C) Your Decision (Step 4 - Two Parts):**\nNow, looking at the dashboard (showing the start-of-week state) and considering the incoming order and future arrivals, you decide how much to order:\n* **(Step 4a - Initial Order):** Submit your first estimate.\n* **(Step 4b - Final Order):** See the AI's suggestion, then submit your final decision. This order will arrive in 3 weeks.\n\nSubmitting your final order ends the week. The system then calculates your `Weekly Cost` based on your inventory/backlog *after* Step 3 shipping, logs everything, and advances to the next week.")
+        st.markdown(f"""
+        Your main job is simple: place one order each week based on the dashboard presented to you.
+
+        **A) At the start of every week, BEFORE your turn:**
+        * **(Step 1) Shipments Arrive:** Beer you ordered {ORDER_PASSING_DELAY + FACTORY_LEAD_TIME + FACTORY_SHIPPING_DELAY} weeks ago arrives.
+        * **(Step 2) New Orders Arrive:** You receive a new order from the Wholesaler (this is their order placed *last* week, due to the {ORDER_PASSING_DELAY} week delay).
+        * **(Step 3) You Ship Beer (Automatically):** The system ships beer *immediately* based on your inventory *after* Step 1 and the total demand *after* Step 2.
+
+        **B) Your Dashboard (What You See for Your Turn):**
+        The dashboard shows your status **at the start of the week, BEFORE Steps 1, 2, and 3 happen**:
+        * `Inventory (Opening)`: Your stock **at the beginning of the week**.
+        * `Backlog (Opening)`: Unfilled orders **carried over from the end of last week**.
+        * `Incoming Order (This Week)`: The specific order quantity arriving from the Wholesaler *during* this week (Step 2). **This is the primary demand signal you need to react to.**
+        * `Arriving Next Week`: The quantity scheduled to arrive from the Factory at the start of the **next week**.
+        * `Your Total Cumulative Cost`: Sum of all weekly costs up to the **end of last week** (Removed from dashboard).
+        * `Cost Last Week`: The specific cost incurred just **last week** (Removed from dashboard).
+
+        **C) Your Decision (Step 4 - Two Parts):**
+        Now, looking at the dashboard (showing the start-of-week state) and considering the incoming order and future arrivals, you decide how much to order:
+        * **(Step 4a - Initial Order):** Submit your first estimate. Input box starts blank.
+        * **(Step 4b - Final Order):** See the AI's suggestion, then submit your final decision. Input box starts blank (or with AI suggestion if preferred - currently blank). This order will arrive in 3 weeks.
+
+        Submitting your final order ends the week. The system then calculates your `Weekly Cost` based on your inventory/backlog *after* Step 3 shipping, logs everything, and advances to the next week.
+        """)
+        # ==============================================================================
 
-        # --- Game Configuration ---
         st.markdown("---")
         st.header("⚙️ Game Configuration")
         c1, c2 = st.columns(2)
@@ -372,7 +396,7 @@ else:
                     # =============== UI CHANGE: Highlight Player ===============
                     if name == human_role:
                         # Use markdown with HTML/CSS for highlighting
-                        st.markdown(f"##### **<span style='color:#FF4B4B; border: 1px solid #FF4B4B; padding: 2px 5px; border-radius: 3px;'>{icon} {name} (You)</span>**", unsafe_allow_html=True)
+                        st.markdown(f"##### **<span style='border: 1px solid #FF4B4B; padding: 2px 5px; border-radius: 3px;'>{icon} {name} (You)</span>**", unsafe_allow_html=True)
                     else:
                         st.markdown(f"##### {icon} {name}")
                     # ========================================================
@@ -382,41 +406,48 @@ else:
                     st.metric("Backlog (Opening)", e['backlog'])
 
                     # =============== UI CHANGE: Removed Costs ===============
-                    # if name == human_role:
-                    #     st.metric("Total Cost (Cumulative)", f"${e['total_cost']:,.2f}")
-                    #     last_week_cost = state['logs'][-1][f"{human_role}.weekly_cost"] if week > 1 and state['logs'] else 0
-                    #     st.metric("Cost Last Week", f"${last_week_cost:,.2f}")
+                    # Costs are no longer displayed on the main dashboard
                     # =======================================================
 
                     # Display info about THIS week's events / NEXT week's arrivals
-                    st.write(f"Incoming Order (This Week): **{e['incoming_order']}**") # Order arriving in Step 2
+                    # Calculate the INCOMING order for THIS week
+                    current_incoming_order = 0
+                    if name == "Retailer":
+                        current_incoming_order = get_customer_demand(week)
+                    else:
+                        downstream_name = e['downstream_name']
+                        if downstream_name:
+                            current_incoming_order = state['last_week_orders'].get(downstream_name, 0)
+                    st.write(f"Incoming Order (This Week): **{current_incoming_order}**") # Display calculated order
+
+                    # Display prediction for NEXT week's arrivals
                     if name == "Factory":
-                        # Production completing NEXT week
                         prod_completing_next = list(state['factory_production_pipeline'])[0] if state['factory_production_pipeline'] else 0
                         st.write(f"Completing Next Week: **{prod_completing_next}**")
                     else:
-                        # Shipment arriving NEXT week
                         arriving_next = list(e['incoming_shipments'])[0] if e['incoming_shipments'] else 0
                         st.write(f"Arriving Next Week: **{arriving_next}**")
         else: # Local Info Mode
             st.info("In Local Information mode, you can only see your own status dashboard.")
             e = echelons[human_role]
-            # =============== UI CHANGE: Highlight Player ===============
             st.markdown(f"### 👤 **<span style='color:#FF4B4B;'>{human_role} (Your Dashboard - Start of Week State)</span>**", unsafe_allow_html=True) # Highlight self
-            # ========================================================
 
             col1, col2, col3, col4 = st.columns(4)
             # Display OPENING state
             col1.metric("Inventory (Opening)", e['inventory'])
             col2.metric("Backlog (Opening)", e['backlog'])
+
             # Display info about THIS week's events / NEXT week's arrivals
-            col3.write(f"**Incoming Order (This Week):**\n# {e['incoming_order']}")
+            # Calculate the INCOMING order for THIS week
+            current_incoming_order = 0
+            downstream_name = e['downstream_name'] # Wholesaler
+            if downstream_name:
+                 current_incoming_order = state['last_week_orders'].get(downstream_name, 0)
+            col3.write(f"**Incoming Order (This Week):**\n# {current_incoming_order}") # Display calculated order
             col4.write(f"**Shipment Arriving (Next Week):**\n# {list(e['incoming_shipments'])[0] if e['incoming_shipments'] else 0}")
 
             # =============== UI CHANGE: Removed Costs ===============
-            # st.metric("Your Total Cumulative Cost", f"${e['total_cost']:,.2f}")
-            # last_week_cost = state['logs'][-1][f"{human_role}.weekly_cost"] if week > 1 and state['logs'] else 0
-            # st.metric("Cost Last Week", f"${last_week_cost:,.2f}")
+            # Costs are no longer displayed on the main dashboard
             # =======================================================
 
 
@@ -436,13 +467,18 @@ else:
 
             # Calculate the state AFTER arrivals and incoming orders for the prompt
             inv_after_arrival = e_curr['inventory'] + arrived
-            backlog_after_new_order = e_curr['backlog'] + e_curr['incoming_order']
+            # Determine incoming order for *this* week again for prompt state
+            inc_order_this_week = 0
+            if name == "Retailer": inc_order_this_week = get_customer_demand(week)
+            else:
+                ds_name = e_curr['downstream_name']
+                if ds_name: inc_order_this_week = state['last_week_orders'].get(ds_name, 0)
+
+            backlog_after_new_order = e_curr['backlog'] + inc_order_this_week
 
             all_decision_point_states[name] = {
-                'name': name,
-                'inventory': inv_after_arrival, # State for decision making
-                'backlog': backlog_after_new_order, # State for decision making
-                'incoming_order': e_curr['incoming_order'], # Info for decision making
+                'name': name, 'inventory': inv_after_arrival, 'backlog': backlog_after_new_order,
+                'incoming_order': inc_order_this_week, # Use the correctly calculated incoming order
                 'incoming_shipments': e_curr['incoming_shipments'].copy() if name != "Factory" else deque()
             }
         human_echelon_state_for_prompt = all_decision_point_states[human_role]
@@ -451,11 +487,12 @@ else:
         if state['decision_step'] == 'initial_order':
             with st.form(key="initial_order_form"):
                 st.markdown("#### **Step 4a:** Based on the dashboard, submit your **initial** order to the Factory.")
-                # Default initial order based on incoming order, minimum 4
-                default_initial = max(4, echelons[human_role]['incoming_order'])
-                initial_order = st.number_input("Your Initial Order Quantity:", min_value=0, step=1, value=default_initial)
+                # =============== UI CHANGE: Removed Default Value ===============
+                initial_order = st.number_input("Your Initial Order Quantity:", min_value=0, step=1) # No 'value' argument
+                # ===============================================================
                 if st.form_submit_button("Submit Initial Order & See AI Suggestion", type="primary"):
-                    state['human_initial_order'] = int(initial_order)
+                    # Handle case where user leaves it blank (input returns None)
+                    state['human_initial_order'] = int(initial_order) if initial_order is not None else 0
                     state['decision_step'] = 'final_order'
                     st.rerun()
 
@@ -465,16 +502,23 @@ else:
             prompt_sugg = get_llm_prompt(human_echelon_state_for_prompt, week, state['llm_personality'], state['info_sharing'], all_decision_point_states)
             ai_suggestion, _ = get_llm_order_decision(prompt_sugg, f"{human_role} (Suggestion)")
 
-            if 'final_order_input' not in st.session_state:
-                st.session_state.final_order_input = ai_suggestion
+            # We don't pre-fill the final_order_input anymore
+            # if 'final_order_input' not in st.session_state:
+            #     st.session_state.final_order_input = ai_suggestion
 
             with st.form(key="final_order_form"):
                 st.markdown(f"#### **Step 4b:** The AI suggests ordering **{ai_suggestion}** units.")
                 st.markdown("Considering the AI's advice, submit your **final** order to end the week. (This order will arrive in 3 weeks).")
-                st.number_input("Your Final Order Quantity:", min_value=0, step=1, key='final_order_input')
+                # =============== UI CHANGE: Removed Default Value ===============
+                st.number_input("Your Final Order Quantity:", min_value=0, step=1, key='final_order_input') # No 'value' argument
+                # ===============================================================
                 if st.form_submit_button("Submit Final Order & Advance to Next Week"):
-                    final_order_value = st.session_state.final_order_input
+                    # Handle case where user leaves it blank
+                    final_order_value = st.session_state.get('final_order_input', 0) # Use .get with default
+                    final_order_value = int(final_order_value) if final_order_value is not None else 0
+
                     step_game(final_order_value, state['human_initial_order'], ai_suggestion)
+                    # Clean up session state for the input key
                     if 'final_order_input' in st.session_state: del st.session_state.final_order_input
                     st.rerun()
 
@@ -505,7 +549,6 @@ else:
                     else:
                         display_df = history_df[final_cols_to_display].rename(columns=human_cols)
                         if 'Weekly Cost' in display_df.columns:
-                            # Safely apply formatting, handling potential non-numeric data
                             display_df['Weekly Cost'] = display_df['Weekly Cost'].apply(lambda x: f"${x:,.2f}" if isinstance(x, (int, float)) else "")
                         st.dataframe(display_df.sort_values(by="Week", ascending=False), hide_index=True, use_container_width=True)
                 except Exception as e: