Update app.py

app.py

@@ -126,29 +126,28 @@ class Truck:
         self.available_space.sort(key=lambda space: (space[2], space[1], space[0]))
 
 
-# Helper functions for box packing
 def pack_boxes_ffd(truck, consignments):
     packed_positions = []
 
+    # Sort consignments: priority consignments first, then by total volume (descending)
     consignments = sorted(consignments, key=lambda c: (not c[1], -sum(box.volume() * box.quantity for box in c[0])))
 
     for consignment in consignments:
-        consignment_packed = []
-        for box in consignment[0]:
+        consignment_boxes = consignment[0]
+        for box in consignment_boxes:
             for _ in range(box.quantity):
                 position = truck.add_box_ffd(box)
-                if position is None:
-                    break
-                consignment_packed.append((box, position))
-
-        if len(consignment_packed) == sum(box.quantity for box in consignment[0]):
-            packed_positions.extend(consignment_packed)
-        else:
-            break
+                if position is not None:
+                    # Box is packed
+                    packed_positions.append((box, position))
+                else:
+                    # Box cannot be packed, include with position as None
+                    packed_positions.append((box, None))
 
     return packed_positions
 
 
+
 def find_max_consignments_combinations(truck, consignments, combination_limit=100):
     combinations_that_fit = []
     consignments_sorted = sorted(consignments, key=lambda c: (not c[1], -sum(box.volume() * box.quantity for box in c[0])))
@@ -228,7 +227,10 @@ def suggest_truck(consignments):
 
         total_boxes = sum(box.quantity for consignment in consignments for box in consignment[0])
 
-        if len(packed_positions) == total_boxes:
+        # Count successfully packed boxes
+        packed_boxes_count = sum(1 for _, pos in packed_positions if pos is not None)
+
+        if packed_boxes_count == total_boxes:
             return {"name": truck_name, "dimensions": dimensions}
 
     return None
@@ -314,30 +316,30 @@ async def submit_data(request: SubmitDataRequest):
         # Assuming truck dimensions are known based on truck_name
         trucks = {
             "TATA ACE": {"length": 7, "width": 4.8, "height": 4.8},
-        "ASHOK LEYLAND DOST": {"length": 7, "width": 4.8, "height": 4.8},
-        "MAHINDRA BOLERO PICK UP": {"length": 8, "width": 5, "height": 4.8},
-        "ASHOK LEYLAND BADA DOST": {"length": 9.5, "width": 5.5, "height": 5},
-        "TATA 407": {"length": 9, "width": 5.5, "height": 5},
-        "EICHER 14 FEET": {"length": 14, "width": 6, "height": 6.5},
-        "EICHER 17 FEET": {"length": 17, "width": 6, "height": 7},
-        "EICHER 19 FEET": {"length": 19, "width": 7, "height": 7},
-        "TATA 22 FEET": {"length": 22, "width": 7.5, "height": 7},
-        "TATA TRUCK (6 TYRE)": {"length": 17.5, "width": 7, "height": 7},
-        "TAURUS 16 T (10 TYRE)": {"length": 21, "width": 7.2, "height": 7},
-        "TAURUS 21 T (12 TYRE)": {"length": 24, "width": 7.3, "height": 7},
-        "TAURUS 25 T (14 TYRE)": {"length": 28, "width": 7.8, "height": 7},
-        "CONTAINER 20 FT": {"length": 20, "width": 8, "height": 8},
-        "CONTAINER 32 FT SXL": {"length": 32, "width": 8, "height": 8},
-        "CONTAINER 32 FT MXL": {"length": 32, "width": 8, "height": 8},
-        "CONTAINER 32 FT SXL / MXL HQ": {"length": 32, "width": 8, "height": 10},
-        "20 FEET OPEN ALL SIDE (ODC)": {"length": 20, "width": 8, "height": 8},
-        "28-32 FEET OPEN-TRAILOR JCB ODC": {"length": 28, "width": 8, "height": 8},
-        "32 FEET OPEN-TRAILOR ODC": {"length": 32, "width": 8, "height": 8},
-        "40 FEET OPEN-TRAILOR ODC": {"length": 40, "width": 8, "height": 8},
-        "SCV": {"length": 5, "width": 12, "height": 6},
-        "LCV": {"length": 11, "width": 5, "height": 5},
-        "ICV": {"length": 16, "width": 6.5, "height": 6.5},
-        "MCV": {"length": 19, "width": 7, "height": 7}
+            "ASHOK LEYLAND DOST": {"length": 7, "width": 4.8, "height": 4.8},
+            "MAHINDRA BOLERO PICK UP": {"length": 8, "width": 5, "height": 4.8},
+            "ASHOK LEYLAND BADA DOST": {"length": 9.5, "width": 5.5, "height": 5},
+            "TATA 407": {"length": 9, "width": 5.5, "height": 5},
+            "EICHER 14 FEET": {"length": 14, "width": 6, "height": 6.5},
+            "EICHER 17 FEET": {"length": 17, "width": 6, "height": 7},
+            "EICHER 19 FEET": {"length": 19, "width": 7, "height": 7},
+            "TATA 22 FEET": {"length": 22, "width": 7.5, "height": 7},
+            "TATA TRUCK (6 TYRE)": {"length": 17.5, "width": 7, "height": 7},
+            "TAURUS 16 T (10 TYRE)": {"length": 21, "width": 7.2, "height": 7},
+            "TAURUS 21 T (12 TYRE)": {"length": 24, "width": 7.3, "height": 7},
+            "TAURUS 25 T (14 TYRE)": {"length": 28, "width": 7.8, "height": 7},
+            "CONTAINER 20 FT": {"length": 20, "width": 8, "height": 8},
+            "CONTAINER 32 FT SXL": {"length": 32, "width": 8, "height": 8},
+            "CONTAINER 32 FT MXL": {"length": 32, "width": 8, "height": 8},
+            "CONTAINER 32 FT SXL / MXL HQ": {"length": 32, "width": 8, "height": 10},
+            "20 FEET OPEN ALL SIDE (ODC)": {"length": 20, "width": 8, "height": 8},
+            "28-32 FEET OPEN-TRAILOR JCB ODC": {"length": 28, "width": 8, "height": 8},
+            "32 FEET OPEN-TRAILOR ODC": {"length": 32, "width": 8, "height": 8},
+            "40 FEET OPEN-TRAILOR ODC": {"length": 40, "width": 8, "height": 8},
+            "SCV": {"length": 5, "width": 12, "height": 6},
+            "LCV": {"length": 11, "width": 5, "height": 5},
+            "ICV": {"length": 16, "width": 6.5, "height": 6.5},
+            "MCV": {"length": 19, "width": 7, "height": 7}
         }
 
         if truck_name not in trucks:
