@trillboards/edge-sdk 0.2.178 → 0.2.181
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/THIRD-PARTY-NOTICES.md +220 -0
- package/deploy/detector/bench/actor-appearance-qualified-v1.json +106 -0
- package/deploy/detector/bench/actor-appearance.md +52 -0
- package/deploy/detector/bench/export_actor_appearance.py +134 -0
- package/deploy/detector/bench/qualify_actor_appearance.py +77 -0
- package/deploy/detector/bench/qualify_actor_appearance_client.cjs +50 -0
- package/deploy/detector/bench/qualify_actor_appearance_wire.py +170 -0
- package/deploy/detector/bench/requirements-appearance-export.txt +4 -0
- package/deploy/detector/pyproject.toml +1 -1
- package/deploy/detector/tests/fixtures/actor-appearance-original-g326-v1.json +27105 -0
- package/deploy/detector/tests/test_actor_appearance_tracking.py +196 -0
- package/deploy/detector/tests/test_appearance_wire.py +80 -0
- package/deploy/detector/tests/test_loader.py +9 -7
- package/deploy/detector/trillboards_detector/_version.py +2 -2
- package/deploy/detector/trillboards_detector/actor_identity.py +323 -0
- package/deploy/detector/trillboards_detector/actor_tracking.py +163 -1
- package/deploy/detector/trillboards_detector/appearance.py +149 -0
- package/deploy/detector/trillboards_detector/loader.py +6 -0
- package/deploy/detector/trillboards_detector/registry.py +30 -1
- package/deploy/detector/trillboards_detector/server.py +56 -1
- package/deploy/detector/trillboards_detector/tasks.py +7 -1
- package/dist/ActorAppearance.d.ts +13 -0
- package/dist/ActorAppearance.d.ts.map +1 -0
- package/dist/ActorAppearance.js +17 -0
- package/dist/ActorAppearance.js.map +1 -0
- package/dist/ActorPerception.d.ts +2 -0
- package/dist/ActorPerception.d.ts.map +1 -1
- package/dist/ActorPerception.js +12 -5
- package/dist/ActorPerception.js.map +1 -1
- package/dist/ActorTracking.d.ts +3 -1
- package/dist/ActorTracking.d.ts.map +1 -1
- package/dist/ActorTracking.js +10 -3
- package/dist/ActorTracking.js.map +1 -1
- package/dist/EdgeAgent.js +1 -1
- package/dist/LocalDetectorClient.d.ts +2 -1
- package/dist/LocalDetectorClient.d.ts.map +1 -1
- package/dist/LocalDetectorClient.js +9 -2
- package/dist/LocalDetectorClient.js.map +1 -1
- package/dist/RuntimeModelSelection.d.ts.map +1 -1
- package/dist/RuntimeModelSelection.js +15 -1
- package/dist/RuntimeModelSelection.js.map +1 -1
- package/dist/diagnose.d.ts +1 -1
- package/dist/diagnose.js +1 -1
- package/package.json +2 -2
- package/retained/__tests__/actor-perception.test.cjs +29 -6
- package/retained/manager.cjs +20 -9
package/dist/ActorPerception.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.SelectedActorPerceptionClient = exports.ActorPerceptionClient = void 0;
|
|
|
4
4
|
exports.parseActorPerceptionPolicy = parseActorPerceptionPolicy;
|
|
5
5
|
exports.actorPerceptionPolicyFromSelection = actorPerceptionPolicyFromSelection;
|
|
6
6
|
const crypto_1 = require("crypto");
|
|
7
|
+
const ActorAppearance_1 = require("./ActorAppearance");
|
|
7
8
|
const LocalDetectorClient_1 = require("./LocalDetectorClient");
|
|
8
9
|
const ActorTracking_1 = require("./ActorTracking");
|
|
9
10
|
const ActorPose_1 = require("./ActorPose");
|
|
@@ -15,8 +16,9 @@ const sha = (v) => typeof v === 'string' && /^[a-f0-9]{64}$/.test(v);
|
|
|
15
16
|
const finite = (v) => typeof v === 'number' && Number.isFinite(v);
|
|
16
17
|
function parseActorPerceptionPolicy(value) {
|
|
17
18
|
const p = value;
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
const fields = ['cameraId', 'detector', 'minConfidence', 'sourceId', 'version',
|
|
20
|
+
...(['pose', 'appearance'].filter(key => Object.prototype.hasOwnProperty.call(p ?? {}, key)))];
|
|
21
|
+
if (!keys(p, fields.sort().join(',')) || p.version !== 1
|
|
20
22
|
|| !keys(p.detector, 'modelId,sha256') || !sha(p.detector.sha256)
|
|
21
23
|
|| p.detector.modelId !== 'rfdetr_medium'
|
|
22
24
|
|| p.detector.sha256 !== '8e8197112112b79d7cc5d0a94ecef659c05317a658aadc7c7643374c539d7615'
|
|
@@ -25,6 +27,8 @@ function parseActorPerceptionPolicy(value) {
|
|
|
25
27
|
(0, ActorTracking_1.validateActorTrackingRequest)({ version: 1, cameraId: p.cameraId, sourceId: p.sourceId, frameId: 'validate', capturedAtMs: 0 });
|
|
26
28
|
if (Object.prototype.hasOwnProperty.call(p, 'pose'))
|
|
27
29
|
(0, ActorPose_1.validateActorPosePin)(p.pose);
|
|
30
|
+
if (Object.prototype.hasOwnProperty.call(p, 'appearance'))
|
|
31
|
+
(0, ActorAppearance_1.validateActorAppearancePin)(p.appearance);
|
|
28
32
|
return structuredClone(p);
|
|
29
33
|
}
|
|
30
34
|
/** Auxiliary native tasks are selected explicitly; older profiles keep their existing path. */
|
|
@@ -42,9 +46,12 @@ function actorPerceptionPolicyFromSelection(value, binding) {
|
|
|
42
46
|
const detector = selection.models.find(m => m.modelId === task.modelId);
|
|
43
47
|
const poseTask = selection.tasks.find(t => t.task === 'pose_coco17');
|
|
44
48
|
const pose = poseTask ? selection.models.find(m => m.modelId === poseTask.modelId) : undefined;
|
|
49
|
+
const appearanceTask = selection.tasks.find(t => t.task === 'actor_appearance');
|
|
50
|
+
const appearance = appearanceTask ? selection.models.find(m => m.modelId === appearanceTask.modelId) : undefined;
|
|
45
51
|
return parseActorPerceptionPolicy({ version: 1, ...binding, minConfidence: task.minConfidence,
|
|
46
52
|
detector: { modelId: detector.modelId, sha256: detector.sha256 },
|
|
47
|
-
...(pose ? { pose: { modelId: pose.modelId, sha256: pose.sha256 } } : {})
|
|
53
|
+
...(pose ? { pose: { modelId: pose.modelId, sha256: pose.sha256 } } : {}),
|
|
54
|
+
...(appearance ? { appearance: { modelId: appearance.modelId, sha256: appearance.sha256 } } : {}) });
|
|
48
55
|
}
|
|
49
56
|
/** Continuous perception owns no queue: the original capture archive owns retry and ordering. */
|
|
50
57
|
class ActorPerceptionClient {
|
|
@@ -64,7 +71,7 @@ class ActorPerceptionClient {
|
|
|
64
71
|
const policy = parseActorPerceptionPolicy(value), tracking = this.request(input, policy);
|
|
65
72
|
const detector = new LocalDetectorClient_1.LocalDetectorClient({ baseUrl: this.transport.baseUrl, timeoutMs: this.transport.timeoutMs,
|
|
66
73
|
expectedModel: policy.detector, classes: ['person'], minConfidence: policy.minConfidence }, this.transport.poster);
|
|
67
|
-
const result = await detector.detect(input.jpeg, tracking, policy.pose);
|
|
74
|
+
const result = await detector.detect(input.jpeg, tracking, policy.pose, policy.appearance);
|
|
68
75
|
return this.validate({ version: 1, policySha256: (0, ActorTracking_1.actorProofHash)(policy), contextSha256: input.contextSha256, result }, input, policy);
|
|
69
76
|
}
|
|
70
77
|
validate(value, input, policyValue = this.policy) {
|
|
@@ -87,7 +94,7 @@ class ActorPerceptionClient {
|
|
|
87
94
|
|| d.box.x + d.box.width > size.width || d.box.y + d.box.height > size.height)
|
|
88
95
|
throw Error('Invalid original person perception box');
|
|
89
96
|
}
|
|
90
|
-
const tracking = (0, ActorTracking_1.parseActorTrackingResult)(frame.result.tracking, request, input.jpeg, frame.result.modelHashes, frame.result.detections);
|
|
97
|
+
const tracking = (0, ActorTracking_1.parseActorTrackingResult)(frame.result.tracking, request, input.jpeg, frame.result.modelHashes, frame.result.detections, policy.appearance);
|
|
91
98
|
if (policy.pose)
|
|
92
99
|
(0, ActorPose_1.parseActorPoseResult)(frame.result.pose, policy.pose, tracking, input.jpeg, size);
|
|
93
100
|
if (tracking.imageSha256 !== (0, crypto_1.createHash)('sha256').update(input.jpeg).digest('hex'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorPerception.js","sourceRoot":"","sources":["../src/ActorPerception.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ActorPerception.js","sourceRoot":"","sources":["../src/ActorPerception.ts"],"names":[],"mappings":"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"}
|
package/dist/ActorTracking.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ActorAppearancePin, type ActorIdentityModelProof } from './ActorAppearance';
|
|
1
2
|
import type { TemporalActorIdentity } from './TemporalReviewJournal';
|
|
2
3
|
/** Wire identities represent one physical track in one camera/view epoch. */
|
|
3
4
|
export interface ActorTrackingRequest {
|
|
@@ -14,6 +15,7 @@ export interface ActorTrackingResult extends ActorTrackingRequest {
|
|
|
14
15
|
contextSha256: string;
|
|
15
16
|
modelHashes: Record<string, string>;
|
|
16
17
|
sha256: string;
|
|
18
|
+
identityModel?: ActorIdentityModelProof;
|
|
17
19
|
continuity: 'start' | 'continued' | 'gap_reset' | 'context_reset' | 'recovery_reset';
|
|
18
20
|
actors: Array<{
|
|
19
21
|
detectionIndex: number;
|
|
@@ -29,5 +31,5 @@ export declare function validateActorIdentity(value: unknown, cameraId: string,
|
|
|
29
31
|
/** A malformed/missing proof is an unavailable tracker, never a negative action. */
|
|
30
32
|
export declare function parseActorTrackingResult(value: unknown, request: ActorTrackingRequest, jpeg: Buffer, modelHashes: Record<string, string>, detections: ReadonlyArray<{
|
|
31
33
|
label: string;
|
|
32
|
-
}
|
|
34
|
+
}>, appearance?: ActorAppearancePin): ActorTrackingResult;
|
|
33
35
|
//# sourceMappingURL=ActorTracking.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorTracking.d.ts","sourceRoot":"","sources":["../src/ActorTracking.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAEnE,6EAA6E;AAC7E,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAC,CAAC,CAAC;IAAC,QAAQ,EAAC,MAAM,CAAC;IAAC,QAAQ,EAAC,MAAM,CAAC;IAAC,OAAO,EAAC,MAAM,CAAC;IAAC,YAAY,EAAC,MAAM,CAAC;CAClF;AACD,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;IAC/D,SAAS,EAAC,iBAAiB,CAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,WAAW,EAAC,MAAM,CAAC;IAAC,aAAa,EAAC,MAAM,CAAC;IACpF,WAAW,EAAC,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAAC,MAAM,EAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ActorTracking.d.ts","sourceRoot":"","sources":["../src/ActorTracking.ts"],"names":[],"mappings":"AACA,OAAO,EAA4D,KAAK,kBAAkB,EAAC,KAAK,uBAAuB,EAAC,MAAM,mBAAmB,CAAC;AAClJ,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAEnE,6EAA6E;AAC7E,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAC,CAAC,CAAC;IAAC,QAAQ,EAAC,MAAM,CAAC;IAAC,QAAQ,EAAC,MAAM,CAAC;IAAC,OAAO,EAAC,MAAM,CAAC;IAAC,YAAY,EAAC,MAAM,CAAC;CAClF;AACD,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;IAC/D,SAAS,EAAC,iBAAiB,CAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,WAAW,EAAC,MAAM,CAAC;IAAC,aAAa,EAAC,MAAM,CAAC;IACpF,WAAW,EAAC,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAAC,MAAM,EAAC,MAAM,CAAC;IAAC,aAAa,CAAC,EAAC,uBAAuB,CAAC;IACzF,UAAU,EAAC,OAAO,GAAC,WAAW,GAAC,WAAW,GAAC,eAAe,GAAC,gBAAgB,CAAC;IAC5E,MAAM,EAAC,KAAK,CAAC;QAAC,cAAc,EAAC,MAAM,CAAC;QAAA,KAAK,EAAC,qBAAqB,CAAA;KAAC,CAAC,CAAC;IAClE,WAAW,EAAC,MAAM,EAAE,CAAC;IAAC,WAAW,EAAC,qBAAqB,EAAE,CAAC;CAC3D;AAaD,eAAO,MAAM,gBAAgB,GAAE,OAAM,OAAO,KAAE,MAAwC,CAAC;AACvF,eAAO,MAAM,cAAc,GAAE,OAAM,OAAO,WACa,CAAC;AACxD,wBAAgB,4BAA4B,CAAC,KAAK,EAAC,OAAO,GAAE,oBAAoB,CAM/E;AACD,wBAAgB,qBAAqB,CAAC,KAAK,EAAC,OAAO,EAAC,QAAQ,EAAC,MAAM,EAAC,KAAK,CAAC,EAAC,MAAM,GAAE,qBAAqB,CAKvG;AACD,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,KAAK,EAAC,OAAO,EAAC,OAAO,EAAC,oBAAoB,EAAC,IAAI,EAAC,MAAM,EAC7F,WAAW,EAAC,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,EAAC,UAAU,EAAC,aAAa,CAAC;IAAC,KAAK,EAAC,MAAM,CAAA;CAAC,CAAC,EAAC,UAAU,CAAC,EAAC,kBAAkB,GAAE,mBAAmB,CA2C/H"}
|
package/dist/ActorTracking.js
CHANGED
|
@@ -5,6 +5,7 @@ exports.validateActorTrackingRequest = validateActorTrackingRequest;
|
|
|
5
5
|
exports.validateActorIdentity = validateActorIdentity;
|
|
6
6
|
exports.parseActorTrackingResult = parseActorTrackingResult;
|
|
7
7
|
const crypto_1 = require("crypto");
|
|
8
|
+
const ActorAppearance_1 = require("./ActorAppearance");
|
|
8
9
|
const id = /^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,127}$/;
|
|
9
10
|
const sha = /^[a-f0-9]{64}$/;
|
|
10
11
|
const isId = (v) => typeof v === 'string' && id.test(v);
|
|
@@ -40,17 +41,23 @@ function validateActorIdentity(value, cameraId, epoch) {
|
|
|
40
41
|
return { kind: 'person', cameraId: v.cameraId, id: v.id, epoch: v.epoch };
|
|
41
42
|
}
|
|
42
43
|
/** A malformed/missing proof is an unavailable tracker, never a negative action. */
|
|
43
|
-
function parseActorTrackingResult(value, request, jpeg, modelHashes, detections) {
|
|
44
|
+
function parseActorTrackingResult(value, request, jpeg, modelHashes, detections, appearance) {
|
|
44
45
|
validateActorTrackingRequest(request);
|
|
45
46
|
const v = value;
|
|
46
|
-
|
|
47
|
+
const pin = appearance === undefined ? undefined : (0, ActorAppearance_1.validateActorAppearancePin)(appearance);
|
|
48
|
+
const expectedHashes = { ...modelHashes, ...(pin ? { [pin.modelId]: pin.sha256 } : {}) };
|
|
49
|
+
if (pin && (!keys(v?.identityModel, 'modelId,preprocessing,sha256')
|
|
50
|
+
|| v.identityModel.modelId !== pin.modelId || v.identityModel.sha256 !== pin.sha256
|
|
51
|
+
|| v.identityModel.preprocessing !== ActorAppearance_1.PERSON_APPEARANCE_PREPROCESSING))
|
|
52
|
+
throw Error('Invalid native actor identity model proof');
|
|
53
|
+
if (!keys(v, ('actors,algorithm,cameraId,capturedAtMs,contextSha256,continuity,endedActors,epoch,frameId,imageSha256,modelHashes,sha256,sourceId,unconfirmed,version' + (pin ? ',identityModel' : '')).split(',').sort().join(','))
|
|
47
54
|
|| v.version !== 1 || v.algorithm !== 'bytetrack_2.6.1' || !isId(v.epoch)
|
|
48
55
|
|| v.cameraId !== request.cameraId || v.sourceId !== request.sourceId || v.frameId !== request.frameId
|
|
49
56
|
|| v.capturedAtMs !== request.capturedAtMs || !isSha(v.contextSha256) || !isSha(v.sha256)
|
|
50
57
|
|| v.imageSha256 !== (0, crypto_1.createHash)('sha256').update(jpeg).digest('hex')
|
|
51
58
|
|| !v.modelHashes || Array.isArray(v.modelHashes) || !Object.keys(v.modelHashes).length
|
|
52
59
|
|| Object.entries(v.modelHashes).some(([k, s]) => !isId(k) || !isSha(s))
|
|
53
|
-
|| (0, exports.actorProofHash)(v.modelHashes) !== (0, exports.actorProofHash)(
|
|
60
|
+
|| (0, exports.actorProofHash)(v.modelHashes) !== (0, exports.actorProofHash)(expectedHashes)
|
|
54
61
|
|| !['start', 'continued', 'gap_reset', 'context_reset', 'recovery_reset'].includes(v.continuity)
|
|
55
62
|
|| !Array.isArray(v.actors) || !Array.isArray(v.unconfirmed) || !Array.isArray(v.endedActors)
|
|
56
63
|
|| v.actors.length + v.unconfirmed.length > 256 || v.endedActors.length > 256)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorTracking.js","sourceRoot":"","sources":["../src/ActorTracking.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ActorTracking.js","sourceRoot":"","sources":["../src/ActorTracking.ts"],"names":[],"mappings":"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"}
|
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.181';
|
|
48
48
|
class EdgeAgent extends events_1.EventEmitter {
|
|
49
49
|
constructor(config, deps) {
|
|
50
50
|
super();
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ActorAppearancePin } from './ActorAppearance';
|
|
1
2
|
import { type ActorPosePin, type ActorPoseResult } from './ActorPose';
|
|
2
3
|
import { type ActorTrackingRequest, type ActorTrackingResult } from './ActorTracking';
|
|
3
4
|
/** Where the detector service listens. Distinct port from litert-lm's 9379. */
|
|
@@ -186,7 +187,7 @@ export declare class LocalDetectorClient {
|
|
|
186
187
|
* two must never collapse into one another: a gate that reads "service down"
|
|
187
188
|
* as "nothing there" suppresses every alert while looking healthy.
|
|
188
189
|
*/
|
|
189
|
-
detect(jpeg: Buffer, tracking?: ActorTrackingRequest, pose?: ActorPosePin): Promise<DetectResult>;
|
|
190
|
+
detect(jpeg: Buffer, tracking?: ActorTrackingRequest, pose?: ActorPosePin, appearance?: ActorAppearancePin): Promise<DetectResult>;
|
|
190
191
|
}
|
|
191
192
|
/** Node built-ins only — no new dependency, matching LiteRtVlmProvider. */
|
|
192
193
|
export declare const defaultDetectorPoster: DetectorHttpPoster;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalDetectorClient.d.ts","sourceRoot":"","sources":["../src/LocalDetectorClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LocalDetectorClient.d.ts","sourceRoot":"","sources":["../src/LocalDetectorClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,7 @@ exports.defaultDetectorPoster = exports.LocalDetectorClient = exports.DetectorUn
|
|
|
62
62
|
* the pinned Apache-2.0 ByteTrack implementation in the detector service.
|
|
63
63
|
*/
|
|
64
64
|
const http_1 = require("http");
|
|
65
|
+
const ActorAppearance_1 = require("./ActorAppearance");
|
|
65
66
|
const jpegFrameSize_1 = require("./jpegFrameSize");
|
|
66
67
|
const ActorPose_1 = require("./ActorPose");
|
|
67
68
|
const ActorTracking_1 = require("./ActorTracking");
|
|
@@ -211,7 +212,7 @@ class LocalDetectorClient {
|
|
|
211
212
|
* two must never collapse into one another: a gate that reads "service down"
|
|
212
213
|
* as "nothing there" suppresses every alert while looking healthy.
|
|
213
214
|
*/
|
|
214
|
-
async detect(jpeg, tracking, pose) {
|
|
215
|
+
async detect(jpeg, tracking, pose, appearance) {
|
|
215
216
|
if (!jpeg || jpeg.length === 0)
|
|
216
217
|
throw new Error('detect() requires a non-empty jpeg buffer');
|
|
217
218
|
if (tracking) {
|
|
@@ -224,7 +225,13 @@ class LocalDetectorClient {
|
|
|
224
225
|
if (!tracking)
|
|
225
226
|
throw new DetectorUnavailableError('Pose requires original-frame actor tracking');
|
|
226
227
|
}
|
|
228
|
+
if (appearance !== undefined) {
|
|
229
|
+
(0, ActorAppearance_1.validateActorAppearancePin)(appearance);
|
|
230
|
+
if (!tracking)
|
|
231
|
+
throw new DetectorUnavailableError('Appearance requires original-frame actor tracking');
|
|
232
|
+
}
|
|
227
233
|
const body = JSON.stringify({
|
|
234
|
+
...(appearance ? { appearance_model: appearance } : {}),
|
|
228
235
|
...(pose ? { pose_model: pose } : {}),
|
|
229
236
|
...(tracking ? { tracking } : {}),
|
|
230
237
|
image_b64: jpeg.toString('base64'),
|
|
@@ -300,7 +307,7 @@ class LocalDetectorClient {
|
|
|
300
307
|
let tracked;
|
|
301
308
|
if (tracking) {
|
|
302
309
|
try {
|
|
303
|
-
tracked = (0, ActorTracking_1.parseActorTrackingResult)(parsed.tracking, tracking, jpeg, parsed.model_hashes, detections);
|
|
310
|
+
tracked = (0, ActorTracking_1.parseActorTrackingResult)(parsed.tracking, tracking, jpeg, parsed.model_hashes, detections, appearance);
|
|
304
311
|
}
|
|
305
312
|
catch (error) {
|
|
306
313
|
throw new DetectorUnavailableError('Actor tracking verification failed: ' + error.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalDetectorClient.js","sourceRoot":"","sources":["../src/LocalDetectorClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"LocalDetectorClient.js","sourceRoot":"","sources":["../src/LocalDetectorClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimeModelSelection.d.ts","sourceRoot":"","sources":["../src/RuntimeModelSelection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"RuntimeModelSelection.d.ts","sourceRoot":"","sources":["../src/RuntimeModelSelection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAG1E,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,2BAA2B,EAAE;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AACrF,MAAM,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAoDxD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,oBAAoB,UAAQ,EAAE,iBAAiB,UAAQ,GAAG,2BAA2B,GAAG,IAAI,CAiB/I;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EAAE,oBAAoB,UAAQ,EAAE,iBAAiB,UAAQ,GAAG,cAAc,GAAG,IAAI,CAkB/J;AAED,sFAAsF;AACtF,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAU7F"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parseModelSelection = parseModelSelection;
|
|
4
4
|
exports.retainedModelSelection = retainedModelSelection;
|
|
5
5
|
exports.assertVlmRuntimeProof = assertVlmRuntimeProof;
|
|
6
|
+
const ActorAppearance_1 = require("./ActorAppearance");
|
|
6
7
|
const ActorWindowContract_1 = require("./ActorWindowContract");
|
|
7
8
|
const record = (v) => v && typeof v === 'object' && !Array.isArray(v);
|
|
8
9
|
const key = (v) => typeof v === 'string' && /^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,127}$/.test(v);
|
|
@@ -22,7 +23,8 @@ function validTasks(v) {
|
|
|
22
23
|
return false;
|
|
23
24
|
const detectors = tasks.filter((t) => t.task === 'actor_detection');
|
|
24
25
|
const poses = tasks.filter((t) => t.task === 'pose_coco17');
|
|
25
|
-
|
|
26
|
+
const appearances = tasks.filter((t) => t.task === 'actor_appearance');
|
|
27
|
+
if (detectors.length !== 1 || poses.length > 1 || appearances.length > 1)
|
|
26
28
|
return false;
|
|
27
29
|
const detector = detectors[0], pose = poses[0];
|
|
28
30
|
const actionFields = new Set();
|
|
@@ -38,6 +40,18 @@ function validTasks(v) {
|
|
|
38
40
|
|| v.fieldOwners.some((f) => f.modelId === task.modelId))
|
|
39
41
|
return false;
|
|
40
42
|
}
|
|
43
|
+
else if (task.task === 'actor_appearance') {
|
|
44
|
+
if (!keys(task, ['task', 'modelId', 'inputModelId']) || task.inputModelId !== detector.modelId
|
|
45
|
+
|| v.fieldOwners.some((f) => f.modelId === task.modelId))
|
|
46
|
+
return false;
|
|
47
|
+
const model = v.models.find((m) => m.modelId === task.modelId);
|
|
48
|
+
try {
|
|
49
|
+
(0, ActorAppearance_1.validateActorAppearancePin)({ modelId: model.modelId, sha256: model.sha256 });
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
41
55
|
else if (task.task === 'actor_actions') {
|
|
42
56
|
const hasPose = Object.prototype.hasOwnProperty.call(task, 'poseModelId');
|
|
43
57
|
if (!keys(task, ['task', 'modelId', 'inputModelId', 'fields', 'window', ...(hasPose ? ['poseModelId'] : [])])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimeModelSelection.js","sourceRoot":"","sources":["../src/RuntimeModelSelection.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"RuntimeModelSelection.js","sourceRoot":"","sources":["../src/RuntimeModelSelection.ts"],"names":[],"mappings":"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"}
|
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.181";
|
|
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.181';
|
|
67
67
|
exports._SDK_VERSION = SDK_VERSION;
|
|
68
68
|
// ---------------------------------------------------------------------------
|
|
69
69
|
// ANSI helpers (no external deps)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trillboards/edge-sdk",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.181",
|
|
4
4
|
"description": "Composable cross-platform Edge AI SDK for audience sensing on DOOH/CTV devices",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@trillboards/edge-ads": "^0.2.0",
|
|
21
21
|
"@trillboards/edge-cloud": "^0.2.0",
|
|
22
|
-
"@trillboards/edge-core": "^0.4.
|
|
22
|
+
"@trillboards/edge-core": "^0.4.16",
|
|
23
23
|
"@trillboards/edge-federated": "^0.2.0 || ^1.0.0",
|
|
24
24
|
"@trillboards/edge-sensing": "^0.2.4",
|
|
25
25
|
"jpeg-js": "^0.4.4",
|
|
@@ -104,22 +104,45 @@ test('capture freezes task policy from its own context across profile changes an
|
|
|
104
104
|
const runtime=new SelectedActorPerceptionClient(binding),f=fixture({actorPerceiver:runtime});
|
|
105
105
|
const detector={modelId:'rfdetr_medium',format:'onnx',sha256:'8e8197112112b79d7cc5d0a94ecef659c05317a658aadc7c7643374c539d7615'};
|
|
106
106
|
const pose={modelId:'rtmpose_m_body7',format:'onnx',sha256:'5c0a4bf67953e6d2ac43ce15e77dc9d5d354ae18430a47d2c5963a7bc5683e3c'};
|
|
107
|
-
const
|
|
108
|
-
|
|
107
|
+
const appearance={modelId:'person_reid_osnet_0277',format:'onnx',sha256:'a26d1586786a09529801517061b84fad833ba07992c1881cc417f935c3c9097d'};
|
|
108
|
+
const selection=(withPose,withAppearance=false)=>({version:1,selectionId:'capture-model-tasks',
|
|
109
|
+
models:[{modelId:'scene',format:'litert-lm',sha256:'b'.repeat(64)},detector,...(withPose?[pose]:[]),...(withAppearance?[appearance]:[])],
|
|
109
110
|
fieldOwners:[{field:'door_open',modelId:'scene'}],
|
|
110
111
|
tasks:[{task:'actor_detection',modelId:detector.modelId,minConfidence:.25},
|
|
111
|
-
...(withPose?[{task:'pose_coco17',modelId:pose.modelId,inputModelId:detector.modelId}]:[])
|
|
112
|
+
...(withPose?[{task:'pose_coco17',modelId:pose.modelId,inputModelId:detector.modelId}]:[]),
|
|
113
|
+
...(withAppearance?[{task:'actor_appearance',modelId:appearance.modelId,inputModelId:detector.modelId}]:[])]});
|
|
112
114
|
const capture=(at,modelSelection)=>{
|
|
113
115
|
f.archive.retainOrderedCapture({name:'human_feed_name',enqueuedAtMs:at,jpeg:Buffer.from('original-'+at),
|
|
114
116
|
reviewContext:{version:1,...(modelSelection?{modelSelection}:{})}});
|
|
115
117
|
return f.archive.previousCaptureRecord;
|
|
116
118
|
};
|
|
117
|
-
const before=capture(100000,null),withPose=capture(100500,selection(true)),
|
|
119
|
+
const before=capture(100000,null),withPose=capture(100500,selection(true)),
|
|
120
|
+
withAppearance=capture(101000,selection(false,true)),rgb=capture(101500,selection(false)),after=capture(102000,null);
|
|
118
121
|
assert.equal(before.actorPerceptionPolicy,undefined);assert.equal(after.actorPerceptionPolicy,undefined);
|
|
119
122
|
assert.equal(withPose.actorPerceptionPolicy.pose.modelId,pose.modelId);
|
|
120
123
|
assert.equal(rgb.actorPerceptionPolicy.pose,undefined);
|
|
121
|
-
assert.equal(
|
|
124
|
+
assert.equal(rgb.actorPerceptionPolicy.appearance,undefined);
|
|
125
|
+
assert.deepEqual(withAppearance.actorPerceptionPolicy.appearance,{modelId:appearance.modelId,sha256:appearance.sha256});
|
|
126
|
+
assert.equal(f.archive.stats().actorPerception.pending,3);
|
|
122
127
|
const cold=new RetainedCaptureClient(f.client,f.directory,{...f.options,actorPerceiver:new SelectedActorPerceptionClient(binding)});
|
|
123
|
-
assert.equal(cold.stats().actorPerception.pending,
|
|
128
|
+
assert.equal(cold.stats().actorPerception.pending,3);
|
|
124
129
|
assert.deepEqual(cold.records.get(withPose.id).actorPerceptionPolicy,withPose.actorPerceptionPolicy);
|
|
130
|
+
assert.deepEqual(cold.records.get(withAppearance.id).actorPerceptionPolicy,withAppearance.actorPerceptionPolicy);
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
const {assertSelectedModelsPrepared}=require('../manager.cjs');
|
|
134
|
+
const nativeAppearance={modelId:'person_reid_osnet_0277',sha256:'a26d1586786a09529801517061b84fad833ba07992c1881cc417f935c3c9097d'};
|
|
135
|
+
const appearanceModel={...nativeAppearance,format:'onnx'};
|
|
136
|
+
test('appearance helper is admitted by the website manager only through the captured actor policy',()=>{
|
|
137
|
+
assert.doesNotThrow(()=>assertSelectedModelsPrepared([appearanceModel],{appearance:nativeAppearance},true));
|
|
138
|
+
});
|
|
139
|
+
test('appearance helper cannot bypass explicit dependency, bytes, or runtime preparation',()=>{
|
|
140
|
+
for(const [models,policy,prepared] of [
|
|
141
|
+
[[appearanceModel],undefined,true],
|
|
142
|
+
[[{...appearanceModel,sha256:'f'.repeat(64)}],{appearance:nativeAppearance},true],
|
|
143
|
+
[[appearanceModel],{appearance:nativeAppearance},false],
|
|
144
|
+
[[{...appearanceModel,modelId:'unselected_embedding'}],{appearance:nativeAppearance},true],
|
|
145
|
+
]){
|
|
146
|
+
assert.throws(()=>assertSelectedModelsPrepared(models,policy,prepared),/explicitly prepared runtime/);
|
|
147
|
+
}
|
|
125
148
|
});
|
package/retained/manager.cjs
CHANGED
|
@@ -6,6 +6,24 @@ const {createHash}=require('node:crypto');
|
|
|
6
6
|
const take = name => require('../dist/' + name);
|
|
7
7
|
const { checkRetainedApi } = require('./website-api-capability.cjs');
|
|
8
8
|
|
|
9
|
+
// Capture startup and the native qualification use the same model admission.
|
|
10
|
+
function assertSelectedModelsPrepared(models, actorPolicy, requiresDetector) {
|
|
11
|
+
const nativePins = [
|
|
12
|
+
{modelId:'rfdetr_medium',sha256:'8e8197112112b79d7cc5d0a94ecef659c05317a658aadc7c7643374c539d7615'},
|
|
13
|
+
actorPolicy?.pose, actorPolicy?.appearance,
|
|
14
|
+
];
|
|
15
|
+
for (const selected of models ?? []) {
|
|
16
|
+
if (selected.format === 'litert-lm') {
|
|
17
|
+
assert(selected.sha256 === 'ab7838cdfc8f77e54d8ca45eadceb20452d9f01e4bfade03e5dce27911b27e42',
|
|
18
|
+
'Website selected a different Gemma artifact');
|
|
19
|
+
} else {
|
|
20
|
+
assert(selected.format === 'onnx' && requiresDetector === true
|
|
21
|
+
&& nativePins.some(pin => pin?.modelId === selected.modelId && pin.sha256 === selected.sha256),
|
|
22
|
+
'The selected specialist requires an explicitly prepared runtime');
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
9
27
|
// The normal connector's website entry point. Capability, strict profile and
|
|
10
28
|
// artifact identity still pass before capture; this is not a second installer.
|
|
11
29
|
async function createWebsiteManager(input, stateDirectory, deps = {}) {
|
|
@@ -79,14 +97,7 @@ async function createWebsiteManager(input, stateDirectory, deps = {}) {
|
|
|
79
97
|
sourceId:createHash('sha256').update(JSON.stringify({url:sourceUrl?.toString()??null,crop:feed?.crop??null})).digest('hex')};
|
|
80
98
|
const actorPolicy=actorPerceptionPolicyFromSelection(context.modelSelection,binding);
|
|
81
99
|
assert(!actorPolicy||rule.mode==='immediate','Actor task profiles require continuous original capture');
|
|
82
|
-
|
|
83
|
-
if(selected.format==='litert-lm')assert(selected.sha256==='ab7838cdfc8f77e54d8ca45eadceb20452d9f01e4bfade03e5dce27911b27e42','Website selected a different Gemma artifact');
|
|
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)
|
|
88
|
-
&& config.pilot.requiresDetector===true,'The selected specialist requires an explicitly prepared runtime');
|
|
89
|
-
}
|
|
100
|
+
assertSelectedModelsPrepared(context.modelSelection?.models, actorPolicy, config.pilot.requiresDetector);
|
|
90
101
|
if (stages) {
|
|
91
102
|
assert(!context.detectorCounts && !context.scopedVlmReview && context.mixedModelExecution === undefined
|
|
92
103
|
&& context.modelSelection.models.some(m => m.format === 'litert-lm')
|
|
@@ -142,4 +153,4 @@ async function createWebsiteManager(input, stateDirectory, deps = {}) {
|
|
|
142
153
|
};
|
|
143
154
|
return { manager, clients, loops, ...(stages ? { stageScheduler: stages } : {}) };
|
|
144
155
|
}
|
|
145
|
-
module.exports = { createWebsiteManager };
|
|
156
|
+
module.exports = { createWebsiteManager, assertSelectedModelsPrepared };
|