@trillboards/edge-sdk 0.2.206 → 0.2.209
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/deploy/detector/pyproject.toml +1 -1
- package/deploy/detector/tests/test_server.py +26 -3
- package/deploy/detector/trillboards_detector/_version.py +2 -2
- package/deploy/detector/trillboards_detector/server.py +11 -11
- package/dist/EdgeAgent.js +1 -1
- package/dist/diagnose.d.ts +1 -1
- package/dist/diagnose.js +1 -1
- package/package.json +1 -1
|
@@ -10,7 +10,7 @@ name = "trillboards-detector"
|
|
|
10
10
|
# constant, a `labels.py`-only change survives `uv tool install` AND
|
|
11
11
|
# `uv tool install --force`; move the version and a bare `uv tool install`
|
|
12
12
|
# reinstalls. See `stamp_version.py`.
|
|
13
|
-
version = "0.2.0+src.
|
|
13
|
+
version = "0.2.0+src.befcd33e8e35"
|
|
14
14
|
description = "On-device object-detector service for the Trillboards BYO-CCTV connector (loopback HTTP, ONNX Runtime)."
|
|
15
15
|
requires-python = ">=3.10"
|
|
16
16
|
|
|
@@ -340,12 +340,35 @@ class TestReadiness(ServerCase):
|
|
|
340
340
|
self.assertTrue(all(state.in_flight == 0 for state in loader.registry._states.values()))
|
|
341
341
|
|
|
342
342
|
def test_ready_preparation_gate_releases_after_colour_failure(self):
|
|
343
|
-
loader = self.loader(); url = self.serve(loader)
|
|
343
|
+
loader = self.loader(); url = self.serve(loader); server = self.last_server
|
|
344
|
+
logged = threading.Event(); release_log = threading.Event(); handlers = []
|
|
345
|
+
process = server.process_request_thread
|
|
346
|
+
def observed_handler(*args):
|
|
347
|
+
handlers.append(threading.current_thread())
|
|
348
|
+
return process(*args)
|
|
349
|
+
server.process_request_thread = observed_handler
|
|
350
|
+
def log_after_response(message):
|
|
351
|
+
if message.endswith("POST /ready -> 503") and not logged.is_set():
|
|
352
|
+
logged.set()
|
|
353
|
+
release_log.wait() # The client path always releases this in finally.
|
|
354
|
+
server.log_line = log_after_response
|
|
344
355
|
def failed_probe(caps):
|
|
345
356
|
raise RuntimeError("controlled colour probe failure")
|
|
346
|
-
|
|
347
|
-
|
|
357
|
+
try:
|
|
358
|
+
status, body = self.ready(url, self.payload(), failed_probe)
|
|
359
|
+
self.assertEqual(status, 503)
|
|
360
|
+
self.assertEqual(body, {"error": "requested colour capability failed its preparation probe"})
|
|
361
|
+
self.assertTrue(logged.wait(2), "owner did not reach logging after response delivery")
|
|
362
|
+
self.assertTrue(handlers[0].is_alive(), "owner must still be blocked in response logging")
|
|
363
|
+
status, body = self.ready(url, self.payload())
|
|
364
|
+
self.assertEqual(status, 200, f"gate_locked_after_response={server.preparation_gate.locked()}; response={body}; loads={self.loads}")
|
|
365
|
+
finally:
|
|
366
|
+
release_log.set()
|
|
367
|
+
for handler in handlers:
|
|
368
|
+
handler.join(2)
|
|
369
|
+
self.assertFalse(any(handler.is_alive() for handler in handlers))
|
|
348
370
|
self.assertEqual(self.ready(url, self.payload())[0], 200)
|
|
371
|
+
self.assertTrue(all(state.in_flight == 0 for state in loader.registry._states.values()))
|
|
349
372
|
|
|
350
373
|
def test_ready_preparation_gate_releases_after_model_errors(self):
|
|
351
374
|
loader = self.loader(); url = self.serve(loader)
|
|
@@ -468,30 +468,30 @@ class DetectorHandler(BaseHTTPRequestHandler):
|
|
|
468
468
|
try:
|
|
469
469
|
prepared_caps = prepare_color_capabilities(caps)
|
|
470
470
|
except Exception:
|
|
471
|
-
|
|
472
|
-
return
|
|
471
|
+
raise WireError(503, "requested colour capability failed its preparation probe") from None
|
|
473
472
|
try:
|
|
474
473
|
proof = prepare(models)
|
|
475
474
|
except ModelVerificationError as err:
|
|
476
|
-
|
|
477
|
-
return
|
|
475
|
+
raise WireError(409, str(err)) from None
|
|
478
476
|
except DetectorNotReady as err:
|
|
479
|
-
|
|
480
|
-
return
|
|
477
|
+
raise WireError(503, str(err)) from None
|
|
481
478
|
except Exception:
|
|
482
|
-
|
|
483
|
-
return
|
|
479
|
+
raise WireError(500, "model preparation failed") from None
|
|
484
480
|
if (not isinstance(proof, list) or len(proof) != len(models)
|
|
485
481
|
or prepared_caps != caps
|
|
486
482
|
or any(not isinstance(row, dict) or set(row) != {"modelId", "sha256", "task"}
|
|
487
483
|
or row["modelId"] != model["modelId"] or row["sha256"] != model["sha256"]
|
|
488
484
|
or not isinstance(row["task"], str) or not row["task"]
|
|
489
485
|
for model, row in zip(models, proof))):
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
486
|
+
raise WireError(500, "model preparation returned an invalid proof")
|
|
487
|
+
status, payload = 200, {"version": 1, "ready": True, "models": proof, "capabilities": prepared_caps}
|
|
488
|
+
except WireError as err:
|
|
489
|
+
status, payload = err.status, {"error": err.message}
|
|
493
490
|
finally:
|
|
494
491
|
gate.release()
|
|
492
|
+
# Native work has ended. Response writes and logging may outlive the
|
|
493
|
+
# client's receipt; they must not make its next preparation look busy.
|
|
494
|
+
self._json(status, payload)
|
|
495
495
|
|
|
496
496
|
# ── /health ──────────────────────────────────────────────────────────────
|
|
497
497
|
|
package/dist/EdgeAgent.js
CHANGED
|
@@ -44,7 +44,7 @@ const edge_ads_1 = require("@trillboards/edge-ads");
|
|
|
44
44
|
const CommandRouter_1 = require("./CommandRouter");
|
|
45
45
|
const config_1 = require("./config");
|
|
46
46
|
const dataDir_1 = require("./dataDir");
|
|
47
|
-
const SDK_VERSION = '0.2.
|
|
47
|
+
const SDK_VERSION = '0.2.209';
|
|
48
48
|
class EdgeAgent extends events_1.EventEmitter {
|
|
49
49
|
constructor(config, deps) {
|
|
50
50
|
super();
|
package/dist/diagnose.d.ts
CHANGED
|
@@ -31,7 +31,7 @@ export interface DiagnosticReport {
|
|
|
31
31
|
skipped: number;
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
-
declare const SDK_VERSION = "0.2.
|
|
34
|
+
declare const SDK_VERSION = "0.2.209";
|
|
35
35
|
declare function checkNodeVersion(): CheckResult;
|
|
36
36
|
declare function checkPlatform(): CheckResult;
|
|
37
37
|
declare function checkMemory(): CheckResult;
|
package/dist/diagnose.js
CHANGED
|
@@ -63,7 +63,7 @@ const localNetworkAccess_1 = require("./localNetworkAccess");
|
|
|
63
63
|
// ---------------------------------------------------------------------------
|
|
64
64
|
// SDK version — mirrors package.json; kept in sync by CI
|
|
65
65
|
// ---------------------------------------------------------------------------
|
|
66
|
-
const SDK_VERSION = '0.2.
|
|
66
|
+
const SDK_VERSION = '0.2.209';
|
|
67
67
|
exports._SDK_VERSION = SDK_VERSION;
|
|
68
68
|
// ---------------------------------------------------------------------------
|
|
69
69
|
// ANSI helpers (no external deps)
|
package/package.json
CHANGED