Update app.py

app.py

@@ -1,5 +1,5 @@
 # app.py
-# @title Beer Game Final Version (v9 - Correct LT=3, Correct UI, Correct Log)
+# @title Beer Game Final Version (v7 - THE REAL FIX: LT=3, Log Fix, Prompt Fix)
 
 # -----------------------------------------------------------------------------
 # 1. Import Libraries
@@ -35,8 +35,10 @@ INITIAL_BACKLOG = 0
 ORDER_PASSING_DELAY = 1 # Handled by last_week_orders
 SHIPPING_DELAY = 2 # General shipping delay (R->W, W->D)
 FACTORY_LEAD_TIME = 1
-# This is CORRECT for LT=3 (1 pass + 1 produce + 1 ship = 3 week total LT)
-FACTORY_SHIPPING_DELAY = 1 
+# --------------------- THE REAL BUG FIX (LT=3) ---------------------
+# This MUST be 2 for LT=3. (Order W2 -> F Rec W3 -> F Prod W3 -> F Fin W4 -> F Ship W4 -> D Rec W5)
+FACTORY_SHIPPING_DELAY = 2 # Specific delay from Factory to Distributor
+# -------------------------------------------------------------------
 HOLDING_COST = 0.5
 BACKLOG_COST = 1.0
 
