Update app.py

app.py

@@ -1,5 +1,5 @@
 # app.py
-# @title Beer Game Final Version (v4.25 - Based on v4.21 Logic + UI Fixes v2)
+# @title Beer Game Final Version (v4.25 - Based on v4.21 Logic + UI Fixes v3 - Log Fix)
 
 # -----------------------------------------------------------------------------
 # 1. Import Libraries
@@ -191,22 +191,56 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
     llm_personality, info_sharing = state['llm_personality'], state['info_sharing']
     echelon_order = ["Retailer", "Wholesaler", "Distributor", "Factory"]
     llm_raw_responses = {}
+    
+    # Capture opening state for logging
     opening_inventories = {name: e['inventory'] for name, e in echelons.items()}
     opening_backlogs = {name: e['backlog'] for name, e in echelons.items()}
+
+    # --- LOG FIX (v3): Capture arrival data BEFORE mutation ---
     arrived_this_week = {name: 0 for name in echelon_order}
+    # This dict will store the value shown on the UI for "next week"
+    opening_arriving_next_week_UI_VALUE = {name: 0 for name in echelon_order} 
+    
+    # Factory
+    factory_q = state['factory_production_pipeline']
+    if factory_q:
+        arrived_this_week["Factory"] = factory_q[0] # Read before pop
+    if len(factory_q) > 1:
+        opening_arriving_next_week_UI_VALUE["Factory"] = factory_q[1] # Read [1] before pop
+
+    # R, W, D
+    for name in ["Retailer", "Wholesaler", "Distributor"]:
+        shipment_q = echelons[name]['incoming_shipments']
+        if shipment_q:
+            arrived_this_week[name] = shipment_q[0] # Read before pop
+        
+        # This logic MUST match the v2 UI logic
+        if name == 'Distributor':
+            # "Next" for Distributor is what's at the front of the Factory's pipeline
+            if factory_q:
+                opening_arriving_next_week_UI_VALUE[name] = factory_q[0]
+        elif name in ("Retailer", "Wholesaler"):
+            if len(shipment_q) > 1: # q_len=2
+                opening_arriving_next_week_UI_VALUE[name] = shipment_q[1]
+            elif len(shipment_q) == 1: # q_len=1
+                opening_arriving_next_week_UI_VALUE[name] = shipment_q[0] # Match the v2 UI
+    # --- END OF LOG FIX (v3) ---
+
+    # Now, the *actual* state mutation (popping)
     inventory_after_arrival = {}
     factory_state = echelons["Factory"]
     produced_units = 0
     if state['factory_production_pipeline']:
         produced_units = state['factory_production_pipeline'].popleft()
-        arrived_this_week["Factory"] = produced_units
     inventory_after_arrival["Factory"] = factory_state['inventory'] + produced_units
+    
     for name in ["Retailer", "Wholesaler", "Distributor"]:
         arrived_shipment = 0
         if echelons[name]['incoming_shipments']:
             arrived_shipment = echelons[name]['incoming_shipments'].popleft()
-            arrived_this_week[name] = arrived_shipment
         inventory_after_arrival[name] = echelons[name]['inventory'] + arrived_shipment
+    
+    # (Rest of game logic)
     total_backlog_before_shipping = {}
     for name in echelon_order:
         incoming_order_for_this_week = 0
@@ -240,6 +274,8 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
     if units_shipped["Factory"] > 0: echelons['Distributor']['incoming_shipments'].append(units_shipped["Factory"])
     if units_shipped['Distributor'] > 0: echelons['Wholesaler']['incoming_shipments'].append(units_shipped['Distributor'])
     if units_shipped['Wholesaler'] > 0: echelons['Retailer']['incoming_shipments'].append(units_shipped['Wholesaler'])
+    
+    # (Logging)
     log_entry = {'timestamp': datetime.utcnow().isoformat() + "Z", 'week': week, **state}
     del log_entry['echelons'], log_entry['factory_production_pipeline'], log_entry['logs'], log_entry['last_week_orders']
     if 'current_ai_suggestion' in log_entry: del log_entry['current_ai_suggestion']
@@ -247,10 +283,18 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
         e = echelons[name]; e['weekly_cost'] = (e['inventory'] * HOLDING_COST) + (e['backlog'] * BACKLOG_COST); e['total_cost'] += e['weekly_cost']
         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_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[name]
-        if name != 'Factory': log_entry[f'{name}.arriving_next_week'] = list(e['incoming_shipments'])[0] if e['incoming_shipments'] else 0
-        else: log_entry[f'{name}.production_completing_next_week'] = list(state['factory_production_pipeline'])[0] if state['factory_production_pipeline'] else 0
+        
+        # --- LOG FIX (v3): 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[name] # Use captured value
+        
+        if name != 'Factory': 
+            log_entry[f'{name}.arriving_next_week'] = opening_arriving_next_week_UI_VALUE[name]
+        else: 
+            log_entry[f'{name}.production_completing_next_week'] = opening_arriving_next_week_UI_VALUE[name]
+        # --- END OF LOG FIX (v3) ---
+            
     log_entry[f'{human_role}.initial_order'] = human_initial_order; log_entry[f'{human_role}.ai_suggestion'] = ai_suggestion
     state['logs'].append(log_entry)
     state['week'] += 1; state['decision_step'] = 'initial_order'; state['last_week_orders'] = current_week_orders
@@ -554,9 +598,10 @@ else:
                 st.write(f"**Incoming Order (This Week):**\n# {current_incoming_order}")
                 
             with col3:
-                # FIX: 'Arriving This Week' removed from UI
+                # FIX: 'Arriving This Week' removed from UI per user request
+                # st.write(f"**Shipment Arriving (This Week):**\n# {list(e['incoming_shipments'])[0] if e['incoming_shipments'] else 0}")
                 
-                # Arriving NEXT week (Distributor的队列长度为1，所以[1]永远是0, this is correct for local view)
+                # Arriving NEXT week (Distributor's local view CANNOT see factory pipeline)
                 arriving_next = 0
                 st.write(f"**Shipment Arriving (Next Week):**\n# {arriving_next}")