Update app.py

app.py

@@ -10,7 +10,7 @@ def process_file(file):
     try:
         if file_name.endswith(('.xls', '.xlsx', '.xlsm')):
             # Read data from the "YunExpress" sheet
-            df = pd.read_excel(file.name, sheet_name="YunExpress")
+            df = pd.read_excel(file, sheet_name="YunExpress")
         else:
             return f"Unsupported file format: {file_name}", None
     except Exception as e:
@@ -61,9 +61,13 @@ def process_file(file):
     if "Shipping Province" in df.columns:
         output_df["Province/State"] = df["Shipping Province"]
 
-    # 6. ZipCode
+    # 6. ZipCode (pad 4-digit US zips with a leading zero)
     if "Shipping ZIP" in df.columns:
-        output_df["ZipCode"] = df["Shipping ZIP"]
+        zip_raw = df["Shipping ZIP"].astype(str).str.strip()
+        mask_us = output_df["CountryCode"] == "US"
+        mask_4  = zip_raw.str.len() == 4
+        zip_fixed = zip_raw.where(~(mask_us & mask_4), "0" + zip_raw)
+        output_df["ZipCode"] = zip_fixed
 
     # 7. CountryCode
     if "Shipping Country Code" in df.columns:
@@ -83,30 +87,28 @@ def process_file(file):
 
     # 11. Fixed defaults and conditional RoutingCode
     mask = output_df["CustomerOrderNo."].notna() & (output_df["CustomerOrderNo."] != "")
-    # Norway code
     mask_norway = mask & (output_df["CountryCode"] == "NO")
     mask_other  = mask & (output_df["CountryCode"] != "NO")
-    # RoutingCode assignments
+
     output_df.loc[mask_other, "RoutingCode"] = "HKTHZXR"
     output_df.loc[mask_norway, "RoutingCode"] = "HK-ASS-PF"
-    # Other fixed values
+
     output_df.loc[mask, "UnitPrice1"]              = 2
     output_df.loc[mask, "CurrencyCode"]            = "USD"
     output_df.loc[mask, "ItemDescription1"]        = "Eye Cosmetic Accessories"
     output_df.loc[mask, "UnitWeight1"]             = 0.02
-    # ForeignItemDescription1
     output_df.loc[mask, "ForeignItemDescription1"] = "Eye Cosmetic Accessories"
-    # EU AdditionalServices
+
     EU_COUNTRIES = {"AT","BE","BG","CY","CZ","DE","DK","EE","ES","FI",
                     "FR","HR","HU","IE","IT","LT","LU","LV","MT","NL",
                     "PL","PT","RO","SE","SI","SK","GR"}
     mask_eu = mask & output_df["CountryCode"].isin(EU_COUNTRIES)
-    output_df.loc[mask_eu, "AdditionalServices"]    = "v1"
+    output_df.loc[mask_eu, "AdditionalServices"] = "v1"
 
     # 12. Remove duplicate rows based on CustomerOrderNo.
     output_df = output_df.drop_duplicates(subset=["CustomerOrderNo."], keep="first")
 
-    # 13. Generate output filename using HK date
+    # 13. Generate output filename using Hong Kong date
     hk_tz = pytz.timezone("Asia/Hong_Kong")
     today_hk = datetime.now(hk_tz).strftime("%y%m%d")
     output_file_name = f"yunexpress {today_hk}.xlsx"
@@ -127,7 +129,7 @@ with gr.Blocks(title="Shipping - YunExpress") as demo:
         output_file_component = gr.File(label="Download Processed File")
     process_button.click(fn=process_file, inputs=[file_input], outputs=[output_data, output_file_component])
 
-    # Restored original hyperlinks + Yunexpress link
+    # Links to other tools
     gr.HTML(
         """
         <div style="text-align: center; font-size: 16px; margin-top: 20px;">
@@ -147,4 +149,4 @@ with gr.Blocks(title="Shipping - YunExpress") as demo:
         """
     )
 
-demo.launch()
+demo.launch()