Update app.py

app.py

@@ -218,11 +218,11 @@ def step_game(human_final_order: int, human_initial_order: int, ai_suggestion: i
         total_backlog_before_shipping[name] = echelons[name]['backlog'] + incoming_order_for_this_week
     decision_point_states = {}
     for name in echelon_order:
-         decision_point_states[name] = {
-             'name': name, 'inventory': inventory_after_arrival[name],
-             'backlog': total_backlog_before_shipping[name], 'incoming_order': echelons[name]['incoming_order'],
-             'incoming_shipments': echelons[name]['incoming_shipments'].copy() if name != "Factory" else deque(),
-         }
+        decision_point_states[name] = {
+            'name': name, 'inventory': inventory_after_arrival[name],
+            'backlog': total_backlog_before_shipping[name], 'incoming_order': echelons[name]['incoming_order'],
+            'incoming_shipments': echelons[name]['incoming_shipments'].copy() if name != "Factory" else deque(),
+        }
     current_week_orders = {}
     for name in echelon_order:
         e = echelons[name]; prompt_state = decision_point_states[name]
@@ -433,7 +433,7 @@ else:
         
         c1, c2 = st.columns(2)
         with c1:
-             llm_personality = st.selectbox("AI Agent 'Personality'", ('human_like', 'perfect_rational'), format_func=lambda x: x.replace('_', ' ').title(), help="**Human-like:** Tends to react emotionally, potentially over-ordering. **Perfect Rational:** Uses a mathematical heuristic to make stable, logical decisions.")
+            llm_personality = st.selectbox("AI Agent 'Personality'", ('human_like', 'perfect_rational'), format_func=lambda x: x.replace('_', ' ').title(), help="**Human-like:** Tends to react emotionally, potentially over-ordering. **Perfect Rational:** Uses a mathematical heuristic to make stable, logical decisions.")
         with c2:
             info_sharing = st.selectbox("Information Sharing Level", ('local', 'full'), format_func=lambda x: x.title(), help="**Local:** You and the AI agents can only see your own inventory and incoming orders. **Full:** Everyone can see the entire supply chain's status and the true end-customer demand.")
 
@@ -456,7 +456,7 @@ else:
                 else:
                     # 新ID，直接开始
                     if 'last_id_warning' in st.session_state:
-                         del st.session_state['last_id_warning']
+                        del st.session_state['last_id_warning']
                     init_game_state(llm_personality, info_sharing, participant_id)
                     st.rerun()
         # ===========================================================
@@ -504,32 +504,43 @@ else:
                         if downstream_name:
                             current_incoming_order = state['last_week_orders'].get(downstream_name, 0)
                     st.write(f"Incoming Order (This Week): **{current_incoming_order}**") 
-                                        
+                                            
                     if name == "Factory":
                         arriving_this_week = list(state['factory_production_pipeline'])[0] if state['factory_production_pipeline'] else 0
                         st.write(f"Completing This Week: **{arriving_this_week}**")
-                        prod_completing_next = list(state['factory_production_pipeline'])[1] if len(state['factory_production_pipeline']) > 1 else 0
+                        
+                        # FIX: 'Next week' for Factory is the order it just received from Distributor
+                        prod_completing_next = state['last_week_orders'].get("Distributor", 0)
+                        
                         st.write(f"Completing Next Week: **{prod_completing_next}**")
                     else:
                         arriving_this_week = list(e['incoming_shipments'])[0] if e['incoming_shipments'] else 0
                         st.write(f"Arriving This Week: **{arriving_this_week}**")
                         
                         arriving_next = 0
-                        # 检查队列长度是否大于1
-                        if len(e['incoming_shipments']) > 1:
+                        
+                        # FIX: Add special case for Distributor
+                        if name == 'Distributor':
+                            # 'Next week' for Distributor is what's in the factory pipeline
+                            if state['factory_production_pipeline']:
+                                arriving_next = list(state['factory_production_pipeline'])[0]
+                        
+                        # Original logic for R/W (q_len > 1)
+                        elif len(e['incoming_shipments']) > 1:
                             arriving_next = list(e['incoming_shipments'])[1]
-                        # 专门处理R和W的2周延迟
+                        
+                        # Original logic for R/W (q_len = 1 or 0)
                         elif name in ('Wholesaler', 'Retailer') and e['incoming_shipments'].maxlen == 2:
-                             # 如果队列长度为1，说���下周的货在[0]，这周的货是0
-                             if len(e['incoming_shipments']) == 1:
-                                 arriving_next = list(e['incoming_shipments'])[0]
-                                 arriving_this_week = 0 # 覆盖
-                             else: # 队列为0
-                                 arriving_next = 0
-                                 arriving_this_week = 0 # 覆盖
-                             
-                             # 重新显示修正后的"Arriving This Week"
-                             st.write(f"Arriving This Week: **{arriving_this_week}**")
+                            # 如果队列长度为1，说明下周的货在[0]，这周的货是0
+                            if len(e['incoming_shipments']) == 1:
+                                arriving_next = list(e['incoming_shipments'])[0]
+                                arriving_this_week = 0 # 覆盖
+                            else: # 队列为0
+                                arriving_next = 0
+                                arriving_this_week = 0 # 覆盖
+                            
+                            # 重新显示修正后的"Arriving This Week"
+                            st.write(f"Arriving This Week: **{arriving_this_week}**")
                         
                         st.write(f"Arriving Next Week: **{arriving_next}**")
         
@@ -547,7 +558,7 @@ else:
                 current_incoming_order = 0
                 downstream_name = e['downstream_name'] # Wholesaler
                 if downstream_name:
-                     current_incoming_order = state['last_week_orders'].get(downstream_name, 0)
+                    current_incoming_order = state['last_week_orders'].get(downstream_name, 0)
                 st.write(f"**Incoming Order (This Week):**\n# {current_incoming_order}")
                 
             with col3:
@@ -570,9 +581,9 @@ else:
             e_curr = echelons[name] # This is END OF LAST WEEK state
             arrived = 0
             if name == "Factory":
-                 if state['factory_production_pipeline']: arrived = list(state['factory_production_pipeline'])[0]
+                if state['factory_production_pipeline']: arrived = list(state['factory_production_pipeline'])[0]
             else:
-                 if e_curr['incoming_shipments']: arrived = list(e_curr['incoming_shipments'])[0]
+                if e_curr['incoming_shipments']: arrived = list(e_curr['incoming_shipments'])[0]
             
             inc_order_this_week = 0
             if name == "Retailer": inc_order_this_week = get_customer_demand(week)
@@ -622,7 +633,7 @@ else:
                 if st.form_submit_button("Submit Final Order & Advance to Next Week"):
                     final_order_value = st.session_state.get('final_order_input', 0)
                     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)
                     
                     if 'final_order_input' in st.session_state: del st.session_state.final_order_input
@@ -647,11 +658,11 @@ else:
                         f'{human_role}.arrived_this_week', f'{human_role}.incoming_order',
                         f'{human_role}.initial_order', f'{human_role}.ai_suggestion', f'{human_role}.order_placed',
                         f'{human_role}.arriving_next_week', f'{human_role}.weekly_cost'
-                     ]
+                    ]
                     final_cols_to_display = [col for col in ordered_display_cols_keys if col in history_df.columns]
 
                     if not final_cols_to_display:
-                         st.write("No data columns available to display.")
+                        st.write("No data columns available to display.")
                     else:
                         display_df = history_df[final_cols_to_display].rename(columns=human_cols)
                         if 'Weekly Cost' in display_df.columns: