@trillboards/edge-sdk 0.2.175 → 0.2.178
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/README.md +6 -0
- package/deploy/detector/pyproject.toml +4 -1
- package/deploy/detector/tests/test_actor_action_wire.py +103 -0
- package/deploy/detector/tests/test_actor_actions.py +94 -0
- package/deploy/detector/tests/test_actor_checkpoint.py +99 -0
- package/deploy/detector/tests/test_actor_tracking.py +191 -0
- package/deploy/detector/tests/test_actor_tracking_wire.py +120 -0
- package/deploy/detector/tests/test_actor_views.py +108 -0
- package/deploy/detector/tests/test_compute_budget.py +28 -0
- package/deploy/detector/tests/test_detector_request.py +52 -0
- package/deploy/detector/tests/test_input_recipe.py +77 -0
- package/deploy/detector/tests/test_loader.py +20 -1
- package/deploy/detector/tests/test_pose.py +66 -0
- package/deploy/detector/tests/test_server.py +83 -0
- package/deploy/detector/tests/test_task_registry.py +74 -0
- package/deploy/detector/trillboards_detector/_version.py +2 -2
- package/deploy/detector/trillboards_detector/actor_action_contract.py +65 -0
- package/deploy/detector/trillboards_detector/actor_action_wire.py +189 -0
- package/deploy/detector/trillboards_detector/actor_actions.py +115 -0
- package/deploy/detector/trillboards_detector/actor_checkpoint.py +91 -0
- package/deploy/detector/trillboards_detector/actor_tracking.py +337 -0
- package/deploy/detector/trillboards_detector/actor_views.py +102 -0
- package/deploy/detector/trillboards_detector/cli.py +12 -2
- package/deploy/detector/trillboards_detector/labels.py +32 -0
- package/deploy/detector/trillboards_detector/loader.py +30 -4
- package/deploy/detector/trillboards_detector/pose.py +129 -0
- package/deploy/detector/trillboards_detector/registry.py +92 -7
- package/deploy/detector/trillboards_detector/server.py +131 -3
- package/deploy/detector/trillboards_detector/session.py +83 -49
- package/deploy/detector/trillboards_detector/tasks.py +27 -0
- package/deploy/detector/trillboards_detector/worker_budget.py +14 -0
- package/deploy/windows/README.md +1 -1
- package/deploy/windows/ci/test-published-install.ps1 +16 -3
- package/dist/ActorActionClient.d.ts +47 -0
- package/dist/ActorActionClient.d.ts.map +1 -0
- package/dist/ActorActionClient.js +187 -0
- package/dist/ActorActionClient.js.map +1 -0
- package/dist/ActorActionProducer.d.ts +17 -0
- package/dist/ActorActionProducer.d.ts.map +1 -0
- package/dist/ActorActionProducer.js +92 -0
- package/dist/ActorActionProducer.js.map +1 -0
- package/dist/ActorPerception.d.ts +65 -0
- package/dist/ActorPerception.d.ts.map +1 -0
- package/dist/ActorPerception.js +124 -0
- package/dist/ActorPerception.js.map +1 -0
- package/dist/ActorPose.d.ts +42 -0
- package/dist/ActorPose.d.ts.map +1 -0
- package/dist/ActorPose.js +62 -0
- package/dist/ActorPose.js.map +1 -0
- package/dist/ActorReview.d.ts +51 -0
- package/dist/ActorReview.d.ts.map +1 -0
- package/dist/ActorReview.js +84 -0
- package/dist/ActorReview.js.map +1 -0
- package/dist/ActorTracking.d.ts +33 -0
- package/dist/ActorTracking.d.ts.map +1 -0
- package/dist/ActorTracking.js +90 -0
- package/dist/ActorTracking.js.map +1 -0
- package/dist/ActorWindow.d.ts +56 -0
- package/dist/ActorWindow.d.ts.map +1 -0
- package/dist/ActorWindow.js +86 -0
- package/dist/ActorWindow.js.map +1 -0
- package/dist/ActorWindowContract.d.ts +5 -0
- package/dist/ActorWindowContract.d.ts.map +1 -0
- package/dist/ActorWindowContract.js +23 -0
- package/dist/ActorWindowContract.js.map +1 -0
- package/dist/AudienceAnalyzeClient.d.ts +4 -0
- package/dist/AudienceAnalyzeClient.d.ts.map +1 -1
- package/dist/AudienceAnalyzeClient.js.map +1 -1
- package/dist/ChannelProber.d.ts.map +1 -1
- package/dist/ChannelProber.js +8 -0
- package/dist/ChannelProber.js.map +1 -1
- package/dist/CloudSensingManager.d.ts +7 -0
- package/dist/CloudSensingManager.d.ts.map +1 -1
- package/dist/CloudSensingManager.js +31 -0
- package/dist/CloudSensingManager.js.map +1 -1
- package/dist/DurableVlmCandidateSpool.d.ts.map +1 -1
- package/dist/DurableVlmCandidateSpool.js +31 -11
- package/dist/DurableVlmCandidateSpool.js.map +1 -1
- package/dist/EdgeAgent.js +1 -1
- package/dist/LocalDetectorClient.d.ts +5 -1
- package/dist/LocalDetectorClient.d.ts.map +1 -1
- package/dist/LocalDetectorClient.js +48 -3
- package/dist/LocalDetectorClient.js.map +1 -1
- package/dist/RetainedFieldContract.d.ts +2 -1
- package/dist/RetainedFieldContract.d.ts.map +1 -1
- package/dist/RetainedFieldContract.js +17 -5
- package/dist/RetainedFieldContract.js.map +1 -1
- package/dist/RuntimeModelSelection.d.ts.map +1 -1
- package/dist/RuntimeModelSelection.js +63 -2
- package/dist/RuntimeModelSelection.js.map +1 -1
- package/dist/TemporalReviewClient.d.ts.map +1 -1
- package/dist/TemporalReviewClient.js +20 -1
- package/dist/TemporalReviewClient.js.map +1 -1
- package/dist/TemporalReviewJournal.d.ts +10 -1
- package/dist/TemporalReviewJournal.d.ts.map +1 -1
- package/dist/TemporalReviewJournal.js +42 -10
- package/dist/TemporalReviewJournal.js.map +1 -1
- package/dist/connectorUpdate.d.ts +2 -0
- package/dist/connectorUpdate.d.ts.map +1 -1
- package/dist/connectorUpdate.js +33 -7
- package/dist/connectorUpdate.js.map +1 -1
- package/dist/diagnose.d.ts +1 -1
- package/dist/diagnose.js +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -1
- package/dist/index.js.map +1 -1
- package/dist/localSensing.d.ts +4 -0
- package/dist/localSensing.d.ts.map +1 -1
- package/dist/localSensing.js +43 -8
- package/dist/localSensing.js.map +1 -1
- package/package.json +5 -5
- package/retained/RetainedCaptureClient.cjs +55 -9
- package/retained/__tests__/actor-perception.test.cjs +125 -0
- package/retained/__tests__/actor-window.test.cjs +78 -0
- package/retained/__tests__/runtime.test.cjs +44 -4
- package/retained/actor-window.cjs +62 -0
- package/retained/manager.cjs +14 -2
|
@@ -298,7 +298,7 @@ test('real website factory retains the captured contract and builds one/two slot
|
|
|
298
298
|
});
|
|
299
299
|
test('normal website startup resolves thirteen paired cameras with two active profiles and no manual pilot rules', async () => {
|
|
300
300
|
const directory = fs.mkdtempSync(path.join(require('node:os').tmpdir(), 'normal-website-fixture-'));
|
|
301
|
-
let opens = 0, models = 0, profiles = 0, capabilities = 0, denied = false;
|
|
301
|
+
let opens = 0, models = 0, profiles = 0, capabilities = 0, denied = false, actorTasks = false;
|
|
302
302
|
const nonceSet = new Set();
|
|
303
303
|
const cameras = Array.from({ length: 13 }, (_, i) => ({ name: 'camera-' + i, screenId: 'screen_' + i,
|
|
304
304
|
deviceToken: 'synthetic-token-' + i, rtspUrl: 'rtsp://fixture.invalid/channel-' + i }));
|
|
@@ -328,8 +328,15 @@ test('normal website startup resolves thirteen paired cameras with two active pr
|
|
|
328
328
|
retainedPilot: { version: 1, reviewFieldSet: 'declared' },
|
|
329
329
|
fieldRouting: { vlm: active ? [field] : [], producer: [], withheld: [], operatingPoints: {}, alertFocusRegions: [] },
|
|
330
330
|
modelSelection: active ? { version: 1, selectionId: 'door-' + cameraId,
|
|
331
|
-
models: [clone(sourceContract.modelSelection.models[0])
|
|
332
|
-
|
|
331
|
+
models: [clone(sourceContract.modelSelection.models[0]), ...(actorTasks ? [
|
|
332
|
+
{modelId:'rfdetr_medium',format:'onnx',sha256:'8e8197112112b79d7cc5d0a94ecef659c05317a658aadc7c7643374c539d7615'},
|
|
333
|
+
...(feed === cameras[0] ? [{modelId:'rtmpose_m_body7',format:'onnx',sha256:'5c0a4bf67953e6d2ac43ce15e77dc9d5d354ae18430a47d2c5963a7bc5683e3c'}] : []),
|
|
334
|
+
] : [])],
|
|
335
|
+
fieldOwners: [{ field: 'door_open', modelId: 'gemma_4_e2b' }],
|
|
336
|
+
...(actorTasks ? {tasks:[
|
|
337
|
+
{task:'actor_detection',modelId:'rfdetr_medium',minConfidence:.25},
|
|
338
|
+
...(feed === cameras[0] ? [{task:'pose_coco17',modelId:'rtmpose_m_body7',inputModelId:'rfdetr_medium'}] : []),
|
|
339
|
+
]} : {}) } : null }));
|
|
333
340
|
});
|
|
334
341
|
await new Promise(resolve => server.listen(0, '127.0.0.1', resolve));
|
|
335
342
|
try {
|
|
@@ -351,9 +358,23 @@ test('normal website startup resolves thirteen paired cameras with two active pr
|
|
|
351
358
|
assert.equal(captured.temporalReviewContract, undefined);
|
|
352
359
|
}
|
|
353
360
|
assert.equal(opens, 0); assert.equal(models, 0);
|
|
361
|
+
actorTasks = true;
|
|
362
|
+
const withActors = await createWebsiteManager(input, path.join(directory, 'actors'), deps);
|
|
363
|
+
for (const [index, client] of withActors.clients.entries()) {
|
|
364
|
+
const policy=client.actorPerceiver.policyForContext(client.captureReviewContext());
|
|
365
|
+
assert.equal(!!policy,index < 2);
|
|
366
|
+
if (index >= 2) continue;
|
|
367
|
+
assert.equal(policy.cameraId,cameras[index].screenId);
|
|
368
|
+
assert.match(policy.sourceId,/^[a-f0-9]{64}$/);
|
|
369
|
+
assert.equal(policy.detector.modelId,'rfdetr_medium');
|
|
370
|
+
assert.equal(!!policy.pose,index===0);
|
|
371
|
+
}
|
|
372
|
+
assert.notEqual(withActors.clients[0].actorPerceiver.binding.sourceId,
|
|
373
|
+
withActors.clients[1].actorPerceiver.binding.sourceId);
|
|
374
|
+
assert.equal(opens, 0); assert.equal(models, 0); assert.equal(profiles, 26); assert.equal(capabilities, 26);
|
|
354
375
|
denied = true;
|
|
355
376
|
await assert.rejects(createWebsiteManager(input, path.join(directory, 'denied'), deps), /HTTP 403/);
|
|
356
|
-
assert.equal(profiles,
|
|
377
|
+
assert.equal(profiles, 26); assert.equal(opens, 0); assert.equal(models, 0);
|
|
357
378
|
} finally {
|
|
358
379
|
await new Promise((resolve, reject) => server.close(error => error ? reject(error) : resolve()));
|
|
359
380
|
fs.rmSync(directory, { recursive: true, force: true });
|
|
@@ -382,3 +403,22 @@ test('native durable spool enforces capture order and one in-flight review per f
|
|
|
382
403
|
now += 6000; // The native retry backoff is five seconds, not two.
|
|
383
404
|
const again = spool.take(undefined, 'review'); assert.equal(again.enqueuedAtMs, first.enqueuedAtMs);
|
|
384
405
|
});
|
|
406
|
+
|
|
407
|
+
test('an archived capture retry remains idempotent after later captures and restart',()=>{
|
|
408
|
+
const directory=fs.mkdtempSync(path.join(require('node:os').tmpdir(),'retained-original-retry-'));
|
|
409
|
+
try{
|
|
410
|
+
const {RetainedCaptureClient}=require('../RetainedCaptureClient.cjs');
|
|
411
|
+
const native={getEndpoint:()=> 'http://127.0.0.1:18791/v2/earner/audience-analyze'};
|
|
412
|
+
const jpeg=fs.readFileSync(path.resolve(__dirname,'../../../../../trillboard-api/tests/fixtures/actor-review-original-640x480.jpg'));
|
|
413
|
+
const original={name:'camera_retry',enqueuedAtMs:1000,jpeg,reviewContext:{version:1,profileState:'active'}};
|
|
414
|
+
const capture=new RetainedCaptureClient(native,directory,{cameraId:'camera_retry'});
|
|
415
|
+
capture.retainOrderedCapture(original);
|
|
416
|
+
capture.retainOrderedCapture({...original,enqueuedAtMs:1500});
|
|
417
|
+
const resumed=new RetainedCaptureClient(native,directory,{cameraId:'camera_retry'});
|
|
418
|
+
const before=[...resumed.records].map(([id,row])=>[id,digest(fs.readFileSync(resumed.file(id)))]);
|
|
419
|
+
assert.doesNotThrow(()=>resumed.retainOrderedCapture(original));
|
|
420
|
+
assert.equal(resumed.stats().captures,2);assert.equal(resumed.stats().retainedCaptures,2);
|
|
421
|
+
assert.deepEqual([...resumed.records].map(([id,row])=>[id,digest(fs.readFileSync(resumed.file(id)))]),before);
|
|
422
|
+
assert.throws(()=>resumed.retainOrderedCapture({...original,enqueuedAtMs:500}),/Capture time moved backwards/);
|
|
423
|
+
}finally{fs.rmSync(directory,{recursive:true,force:true});}
|
|
424
|
+
});
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
const assert=require('node:assert/strict'),fs=require('node:fs'),crypto=require('node:crypto');
|
|
3
|
+
const {parseModelSelection}=require('../dist/RuntimeModelSelection');
|
|
4
|
+
const {buildActorWindow,actorWindowLookbackMs}=require('../dist/ActorWindow');
|
|
5
|
+
const {actorProofHash}=require('../dist/ActorTracking');
|
|
6
|
+
const hash=bytes=>crypto.createHash('sha256').update(bytes).digest('hex');
|
|
7
|
+
function actionTasks(record){
|
|
8
|
+
const selected=parseModelSelection(record.candidate.reviewContext?.modelSelection);
|
|
9
|
+
assert(!selected||!('invalid' in selected),'Invalid captured actor model selection');
|
|
10
|
+
return selected?.tasks?.filter(task=>task.task==='actor_actions')??[];
|
|
11
|
+
}
|
|
12
|
+
function contextHash(record){return hash(JSON.stringify(record.candidate.reviewContext??null));}
|
|
13
|
+
function sameContext(a,b){
|
|
14
|
+
return contextHash(a)===contextHash(b)&&actorProofHash(a.actorPerceptionPolicy??null)===actorProofHash(b.actorPerceptionPolicy??null);
|
|
15
|
+
}
|
|
16
|
+
/** Existing archive owns these originals. One boundary witness makes missing
|
|
17
|
+
* required history distinguishable from the real start of a camera/context.
|
|
18
|
+
*/
|
|
19
|
+
function pinActorWindowHistory(archive,current,pins,visited){
|
|
20
|
+
const tasks=actionTasks(current);
|
|
21
|
+
if(!tasks.length)return;
|
|
22
|
+
const floor=current.capturedAt-Math.max(...tasks.map(task=>actorWindowLookbackMs(task.window)));
|
|
23
|
+
let record=current,walked=0;
|
|
24
|
+
while(record){
|
|
25
|
+
assert(++walked<=256,'Actor history exceeded bounded capture window');
|
|
26
|
+
pins.add(record.id);
|
|
27
|
+
if(record.capturedAt<floor||!sameContext(record,current))break;
|
|
28
|
+
const previousFloor=visited.get(record.id);
|
|
29
|
+
if(previousFloor!==undefined&&previousFloor<=floor)break;
|
|
30
|
+
visited.set(record.id,floor);
|
|
31
|
+
if(!record.previousCaptureId)break;
|
|
32
|
+
const previous=archive.records.get(record.previousCaptureId);
|
|
33
|
+
assert(previous,'Protected actor history is missing before cleanup');
|
|
34
|
+
assert(previous.capturedAt<record.capturedAt,'Actor history capture order changed');
|
|
35
|
+
record=previous;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
function resolveActorWindow(archive,current,actor,modelId){
|
|
39
|
+
const task=actionTasks(current).find(task=>task.modelId===modelId);
|
|
40
|
+
assert(task,'Action model did not declare a selected actor window');
|
|
41
|
+
assert(current.actorPerceptionPolicy,'Actor action requires its captured perception policy');
|
|
42
|
+
const floor=current.capturedAt-actorWindowLookbackMs(task.window),frames=[];
|
|
43
|
+
let id=current.id,lastAt=Infinity,walked=0;
|
|
44
|
+
while(id){
|
|
45
|
+
assert(++walked<=256,'Actor history exceeded bounded capture window');
|
|
46
|
+
assert(/^[a-f0-9]{32}$/.test(id),'Invalid actor history capture reference');
|
|
47
|
+
const r=JSON.parse(fs.readFileSync(archive.file(id),'utf8'));
|
|
48
|
+
assert(r.id===id&&r.cameraId===current.cameraId,'Actor history camera/identity changed');
|
|
49
|
+
assert(r.capturedAt<lastAt&&r.capturedAt<=current.capturedAt,'Actor history capture order changed');
|
|
50
|
+
const expected=hash(JSON.stringify([r.cameraId,r.capturedAt,r.imageSha256,r.candidate.reviewContext])).slice(0,32);
|
|
51
|
+
assert(expected===r.id,'Actor history captured metadata changed');
|
|
52
|
+
if(!sameContext(r,current)||r.capturedAt<floor)break;
|
|
53
|
+
assert(r.actorPerception,'Original actor history perception must finish before review');
|
|
54
|
+
const jpeg=fs.readFileSync(archive.image(r));
|
|
55
|
+
assert(hash(jpeg)===r.imageSha256&&jpeg.length===r.imageBytes,'Actor history original JPEG changed');
|
|
56
|
+
frames.push({frameId:r.id,capturedAtMs:r.capturedAt,jpeg,perception:r.actorPerception});
|
|
57
|
+
lastAt=r.capturedAt;id=r.previousCaptureId;
|
|
58
|
+
}
|
|
59
|
+
return buildActorWindow({contract:task.window,actor,policy:current.actorPerceptionPolicy,
|
|
60
|
+
contextSha256:contextHash(current),currentFrameId:current.id,frames:frames.reverse()});
|
|
61
|
+
}
|
|
62
|
+
module.exports={pinActorWindowHistory,resolveActorWindow};
|
package/retained/manager.cjs
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
const fs = require('node:fs');
|
|
3
3
|
const path = require('node:path');
|
|
4
4
|
const assert = require('node:assert/strict');
|
|
5
|
+
const {createHash}=require('node:crypto');
|
|
5
6
|
const take = name => require('../dist/' + name);
|
|
6
7
|
const { checkRetainedApi } = require('./website-api-capability.cjs');
|
|
7
8
|
|
|
@@ -13,6 +14,7 @@ async function createWebsiteManager(input, stateDirectory, deps = {}) {
|
|
|
13
14
|
const { CloudSensingManager, resolveFeeds } = take('CloudSensingManager');
|
|
14
15
|
const { TemporalReviewClient } = take('TemporalReviewClient');
|
|
15
16
|
const { TemporalReviewJournal } = take('TemporalReviewJournal');
|
|
17
|
+
const {SelectedActorPerceptionClient,actorPerceptionPolicyFromSelection}=take('ActorPerception');
|
|
16
18
|
const { RetainedCaptureClient } = require('./RetainedCaptureClient.cjs');
|
|
17
19
|
const { WaitRecheckCaptureClient } = require('./WaitRecheckCaptureClient.cjs');
|
|
18
20
|
const { validateRule, contractFor } = require('./alert-rule-policy.cjs');
|
|
@@ -70,10 +72,19 @@ async function createWebsiteManager(input, stateDirectory, deps = {}) {
|
|
|
70
72
|
const active = context.profileState !== 'inactive';
|
|
71
73
|
assert(websiteManaged || active, 'The explicitly selected pilot camera has no active profile');
|
|
72
74
|
assert(!active || context.modelSelection?.models?.length,'The active website profile has no pinned model selection');
|
|
75
|
+
const feed=feeds.find(f=>f.name===loop.name);
|
|
76
|
+
const sourceUrl=typeof feed?.rtspUrl==='string'?new URL(feed.rtspUrl):null;
|
|
77
|
+
if(sourceUrl){sourceUrl.username='';sourceUrl.password='';sourceUrl.hash='';}
|
|
78
|
+
const binding={cameraId:capabilities.get(loop.name).cameraId,
|
|
79
|
+
sourceId:createHash('sha256').update(JSON.stringify({url:sourceUrl?.toString()??null,crop:feed?.crop??null})).digest('hex')};
|
|
80
|
+
const actorPolicy=actorPerceptionPolicyFromSelection(context.modelSelection,binding);
|
|
81
|
+
assert(!actorPolicy||rule.mode==='immediate','Actor task profiles require continuous original capture');
|
|
73
82
|
for(const selected of context.modelSelection?.models ?? []){
|
|
74
83
|
if(selected.format==='litert-lm')assert(selected.sha256==='ab7838cdfc8f77e54d8ca45eadceb20452d9f01e4bfade03e5dce27911b27e42','Website selected a different Gemma artifact');
|
|
75
|
-
else assert(selected.format==='onnx'
|
|
76
|
-
&& selected.
|
|
84
|
+
else assert(selected.format==='onnx'
|
|
85
|
+
&& (selected.modelId==='rfdetr_medium'
|
|
86
|
+
&& selected.sha256==='8e8197112112b79d7cc5d0a94ecef659c05317a658aadc7c7643374c539d7615'
|
|
87
|
+
|| actorPolicy?.pose?.modelId===selected.modelId && actorPolicy.pose.sha256===selected.sha256)
|
|
77
88
|
&& config.pilot.requiresDetector===true,'The selected specialist requires an explicitly prepared runtime');
|
|
78
89
|
}
|
|
79
90
|
if (stages) {
|
|
@@ -106,6 +117,7 @@ async function createWebsiteManager(input, stateDirectory, deps = {}) {
|
|
|
106
117
|
maxCaptures: config.pilot.maxCapturesPerCamera, maxBytes: config.pilot.maxBytesPerCamera,
|
|
107
118
|
archiveRetentionMs: config.pilot.archiveRetentionMs ?? 600000,
|
|
108
119
|
offerWindow: rule.mode === 'wait_recheck' ? 1 : 16, unclearRetryMs: 2000,
|
|
120
|
+
...(rule.mode==='immediate'?{actorPerceiver:new SelectedActorPerceptionClient(binding)}:{}),
|
|
109
121
|
});
|
|
110
122
|
loop.client = client; clients.push(client);
|
|
111
123
|
}
|