Update app.py

app.py

@@ -7,13 +7,13 @@ from reportlab.lib.pagesizes import inch
 import barcode
 from barcode.writer import ImageWriter
 
-# Folders for generated files
+# Directories for generated files
 LABELS_DIR = "labels"
 BARCODES_DIR = "barcodes"
 os.makedirs(LABELS_DIR, exist_ok=True)
 os.makedirs(BARCODES_DIR, exist_ok=True)
 
-# Columns we expect in the CSV/Excel
+# Required CSV/Excel columns
 REQUIRED_COLUMNS = [
     "Order ID", "Order Date", "Shipper Name", "Shipper Address", "Shipper Phone",
     "Receiver Name", "Receiver Address", "Receiver Phone", "Package Weight (kg)",
@@ -21,19 +21,18 @@ REQUIRED_COLUMNS = [
 ]
 
 ###############################################################################
-# 1) Draw the static background ("collage") for a 4x6 USPS label
+# 1) Draw the static collage (top portion) for a 4x6 USPS label
 ###############################################################################
 def draw_label_collage(c, width, height):
     """
-    Draws the static elements, like the big "F", USPS text, 
-    placeholder for QR code, horizontal lines, etc.
-    Coordinates are measured from the bottom-left corner in ReportLab.
+    Draws the top portion: big 'F', USPS text, placeholder QR code,
+    'USPS FIRST-CLASS PKG' title, plus a top horizontal line.
     """
-    # Big "F" in top-left
+    # Big "F" near top-left
     c.setFont("Helvetica-Bold", 80)
     c.drawString(15, height - 85, "F")
 
-    # USPS postage info block (under the big "F")
+    # USPS postage info block (small text under "F")
     c.setFont("Helvetica", 6)
     c.drawString(70, height - 20, "US POSTAGE AND FEES PAID")
     c.drawString(70, height - 30, "Apr 12 2018")
@@ -45,23 +44,26 @@ def draw_label_collage(c, width, height):
     c.setFont("Helvetica", 6)
     c.drawString(width - 50, height - 20, "QR CODE")
 
-    # "USPS FIRST-CLASS PKG" near top, horizontally centered
+    # "USPS FIRST-CLASS PKG" in bold, centered near top
     c.setFont("Helvetica-Bold", 14)
     c.drawCentredString(width / 2, height - 110, "USPS FIRST-CLASS PKG")
 
-    # Horizontal line below it
+    # Horizontal line across the label, just below the header
     c.setLineWidth(1)
     c.line(15, height - 115, width - 15, height - 115)
 
 ###############################################################################
-# 2) Overlay dynamic text from the CSV row
+# 2) Overlay dynamic text + horizontal lines to mimic the sample layout
 ###############################################################################
 def draw_label_text(c, row, width, height):
     """
-    Places the order info, shipper details, receiver details,
-    shipping details, and a placeholder for tracking text.
+    Places:
+    - Warehouse & Order info, then a horizontal line
+    - Recipient address, then another line
+    - "USPS TRACKING #" heading, then another line
+    - Tracking number below that line
     """
-    # Extract row data (with default fallbacks if missing)
+    # Convert row to local variables (with fallback)
     order_id       = row.get("Order ID", "")
     order_date     = row.get("Order Date", "")
     shipper_name   = row.get("Shipper Name", "")
@@ -75,113 +77,129 @@ def draw_label_text(c, row, width, height):
     tracking_num   = row.get("Tracking Number", "")
     eta_date       = row.get("Estimated Delivery Date", "")
 
-    # Top-right: Order info
-    c.setFont("Helvetica-Bold", 9)
-    c.drawRightString(width - 15, height - 130, f"Order: {order_id}")
-    c.drawRightString(width - 15, height - 142, f"Date: {order_date}")
+    # We'll start below the top line from the collage
+    top_line_y = height - 115
 
-    # Shipper block (left side, below the line)
-    start_y = height - 130
-    c.setFont("Helvetica-Bold", 10)
-    c.drawString(15, start_y - 20, "From:")
+    ############################
+    # Warehouse + Order Info
+    ############################
+    # Left: Warehouse lines
+    c.setFont("Helvetica-Bold", 9)
+    c.drawString(15, top_line_y - 15, shipper_name or "WAREHOUSE 2")
     c.setFont("Helvetica", 9)
-    c.drawString(15, start_y - 35, shipper_name)
-    c.drawString(15, start_y - 50, shipper_addr)
-    c.drawString(15, start_y - 65, f"Phone: {shipper_phone}")
+    c.drawString(15, top_line_y - 30, shipper_addr or "11919 WINK RD")
+    c.drawString(15, top_line_y - 45, f"{shipper_phone}" or "HOUSTON TX 77024-7134")
 
-    # Receiver block (centered)
-    # We'll place "To:" a bit lower, then name & address below it
-    rec_start = start_y - 95
-    c.setFont("Helvetica-Bold", 10)
-    c.drawString(15, rec_start, "To:")
-    c.setFont("Helvetica-Bold", 12)
-    c.drawCentredString(width / 2, rec_start - 20, receiver_name)
-    c.setFont("Helvetica", 10)
-    c.drawCentredString(width / 2, rec_start - 35, receiver_addr)
-    c.drawCentredString(width / 2, rec_start - 50, f"Phone: {receiver_phone}")
+    # Right: "Order: 286"
+    c.setFont("Helvetica", 9)
+    c.drawRightString(width - 15, top_line_y - 15, f"Order: {order_id}")
+    c.drawRightString(width - 15, top_line_y - 30, f"Date: {order_date}")
+
+    # Horizontal line under Warehouse/Order block
+    warehouse_line_y = top_line_y - 60
+    c.line(15, warehouse_line_y, width - 15, warehouse_line_y)
+
+    ############################
+    # Recipient Block
+    ############################
+    # Bold name, address, phone
+    c.setFont("Helvetica-Bold", 11)
+    c.drawString(15, warehouse_line_y - 15, receiver_name)
+    c.setFont("Helvetica", 9)
+    c.drawString(15, warehouse_line_y - 30, receiver_addr)
+    c.drawString(15, warehouse_line_y - 45, f"Phone: {receiver_phone}")
 
-    # Shipping details (Weight, Method, ETA) – place them below the receiver
-    ship_info_start = rec_start - 70
+    # Possibly show shipping details to the right
     c.setFont("Helvetica-Bold", 9)
-    c.drawString(15, ship_info_start, f"Weight: {weight} kg")
-    c.drawString(15, ship_info_start - 15, f"Method: {ship_method}")
-    c.drawString(15, ship_info_start - 30, f"ETA: {eta_date}")
-
-    # "USPS TRACKING #" – centered, further down
-    track_label_y = ship_info_start - 60
+    c.drawRightString(width - 15, warehouse_line_y - 15, f"Weight: {weight} kg")
+    c.drawRightString(width - 15, warehouse_line_y - 30, f"Method: {ship_method}")
+    c.drawRightString(width - 15, warehouse_line_y - 45, f"ETA: {eta_date}")
+
+    # Another line below the recipient block
+    recipient_line_y = warehouse_line_y - 60
+    c.line(15, recipient_line_y, width - 15, recipient_line_y)
+
+    ############################
+    # USPS TRACKING #
+    ############################
+    # Place "USPS TRACKING #" in bold, centered
     c.setFont("Helvetica-Bold", 12)
-    c.drawCentredString(width / 2, track_label_y, "USPS TRACKING #")
+    c.drawCentredString(width / 2, recipient_line_y - 20, "USPS TRACKING #")
 
-    # Tracking number text – just below the label
+    # Another line under "USPS TRACKING #"
+    tracking_line_y = recipient_line_y - 35
+    c.line(15, tracking_line_y, width - 15, tracking_line_y)
+
+    # Tracking number below that line, centered
     c.setFont("Helvetica-Bold", 10)
-    c.drawCentredString(width / 2, track_label_y - 15, tracking_num)
+    c.drawCentredString(width / 2, tracking_line_y - 20, tracking_num)
 
 ###############################################################################
-# 3) Create the 4x6-inch USPS-style label (PDF)
+# 3) Create the 4x6 USPS-style label
 ###############################################################################
 def create_usps_label(row, index=1):
     """
-    1) Generate barcode
-    2) Draw static collage
-    3) Overlay dynamic text
+    1) Generate a Code128 barcode from 'Tracking Number'
+    2) Draw collage
+    3) Draw dynamic text & lines
     4) Place barcode near the bottom
     """
-    # Generate barcode image
-    tracking_number = row.get("Tracking Number", "000000000000")
+    # Barcode
+    tracking_number = row.get("Tracking Number", "0000000000")
     barcode_filename = os.path.join(BARCODES_DIR, f"barcode_{index}.png")
     code128 = barcode.get_barcode_class("code128")
     code128_obj = code128(tracking_number, writer=ImageWriter())
     code128_obj.save(barcode_filename)
 
-    # Create a 4x6 inch PDF
+    # 4x6 inches
     width, height = 4 * inch, 6 * inch
     label_filename = os.path.join(LABELS_DIR, f"label_{index}.pdf")
     c = canvas.Canvas(label_filename, pagesize=(width, height))
 
-    # 1) Draw static collage (background)
+    # Draw the collage
     draw_label_collage(c, width, height)
-    # 2) Overlay dynamic text
+    # Overlay text & lines
     draw_label_text(c, row, width, height)
-    # 3) Place barcode near bottom (centered horizontally)
+
+    # Place barcode near bottom, centered horizontally
     if os.path.exists(barcode_filename):
         barcode_w = 3 * inch
         barcode_h = 0.8 * inch
         x_pos = (width - barcode_w) / 2
-        y_pos = 0.6 * inch  # ~0.6 inch from bottom
+        y_pos = 0.5 * inch  # ~0.5 inch from bottom
         c.drawImage(barcode_filename, x_pos, y_pos, width=barcode_w, height=barcode_h)
     else:
         c.setFont("Helvetica", 10)
-        c.drawString(15, 0.6 * inch, "Barcode generation failed.")
+        c.drawString(15, 0.5 * inch, "Barcode generation failed.")
 
     c.showPage()
     c.save()
     return label_filename
 
 ###############################################################################
-# 4) Gradio function to process file upload
+# 4) Gradio function to process file uploads
 ###############################################################################
 def process_file(file_obj):
     """
-    Reads CSV/XLSX, checks required columns, 
-    generates one label per row, zips them up.
-    Returns (status_message, zip_file_path) for Gradio outputs.
+    Reads CSV/Excel, checks columns, 
+    generates one label per row, zips them.
     """
     try:
-        # Clear old labels/barcodes
+        # Clean out old labels/barcodes
         for f in os.listdir(LABELS_DIR):
             os.remove(os.path.join(LABELS_DIR, f))
         for f in os.listdir(BARCODES_DIR):
             os.remove(os.path.join(BARCODES_DIR, f))
 
-        # Read the file
+        # Read the uploaded file
         if file_obj.name.endswith(".csv"):
             df = pd.read_csv(file_obj)
         elif file_obj.name.endswith((".xls", ".xlsx")):
             df = pd.read_excel(file_obj)
         else:
-            return "Invalid file format. Please upload .csv, .xls, or .xlsx.", None
+            return "Invalid file format. Please upload a .csv, .xls, or .xlsx file.", None
 
-        # Check for required columns
+        # Check required columns
         missing = [col for col in REQUIRED_COLUMNS if col not in df.columns]
         if missing:
             return f"Missing columns: {', '.join(missing)}", None
@@ -190,7 +208,7 @@ def process_file(file_obj):
         for i, row in df.iterrows():
             create_usps_label(row.to_dict(), index=i+1)
 
-        # Zip all PDFs
+        # Zip them up
         zip_filename = "usps_labels.zip"
         with zipfile.ZipFile(zip_filename, "w") as zf:
             for f in os.listdir(LABELS_DIR):
@@ -211,14 +229,13 @@ iface = gr.Interface(
     outputs=[gr.Text(label="Status"), gr.File(label="Download Zipped Labels")],
     title="USPS-Style Label Generator (4x6)",
     description=(
-        "Upload a CSV/XLS/XLSX file with these columns:\n"
-        "• Order ID, Order Date, Shipper Name, Shipper Address, Shipper Phone\n"
-        "• Receiver Name, Receiver Address, Receiver Phone, Package Weight (kg)\n"
-        "• Shipping Method, Tracking Number, Estimated Delivery Date\n\n"
-        "One 4x6 USPS-style PDF label is created per row, then zipped for download."
+        "Upload a CSV/XLS/XLSX file with columns:\n"
+        "Order ID, Order Date, Shipper Name, Shipper Address, Shipper Phone,\n"
+        "Receiver Name, Receiver Address, Receiver Phone, Package Weight (kg),\n"
+        "Shipping Method, Tracking Number, Estimated Delivery Date\n\n"
+        "Generates a 4x6 USPS-style PDF label per row, including lines that match the sample."
     ),
 )
 
-# Launch the Gradio app
 if __name__ == "__main__":
     iface.launch()