File

--- a/app/main.py

+++ b/app/main.py

@@ -78,8 +78,10 @@

 APP_VERSION = "0.18.0-multi-shop-onboarding"

 app = FastAPI(title="Shopee Operations Hub", version=APP_VERSION, lifespan=lifespan)

+_OPERATIONS_AUTO_LOCK = threading.Lock()

+_OPERATIONS_AUTO_ACTIVE_SHOPS: set[int] = set()

 _cors_origins = list(settings.cors_origins)

 app.add_middleware(CORSMiddleware, allow_origins=_cors_origins, allow_credentials=False, allow_methods=["GET","POST","PUT","PATCH","DELETE","OPTIONS"], allow_headers=["Content-Type","X-Admin-Token","X-LLM-Service-Token","X-Device-Token","X-Widget-Token","X-Public-Token","X-Share-Token","X-Shop-Id","X-Print-Agent-Id","X-Print-Agent-Token"])

 STATIC_DIR = Path(__file__).resolve().parent / "static"

 app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")

@@ -349,8 +351,16 @@

     method: str = "auto"

     limit: int = Field(default=100, ge=1, le=200)

     confirmation: str = ""

     confirmed: bool = False

+    dry_run: bool = False

+    exclude_instant_delivery: bool = False

+    require_known_carrier: bool = False

+

+

+class OperationsAutoProcessRequest(BaseModel):

+    method: str = "auto"

+    limit: int = Field(default=100, ge=1, le=200)

     dry_run: bool = False

 class AwbDocumentKey(BaseModel):

@@ -2212,9 +2222,13 @@

         if not (req.confirmed or req.confirmation == settings.shipment_confirmation_phrase):

             raise HTTPException(400, "Sila tekan CONFIRM pada popup sebelum arrange shipment.")

     db.clear_cache("ready")

     packing_before = db.get_ready_to_ship_packing(source="auto", days=7, limit=req.limit)

-    candidates = db.list_ready_to_ship_for_arrange(req.limit)

+    candidates = db.list_ready_to_ship_for_arrange(

+        req.limit,

+        exclude_instant_delivery=req.exclude_instant_delivery,

+        require_known_carrier=req.require_known_carrier,

+    )

     results: list[dict[str, Any]] = []

     awb_documents: list[dict[str, Any]] = []

     client = ShopeeClient()

     try:

@@ -2230,8 +2244,30 @@

                     "current_status": current_status or "MISSING",

                     "reason": f"Order sudah {current_status.lower() if current_status else 'hilang'} sebelum sempat arrange.",

                 })

                 continue

+            if req.exclude_instant_delivery or req.require_known_carrier:

+                latest = db.get_order(order_sn, current_shop_id()) or {}

+                shipping_carrier = str(latest.get("shipping_carrier") or order.get("shipping_carrier") or "").strip()

+                checkout_carrier = str(latest.get("checkout_shipping_carrier") or order.get("checkout_shipping_carrier") or "").strip()

+                carrier_text = " | ".join(x for x in (shipping_carrier, checkout_carrier) if x)

+                if req.require_known_carrier and not carrier_text:

+                    results.append({

+                        "order_sn": order_sn,

+                        "package_number": None,

+                        "status": "skipped_unknown_carrier",

+                        "reason": "Carrier belum diketahui; auto-process fail-closed.",

+                    })

+                    continue

+                if req.exclude_instant_delivery and "instant delivery" in carrier_text.lower():

+                    results.append({

+                        "order_sn": order_sn,

+                        "package_number": None,

+                        "status": "skipped_instant_delivery",

+                        "carrier": carrier_text,

+                        "reason": "Instant Delivery mesti diproses manual.",

+                    })

+                    continue

             for package_number in (order.get("packages") or [None]):

                 item: dict[str, Any] = {"order_sn": order_sn, "package_number": package_number, "status": "pending"}

                 try:

                     params = client.get_shipping_parameter(order_sn, package_number)

@@ -3265,8 +3301,54 @@

     )

     return {"ok": True, "acknowledgement": acknowledgement}

[email protected]("/api/operations/auto-process-ready")

+def api_operations_auto_process_ready(

+    req: OperationsAutoProcessRequest,

+    device: dict[str, Any] = Depends(require_operations_device),

+):

+    shop_id = int(device["shop_id"])

+    device_id = str(device["device_id"])

