Update app.py

app.py

@@ -81,13 +81,27 @@ def process_file(file):
     if "Order Number" in df.columns and "Quantity" in df.columns:
         output_df["DeclaredQuantity1"] = df.groupby("Order Number")["Quantity"].transform("sum")
 
-    # 11. Fixed defaults for every populated CustomerOrderNo.
+    # 11. Fixed defaults and conditional RoutingCode
     mask = output_df["CustomerOrderNo."].notna() & (output_df["CustomerOrderNo."] != "")
-    output_df.loc[mask, "RoutingCode"] = "HKTHZXR"
-    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
+    # 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"
 
     # 12. Remove duplicate rows based on CustomerOrderNo.
     output_df = output_df.drop_duplicates(subset=["CustomerOrderNo."], keep="first")
@@ -113,7 +127,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
+    # Restored original hyperlinks + Yunexpress link
     gr.HTML(
         """
         <div style="text-align: center; font-size: 16px; margin-top: 20px;">
@@ -121,7 +135,8 @@ with gr.Blocks(title="Shipping - YunExpress") as demo:
             <a href="https://huggingface.co/spaces/leadingbridge/shipping-dhl-e-commerce">DHL</a> | 
             <a href="https://huggingface.co/spaces/leadingbridge/shipping-ec-ship">EC-Ship</a> | 
             <a href="https://huggingface.co/spaces/leadingbridge/shipping-fedex">Fedex</a> | 
-            <a href="https://huggingface.co/spaces/leadingbridge/shipping-UPS">UPS</a>
+            <a href="https://huggingface.co/spaces/leadingbridge/shipping-UPS">UPS</a><br>
+            <a href="https://huggingface.co/spaces/leadingbridge/shipping-yunexpress">Yunexpress</a>
         </div>
         <div style="text-align: center; font-size: 16px; margin-top: 20px;">
             <h3>Administration Tools</h3>