ruyi 0.43.0a20251017__tar.gz → 0.44.0__tar.gz

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruyi
-Version: 0.43.0a20251017
+Version: 0.44.0
 Summary: Package manager for RuyiSDK
 License: Apache License
                                     Version 2.0, January 2004
@@ -217,6 +217,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Topic :: System :: Software Distribution
@@ -225,7 +226,8 @@ Requires-Dist: argcomplete (>=2.0.0)
 Requires-Dist: arpy
 Requires-Dist: fastjsonschema (>=2.15.1)
 Requires-Dist: jinja2 (>=3,<4)
-Requires-Dist: pygit2 (>=1.6)
+Requires-Dist: pygit2 (>=1.6) ; python_version >= "3.11"
+Requires-Dist: pygit2 (>=1.6,<1.19) ; python_version < "3.11"
 Requires-Dist: pyyaml (>=5.4)
 Requires-Dist: requests (>=2,<3)
 Requires-Dist: rich (>=11.2.0)
@@ -406,7 +408,8 @@ described below.
 There are 3 telemetry modes available:
 
 * `local`: data will be collected but not uploaded without user action.
-* `off`: data will not be collected nor uploaded.
+* `off`: data will neither be collected nor uploaded, except for a one-time
+  upload of `ruyi`'s version number on first run.
 * `on`: data will be collected and periodically uploaded.
 
 By default the `local` mode is active from `ruyi` 0.42.0 (inclusive) on, which

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/README.md

@@ -163,7 +163,8 @@ described below.
 There are 3 telemetry modes available:
 
 * `local`: data will be collected but not uploaded without user action.
-* `off`: data will not be collected nor uploaded.
+* `off`: data will neither be collected nor uploaded, except for a one-time
+  upload of `ruyi`'s version number on first run.
 * `on`: data will be collected and periodically uploaded.
 
 By default the `local` mode is active from `ruyi` 0.42.0 (inclusive) on, which

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "ruyi"
-version = "0.43.0-alpha.20251017"
+version = "0.44.0"
 description = "Package manager for RuyiSDK"
 keywords = ["ruyi", "ruyisdk"]
 license = { file = "LICENSE-Apache.txt" }
@@ -22,6 +22,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Topic :: Software Development :: Build Tools",
   "Topic :: Software Development :: Embedded Systems",
   "Topic :: System :: Software Distribution",