@@ -352,9 +354,13 @@ async def submit_data(request: SubmitDataRequest):
     truck = Truck(length * 12, width * 12, height * 12)  # Convert feet to inches
     packed_positions = pack_boxes_ffd(truck, consignments)
 
-    total_boxes = sum(box.quantity for consignment in consignments for box in consignment[0])
+    # Count how many boxes were successfully packed
+    packed_boxes_count = sum(1 for _, pos in packed_positions if pos is not None)
+
+    # Total number of boxes
+    total_boxes = len(packed_positions)  # Since we expanded quantities during packing
 
-    if len(packed_positions) < total_boxes:
+    if packed_boxes_count < total_boxes:
         stored_combinations = find_max_consignments_combinations(truck, consignments)
         if stored_combinations:
             combinations_info = []
@@ -385,25 +391,28 @@ async def submit_data(request: SubmitDataRequest):
                         "width": width,
                         "height": height
                     }
-                }
+                },
+                "consignments_data": [consignment.dict() for consignment in consignments_data]  # **Added**
             }
 
             # Redirect to the visualization page
-            return RedirectResponse(url=f"https://66e6a92ec63a386749804f24--clever-lollipop-deec4d.netlify.app?session_id={session_id}", status_code=302)
-
+            return RedirectResponse(url=f"https://66eaf98cbe66f53e549027bb--joyful-cheesecake-ae839d.netlify.app/?session_id={session_id}", status_code=302)
 
     # Prepare box data for visualization
-    box_data = [
-        {
+    box_data = []
+    for box, pos in packed_positions:
+        if pos is not None:
+            position = {'x': pos[0], 'y': pos[1], 'z': pos[2]}
+        else:
+            position = None  # Box could not be packed
+        box_data.append({
             'length': box.length,
             'width': box.width,
             'height': box.height,
             'type': box.type,
-            'quantity': box.quantity,
-            'position': {'x': pos[0], 'y': pos[1], 'z': pos[2]}
-        }
-        for box, pos in packed_positions
-    ]
+            'quantity': 1,  # Since we're iterating over each individual box
+            'position': position
+        })
 
     # Generate a unique session_id
     session_id = str(uuid.uuid4())
@@ -420,7 +429,7 @@ async def submit_data(request: SubmitDataRequest):
     }
 
     # Redirect to the visualization page
-    return RedirectResponse(url=f"https://66e6a92ec63a386749804f24--clever-lollipop-deec4d.netlify.app?session_id={session_id}", status_code=302)
+    return RedirectResponse(url=f"https://66eaf98cbe66f53e549027bb--joyful-cheesecake-ae839d.netlify.app/?session_id={session_id}", status_code=302)
 
 
 
@@ -456,17 +465,22 @@ async def load_combination(
     packed_positions = pack_boxes_ffd(truck, consignments)
 
     # Prepare the box data
-    box_data = [
-        {
+    box_data = []
+    for box, pos in packed_positions:
+        if pos is not None:
+            position = {'x': pos[0], 'y': pos[1], 'z': pos[2]}
+        else:
+            position = None
+        box_data.append({
             'length': box.length,
             'width': box.width,
             'height': box.height,
             'type': box.type,
-            'quantity': box.quantity,
-            'position': {'x': pos[0], 'y': pos[1], 'z': pos[2]}
-        }
-        for box, pos in packed_positions
-    ]
+            'quantity': 1,
+            'position': position
+        })
+
+    print("Data sent to the frontend:", len(box_data))
 
     # Return the box data and truck information to the frontend
     return {