A5-R3-R5C dormant commercial lifecycle

app.py

@@ -663,11 +663,15 @@ def _process_pending_launch(lang_code: str) -> None:
     except Exception as exc:
         st.session_state["sp_pending_launch"] = None
         raw = str(exc or "")
-        if "payment_required" in raw:
+        if "product_entitlement_required" in raw:
+            st.session_state["sp_payment_required"] = True
+            st.error(tr(lang_code, "product_entitlement_required"))
+            render_payment_purchase(lang_code)
+        elif "payment_required" in raw:
             st.session_state["sp_payment_required"] = True
             st.error(tr(lang_code, "quota_exhausted"))
             render_payment_purchase(lang_code)
-        elif "a5_product_task_path_not_authorized" in raw:
+        elif "a5_product_task_path_not_active" in raw or "a5_product_task_path_not_authorized" in raw:
             st.error(tr(lang_code, "product_generation_not_active"))
         else:
             st.error(raw)

i18n.py

@@ -395,6 +395,9 @@ TEXTS: dict[str, dict[str, str]] = {
         "logout_short": "退出",
         "payment_dialog_title": "支付宝付款",
         "payment_notice": "今日免费额度和长期额度均已用完。支付9.9元可增加3篇长期有效额度。",
+        "product_entitlement_required": "当前所选版本额度不足，请使用支付宝购买对应版本额度。",
+        "payment_notice_product": "购买{tier}：支付 {amount} {currency} 可增加{credits}篇长期有效额度。",
+        "payment_paid_product": "支付成功，已增加{credits}篇{tier}长期有效额度。请重新点击生成论文。",
         "quota_exhausted": "今日免费额度和长期额度均已用完。请使用支付宝购买长期额度。",
         "payment_create": "生成支付宝付款二维码",
         "payment_creating": "正在创建支付宝订单……",
@@ -602,6 +605,9 @@ TEXTS: dict[str, dict[str, str]] = {
         "logout_short": "Sign out",
         "payment_dialog_title": "Alipay Payment",
         "payment_notice": "Your daily free quota and long-term quota are exhausted. Pay CNY 9.9 to add three long-term papers.",
+        "product_entitlement_required": "The selected plan has no remaining credits. Purchase credits for this plan with Alipay.",
+        "payment_notice_product": "Purchase {tier}: pay {currency} {amount} to add {credits} long-term paper credits.",
+        "payment_paid_product": "Payment succeeded. {credits} long-term {tier} paper credits were added. Start the paper again.",
         "quota_exhausted": "Your daily free quota and long-term quota are exhausted. Purchase long-term quota with Alipay.",
         "payment_create": "Create Alipay QR code",
         "payment_creating": "Creating the Alipay order…",
@@ -809,6 +815,9 @@ TEXTS: dict[str, dict[str, str]] = {
         "logout_short": "Выйти",
         "payment_dialog_title": "Оплата через Alipay",
         "payment_notice": "Ежедневная бесплатная и долгосрочная квоты исчерпаны. Оплата 9,9 юаня добавляет квоту на три статьи без срока действия.",
+        "product_entitlement_required": "Квота выбранного тарифа исчерпана. Приобретите квоту этого тарифа через Alipay.",
+        "payment_notice_product": "Покупка тарифа {tier}: оплата {amount} {currency} добавит {credits} долгосрочных квот на статьи.",
+        "payment_paid_product": "Оплата прошла успешно. Добавлено {credits} долгосрочных квот тарифа {tier}. Запустите создание статьи повторно.",
         "quota_exhausted": "Ежедневная бесплатная и долгосрочная квоты исчерпаны. Приобретите долгосрочную квоту через Alipay.",
         "payment_create": "Создать QR-код для оплаты",
         "payment_creating": "Создаётся заказ Alipay…",
@@ -1016,6 +1025,9 @@ TEXTS: dict[str, dict[str, str]] = {
         "logout_short": "Шығу",
         "payment_dialog_title": "Alipay арқылы төлеу",
         "payment_notice": "Күнделікті тегін және ұзақ мерзімді квота таусылды. 9,9 юань төлегенде мерзімі шектелмеген үш мақала квотасы қосылады.",
+        "product_entitlement_required": "Таңдалған нұсқаның квотасы таусылды. Осы нұсқаға арналған квотаны Alipay арқылы сатып алыңыз.",
+        "payment_notice_product": "{tier} нұсқасын сатып алу: {amount} {currency} төлемі {credits} ұзақ мерзімді мақала квотасын қосады.",
+        "payment_paid_product": "Төлем сәтті өтті. {tier} нұсқасына {credits} ұзақ мерзімді мақала квотасы қосылды. Мақала жасауды қайта бастаңыз.",
         "quota_exhausted": "Күнделікті тегін және ұзақ мерзімді квота таусылды. Alipay арқылы ұзақ мерзімді квота сатып алыңыз.",
         "payment_create": "Төлемге арналған QR-код жасау",
         "payment_creating": "Alipay тапсырысы жасалуда…",

managed_auth.py

@@ -135,7 +135,7 @@ def _clear_generation_session_state() -> None:
         "is_running", "start_pipeline", "resume_pipeline", "run_mode",
         "rag_engine", "up_amj_ref", "up_amj_data", "up_asq_ref",
         "up_asq_data", "sp_payment_required", "sp_payment_order",
-        "sp_payment_request_id",
+        "sp_payment_request_id", "sp_payment_package_sku",
     ):
         st.session_state.pop(key, None)
 
@@ -261,6 +261,11 @@ def _normalize_product_ui_projection(value: Any) -> dict[str, Any]:
             raise RuntimeError("product_ui_projection_invalid_word_policy") from exc
         if minimum <= 0 or maximum < minimum:
             raise RuntimeError("product_ui_projection_invalid_word_policy")
+        try:
+            amount_fen = int(raw.get("amount_fen"))
+            credits_granted = int(raw.get("credits_granted"))
+        except (TypeError, ValueError) as exc:
+            raise RuntimeError("product_ui_projection_invalid_billing_policy") from exc
         products[tier] = {
             "product_tier": tier,
             "product_policy_version": str(raw.get("product_policy_version") or ""),
@@ -269,13 +274,21 @@ def _normalize_product_ui_projection(value: Any) -> dict[str, Any]:
             "min_body_words": minimum,
             "max_body_words": maximum,
             "counting_contract_version": str(raw.get("counting_contract_version") or ""),
+            "package_sku": str(raw.get("package_sku") or ""),
+            "billing_policy_version": str(raw.get("billing_policy_version") or ""),
+            "amount_fen": amount_fen,
+            "currency": str(raw.get("currency") or ""),
+            "credits_granted": credits_granted,
         }
         if not all((
             products[tier]["product_policy_version"],
             products[tier]["word_count_policy_version"],
             products[tier]["body_metric"],
             products[tier]["counting_contract_version"],
-        )):
+            products[tier]["package_sku"],
+            products[tier]["billing_policy_version"],
+            products[tier]["currency"],
+        )) or amount_fen <= 0 or credits_granted <= 0:
             raise RuntimeError("product_ui_projection_incomplete")
 
     try:
@@ -454,12 +467,19 @@ def logout_alipay_session(on_logout: Callable[[str, str], None] | None = None) -
     _clear_generation_session_state()
 
 
-def create_payment_order(idempotency_key: str) -> dict[str, Any]:
+def create_payment_order(
+    idempotency_key: str,
+    package_sku: str | None = None,
+) -> dict[str, Any]:
     normalized = str(idempotency_key or "").strip()
+    payload: dict[str, Any] = {"idempotency_key": normalized}
+    normalized_sku = str(package_sku or "").strip()
+    if normalized_sku:
+        payload["package_sku"] = normalized_sku
     result = _edge_call(
         "pay_create",
         normalized,
-        {"idempotency_key": normalized},
+        payload,
         key_prefix="sp_pay_create",
     )
     if result is None:
@@ -493,22 +513,65 @@ def _qr_png_bytes(value: str) -> bytes:
 
 
 def _render_payment_purchase_body(language: str) -> None:
-    st.warning(tr(language, "payment_notice"))
+    projection = get_product_ui_projection()
+    product_mode = projection.get("mode") == "a5_product"
+    selected_product: dict[str, Any] | None = None
+    package_sku = ""
+    if product_mode:
+        selected_tier = str(st.session_state.get("sp_product_tier") or "STANDARD").strip().upper()
+        raw_product = (projection.get("products") or {}).get(selected_tier)
+        if not isinstance(raw_product, dict):
+            raise RuntimeError("product_payment_projection_missing_tier")
+        selected_product = dict(raw_product)
+        package_sku = str(selected_product.get("package_sku") or "").strip()
+        amount_fen = int(selected_product.get("amount_fen") or 0)
+        credits = int(selected_product.get("credits_granted") or 0)
+        if not package_sku or amount_fen <= 0 or credits <= 0:
+            raise RuntimeError("product_payment_projection_invalid")
+        amount_text = f"{amount_fen / 100:.2f}".rstrip("0").rstrip(".")
+        currency = str(selected_product.get("currency") or "").strip()
+        if not currency:
+            raise RuntimeError("product_payment_projection_invalid_currency")
+        tier_name = tr(language, f"product_tier_{selected_tier.lower()}")
+        st.warning(
+            tr(
+                language,
+                "payment_notice_product",
+                tier=tier_name,
+                amount=amount_text,
+                currency=currency,
+                credits=credits,
+            )
+        )
+        existing_order = st.session_state.get("sp_payment_order")
+        existing_sku = str(st.session_state.get("sp_payment_package_sku") or "").strip()
+        order_sku = str((existing_order or {}).get("package_sku") or "").strip() if isinstance(existing_order, dict) else ""
+        if (existing_sku and existing_sku != package_sku) or (existing_order and order_sku != package_sku):
+            st.session_state["sp_payment_order"] = None
+            st.session_state["sp_payment_request_id"] = ""
+    else:
+        st.warning(tr(language, "payment_notice"))
 
     if st.button(tr(language, "payment_create"), key="sp_create_payment_order"):
         st.session_state["sp_payment_request_id"] = (
             f"pay_{int(time.time() * 1000)}_{secrets.token_urlsafe(12)}"
         )
+        st.session_state["sp_payment_package_sku"] = package_sku
 
     request_id = str(st.session_state.get("sp_payment_request_id") or "").strip()
     order = st.session_state.get("sp_payment_order")
     if request_id and not order:
         st.info(tr(language, "payment_creating"))
-        order_result = create_payment_order(request_id)
+        order_result = create_payment_order(request_id, package_sku or None)
         order = dict(order_result.get("order") or {})
         if not order.get("merchant_order_no") or not order.get("qr_code"):
             raise RuntimeError("payment_order_missing_qr_code")
+        if product_mode and str(order.get("package_sku") or "") != package_sku:
+            raise RuntimeError("payment_order_package_mismatch")
         st.session_state["sp_payment_order"] = order
+        projected = order_result.get("product_ui")
+        if isinstance(projected, dict):
+            st.session_state["sp_product_ui_projection"] = _normalize_product_ui_projection(projected)
 
     order = st.session_state.get("sp_payment_order") or {}
     qr_code = str(order.get("qr_code") or "").strip()
@@ -519,6 +582,9 @@ def _render_payment_purchase_body(language: str) -> None:
             status_result = payment_order_status(order.get("merchant_order_no", ""))
             updated = dict(status_result.get("order") or {})
             st.session_state["sp_payment_order"] = updated
+            projected = status_result.get("product_ui")
+            if isinstance(projected, dict):
+                st.session_state["sp_product_ui_projection"] = _normalize_product_ui_projection(projected)
             if updated.get("status") == "paid" and updated.get("credit_applied"):
                 user = status_result.get("user")
                 if isinstance(user, dict):
@@ -529,10 +595,23 @@ def _render_payment_purchase_body(language: str) -> None:
                 st.session_state["sp_payment_required"] = False
                 st.session_state["sp_payment_order"] = None
                 st.session_state["sp_payment_request_id"] = ""
-                st.success(tr(language, "payment_paid"))
+                st.session_state["sp_payment_package_sku"] = ""
+                if product_mode and selected_product is not None:
+                    tier_name = tr(language, f"product_tier_{str(selected_product.get('product_tier') or '').lower()}")
+                    st.success(
+                        tr(
+                            language,
+                            "payment_paid_product",
+                            tier=tier_name,
+                            credits=int(selected_product.get("credits_granted") or 0),
+                        )
+                    )
+                else:
+                    st.success(tr(language, "payment_paid"))
             elif updated.get("status") in {"closed", "failed"}:
                 st.session_state["sp_payment_order"] = None
                 st.session_state["sp_payment_request_id"] = ""
+                st.session_state["sp_payment_package_sku"] = ""
                 st.warning(tr(language, "payment_expired"))