Update app.py

app.py

@@ -492,9 +492,89 @@ def perform_sustainability_analysis(state):
     except Exception as e:
         return f"❌ Error in sustainability analysis: {str(e)}", None, "Analysis failed"
 
-def predict_freight_cost(state, weight=1000, line_item_value=10000, cost_per_kg=50,
-                       shipment_mode="Air", air_charter_weight=0, ocean_weight=0, truck_weight=0,
-                       air_charter_value=0, ocean_value=0, truck_value=0):
+def calculate_shipping_cost(base_cost, params):
+    """Calculate total shipping cost with all factors"""
+    total_cost = base_cost
+    
+    # Fuel surcharge
+    fuel_charge = base_cost * (params['fuel_surcharge'] / 100)
+    
+    # Insurance
+    insurance = params['line_item_value'] * (params['insurance_rate'] / 100)
+    
+    # Customs duty
+    duty = params['line_item_value'] * (params['customs_duty'] / 100)
+    
+    # Special handling charges
+    handling_charges = 0
+    handling_rates = {
+        "Temperature Controlled": 0.15,
+        "Hazardous Materials": 0.25,
+        "Fragile Items": 0.10,
+        "Express Delivery": 0.20,
+        "Door-to-Door Service": 0.15
+    }
+    
+    for requirement in params['special_handling']:
+        if requirement in handling_rates:
+            handling_charges += base_cost * handling_rates[requirement]
+    
+    # Distance-based charge
+    distance_rate = {
+        "Air": 0.1,
+        "Ocean": 0.05,
+        "Truck": 0.15
+    }
+    distance_charge = params['distance'] * distance_rate[params['shipment_mode']]
+    
+    # Time-based charge
+    transit_charge = params['transit_time'] * (base_cost * 0.01)
+    
+    total_cost = base_cost + fuel_charge + insurance + duty + handling_charges + distance_charge + transit_charge
+    
+    return {
+        'base_cost': round(base_cost, 2),
+        'fuel_charge': round(fuel_charge, 2),
+        'insurance': round(insurance, 2),
+        'customs_duty': round(duty, 2),
+        'handling_charges': round(handling_charges, 2),
+        'distance_charge': round(distance_charge, 2),
+        'transit_charge': round(transit_charge, 2),
+        'total_cost': round(total_cost, 2)
+    }
+
+def predict_freight_cost(state, params):
+    """Predict freight cost with enhanced parameters"""
+    if state.freight_model is None:
+        return "Error: Freight prediction model not loaded"
+        
+    try:
+        # Clean shipment mode string
+        mode = params['shipment_mode'].replace("✈️ ", "").replace("🚢 ", "").replace("🚛 ", "")
+        
+        # Prepare features for the model
+        features = {
+            'weight (kilograms)': params['weight'],
+            'line item value': params['line_item_value'],
+            'cost per kilogram': params['cost_per_kg'],
+            'shipment mode_Air Charter_weight': params['weight'] if mode == "Air" else 0,
+            'shipment mode_Ocean_weight': params['weight'] if mode == "Ocean" else 0,
+            'shipment mode_Truck_weight': params['weight'] if mode == "Truck" else 0,
+            'shipment mode_Air Charter_line_item_value': params['line_item_value'] if mode == "Air" else 0,
+            'shipment mode_Ocean_line_item_value': params['line_item_value'] if mode == "Ocean" else 0,
+            'shipment mode_Truck_line_item_value': params['line_item_value'] if mode == "Truck" else 0
+        }
+        
+        input_data = pd.DataFrame([features])
+        base_prediction = state.freight_model.predict(input_data)[0]
+        
+        # Calculate total cost with all factors
+        cost_breakdown = calculate_shipping_cost(base_prediction, params)
+        
+        return cost_breakdown
+        
+    except Exception as e:
+        return f"Error making prediction: {str(e)}"
     if state.freight_model is None:
         return "Error: Freight prediction model not loaded"
         
@@ -717,10 +797,13 @@ def run_analyses(state, choices, sales_file, supplier_file, text_data):
     return combined_results, final_figure, combined_status
 
 def predict_and_store_freight(state, *args):
-    result = predict_freight_cost(state, *args)
-    if isinstance(result, (int, float)):
-        state.freight_predictions.append(result)
-    return result
+    if len(args) >= 3:
+        weight, line_item_value, shipment_mode = args[:3]
+        result = predict_freight_cost(state, weight, line_item_value, 50, shipment_mode)
+        if isinstance(result, (int, float)):
+            state.freight_predictions.append(result)
+        return result
+    return "Error: Invalid parameters"
 
 def create_interface():
     state = SupplyChainState()
@@ -812,15 +895,15 @@ def create_interface():
 
             # Cost Prediction Tab
             with gr.Tab("💰 Cost Prediction", elem_classes="tab-content"):