@@ -33,7 +34,8 @@ dependencies = [
   "arpy",
   "fastjsonschema>=2.15.1",
   "jinja2 (>=3, <4)",
-  "pygit2>=1.6",
+  "pygit2 (>=1.6, <1.19); python_version<'3.11'",
+  "pygit2>=1.6; python_version>='3.11'",
   "pyyaml>=5.4",
   "requests (>=2, <3)",
   "rich>=11.2.0",

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/cli/main.py

@@ -39,11 +39,11 @@ def main(gm: GlobalModeProvider, gc: GlobalConfig, argv: list[str]) -> int:
     if not gm.is_cli_autocomplete:
         oobe = OOBE(gc)
 
-        if tm := gc.telemetry:
-            tm.check_first_run_status()
-            tm.init_installation(False)
-            atexit.register(tm.flush)
-            oobe.handlers.append(tm.oobe_prompt)
+        tm = gc.telemetry
+        tm.check_first_run_status()
+        tm.init_installation(False)
+        atexit.register(tm.flush)
+        oobe.handlers.append(tm.oobe_prompt)
 
         oobe.maybe_prompt()
 
@@ -59,12 +59,11 @@ def main(gm: GlobalModeProvider, gc: GlobalConfig, argv: list[str]) -> int:
         from ..mux.runtime import mux_main
 
         # record an invocation and the command name being proxied to
-        if tm := gc.telemetry:
-            tm.record(
-                TelemetryScope(None),
-                "cli:mux-invocation-v1",
-                target=os.path.basename(gm.argv0),
-            )
+        gc.telemetry.record(
+            TelemetryScope(None),
+            "cli:mux-invocation-v1",
+            target=os.path.basename(gm.argv0),
+        )
 
         return mux_main(gm, gc, argv)
 
@@ -127,8 +126,16 @@ def main(gm: GlobalModeProvider, gc: GlobalConfig, argv: list[str]) -> int:
     except AttributeError:
         pass
 
-    if tm := gc.telemetry:
-        tm.print_telemetry_notice()
+    tm = gc.telemetry
+    tm.print_telemetry_notice()
+
+    # Do not record `ruyi telemetry --cron-upload` invocations.
+    skip_recording_invocation = telemetry_key == "telemetry" and getattr(
+        args,
+        "cron_upload",
+        False,
+    )
+    if not skip_recording_invocation:
         tm.record(
             TelemetryScope(None),
             "cli:invocation-v1",

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/cli/oobe.py

@@ -30,13 +30,9 @@ class OOBE:
         ]
 
     def is_first_run(self) -> bool:
-        if tm := self._gc.telemetry:
-            return tm.is_first_run
-        # cannot reliably determine first run status without telemetry
-        # we may revisit this later if it turns out users want OOBE tips even
-        # if they know how to disable telemetry (hence more likely to be power
-        # users)
-        return False
+        # We now always have our first-run indicator because of the minimal
+        # telemetry mode.
+        return self._gc.telemetry.is_first_run
 
     def should_prompt(self) -> bool:
         from ..utils.global_mode import is_env_var_truthy

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/cli/self_cli.py

@@ -241,8 +241,7 @@ def _do_reset(
 
     # do not record any telemetry data if we're purging it
     if all_state or telemetry:
-        if tm := cfg.telemetry:
-            tm.discard_events(True)
+        cfg.telemetry.discard_events(True)
 
     if all_state:
         status("removing state data")

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/config/__init__.py

@@ -297,17 +297,13 @@ class GlobalConfig:
     def telemetry_root(self) -> os.PathLike[Any]:
         return pathlib.Path(self.ensure_state_dir()) / "telemetry"
 
-    @property
-    def telemetry(self) -> "TelemetryProvider | None":
-        return None if self.telemetry_mode == "off" else self._telemetry_provider
-
     @cached_property
-    def _telemetry_provider(self) -> "TelemetryProvider | None":
-        """Do not access directly; use the ``telemetry`` property instead."""
-
+    def telemetry(self) -> "TelemetryProvider":
         from ..telemetry.provider import TelemetryProvider
 
-        return None if self.telemetry_mode == "off" else TelemetryProvider(self)
+        # for allowing minimal uploads when telemetry is off
+        minimal_mode = self.telemetry_mode == "off"
+        return TelemetryProvider(self, minimal_mode)
 
     @property
     def telemetry_mode(self) -> str:

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/mux/venv/maker.py

@@ -9,14 +9,46 @@ from typing import Any, Final, Iterator, TypedDict
 from ...config import GlobalConfig
 from ...log import RuyiLogger, humanize_list
 from ...ruyipkg.atom import Atom
-from ...ruyipkg.pkg_manifest import EmulatorProgDecl
+from ...ruyipkg.pkg_manifest import BoundPackageManifest, EmulatorProgDecl
 from ...ruyipkg.profile import ProfileProxy
 from ...utils.global_mode import ProvidesGlobalMode
 from ...utils.templating import render_template_str
-from . import ConfiguredTargetTuple
 from .emulator_cfg import ResolvedEmulatorProg
 
 
+class ConfiguredTargetTuple(TypedDict):
+    target: str
+    toolchain_root: PathLike[Any]
+    toolchain_sysroot: PathLike[Any] | None
+    toolchain_flags: str
+    binutils_flavor: str
+    cc_flavor: str
+    gcc_install_dir: PathLike[Any] | None
+
+
+class VenvPackageInfo(TypedDict):
+    repo_id: str
+    category: str
+    name: str
+    version: str
+
+
+class VenvMetadata(TypedDict):
+    emulator_pkgs: dict[str, VenvPackageInfo]
+    extra_pkgs: list[VenvPackageInfo]
+    sysroot_pkg: VenvPackageInfo | None
+    toolchain_pkgs: dict[str, VenvPackageInfo]
+
+
+def _venv_pkg_info_from_pkg(pkg: BoundPackageManifest) -> VenvPackageInfo:
+    return VenvPackageInfo(
+        repo_id=pkg.repo_id,
+        category=pkg.category,
+        name=pkg.name,
+        version=pkg.ver,
+    )
+
+
 def do_make_venv(
     config: GlobalConfig,
     host: str,
@@ -50,6 +82,12 @@ def do_make_venv(
     seen_target_tuples: set[str] = set()
     targets: list[ConfiguredTargetTuple] = []
     warn_differing_target_arch = False
+    venv_metadata = VenvMetadata(
+        emulator_pkgs={},
+        extra_pkgs=[],
+        sysroot_pkg=None,
+        toolchain_pkgs={},
+    )
 
     for tc_atom_str in tc_atoms_str:
         tc_atom = Atom.parse(tc_atom_str)
@@ -97,6 +135,7 @@ def do_make_venv(
         if with_sysroot:
             if tc_sysroot_relpath := tc_pm.toolchain_metadata.included_sysroot:
                 tc_sysroot_dir = pathlib.Path(toolchain_root) / tc_sysroot_relpath
+                venv_metadata["sysroot_pkg"] = _venv_pkg_info_from_pkg(tc_pm)
             else:
                 if sysroot_atom_str is None:
                     logger.F(
@@ -156,6 +195,8 @@ def do_make_venv(
                     )
                     return 1
 
+                venv_metadata["sysroot_pkg"] = _venv_pkg_info_from_pkg(gcc_pkg_pm)
+
         # derive flags for (the quirks of) this toolchain
         tc_flags = profile.get_common_flags(tc_pm.toolchain_metadata.quirks)
 
@@ -177,6 +218,7 @@ def do_make_venv(
         logger.D(f"configuration for {target_tuple}: {configured_target}")
         targets.append(configured_target)
         seen_target_tuples.add(target_tuple)
+        venv_metadata["toolchain_pkgs"][target_tuple] = _venv_pkg_info_from_pkg(tc_pm)
 
         # record the target architecture for use in emulator package matching
         if not target_arch:
@@ -236,6 +278,8 @@ def do_make_venv(
             logger.F("cannot find the installed directory for the emulator")
             return 1
 
+        venv_metadata["emulator_pkgs"][target_arch] = _venv_pkg_info_from_pkg(emu_pm)
+
     # Now resolve extra commands to provide in the venv.
     extra_cmds: dict[str, str] = {}
     if extra_cmd_atoms_str:
@@ -276,6 +320,8 @@ def do_make_venv(
                 return 1
             cmd_root = pathlib.Path(cmd_root)
 
+            venv_metadata["extra_pkgs"].append(_venv_pkg_info_from_pkg(extra_cmd_pm))
+
             for cmd, cmd_rel_path in extra_cmds_decl.items():
                 # resolve the command path
                 cmd_path = (cmd_root / cmd_rel_path).resolve()
@@ -305,6 +351,7 @@ def do_make_venv(
         emu_progs,
         emu_root,
         extra_cmds,
+        venv_metadata,
         override_name,
     )
     maker.provision()
@@ -350,6 +397,7 @@ class VenvMaker:
         emulator_progs: list[EmulatorProgDecl] | None,
         emulator_root: PathLike[Any] | None,
         extra_cmds: dict[str, str] | None,
+        metadata: VenvMetadata,
         override_name: str | None = None,
     ) -> None:
         self.gc = gc
@@ -359,6 +407,7 @@ class VenvMaker:
         self.emulator_progs = emulator_progs
         self.emulator_root = emulator_root
         self.extra_cmds = extra_cmds or {}
+        self.metadata = metadata
         self.override_name = override_name
 
         self.bindir = self.venv_root / "bin"
@@ -415,6 +464,7 @@ class VenvMaker:
         env_data = {
             "profile": self.profile.id,
             "sysroot": self.sysroot_destdir(None),
+            "metadata": self.metadata,
         }
         self.render_and_write(
             venv_root / "ruyi-venv.toml",

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/pluginhost/unsandboxed.py

@@ -148,7 +148,7 @@ class UnsandboxedRuyiPluginLoader(BasePluginLoader[UnsandboxedModuleDict]):
     @staticmethod
     def source_to_code(
         data: "Buffer | str | ast.Module",
-        path: "Buffer | str | os.PathLike[str]" = "<string>",
+        path: "str | os.PathLike[str]" = "<string>",
     ) -> CodeType:
         mod_ast: ast.Module
         if isinstance(data, ast.Module):

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/resource_bundle/data.py

@@ -11,7 +11,7 @@ RESOURCES: Final = {
     "prompt.venv-created.txt.jinja": b"eNp1kTFvwkAMhff7FV7YStjbqWLqwMZSISSOO4dYJOfIvoRGiP9eXwR0KTedbOv5e8/bBmEkyYNvAZP9OHWYMpBC4gsEQZ8xVs598wCdn8CHTKPVgDIcJ1AeJFA6QTYh3/fCvVBp3+eIE2gQ6k0ylSG3Owli2h8p7VZ7iCQYMsv0Bj5FiPjUN3FKI5+L+EGGiZZ/zUPlroslUA06qTBnWNyc+4RaUJtHbdUL1vRTrPhWGYxtJDUgjHeW/5xX7mt270dPrT+25iTPszW3LV8KTe9z8+4c2LubuV6fILeb2ZrpMEUDLGDbFyHPWIE7VLhQbsDCjtOy8xFhvfFnhMzchsYbbU0tupLQBtUiDcKqc7GCdYPh/MoOzFA1iw2w4oezdaWujwiKhhpEymXNoP5kp02aZQjleFq5Xz21xdY=",  # fmt: skip
     "ruyi-activate.bash.jinja": b"eNp9lN1u2kAQhe/3KSYGqiSVRUnuqIhEGqRESgLCBClKI2uxx/JKZh2t126o6yfqI/QuT9bxH2CHhBvEzpn1d2YO7sDCFxF4IkBYx5GGFUIcoQu/hPbBiMJYOQgrIfsq3giTO1okXKMBp54K17DikX/KOrAJY3C4lKEGFUsQGlyh0NHBhjEmPHgCo5tejq1r25o+zH9MzMyAEZ19M+D5O2gfJQP6oOOHYDzSZQVL9XSdE0aOEi96CD+79XHefPHlrGx8pUeenzNPMFaAulijwvEJpIWoAwoj1BAGLqBMhArlGqWGhCvBVwFGleqIcM3f0E2X4/lXO4Nn6tOxkhFoFSOQHSoAMbnoBFzRsLgGHgRFO1WrfnJszx8eb+zp7ZU9Gy+uh3QZ+YU9w/knL42MblNrbMv4+hIqXai2Z7HMfTQ7imLuvzQhZMID4eYDoKcV7bQhx8ei7tPewFRwdtF3MenLmOg/xbcGH8Bbgya7NXiPbg0+Jq9qNXhZL8rLyf3y0Jk9m0/vZosa94mAiXVQRUqG0sWIFpWvH1vEHbAw8KAWHLWwTA9a4anZMkYhL0VCKQww4Y3gtDPXpGBsCz9K050T+AO0hixj1aB2tllztzTiMhTVj62wT//MYVXbDwr7LAAHl5/28mHuhnw/vpuA2ctYe+4NB6WstpH2TMAgwsN9RveYXhco+Rphz4JxYpSN0iWA3vth1Psu3yNlMnfFqxtrfHk7qURmO6ONpBFCSl8kYtvsvv2d0+5g/8ryquztHzTke2mmRPwHax2J0Q==",  # fmt: skip
     "ruyi-cache.toml.jinja": b"eNptUs1uhCAYvPsUX2nMtknjoccmve0e9tK9eDOGsIJK1r8CmhjjuxcUF6uexG+GmWHgFX5u4eULwpxLSHnBQH9LUpGMUbj3INqeB3C+GRpcztfwxfOihCQ5o7j7jL3BB57CLytbfOcV+ONz+Q1oGBwyjkhzWUU13R/tvkbUxhMbEqs6AzjxYINOZmkt4PEBHWjJDR5wxUr59q5VtPFDO9oMnTH3ZnezX+P/k6xFFREZU3Iltkq0gFY/9lRdF0lOeGXOSLlYHKPTFjnFUwo3TguSySP+BFj6XFMXIQfLXoq6VijW0XbTIz0LzYr7O9DiWZJgXklFigLrqJP0ZuaEN8Ch7LPobbtJSXHJFKFEEVyS5rjmHQvZwlHsUSZXpzR/S7PT3WDVNvoRuxpWU9epy/cHatoHPQ==",  # fmt: skip
-    "ruyi-venv.toml.jinja": b"eNqLTs7PS8tMj+UqKMpPy8xJVbBVUKquVoDxamuVuKpVFTLTFIori4vy80sUdFVruWBsiFoYD6JWVyE1LwWoHqgMAMZMHuE=",  # fmt: skip
+    "ruyi-venv.toml.jinja": b"eNqtkOFqwyAQx7/7FBIIbWEN7AH2JEHCYUwqbTxRN1ZC3n0atQlpSxnbN/V+3v3uX3NUnewZ0QY7eRH0gxbjSPNtmgoyllR21F6tQXT0WE4knyObb5E9UqFaz3uM1INw0IIDRr6EsRKV//JOQscBuEGqz32Tmb0+zM2N0NjINovUu/SwY/MEDk70aK5LPb8kQMEglmK4pcKikGrpIZWTehQL9nHvrFcXac/GSxcsELf1Kg38DL2wVWIYCRPWyz1pc/Cjw6Als+1UMXxewKEJvI1zPdKhoQ5ML1wDhp/eqKZSPf9VSScGu48BP9DOeBWSWfUNwdzvolfWQaR8tcK3M3Dvv1VeU7PnI9EAsb8rOcQLP4FUv4t1++1Vrjf+X4L9AYyLQa0=",  # fmt: skip
     "toolchain.cmake.jinja": b"eNqFkVFrwjAUhd/7Ky6IMGF274M9dG2cZWlT0joUhJDVaIuajKQTR+l/X6zOWccwb+F+5+Scmx5MjIBNuRaPTs/pQb7lawGu68Lc3g5nGPiR94pYRgj2x14Ys1GI0VNdw07IHdNKVdA0D5VSm7zgpXSPFnOn7g+hXIL5Mi3Tb64MwzjNPIxZQtEonB4Mf9CmOcmFXFiHs9LGchwjqrujQTpLMxSx2IsQ4FJ+7gd/hwklPkpTQsH6f2iVC2OUti9csj7zSZTYVi2V59fj6bQL7PctUfcv+w1tzF/NKIwDRgnJWOJlY+iUa5UX1YzgOi9gaXMVgi+ENsDlwn7Ku+a6FAZKCVUhoOJ6JSqr3JVaya2Q1X1XbfutNN+eBYUyHfzffCwiATrs6oV6EcToDdHBDRiHz9SjMyAxnt1iw9jHkwCd2G+4PsQk",  # fmt: skip
 }
 

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/ruyipkg/install.py

@@ -168,17 +168,16 @@ def do_install_atoms(
             for s in sv.render_known_issues(pm.repo.messages, config.lang_code):
                 logger.I(s)
 
-        if tm := config.telemetry:
-            tm.record(
-                TelemetryScope(mr.repo_id),
-                "repo:package-install-v1",
-                atom=a_str,
-                host=canonicalized_host,
-                pkg_category=pm.category,
-                pkg_kinds=pm.kind,
-                pkg_name=pm.name,
-                pkg_version=pm.ver,
-            )
+        config.telemetry.record(
+            TelemetryScope(mr.repo_id),
+            "repo:package-install-v1",
+            atom=a_str,
+            host=canonicalized_host,
+            pkg_category=pm.category,
+            pkg_kinds=pm.kind,
+            pkg_name=pm.name,
+            pkg_version=pm.ver,
+        )
 
         if pm.binary_metadata is not None:
             ret = _do_install_binary_pkg(
@@ -478,17 +477,16 @@ def do_uninstall_atoms(
     for a_str, pm in pms_to_uninstall:
         pkg_name = pm.name_for_installation
 
-        if tm := config.telemetry:
-            tm.record(
-                TelemetryScope(mr.repo_id),
-                "repo:package-uninstall-v1",
-                atom=a_str,
-                host=canonicalized_host,
-                pkg_category=pm.category,
-                pkg_kinds=pm.kind,
-                pkg_name=pm.name,
-                pkg_version=pm.ver,
-            )
+        config.telemetry.record(
+            TelemetryScope(mr.repo_id),
+            "repo:package-uninstall-v1",
+            atom=a_str,
+            host=canonicalized_host,
+            pkg_category=pm.category,
+            pkg_kinds=pm.kind,
+            pkg_name=pm.name,
+            pkg_version=pm.ver,
+        )
 
         if pm.binary_metadata is not None:
             ret = _do_uninstall_binary_pkg(

{ruyi-0.43.0a20251017 → ruyi-0.44.0}/ruyi/telemetry/aggregate.py

@@ -18,8 +18,13 @@ class UploadPayload(TypedDict):
     fmt: int
     nonce: str
     ruyi_version: str
+    report_uuid: "NotRequired[str]"
+    """Optional field in case the client wishes to report this, and nothing
+    else. If `installation` is present, this field is ignored."""
     installation: "NotRequired[NodeInfo | None]"
+    """More detailed installation info that the client has user consent to report."""
     events: list[AggregatedTelemetryEvent]
+    """Aggregated telemetry events that the client has user consent to upload."""
 
 
 def stringify_param_val(v: object) -> str: