Update app.py

app.py

@@ -121,16 +121,62 @@ def pack_boxes(truck, boxes):
 
     return packed_positions
 
+def suggest_truck(boxes):
+    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}
+    }
+
+    # Sort trucks by volume (smallest first)
+    sorted_trucks = sorted(trucks.items(), key=lambda t: t[1]['length'] * t[1]['width'] * t[1]['height'])
+    
+    # Try packing the boxes in each truck, return the first one that fits all boxes
+    for truck_name, dimensions in sorted_trucks:
+        truck = Truck(dimensions['length'] * 12, dimensions['width'] * 12, dimensions['height'] * 12)  # Convert to inches
+        packed_positions = pack_boxes(truck, boxes)
+        
+        # Check if all boxes were successfully packed
+        if len(packed_positions) == sum(box.quantity for box in boxes):
+            return {"name": truck_name, "dimensions": dimensions}
+    
+    return None
+
 @app.post("/upload/")
 async def upload_file(
     file: UploadFile = File(...),
-    length: float = Form(...),
-    width: float = Form(...),
-    height: float = Form(...),
+    length: float = Form(None),  # Make these optional
+    width: float = Form(None),
+    height: float = Form(None),
+    name: str = Form(None),
+    autoSuggest: bool = Form(False)
 ):
     if not file:
         raise HTTPException(status_code=400, detail="No file uploaded")
     
+    print("truck name ", name)
     ext = file.filename.split('.')[-1].lower()
     if ext == 'csv':
         data = pd.read_csv(file.file)
@@ -149,7 +195,17 @@ async def upload_file(
         Box(row['PieceLength'], row['PieceBreadth'], row['PieceHeight'], row.get('Quantity', 1), f"{row['PieceNo']}-{row['Priority']}")
         for _, row in data.iterrows()
     ]
-
+    
+    if autoSuggest:
+        # Suggest a truck that can fit all the boxes
+        suggested_truck = suggest_truck(boxes)
+        if suggested_truck:
+            length = suggested_truck['dimensions']['length']
+            width = suggested_truck['dimensions']['width']
+            height = suggested_truck['dimensions']['height']
+        else:
+            raise HTTPException(status_code=400, detail="No suitable truck found")
+    
     # Convert truck dimensions from feet to inches
     truck_length = length * 12  # Convert to inches
     truck_width = width * 12    # Convert to inches
@@ -171,7 +227,15 @@ async def upload_file(
         }
         for box, pos in packed_positions
     ]
-    print(f"quantity {[box_data[i]['quantity'] for i in range(len(box_data))]}")
-
-    return {"boxes": box_data}
 
+    return {
+        "boxes": box_data,
+        "truck": {
+            "name": suggested_truck["name"] if autoSuggest else name,
+            "dimensions": {
+                "length": length,
+                "width": width,
+                "height": height
+            }
+        }
+    }