hap-cli 0.9.13__tar.gz → 0.9.14__tar.gz

{hap_cli-0.9.13 → hap_cli-0.9.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.9.13
+Version: 0.9.14
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli/__init__.py

@@ -3,7 +3,7 @@
 import sys as _sys
 import types as _types
 
-__version__ = "0.9.13"
+__version__ = "0.9.14"
 
 # The command tree used to live in hap_cli/hap_cli.py. A module named
 # after the package it sits in shadows that package: run python with the

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli/commands/auth_cmd.py

@@ -21,7 +21,7 @@ from hap_cli.core.session import (
 from hap_cli.core import auth as auth_mod
 from hap_cli.core import global_meta as gm
 from hap_cli.utils.formatting import output_json, output_kv
-from hap_cli.i18n import t
+from hap_cli.i18n import lang_from_hap_account, t
 
 
 SERVER_HELP = (
@@ -85,6 +85,7 @@ def _save_and_report(ctx, token, webui, user_info, meta, profile_name):
     session.server_url = webui
     session.auth_token = token
     session.account_id = str(user_info.get("id") or "")
+    session.account_lang = lang_from_hap_account(str(user_info.get("lang") or ""))
     session.default_app_id = ""
     session.default_project_id = ""
     session.default_project_name = ""

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli/context.py

@@ -65,6 +65,10 @@ class Context:
         if self.session is None:
             self.session = Session.load(self.profile)
             self.session.relogin_notice = _relogin_notice
+            # Defaults written into an application follow this account's
+            # language, not the display language every profile shares.
+            from hap_cli.i18n import set_content_language_resolver
+            set_content_language_resolver(self.session.account_language)
             # One-time migration for sessions logged in before account_id
             # was persisted. Some HAP controllers (notably
             # Invitation/InviteUser) silently degrade when the AccountId

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli/core/chart.py

@@ -119,7 +119,7 @@ _VALUELESS_FILTER_TYPES = frozenset({7, 8, 41, 42})
 
 def default_chart_filter() -> dict[str, Any]:
     """A fresh copy of DEFAULT_CHART_FILTER, its range labelled in the
-    CLI's language rather than always in Chinese."""
+    account's language rather than always in Chinese."""
     from hap_cli.i18n import content_default
 
     filter_block = dict(DEFAULT_CHART_FILTER)
@@ -132,9 +132,9 @@ def _summary_label(summary_type: Any) -> str:
     entry = _SUMMARY_TYPE_NAMES.get(summary_type)
     if not entry:
         return ""
-    from hap_cli.i18n import get_active_language
+    from hap_cli.i18n import content_language
 
-    return entry.get(get_active_language()) or entry["en"]
+    return entry.get(content_language()) or entry["en"]
 
 
 def _fill_summary_name(block: Any) -> None:

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli/core/relogin.py

@@ -199,6 +199,10 @@ def _apply_login(session: Any, token: str, meta: dict, user_info: dict) -> None:
     session.auth_token = token
     if new_account:
         session.account_id = new_account
+    if user_info.get("lang"):
+        from hap_cli.i18n import lang_from_hap_account
+
+        session.account_lang = lang_from_hap_account(str(user_info["lang"]))
     endpoints = gm.extract_service_endpoints(meta)
     if endpoints:
         session.service_endpoints = endpoints

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli/core/session.py

@@ -267,6 +267,10 @@ class Session:
         # Cached routing table from Global/GetGlobalMeta. See DEFAULT_CONFIG.
         self.service_endpoints: dict[str, Any] = {}
         self._global_meta_cache: Optional[dict[str, Any]] = None
+        # The account's own language (a CLI language code), saved per
+        # profile at login. Defaults written into an application use it;
+        # see hap_cli.i18n.content_language.
+        self.account_lang = ""
         # Which named profile this session loads from / saves back to.
         # Empty until load()/save() binds it.
         self._profile_name: str = ""
@@ -966,6 +970,33 @@ class Session:
         except Exception as exc:
             logger.debug("Failed to backfill account_id lazily: %s", exc)
 
+    def account_language(self) -> str:
+        """The language of the account this session writes as.
+
+        Profiles saved before it was recorded learn it from the account
+        once and keep it. Empty when the account cannot be read.
+        """
+        if self.account_lang:
+            return self.account_lang
+        try:
+            meta = self.get_global_meta()
+            account = (meta.get("md.global") or {}).get("Account") or {}
+        except Exception as exc:
+            logger.warning("Could not read the account language: %s", exc)
+            return ""
+        if not account:
+            return ""
+        from hap_cli.i18n import lang_from_hap_account
+
+        self.account_lang = lang_from_hap_account(str(account.get("lang") or ""))
+        if self._profile_name:
+            try:
+                save_profile(self._profile_name,
+                             {"account_lang": self.account_lang})
+            except Exception as exc:
+                logger.warning("Could not save the account language: %s", exc)
+        return self.account_lang
+
     def get_global_meta(self, refresh: bool = False) -> dict[str, Any]:
         """Return cached Global/GetGlobalMeta data for service routing."""
         if refresh or self._global_meta_cache is None:
@@ -1052,6 +1083,7 @@ class Session:
             auth_token=auth_token,
         )
         session.account_id = config.get("account_id", "")
+        session.account_lang = config.get("account_lang", "")
         session.default_app_id = config.get("default_app_id", "")
         # Read new keys, fall back to legacy ``default_project_id`` /
         # ``default_project_name`` so configs written before the rename
@@ -1085,6 +1117,7 @@ class Session:
                 "login_url": self._login_url,
                 "auth_token": encrypted,
                 "account_id": self.account_id,
+                "account_lang": self.account_lang,
                 "default_app_id": self.default_app_id,
                 "default_org_id": self.default_project_id,
                 "default_org_name": self.default_project_name,
@@ -1174,6 +1207,7 @@ PROFILE_FIELDS = (
     "login_url",
     "auth_token",
     "account_id",
+    "account_lang",
     "default_app_id",
     "default_org_id",
     "default_org_name",

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli/i18n.py

@@ -38,7 +38,7 @@ import logging
 import os
 from functools import lru_cache
 from pathlib import Path
-from typing import Any, Iterable, Optional
+from typing import Any, Callable, Iterable, Optional
 
 logger = logging.getLogger("hap_cli")
 
@@ -288,16 +288,47 @@ CONTENT_DEFAULTS: dict[str, dict[str, str]] = {
 DEFAULT_VIEW_NAMES = frozenset(CONTENT_DEFAULTS["view.all"].values())
 
 
+# Returns the language of the account the CLI is writing as. Installed
+# by the CLI context when it loads a session; None outside a command.
+_content_language_resolver: Optional[Callable[[], str]] = None
+
+
+def set_content_language_resolver(fn: Optional[Callable[[], str]]) -> None:
+    global _content_language_resolver
+    _content_language_resolver = fn
+
+
+def content_language() -> str:
+    """The language stored text is written in.
+
+    Defaults saved into an application are read by everyone who opens
+    it, so they follow the account being written as — the web editor
+    writes them in its user's language. The display language is one
+    setting shared by every profile, so it only fills in when the
+    account's language is unknown.
+    """
+    if _content_language_resolver is not None:
+        try:
+            lang = _content_language_resolver()
+        except Exception:
+            logger.warning("Could not resolve the account language",
+                           exc_info=True)
+            lang = ""
+        if lang in LANG_OPTIONS:
+            return lang
+    return get_active_language()
+
+
 def content_default(key: str) -> str:
-    """Return the default *content* string for ``key`` in the active
-    language, falling back to English.
+    """Return the default *content* string for ``key`` in the content
+    language (see :func:`content_language`), falling back to English.
 
     Raises ``KeyError`` for an unknown key — these are our own payload
     defaults, so a miss is a programming error rather than a missing
     translation.
     """
     entry = CONTENT_DEFAULTS[key]
-    return entry.get(get_active_language()) or entry["en"]
+    return entry.get(content_language()) or entry["en"]
 
 
 def lang_from_hap_account(account_lang: str) -> str:

{hap_cli-0.9.13 → hap_cli-0.9.14}/hap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.9.13
+Version: 0.9.14
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0