Improve Alipay login message and timeout handling

i18n.py

@@ -300,9 +300,11 @@ TEXTS: dict[str, dict[str, str]] = {
         "core_literature_parsing": "🧠 正在深度解析用户上传的核心文献……",
         "section_complete_progress": "🇬🇧 【{name}】英文完成，翻译任务已进入后台。",
         "login_title": "支付宝扫码登录",
-        "login_info": "每位用户每天免费生成3篇论文。支付宝仅用于账户识别，不显示您的支付宝用户标识。",
+        "login_info": "每位小伙伴每日可免费生成 3 篇论文。",
         "login_creating": "正在创建安全登录请求……",
         "login_create_error": "无法创建登录请求：{error}",
+        "login_service_timeout": "登录服务响应较慢，请稍后重试。",
+        "login_service_connection_error": "暂时无法连接登录服务，请检查网络后重试。",
         "login_reconnect": "重新连接登录服务",
         "login_open": "打开支付宝扫码登录",
         "login_caption": "请在新页面使用手机支付宝扫码并确认授权，然后返回本页面检查登录结果。",
@@ -413,9 +415,11 @@ TEXTS: dict[str, dict[str, str]] = {
         "core_literature_parsing": "🧠 Parsing the uploaded core literature in depth…",
         "section_complete_progress": "🇬🇧 English section 【{name}】 complete; translation is running in the background.",
         "login_title": "Sign in with Alipay",
-        "login_info": "Each user may generate three papers free of charge each day. Alipay is used only to identify the account; your Alipay identifier is not displayed.",
+        "login_info": "You can generate up to 3 papers for free each day.",
         "login_creating": "Creating a secure sign-in request…",
         "login_create_error": "Unable to create the sign-in request: {error}",
+        "login_service_timeout": "The sign-in service is taking longer than expected. Please try again.",
+        "login_service_connection_error": "The sign-in service is temporarily unavailable. Check your connection and try again.",
         "login_reconnect": "Reconnect to Sign-in Service",
         "login_open": "Open Alipay QR Sign-in",
         "login_caption": "Use Alipay on your phone to scan and authorize in the new page, then return here to check the result.",
@@ -526,9 +530,11 @@ TEXTS: dict[str, dict[str, str]] = {
         "core_literature_parsing": "🧠 Выполняется углублённая обработка загруженной основной литературы…",
         "section_complete_progress": "🇬🇧 Английский раздел 【{name}】 завершён; перевод выполняется в фоне.",
         "login_title": "Вход через Alipay",
-        "login_info": "Каждый пользователь может бесплатно формировать три статьи в день. Alipay используется только для идентификации учётной записи; идентификатор Alipay не отображается.",
+        "login_info": "Вы можете бесплатно создавать до 3 статей в день.",
         "login_creating": "Создание защищённого запроса на вход…",
         "login_create_error": "Не удалось создать запрос на вход: {error}",
+        "login_service_timeout": "Сервис входа отвечает медленнее обычного. Пожалуйста, попробуйте ещё раз.",
+        "login_service_connection_error": "Сервис входа временно недоступен. Проверьте подключение и повторите попытку.",
         "login_reconnect": "Повторно подключиться к сервису входа",
         "login_open": "Открыть вход по QR-коду Alipay",
         "login_caption": "Откройте новую страницу, отсканируйте QR-код приложением Alipay и подтвердите авторизацию, затем вернитесь сюда.",
@@ -639,9 +645,11 @@ TEXTS: dict[str, dict[str, str]] = {
         "core_literature_parsing": "🧠 Жүктелген негізгі әдебиеттер терең өңделуде…",
         "section_complete_progress": "🇬🇧 【{name}】 ағылшын бөлімі аяқталды; аударма фондық режимде орындалуда.",
         "login_title": "Alipay арқылы кіру",
-        "login_info": "Әр пайдаланушы күніне үш мақаланы тегін дайындай алады. Alipay тек есептік жазбаны сәйкестендіру үшін қолданылады; Alipay идентификаторы көрсетілмейді.",
+        "login_info": "Күніне 3 мақалаға дейін тегін жасай аласыз.",
         "login_creating": "Қауіпсіз кіру сұрауы құрылуда…",
         "login_create_error": "Кіру с��рауын құру мүмкін болмады: {error}",
+        "login_service_timeout": "Кіру қызметі баяу жауап беріп жатыр. Сәл кейінірек қайталап көріңіз.",
+        "login_service_connection_error": "Кіру қызметі уақытша қолжетімсіз. Желіні тексеріп, қайта көріңіз.",
         "login_reconnect": "Кіру қызметіне қайта қосылу",
         "login_open": "Alipay QR-коды арқылы кіруді ашу",
         "login_caption": "Жаңа бетте телефондағы Alipay қолданбасымен QR-кодты сканерлеп, рұқсатты растаңыз, содан кейін осы бетке оралыңыз.",

managed_auth.py

@@ -14,8 +14,21 @@ import streamlit as st
 from i18n import tr
 
 
-REQUEST_TIMEOUT = (8, 25)
+# Connection timeout: 10 seconds; read timeout: 30 seconds.
+REQUEST_TIMEOUT = (10, 30)
+# One initial request plus one automatic retry for temporary network failures.
+REQUEST_ATTEMPTS = 2
+RETRY_DELAY_SECONDS = 1.5
 SESSION_VERIFY_INTERVAL_SECONDS = 60
+TRANSIENT_HTTP_STATUS = {502, 503, 504}
+
+
+class AuthServiceTimeoutError(RuntimeError):
+    """The authentication service did not respond within the allowed time."""
+
+
+class AuthServiceConnectionError(RuntimeError):
+    """The authentication service could not be reached."""
 
 
 def _runtime_value(name: str) -> str:
@@ -43,23 +56,75 @@ def _service_key() -> str:
 
 
 def _post(path: str, payload: dict[str, Any]) -> dict[str, Any]:
-    response = requests.post(
-        f"{_api_base()}{path}",
-        headers={
-            "Authorization": f"Bearer {_service_key()}",
-            "Content-Type": "application/json",
-        },
-        json=payload,
-        timeout=REQUEST_TIMEOUT,
-    )
-    try:
-        data = response.json()
-    except ValueError as exc:
-        raise RuntimeError(f"Authentication service returned non-JSON content (HTTP {response.status_code}).") from exc
-    if response.status_code >= 400:
-        message = data.get("message") or data.get("reason") or data.get("error") or f"HTTP {response.status_code}"
-        raise RuntimeError(str(message))
-    return data
+    """Call a protected Cloudflare endpoint with one transient-failure retry."""
+    url = f"{_api_base()}{path}"
+    headers = {
+        "Authorization": f"Bearer {_service_key()}",
+        "Content-Type": "application/json",
+    }
+
+    last_error: Exception | None = None
+
+    for attempt in range(REQUEST_ATTEMPTS):
+        try:
+            response = requests.post(
+                url,
+                headers=headers,
+                json=payload,
+                timeout=REQUEST_TIMEOUT,
+            )
+
+            if (
+                response.status_code in TRANSIENT_HTTP_STATUS
+                and attempt < REQUEST_ATTEMPTS - 1
+            ):
+                time.sleep(RETRY_DELAY_SECONDS)
+                continue
+
+            try:
+                data = response.json()
+            except ValueError as exc:
+                raise RuntimeError(
+                    "Authentication service returned non-JSON content "
+                    f"(HTTP {response.status_code})."
+                ) from exc
+
+            if response.status_code >= 400:
+                message = (
+                    data.get("message")
+                    or data.get("reason")
+                    or data.get("error")
+                    or f"HTTP {response.status_code}"
+                )
+                raise RuntimeError(str(message))
+
+            return data
+
+        except requests.exceptions.Timeout as exc:
+            last_error = exc
+            if attempt < REQUEST_ATTEMPTS - 1:
+                time.sleep(RETRY_DELAY_SECONDS)
+                continue
+            raise AuthServiceTimeoutError("authentication_service_timeout") from exc
+
+        except requests.exceptions.ConnectionError as exc:
+            last_error = exc
+            if attempt < REQUEST_ATTEMPTS - 1:
+                time.sleep(RETRY_DELAY_SECONDS)
+                continue
+            raise AuthServiceConnectionError(
+                "authentication_service_connection_error"
+            ) from exc
+
+    raise RuntimeError(str(last_error or "Unknown authentication service error."))
+
+
+def _friendly_error(language: str, error: Exception) -> str:
+    if isinstance(error, AuthServiceTimeoutError):
+        return tr(language, "login_service_timeout")
+    if isinstance(error, AuthServiceConnectionError):
+        return tr(language, "login_service_connection_error")
+    return str(error)
 
 
 def _clear_login_request() -> None:
@@ -77,31 +142,47 @@ def _verify_existing_session() -> bool:
     session_token = st.session_state.get("sp_session_token")
     if not session_token:
         return False
+
     last_verified = float(st.session_state.get("sp_last_verified_at", 0))
     if time.time() - last_verified < SESSION_VERIFY_INTERVAL_SECONDS:
         return bool(st.session_state.get("sp_user"))
+
     try:
         result = _post("/session/verify", {"session_token": session_token})
     except Exception:
         _clear_session()
         return False
+
     if not result.get("ok") or not result.get("valid"):
         _clear_session()
         return False
+
     st.session_state["sp_user"] = result.get("user", {})
-    st.session_state["sp_session_expires_at"] = result.get("session_expires_at")
+    st.session_state["sp_session_expires_at"] = result.get(
+        "session_expires_at"
+    )
     st.session_state["sp_last_verified_at"] = time.time()
     return True
 
 
 def _render_login_link(url: str, language: str) -> None:
     if hasattr(st, "link_button"):
-        st.link_button(tr(language, "login_open"), url, use_container_width=True)
+        st.link_button(
+            tr(language, "login_open"),
+            url,
+            use_container_width=True,
+        )
         return
+
     safe_url = html.escape(url, quote=True)
     label = html.escape(tr(language, "login_open"))
     st.markdown(
-        f"""<a href="{safe_url}" target="_blank" style="display:block;text-align:center;padding:0.75rem;border-radius:0.5rem;background:#1677ff;color:white;text-decoration:none;font-weight:600;">{label}</a>""",
+        (
+            f'<a href="{safe_url}" target="_blank" rel="noopener noreferrer" '
+            'style="display:block;text-align:center;padding:0.75rem;'
+            'border-radius:0.5rem;background:#1677ff;color:white;'
+            f'text-decoration:none;font-weight:600;">{label}</a>'
+        ),
         unsafe_allow_html=True,
     )
 
@@ -109,8 +190,10 @@ def _render_login_link(url: str, language: str) -> None:
 def _create_login_request() -> dict[str, Any]:
     result = _post("/login/create", {})
     required = ("login_request_id", "poll_token", "authorization_url")
+
     if not all(result.get(name) for name in required):
         raise RuntimeError("Authentication service returned incomplete login data.")
+
     request_data = {
         "login_request_id": result["login_request_id"],
         "poll_token": result["poll_token"],
@@ -121,7 +204,10 @@ def _create_login_request() -> dict[str, Any]:
     return request_data
 
 
-def _check_login_status(request_data: dict[str, Any], language: str) -> None:
+def _check_login_status(
+    request_data: dict[str, Any],
+    language: str,
+) -> None:
     result = _post(
         "/login/status",
         {
@@ -129,31 +215,45 @@ def _check_login_status(request_data: dict[str, Any], language: str) -> None:
             "poll_token": request_data["poll_token"],
         },
     )
+
     status = result.get("status")
     if status == "pending":
         st.info(tr(language, "login_pending"))
         return
+
     if status != "authenticated":
-        raise RuntimeError(result.get("message") or result.get("reason") or f"Unknown login status: {status}")
+        raise RuntimeError(
+            result.get("message")
+            or result.get("reason")
+            or f"Unknown login status: {status}"
+        )
+
     session_token = result.get("session_token")
     user = result.get("user")
+
     if not session_token or not user:
         raise RuntimeError("Login succeeded but the session data is incomplete.")
+
     st.session_state["sp_session_token"] = session_token
-    st.session_state["sp_session_expires_at"] = result.get("session_expires_at")
+    st.session_state["sp_session_expires_at"] = result.get(
+        "session_expires_at"
+    )
     st.session_state["sp_user"] = user
     st.session_state["sp_last_verified_at"] = time.time()
+
     _clear_login_request()
     st.rerun()
 
 
 def logout_alipay_session() -> None:
     session_token = st.session_state.get("sp_session_token")
+
     if session_token:
         try:
             _post("/logout", {"session_token": session_token})
         except Exception:
             pass
+
     _clear_session()
     _clear_login_request()
     st.rerun()
@@ -164,12 +264,18 @@ def render_logged_in_account(language: str) -> None:
     user_id = user.get("id", "—")
     free_limit = user.get("daily_free_limit", 3)
     bonus_papers = user.get("bonus_papers", 0)
+
     with st.sidebar:
         st.markdown(f"### {tr(language, 'account_title')}")
         st.write(tr(language, "account_id", value=user_id))
         st.write(tr(language, "daily_free", value=free_limit))
         st.write(tr(language, "bonus_papers", value=bonus_papers))
-        if st.button(tr(language, "logout"), key="sp_logout_button", use_container_width=True):
+
+        if st.button(
+            tr(language, "logout"),
+            key="sp_logout_button",
+            use_container_width=True,
+        ):
             logout_alipay_session()
 
 
@@ -184,27 +290,54 @@ def require_alipay_login(language: str = "zh") -> bool:
         unsafe_allow_html=True,
     )
     st.info(tr(language, "login_info"))
+
     request_data = st.session_state.get("sp_login_request")
     if not request_data:
         try:
             with st.spinner(tr(language, "login_creating")):
                 request_data = _create_login_request()
         except Exception as exc:
-            st.error(tr(language, "login_create_error", error=exc))
-            if st.button(tr(language, "login_reconnect"), use_container_width=True):
+            st.error(
+                tr(
+                    language,
+                    "login_create_error",
+                    error=_friendly_error(language, exc),
+                )
+            )
+            if st.button(
+                tr(language, "login_reconnect"),
+                use_container_width=True,
+            ):
                 st.rerun()
             st.stop()
 
     _render_login_link(request_data["authorization_url"], language)
     st.caption(tr(language, "login_caption"))
+
     left, right = st.columns(2)
-    if left.button(tr(language, "login_check"), type="primary", use_container_width=True):
+
+    if left.button(
+        tr(language, "login_check"),
+        type="primary",
+        use_container_width=True,
+    ):
         try:
             with st.spinner(tr(language, "login_checking")):
                 _check_login_status(request_data, language)
         except Exception as exc:
-            st.error(tr(language, "login_check_error", error=exc))
-    if right.button(tr(language, "login_regenerate"), use_container_width=True):
+            st.error(
+                tr(
+                    language,
+                    "login_check_error",
+                    error=_friendly_error(language, exc),
+                )
+            )
+
+    if right.button(
+        tr(language, "login_regenerate"),
+        use_container_width=True,
+    ):
         _clear_login_request()
         st.rerun()
+
     st.stop()