Technician tool v0.6

Imported from the Google Drive folder 004-technician_tool/v0.6.

kota_tech/flash/image.py

@@ -86,6 +86,7 @@ class FirmwareImage:
     app_offset: int                  # where the app starts inside the file
     app_length: int                  # exact app image length (from its structure)
     app: AppInfo
+    built_by: str = ""               # who compiled a developer build (shown in the UI)
 
     @property
     def data(self) -> bytes:
@@ -109,7 +110,10 @@ class FirmwareImage:
         return b"\xff" * self.partition("otadata").size
 
     def label(self) -> str:
-        tag = "factory" if self.origin == "factory" else "developer build"
+        if self.origin == "factory":
+            tag = "factory"
+        else:
+            tag = "developer build" + (f" - built by {self.built_by}" if self.built_by else "")
         return f"{self.app.version} built {self.app.built} [{self.app.elf_sha[:9]}] - {tag}"
 
 
@@ -181,7 +185,7 @@ def _app_info(data: bytes, offset: int) -> AppInfo:
 
 
 def inspect_image(path: Path, name: str = "", notes: str = "", origin: str = "factory",
-                  reference: FirmwareImage | None = None) -> FirmwareImage:
+                  reference: FirmwareImage | None = None, built_by: str = "") -> FirmwareImage:
     """Validate a merged or app-only image. App-only images need a `reference`
     (the factory image) that provides the flash layout."""
     data = path.read_bytes()
@@ -208,13 +212,14 @@ def inspect_image(path: Path, name: str = "", notes: str = "", origin: str = "fa
         raise ImageError(f"firmware ({length} bytes) does not fit the ota_0 partition ({ota0.size} bytes)")
     app = _app_info(data, app_off)
     return FirmwareImage(path, name or path.name, notes, origin, kind, hashlib.sha256(data).hexdigest(),
-                         flash_size, parts, table, app_off, length, app)
+                         flash_size, parts, table, app_off, length, app, built_by)
 
 
 # ------------------------------------------------------------- catalogue
 
-def factory_images(manifest: Path = MANIFEST) -> list[FirmwareImage]:
-    """Bundled images whose file exists and matches the SHA-256 in the manifest."""
+def bundled_images(manifest: Path = MANIFEST) -> list[FirmwareImage]:
+    """Images shipped with the tool whose file exists and matches its SHA-256.
+    Factory images first; bundled developer builds keep their origin/built_by."""
     if not manifest.exists():
         return []
     out = []
@@ -222,11 +227,19 @@ def factory_images(manifest: Path = MANIFEST) -> list[FirmwareImage]:
         path = manifest.parent / e["file"]
         if not path.exists():
             continue
-        img = inspect_image(path, e.get("name", ""), e.get("notes", ""), "factory")
+        origin = e.get("origin", "factory")
+        if origin not in ("factory", "developer"):
+            raise ImageError(f"{path.name}: unknown origin {origin!r} in the manifest")
+        img = inspect_image(path, e.get("name", ""), e.get("notes", ""), origin, built_by=e.get("built_by", ""))
         if img.sha256 != e["sha256"].lower():
             raise ImageError(f"{path.name}: SHA-256 does not match the manifest - file changed or corrupt")
         out.append(img)
-    return out
+    return sorted(out, key=lambda i: i.origin != "factory")
+
+
+def factory_images(manifest: Path = MANIFEST) -> list[FirmwareImage]:
+    """Only the official factory image(s)."""
+    return [i for i in bundled_images(manifest) if i.origin == "factory"]
 
 
 class FirmwareLibrary:
@@ -249,7 +262,8 @@ class FirmwareLibrary:
         for e in self._index():
             path = self.root / e["file"]
             try:
-                img = inspect_image(path, e.get("name", ""), e.get("notes", ""), "developer", reference)
+                img = inspect_image(path, e.get("name", ""), e.get("notes", ""), "developer", reference,
+                                    e.get("built_by", ""))
                 if img.sha256 != e["sha256"]:
                     raise ImageError("file changed since it was imported")
                 imgs.append(img)
@@ -257,21 +271,24 @@ class FirmwareLibrary:
                 problems.append(f"{e.get('original', e['file'])}: {exc}")
         return imgs, problems
 
-    def import_file(self, src: Path, reference: FirmwareImage | None, notes: str = "") -> FirmwareImage:
+    def import_file(self, src: Path, reference: FirmwareImage | None, notes: str = "",
+                    built_by: str = "") -> FirmwareImage:
         img = inspect_image(src, origin="developer", reference=reference)   # validate before copying
         entries = self._index()
         existing = next((e for e in entries if e["sha256"] == img.sha256), None)
         if existing:
             return inspect_image(self.root / existing["file"], existing["name"], existing["notes"],
-                                 "developer", reference)
+                                 "developer", reference, existing.get("built_by", ""))
         self.root.mkdir(parents=True, exist_ok=True)
         fname = f"{img.app.elf_sha[:9]}_{img.sha256[:8]}.bin"
         shutil.copyfile(src, self.root / fname)
-        name = f"Developer build {img.app.version} ({img.app.built})"
+        built_by = built_by.strip()
+        name = f"Developer build {img.app.version} ({img.app.built})" + (f", built by {built_by}" if built_by else "")
         entries.append({"file": fname, "sha256": img.sha256, "name": name, "original": src.name,
-                        "imported": dt.datetime.now().isoformat(timespec="seconds"), "notes": notes})
+                        "imported": dt.datetime.now().isoformat(timespec="seconds"), "notes": notes,
+                        "built_by": built_by})
         self._save(entries)
-        return inspect_image(self.root / fname, name, notes, "developer", reference)
+        return inspect_image(self.root / fname, name, notes, "developer", reference, built_by)
 
     def remove(self, sha256: str) -> None:
         entries = self._index()