@@ -87,9 +89,12 @@ def init_game_state(llm_personality: str, info_sharing: str, participant_id: str
     for i, name in enumerate(roles):
         upstream = roles[i + 1] if i + 1 < len(roles) else None
         downstream = roles[i - 1] if i - 1 >= 0 else None
-        if name == "Distributor": shipping_weeks = FACTORY_SHIPPING_DELAY # This is 1
+        
+        # USE THE CORRECT DELAY
+        if name == "Distributor": shipping_weeks = FACTORY_SHIPPING_DELAY # This is 2
         elif name == "Factory": shipping_weeks = 0
         else: shipping_weeks = SHIPPING_DELAY # This is 2
+        
         st.session_state.game_state['echelons'][name] = {
             'name': name, 'inventory': INITIAL_INVENTORY, 'backlog': INITIAL_BACKLOG,
             'incoming_shipments': deque([0] * shipping_weeks, maxlen=shipping_weeks),
@@ -142,9 +147,9 @@ def get_llm_prompt(echelon_state_decision_point: dict, week: int, llm_personalit
     
     if llm_personality == 'perfect_rational' and info_sharing == 'full':
         stable_demand = current_stable_demand # Use the correct demand
-        # --------------------- LT=3 (1+1+1) ---------------------
+        # --------------------- LT=3 FIX ---------------------
         if e_state['name'] == 'Factory': total_lead_time = FACTORY_LEAD_TIME # 1
-        elif e_state['name'] == 'Distributor': total_lead_time = ORDER_PASSING_DELAY + FACTORY_LEAD_TIME + FACTORY_SHIPPING_DELAY # 1+1+1 = 3
+        elif e_state['name'] == 'Distributor': total_lead_time = ORDER_PASSING_DELAY + FACTORY_LEAD_TIME + FACTORY_SHIPPING_DELAY # 1+1+2 = 4
         else: total_lead_time = ORDER_PASSING_DELAY + SHIPPING_DELAY # 1+2 = 3
         # ----------------------------------------------------
         safety_stock = 4
@@ -245,9 +250,9 @@ def get_llm_prompt(echelon_state_decision_point: dict, week: int, llm_personalit
             """
 # =========================================================
 
-# =============== STEP_GAME (v9 - Stable Logic + Correct Log Fix) ===============
+# =============== STEP_GAME (v8) - Stable Logic + Correct Log Fix ===============
 def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: int):
-    # This version uses the stable v2 game logic AND the correct v9 logging fix
+    # This version uses the stable v2 game logic AND the correct v5 logging fix
     state = st.session_state.game_state
     week, echelons, human_role = state['week'], state['echelons'], state['human_role']
     llm_personality, info_sharing = state['llm_personality'], state['info_sharing']
@@ -258,7 +263,7 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
     opening_inventories = {name: e['inventory'] for name, e in echelons.items()}
     opening_backlogs = {name: e['backlog'] for name, e in echelons.items()}
 
-    # --- LOG FIX (v9): Capture UI-visible values BEFORE any pops ---
+    # --- LOG FIX (v8): Capture UI-visible values BEFORE any pops ---
     arrived_this_week_LOG = {name: 0 for name in echelon_order}
     arriving_next_week_LOG = {name: 0 for name in echelon_order}
     factory_q = state['factory_production_pipeline']
@@ -274,44 +279,25 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
         if shipment_q:
             arrived_this_week_LOG[name] = shipment_q[0] # Arrives this week (W+0)
         
-        # "Next Week" (W+1)
+        # This logic MUST match the UI logic (v8)
         if name == 'Distributor':
-            # "Next" for Distributor is what's in the factory *pipeline*
-            # This is the item that will arrive in W+2
-            # NO! "Next week" (W+1) is what is in shipping_q[0].
-            # "Next Next week" (W+2) is factory_q[0]
-            # The USER wants "Arriving Next Week" to mean W+1.
-            # With maxlen=1, the item for W+1 is NOT in the queue yet.
-            # The item for W+1 is what is in `factory_q`
-            
-            # --- THIS IS THE REAL FIX V9 ---
-            # "Arriving Next Week" for Distributor (who has maxlen=1)
-            # is the item that will be SHIPPED this week, which is in the factory_q
-            if factory_q:
-                arriving_next_week_LOG[name] = factory_q[0]
-            # This is what I had before, and it caused the "8" in the log.
-            # Let's re-read the user's trace:
-            # "W2 order 4 should... in W4 show arriving next week 4"
-            # W4: ANW=4. (Item for W5)
-            # Item for W5 is Order from W2.
-            # At start of W4:
-            #   `factory_q` = [8] (Order from W3, for W6)
-            #   `shipping_q` (Dist) = [4] (Order from W2, for W5)
-            # The user wants "Arriving Next Week" to be 4.
-            # This means `arriving_next_week` MUST read `shipping_q[0]`.
-            
-            if shipment_q: # Read item for W+1
-                 arriving_next_week_LOG[name] = shipment_q[0]
-            
+            # "Next" for Distributor is the *second* item in its queue (or factory pipeline)
+            # --------------------- LT=3 FIX ---------------------
+            # With maxlen=2, the queue [0, 4] -> [0] is this week, [1] is next week
+            if len(shipment_q) > 1:
+                arriving_next_week_LOG[name] = shipment_q[1]
+            # ----------------------------------------------------
         elif name in ("Retailer", "Wholesaler"):
-            # "Next" for R/W is the *second* item in their queue (item for W+1)
+            # "Next" for R/W is the *second* item in their queue
             if len(shipment_q) > 1:
                 arriving_next_week_LOG[name] = shipment_q[1]
-    # --- END LOG FIX (v9) ---
+    # --- END LOG FIX (v8) ---
 
 
     # === NOW, THE STABLE (v2) GAME LOGIC ===
-    arrived_this_week_GAME = {name: 0 for name in echelon_order} 
+    # This block is separate from the logging block above.
+    # It uses its *own* variables to run the game.
+    arrived_this_week_GAME = {name: 0 for name in echelon_order} # Use a fresh dict for game logic
     inventory_after_arrival = {}
     factory_state = echelons["Factory"]
     produced_units = 0
@@ -371,7 +357,7 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
         for key in ['inventory', 'backlog', 'incoming_order', 'order_placed', 'shipment_sent', 'weekly_cost', 'total_cost']: log_entry[f'{name}.{key}'] = e[key]
         log_entry[f'{name}.llm_raw_response'] = llm_raw_responses.get(name, "")
         
-        # --- LOG FIX (v9): Use captured values ---
+        # --- LOG FIX (v8): Use captured values ---
         log_entry[f'{name}.opening_inventory'] = opening_inventories[name]
         log_entry[f'{name}.opening_backlog'] = opening_backlogs[name]
         log_entry[f'{name}.arrived_this_week'] = arrived_this_week_LOG[name] # Use captured
@@ -380,7 +366,7 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
             log_entry[f'{name}.arriving_next_week'] = arriving_next_week_LOG[name] # Use captured
         else: 
             log_entry[f'{name}.production_completing_next_week'] = arriving_next_week_LOG[name] # Use captured
-        # --- END OF LOG FIX (v9) ---
+        # --- END OF LOG FIX (v8) ---
             
     log_entry[f'{human_role}.initial_order'] = human_initial_order; log_entry[f'{human_role}.ai_suggestion'] = ai_suggestion
     state['logs'].append(log_entry)
@@ -610,7 +596,7 @@ else:
         st.markdown("---")
         st.subheader("Supply Chain Status (Start of Week State)") 
 
-        # =============== MODIFIED UI LOGIC (v9) ===============
+        # =============== MODIFIED UI LOGIC (v8) ===============
         if info_sharing == 'full':
             cols = st.columns(4)
             for i, name in enumerate(echelon_order):
@@ -641,17 +627,16 @@ else:
                     else:
                         arriving_next = 0
                         
-                        # --- UI FIX V9 ---
-                        # "Arriving Next Week" (W+1)
+                        # This logic matches the v8 Log Fix
                         if name == 'Distributor':
-                            # Read W+1 item from its own shipping queue
+                            # --------------------- LT=3 FIX ---------------------
                             q = e['incoming_shipments']
-                            if q: arriving_next = list(q)[0]
+                            if len(q) > 1: arriving_next = list(q)[1]
+                            # ----------------------------------------------------
                         elif name in ('Wholesaler', 'Retailer'):
-                            # Read W+1 item from the second slot in queue
+                            # "Next" for R/W is the *second* item in their queue
                             q = e['incoming_shipments']
                             if len(q) > 1: arriving_next = list(q)[1]
-                        # --- END UI FIX V9 ---
                         
                         st.write(f"Arriving Next Week: **{arriving_next}**")
         
@@ -673,13 +658,13 @@ else:
                 st.write(f"**Incoming Order (This Week):**\n# {current_incoming_order}")
                 
             with col3:
-                # --------------------- LOCAL UI FIX V9 ---------------------
+                # --------------------- LOCAL UI FIX V8 ---------------------
                 # "Arriving Next Week" for Distributor in LOCAL mode.
-                # Read W+1 item from its own shipping queue
+                # With LT=3 (maxlen=2), we can now show list(q)[1]
                 arriving_next = 0
                 q = e['incoming_shipments']
-                if q:
-                     arriving_next = list(q)[0]
+                if len(q) > 1:
+                     arriving_next = list(q)[1]
                 st.write(f"**Shipment Arriving (Next Week):**\n# {arriving_next}")
                 # -----------------------------------------------------------