-                with gr.Row():
-                    shipment_mode = gr.Dropdown(
-                        choices=["✈️ Air", "🚢 Ocean", "🚛 Truck"],
-                        label="Transport Mode",
-                        value="✈️ Air"
-                    )
-                
                 with gr.Row():
                     with gr.Column():
+                        shipment_mode = gr.Dropdown(
+                            choices=["✈️ Air", "🚢 Ocean", "🚛 Truck"],
+                            label="Transport Mode",
+                            value="✈️ Air"
+                        )
+                        
+                        # Basic Parameters
                         weight = gr.Slider(
                             label="📦 Weight (kg)",
                             minimum=1,
@@ -828,7 +911,6 @@ def create_interface():
                             step=1,
                             value=1000
                         )
-                    with gr.Column():
                         line_item_value = gr.Slider(
                             label="💵 Item Value (USD)",
                             minimum=1,
@@ -836,16 +918,86 @@ def create_interface():
                             step=1,
                             value=10000
                         )
+                        cost_per_kg = gr.Slider(
+                            label="💲 Base Cost per kg (USD)",
+                            minimum=1,
+                            maximum=500,
+                            step=1,
+                            value=50
+                        )
+                        
+                        # Advanced Parameters
+                        gr.Markdown("### Advanced Parameters")
+                        transit_time = gr.Slider(
+                            label="🕒 Transit Time (Days)",
+                            minimum=1,
+                            maximum=60,
+                            step=1,
+                            value=7
+                        )
+                        distance = gr.Slider(
+                            label="📏 Distance (km)",
+                            minimum=100,
+                            maximum=20000,
+                            step=100,
+                            value=1000
+                        )
+                        fuel_surcharge = gr.Slider(
+                            label="⛽ Fuel Surcharge (%)",
+                            minimum=0,
+                            maximum=50,
+                            step=0.5,
+                            value=5
+                        )
+                        
+                        # Risk Factors
+                        gr.Markdown("### Risk Factors")
+                        insurance_rate = gr.Slider(
+                            label="🛡️ Insurance Rate (%)",
+                            minimum=0.1,
+                            maximum=10,
+                            step=0.1,
+                            value=1
+                        )
+                        customs_duty = gr.Slider(
+                            label="🏛️ Customs Duty (%)",
+                            minimum=0,
+                            maximum=40,
+                            step=0.5,
+                            value=5
+                        )
+                        
+                        # Special Handling
+                        gr.Markdown("### Special Handling")
+                        special_handling = gr.CheckboxGroup(
+                            choices=[
+                                "Temperature Controlled",
+                                "Hazardous Materials",
+                                "Fragile Items",
+                                "Express Delivery",
+                                "Door-to-Door Service"
+                            ],
+                            label="Special Requirements"
+                        )
                 
                 predict_button = gr.Button(
-                    "🔍 Calculate Cost",
+                    "🔍 Calculate Total Cost",
                     variant="primary",
                     elem_classes="action-button"
                 )
-                freight_result = gr.Number(
-                    label="Predicted Cost (USD)",
-                    elem_classes="result-box"
-                )
+                with gr.Row():
+                    freight_result = gr.Number(
+                        label="Base Freight Cost (USD)",
+                        elem_classes="result-box"
+                    )
+                    total_cost = gr.Number(
+                        label="Total Cost Including All Charges (USD)",
+                        elem_classes="result-box"
+                    )
+                    cost_breakdown = gr.JSON(
+                        label="Cost Breakdown",
+                        elem_classes="result-box"
+                    )
 
             # Chat Tab
             with gr.Tab("💬 Chat", elem_classes="tab-content"):
@@ -902,15 +1054,27 @@ def create_interface():
         )
 
         predict_button.click(
-            fn=lambda weight, value, mode: predict_and_store_freight(
-                state, 
-                weight=weight,
-                line_item_value=value,
-                cost_per_kg=50,  # Default value
-                shipment_mode=mode
+            fn=lambda mode, w, val, cost, time, dist, fuel, ins, duty, special: predict_and_store_freight(
+                state,
+                {
+                    'shipment_mode': mode,
+                    'weight': w,
+                    'line_item_value': val,
+                    'cost_per_kg': cost,
+                    'transit_time': time,
+                    'distance': dist,
+                    'fuel_surcharge': fuel,
+                    'insurance_rate': ins,
+                    'customs_duty': duty,
+                    'special_handling': special
+                }
             ),
-            inputs=[weight, line_item_value, shipment_mode],
-            outputs=[freight_result]
+            inputs=[
+                shipment_mode, weight, line_item_value, cost_per_kg,
+                transit_time, distance, fuel_surcharge,
+                insurance_rate, customs_duty, special_handling
+            ],
+            outputs=[freight_result, total_cost, cost_breakdown]
         )
         
         chat_button.click(