+    alert_settings = db.operations_alert_settings(shop_id)

+    if str(alert_settings.get("primary_device_id") or "") != device_id:

+        raise HTTPException(403, "Hanya telefon utama boleh auto-process Ready To Ship")

+    with _OPERATIONS_AUTO_LOCK:

+        if shop_id in _OPERATIONS_AUTO_ACTIVE_SHOPS:

+            return {"ok": True, "busy": True, "shop_id": shop_id, "note": "Auto-process sebelumnya masih berjalan"}

+        _OPERATIONS_AUTO_ACTIVE_SHOPS.add(shop_id)

+    try:

+        guarded = BatchShipmentRequest(

+            method=req.method,

+            limit=req.limit,

+            confirmed=True,

+            dry_run=req.dry_run,

+            exclude_instant_delivery=True,

+            require_known_carrier=True,

+        )

+        result = arrange_all_ready_to_ship(guarded)

+        result["shop_id"] = shop_id

+        result["auto_process"] = True

+        result["instant_delivery_policy"] = "SKIP"

+        result["unknown_carrier_policy"] = "SKIP"

+        db.log_audit(

+            actor=f"operations:{device_id}",

+            action="auto_process_ready_to_ship",

+            target=str(shop_id),

+            details={

+                "dry_run": req.dry_run,

+                "requested_orders": result.get("requested_orders", 0),

+                "success_count": result.get("success_count", 0),

+                "skipped_count": result.get("skipped_count", 0),

+                "failed_count": result.get("failed_count", 0),

+            },

+        )

+        return result

+    finally:

+        with _OPERATIONS_AUTO_LOCK:

+            _OPERATIONS_AUTO_ACTIVE_SHOPS.discard(shop_id)

+

+

 def _scanner_catalog_revision(shop_id: int) -> str:

     """Revision for registry/inventory entities copied to the phone."""

     import hashlib as _hl

     h = _hl.sha256()

--- a/app/db.py

+++ b/app/db.py

@@ -7727,27 +7727,47 @@

     temp.replace(destination)

     return manifest

-def list_ready_to_ship_for_arrange(limit: int = 100) -> list[dict[str, Any]]:

+def list_ready_to_ship_for_arrange(

+    limit: int = 100,

+    *,

+    exclude_instant_delivery: bool = False,

+    require_known_carrier: bool = False,

+) -> list[dict[str, Any]]:

     """READY_TO_SHIP orders with package numbers, sorted by order masuk.

-    Used by the guarded batch arrange-shipment action.

+    Manual dashboard arrange keeps the historical defaults. Automated Operations

+    calls opt into fail-closed carrier guards so Instant Delivery and orders whose

+    carrier has not synced yet never reach ship_order.

     """

+    where = ["o.shop_id=?", "o.order_status='READY_TO_SHIP'"]

+    params: list[Any] = [_shop_id()]

+    if exclude_instant_delivery:

+        where.append(

+            "LOWER(COALESCE(o.shipping_carrier,'')) NOT LIKE '%instant delivery%' "

+            "AND LOWER(COALESCE(o.checkout_shipping_carrier,'')) NOT LIKE '%instant delivery%'"

+        )

+    if require_known_carrier:

+        where.append(

+            "(TRIM(COALESCE(o.shipping_carrier,''))<>'' "

+            "OR TRIM(COALESCE(o.checkout_shipping_carrier,''))<>'')"

+        )

+    params.append(int(limit))

     with connect() as conn:

         rows = conn.execute(

-            """

+            f"""

             SELECT o.order_sn, o.create_time, o.update_time, o.buyer_username, o.total_amount, o.currency,

                    o.shipping_carrier, o.checkout_shipping_carrier,

                    GROUP_CONCAT(NULLIF(p.package_number,'')) AS package_numbers

             FROM orders o

             LEFT JOIN order_packages p ON p.shop_id=o.shop_id AND p.order_sn=o.order_sn

-            WHERE o.shop_id=? AND o.order_status='READY_TO_SHIP'

+            WHERE {' AND '.join(where)}

             GROUP BY o.order_sn

             ORDER BY COALESCE(o.create_time, o.update_time, 0) ASC, o.order_sn ASC

             LIMIT ?

             """,

-            (_shop_id(), int(limit)),

+            params,

         ).fetchall()

     items: list[dict[str, Any]] = []

     for row in rows:

         d = dict(row)