wirestudio 0.26.0__tar.gz → 0.26.2__tar.gz

{wirestudio-0.26.0/wirestudio.egg-info → wirestudio-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wirestudio
-Version: 0.26.0
+Version: 0.26.2
 Summary: Agent-driven IoT device design tool that produces ESPHome YAML.
 Author: wirestudio contributors
 License: MIT

{wirestudio-0.26.0 → wirestudio-0.26.2}/tests/test_fleet.py

@@ -753,3 +753,40 @@ async def test_fleet_push_lorawan_secrets_no_op_for_non_lorawan_designs(
     # The pushed YAML has no lorawan block at all; the secrets are ignored.
     assert "lorawan:" not in pushed
     assert "dev_eui" not in pushed
+
+
+async def test_get_firmware_resolves_a_run_id_to_its_job_id():
+    """The addon keys artifacts by job_id, while the push response, the
+    status poll and the studio's own route are all keyed by run_id. Passing
+    the run_id straight through 404s, which reads as "the build produced
+    nothing" rather than "wrong key" -- a compile that actually succeeded
+    looks broken."""
+    addon = FakeFleetAddon()
+    addon.queue_jobs = [{
+        "id": "job-abc", "run_id": "run-1", "state": "success",
+        "target": "dev.yaml", "finished_at": "2026-08-01T00:00:00Z",
+    }]
+    # Stored under the job id, as the real addon does.
+    addon.firmware["job-abc"] = {"app": b"FAKE-APP-IMAGE", "factory": None}
+    fc = addon.make_client()
+    assert await fc.get_firmware("run-1") == b"FAKE-APP-IMAGE"
+
+
+async def test_get_firmware_still_accepts_a_job_id_directly():
+    addon = FakeFleetAddon()
+    addon.firmware["job-abc"] = {"app": b"DIRECT", "factory": None}
+    fc = addon.make_client()
+    assert await fc.get_firmware("job-abc") == b"DIRECT"
+
+
+async def test_get_firmware_reports_the_jobs_it_tried():
+    """A genuinely missing artifact should say the run's jobs were checked,
+    so the failure is distinguishable from the key mix-up above."""
+    addon = FakeFleetAddon()
+    addon.queue_jobs = [{
+        "id": "job-abc", "run_id": "run-1", "state": "success",
+        "target": "dev.yaml", "finished_at": "2026-08-01T00:00:00Z",
+    }]
+    fc = addon.make_client()
+    with pytest.raises(FleetUnavailable, match="job"):
+        await fc.get_firmware("run-1")

{wirestudio-0.26.0 → wirestudio-0.26.2}/wirestudio/__init__.py

@@ -1,3 +1,3 @@
 """wirestudio: design.json -> ESPHome YAML + ASCII diagram."""
 
-__version__ = "0.26.0"
+__version__ = "0.26.2"

{wirestudio-0.26.0 → wirestudio-0.26.2}/wirestudio/api/app.py

@@ -1330,12 +1330,16 @@ def create_app(
         ``/lorawan/firmware/{cache_key}[/factory]`` so the WebSerial flow
         on the external-component path can reuse ``lib/flash.ts`` unchanged.
 
+        Takes a run_id, matching the push response and the status poll.
+        The addon keys artifacts by job_id, so the client resolves the run
+        to its jobs when the id isn't found directly; a job_id also works
+        if you happen to have one.
+
         Returns 404 when the run hasn't finished, has aged out of the
         addon's tracking, or the build didn't produce the requested image
         type; 503 when fleet credentials are missing; 502 when the addon
-        is reachable but the call failed (e.g. the upstream artifact
-        endpoint isn't implemented yet -- see
-        ``docs/lorawan/fleet-firmware-flash.md``).
+        is reachable but the call failed -- see
+        ``docs/lorawan/fleet-firmware-flash.md``.
         """
         fc = make_fleet()
         if not fc.is_configured():

{wirestudio-0.26.0 → wirestudio-0.26.2}/wirestudio/fleet/client.py

@@ -291,40 +291,59 @@ class FleetClient:
     ) -> bytes:
         """Fetch the compiled firmware bytes for a finished build.
 
-        Mirrors the addon's artifact endpoint at
-        ``GET /ui/api/jobs/{run_id}/firmware[/factory]`` (the upstream
-        half of the headless-device flash story -- see
-        ``docs/lorawan/fleet-firmware-flash.md``). The browser never holds
-        ``FLEET_TOKEN``; this is the studio-side passthrough that fetches
-        with the server token and re-streams the bytes to the WebSerial
-        flasher via the matching studio route.
+        The addon stores artifacts at ``GET /ui/api/jobs/{job_id}/firmware``
+        keyed by **job_id**, while everything else in this flow -- the push
+        response, the status poll, the studio's own route -- is keyed by
+        run_id. Passing the run_id straight through 404s, which reads as
+        "the build produced nothing" rather than "wrong key", so a compile
+        that actually succeeded looks broken. Accepts either: tries the id
+        as given, then resolves the run's jobs and retries.
+
+        The browser never holds ``FLEET_TOKEN``; this is the studio-side
+        passthrough that fetches with the server token and re-streams the
+        bytes to the WebSerial flasher via the matching studio route.
 
         ``factory=False`` (default) fetches the app image (re-flash that
         preserves NVS); ``factory=True`` fetches the merged factory image
         for blank-board flashing at offset 0x0. 404 -> ``FleetUnavailable``
         the same way ``get_job_log`` handles unknown run_ids, so the UI
         can stop polling.
-
-        The upstream endpoint does not exist yet at the time of writing
-        (it's the scoped fleet half); calls will 502 via the matching
-        studio route until the addon ships it. That gates the dialog's
-        "Flash via WebSerial" button on the upstream rollout without
-        changing this client surface later.
         """
         if not self.is_configured():
             raise FleetUnavailable("FLEET_URL or FLEET_TOKEN missing")
         suffix = "/factory" if factory else ""
+
+        async def _fetch(c: httpx.AsyncClient, ident: str) -> Optional[bytes]:
+            resp = await c.get(f"/ui/api/jobs/{ident}/firmware{suffix}")
+            if resp.status_code == 404:
+                return None
+            if resp.status_code >= 400:
+                raise FleetUnavailable(
+                    f"firmware fetch failed: http {resp.status_code} {resp.text}"
+                )
+            return resp.content
+
         async with self._client() as c:
-            resp = await c.get(f"/ui/api/jobs/{run_id}/firmware{suffix}")
-        if resp.status_code == 404:
-            raise FleetUnavailable(
-                f"firmware artifact not available for run_id {run_id!r}"
-            )
-        if resp.status_code >= 400:
-            raise FleetUnavailable(
-                f"firmware fetch failed: http {resp.status_code} {resp.text}"
-            )
-        return resp.content
+            content = await _fetch(c, run_id)
+            if content is not None:
+                return content
+
+        # Not found under that id. If it was a run_id, the artifact lives
+        # under one of its jobs.
+        try:
+            jobs = (await self.get_run_status(run_id)).jobs
+        except FleetUnavailable:
+            jobs = []
+        async with self._client() as c:
+            for job in jobs:
+                content = await _fetch(c, job.job_id)
+                if content is not None:
+                    return content
+
+        raise FleetUnavailable(
+            f"firmware artifact not available for {run_id!r}"
+            + (f" or its {len(jobs)} job(s)" if jobs else "")
+        )
 
     # ------------------------------------------------------------------
     # Internals

{wirestudio-0.26.0 → wirestudio-0.26.2}/wirestudio/generate/yaml_gen.py

@@ -504,6 +504,14 @@ def build_yaml_dict(
         chip_block["framework"] = {"type": design.board.framework}
         if board.chip_variant != "esp32":
             chip_block["variant"] = board.chip_variant.upper()
+        # ESPHome defaults to 4 MB regardless of the PlatformIO board, so a
+        # 16 MB board silently gets a 4 MB partition table -- three quarters
+        # of the flash unused and OTA slots smaller than the chip allows.
+        # Nothing errors, which is why it goes unnoticed. Under-declaring is
+        # the safe direction (over-declaring boot-loops the bootloader on a
+        # size mismatch), so emit what the board file says.
+        if board.flash_size_mb:
+            chip_block["flash_size"] = f"{board.flash_size_mb}MB"
         out["esp32"] = chip_block
     else:
         out[board.chip_variant] = chip_block

{wirestudio-0.26.0 → wirestudio-0.26.2/wirestudio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wirestudio
-Version: 0.26.0
+Version: 0.26.2
 Summary: Agent-driven IoT device design tool that produces ESPHome YAML.
 Author: wirestudio contributors
 License: MIT