@trafficgroup/knex-rel 0.1.23 → 0.1.25
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/dist/dao/batch/batch.dao.d.ts +12 -0
- package/dist/dao/batch/batch.dao.js +60 -0
- package/dist/dao/batch/batch.dao.js.map +1 -1
- package/dist/dao/report-configuration/report-configuration.dao.js +2 -2
- package/dist/dao/report-configuration/report-configuration.dao.js.map +1 -1
- package/dist/interfaces/batch/batch.interfaces.d.ts +1 -0
- package/migrations/20260222140000_migration.ts +15 -0
- package/package.json +1 -1
- package/src/dao/batch/batch.dao.ts +68 -0
- package/src/dao/report-configuration/report-configuration.dao.ts +2 -2
- package/src/interfaces/batch/batch.interfaces.ts +1 -0
|
@@ -18,6 +18,18 @@ export declare class BatchDAO implements IBaseDAO<IBatch> {
|
|
|
18
18
|
* Returns the updated batch with fresh counters.
|
|
19
19
|
*/
|
|
20
20
|
incrementFailed(id: number): Promise<IBatch>;
|
|
21
|
+
/**
|
|
22
|
+
* Atomically decrement completedVideos counter with row-level locking.
|
|
23
|
+
* Used when reprocessing a previously completed video.
|
|
24
|
+
* Returns the updated batch with fresh counters.
|
|
25
|
+
*/
|
|
26
|
+
decrementCompleted(id: number): Promise<IBatch>;
|
|
27
|
+
/**
|
|
28
|
+
* Atomically decrement failedVideos counter with row-level locking.
|
|
29
|
+
* Used when reprocessing a previously failed video.
|
|
30
|
+
* Returns the updated batch with fresh counters.
|
|
31
|
+
*/
|
|
32
|
+
decrementFailed(id: number): Promise<IBatch>;
|
|
21
33
|
/**
|
|
22
34
|
* Get batches by folder ID
|
|
23
35
|
*/
|
|
@@ -127,6 +127,66 @@ class BatchDAO {
|
|
|
127
127
|
}));
|
|
128
128
|
});
|
|
129
129
|
}
|
|
130
|
+
/**
|
|
131
|
+
* Atomically decrement completedVideos counter with row-level locking.
|
|
132
|
+
* Used when reprocessing a previously completed video.
|
|
133
|
+
* Returns the updated batch with fresh counters.
|
|
134
|
+
*/
|
|
135
|
+
decrementCompleted(id) {
|
|
136
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
137
|
+
return this._knex.transaction((trx) => __awaiter(this, void 0, void 0, function* () {
|
|
138
|
+
const batch = yield trx("video_batch")
|
|
139
|
+
.where({ id })
|
|
140
|
+
.forUpdate()
|
|
141
|
+
.first();
|
|
142
|
+
if (!batch)
|
|
143
|
+
throw new Error(`Batch ${id} not found`);
|
|
144
|
+
const newCompleted = Math.max(0, batch.completedVideos - 1);
|
|
145
|
+
const updatePayload = {
|
|
146
|
+
completedVideos: newCompleted,
|
|
147
|
+
updated_at: trx.fn.now()
|
|
148
|
+
};
|
|
149
|
+
// Reset batch status if it was in a terminal state
|
|
150
|
+
if (batch.status === 'COMPLETED' || batch.status === 'FAILED') {
|
|
151
|
+
updatePayload.status = 'IN_PROGRESS';
|
|
152
|
+
}
|
|
153
|
+
yield trx("video_batch")
|
|
154
|
+
.where({ id })
|
|
155
|
+
.update(updatePayload);
|
|
156
|
+
return Object.assign(Object.assign({}, batch), { completedVideos: newCompleted, status: updatePayload.status || batch.status });
|
|
157
|
+
}));
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
/**
|
|
161
|
+
* Atomically decrement failedVideos counter with row-level locking.
|
|
162
|
+
* Used when reprocessing a previously failed video.
|
|
163
|
+
* Returns the updated batch with fresh counters.
|
|
164
|
+
*/
|
|
165
|
+
decrementFailed(id) {
|
|
166
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
167
|
+
return this._knex.transaction((trx) => __awaiter(this, void 0, void 0, function* () {
|
|
168
|
+
const batch = yield trx("video_batch")
|
|
169
|
+
.where({ id })
|
|
170
|
+
.forUpdate()
|
|
171
|
+
.first();
|
|
172
|
+
if (!batch)
|
|
173
|
+
throw new Error(`Batch ${id} not found`);
|
|
174
|
+
const newFailed = Math.max(0, batch.failedVideos - 1);
|
|
175
|
+
const updatePayload = {
|
|
176
|
+
failedVideos: newFailed,
|
|
177
|
+
updated_at: trx.fn.now()
|
|
178
|
+
};
|
|
179
|
+
// Reset batch status if it was in a terminal state
|
|
180
|
+
if (batch.status === 'COMPLETED' || batch.status === 'FAILED') {
|
|
181
|
+
updatePayload.status = 'IN_PROGRESS';
|
|
182
|
+
}
|
|
183
|
+
yield trx("video_batch")
|
|
184
|
+
.where({ id })
|
|
185
|
+
.update(updatePayload);
|
|
186
|
+
return Object.assign(Object.assign({}, batch), { failedVideos: newFailed, status: updatePayload.status || batch.status });
|
|
187
|
+
}));
|
|
188
|
+
});
|
|
189
|
+
}
|
|
130
190
|
/**
|
|
131
191
|
* Get batches by folder ID
|
|
132
192
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.dao.js","sourceRoot":"","sources":["../../../src/dao/batch/batch.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,0EAA+C;AAE/C,MAAa,QAAQ;IAArB;QACY,UAAK,GAAyB,wBAAW,CAAC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"batch.dao.js","sourceRoot":"","sources":["../../../src/dao/batch/batch.dao.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const KnexConnection_1 = __importDefault(require("../../KnexConnection"));
|
|
|
20
20
|
* FHWA Classes:
|
|
21
21
|
* - Class 1: Motorcycles
|
|
22
22
|
* - Class 2: Cars (passenger cars)
|
|
23
|
-
* - Class 3: Pickup trucks, vans
|
|
23
|
+
* - Class 3: Pickup trucks, vans
|
|
24
24
|
* - Class 4: Buses
|
|
25
25
|
* - Class 5: Work vans (2-axle, 6-tire single units)
|
|
26
26
|
* - Classes 6-8: Single unit trucks
|
|
@@ -33,7 +33,7 @@ const DETECTION_LABEL_TO_FHWA = {
|
|
|
33
33
|
'motorcycle': [1],
|
|
34
34
|
'car': [2],
|
|
35
35
|
'pickup_truck': [3],
|
|
36
|
-
'motorized_vehicle': [
|
|
36
|
+
'motorized_vehicle': [2], // Maps to Class 2 (cars) - ambiguous vehicles counted as cars
|
|
37
37
|
'bus': [4],
|
|
38
38
|
'work_van': [5],
|
|
39
39
|
'single_unit_truck': [6, 7, 8], // Classes 6-8
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report-configuration.dao.js","sourceRoot":"","sources":["../../../src/dao/report-configuration/report-configuration.dao.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"report-configuration.dao.js","sourceRoot":"","sources":["../../../src/dao/report-configuration/report-configuration.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAQA,0EAA+C;AAE/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,uBAAuB,GAA6B;IACtD,YAAY,EAAE,CAAC,CAAC,CAAC;IACjB,KAAK,EAAE,CAAC,CAAC,CAAC;IACV,cAAc,EAAE,CAAC,CAAC,CAAC;IACnB,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAG,8DAA8D;IACzF,KAAK,EAAE,CAAC,CAAC,CAAC;IACV,UAAU,EAAE,CAAC,CAAC,CAAC;IACf,mBAAmB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAO,cAAc;IACnD,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAE,eAAe;IACzD,oEAAoE;CACvE,CAAC;AAEF;;;GAGG;AACH,MAAM,qBAAqB,GAAG,CAAC,SAAS,CAAC,CAAC;AAE1C,MAAa,sBAAsB;IAAnC;QACY,UAAK,GAAyB,wBAAW,CAAC,aAAa,EAAE,CAAC;QAC1D,cAAS,GAAG,uBAAuB,CAAC;IAwYhD,CAAC;IAtYG;;OAEG;IACG,MAAM,CAAC,IAA+B;;YACxC,yCAAyC;YACzC,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9E,CAAC;YAED,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;iBACnD,MAAM,CAAC;gBACJ,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC;aACpD,CAAC;iBACD,SAAS,CAAC,GAAG,CAAC,CAAC;YAEpB,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAC5C,CAAC;KAAA;IAED;;OAEG;IACG,OAAO,CAAC,EAAU;;YACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YACtE,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,IAAY;;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YACxE,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,IAAY;;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;iBAC1C,QAAQ,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,CAAC;iBAC1C,KAAK,EAAE,CAAC;YACb,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,CAAC;KAAA;IAED;;OAEG;IACG,MAAM,CAAC,EAAU,EAAE,IAAwC;;YAC7D,iDAAiD;YACjD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACrB,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAClE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC9E,CAAC;YACL,CAAC;YAED,MAAM,UAAU,GAAQ,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;gBAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACzD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS;gBAAE,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC9E,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS;gBAAE,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAEpG,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;iBACnD,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;iBACb,MAAM,CAAC,UAAU,CAAC;iBAClB,SAAS,CAAC,GAAG,CAAC,CAAC;YAEpB,OAAO,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,CAAC;KAAA;IAED;;;OAGG;IACG,MAAM,CAAC,EAAU;;YACnB,6BAA6B;YAC7B,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAEzE,IAAI,QAAQ,CAAC,KAAe,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;YACpG,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;YACpE,OAAO,MAAM,GAAG,CAAC,CAAC;QACtB,CAAC;KAAA;IAED;;OAEG;IACG,MAAM,CAAC,IAAY,EAAE,KAAa;;YACpC,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;YAElC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC3E,MAAM,UAAU,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;YACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;iBAC3C,KAAK,CAAC,KAAK,CAAC;iBACZ,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAEnC,OAAO;gBACH,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAC5C,IAAI;gBACJ,KAAK;gBACL,KAAK,EAAE,OAAO,CAAC,MAAM;gBACrB,UAAU;gBACV,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;aAC5C,CAAC;QACN,CAAC;KAAA;IAED;;;;;;;;;OASG;IACH,qBAAqB,CAAC,MAAgC;QAClD,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,0BAA0B;QAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QACrD,CAAC;QAED,gCAAgC;QAChC,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAChE,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAC9C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QACpC,CAAC;QAED,8BAA8B;QAC9B,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACpD,CAAC;QAED,6DAA6D;QAC7D,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrC,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACjE,CAAC;YACD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;gBACjD,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,iDAAiD,CAAC,CAAC;YAC1F,CAAC;YACD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,8BAA8B,CAAC,CAAC;YACvE,CAAC;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7E,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;YAEtF,uEAAuE;YACvE,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,0DAA0D,CAAC,CAAC;YACnG,CAAC;YAED,IAAI,OAAO,EAAE,CAAC;gBACV,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC;wBACnD,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,IAAI,4BAA4B,CAAC,CAAC;oBACzF,CAAC;oBACD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;YACP,CAAC;YAED,kCAAkC;YAClC,IAAI,UAAU,EAAE,CAAC;gBACb,GAAG,CAAC,cAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBAC7B,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;wBACtC,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,4BAA4B,EAAE,eAAe,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACxH,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,sDAAsD;QACtD,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;QAClD,IAAI,iBAAiB,CAAC,IAAI,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC;YACnD,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;YAClG,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;QACpJ,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAClD,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,kBAAkB,CACd,gBAAwC,EACxC,MAA4B;QAE5B,0CAA0C;QAC1C,MAAM,eAAe,GAA2B,EAAE,CAAC;QAEnD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5D,MAAM,WAAW,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;oBAC5B,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;gBAC3E,CAAC,CAAC,CAAC;YACP,CAAC;YACD,uFAAuF;QAC3F,CAAC;QAED,wEAAwE;QACxE,MAAM,iBAAiB,GAA2B,EAAE,CAAC;QAErD,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACrD,IAAI,KAAK,GAAG,CAAC,CAAC;YAEd,wBAAwB;YACxB,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACxC,KAAK,IAAI,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;YAEH,6EAA6E;YAC7E,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC5C,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;oBAC9C,KAAK,IAAI,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBACjD,CAAC,CAAC,CAAC;YACP,CAAC;YAED,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;;;;;;;;;OAWG;IACH,mCAAmC,CAC/B,iBAAsC,EACtC,MAA4B;QAE5B,6DAA6D;QAC7D,MAAM,sBAAsB,GAA2B,EAAE,CAAC;QAE1D,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;YAC3D,2CAA2C;YAC3C,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC9C,wDAAwD;gBACxD,KAAK,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;oBACzE,IAAI,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;wBAClC,sBAAsB,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC;oBACrD,CAAC;gBACL,CAAC;YACL,CAAC;YAED,uEAAuE;YACvE,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC5C,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;oBACpD,sBAAsB,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC;gBAC5D,CAAC;YACL,CAAC;QACL,CAAC;QAED,mDAAmD;QACnD,MAAM,MAAM,GAAwB,EAAE,CAAC;QACvC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;YAC3D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAClC,CAAC;QAED,sDAAsD;QACtD,KAAK,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC3E,MAAM,eAAe,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;YAE/D,6CAA6C;YAC7C,IAAI,CAAC,eAAe,EAAE,CAAC;gBACnB,SAAS;YACb,CAAC;YAED,uDAAuD;YACvD,MAAM,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAChD,MAAM,CAAC,eAAe,CAAC,EACvB,UAAU,CACb,CAAC;QACN,CAAC;QAED,uDAAuD;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEjD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;;;;;;;OAUG;IACK,qBAAqB,CAAC,MAAW,EAAE,MAAW;QAClD,qDAAqD;QACrD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QAC9D,CAAC;QAED,sDAAsD;QACtD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAChD,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,6BAA6B;QAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAChD,MAAM,GAAG,EAAE,CAAC;QAChB,CAAC;QAED,uCAAuC;QACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;;;OAMG;IACK,iBAAiB,CAAC,iBAAsC;QAC5D,IAAI,KAAK,GAAQ,EAAE,CAAC;QAEpB,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtE,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,8BAA8B;QAC1B,yBAAY,uBAAuB,EAAG;IAC1C,CAAC;IAED;;;OAGG;IACK,YAAY,CAAC,GAAQ;QACzB,OAAO;YACH,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,aAAa,EAAE,OAAO,GAAG,CAAC,aAAa,KAAK,QAAQ;gBAChD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC;gBAC/B,CAAC,CAAC,GAAG,CAAC,aAAa;YACvB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CAAC;IACN,CAAC;CACJ;AA1YD,wDA0YC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { Knex } from "knex";
|
|
2
|
+
|
|
3
|
+
export async function up(knex: Knex): Promise<void> {
|
|
4
|
+
await knex.schema.alterTable("video_batch", (table) => {
|
|
5
|
+
table.integer("previewVideoId").unsigned().nullable().references("id").inTable("video").onDelete("SET NULL");
|
|
6
|
+
table.index(["previewVideoId"], "idx_video_batch_preview_video_id");
|
|
7
|
+
});
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export async function down(knex: Knex): Promise<void> {
|
|
11
|
+
await knex.schema.alterTable("video_batch", (table) => {
|
|
12
|
+
table.dropIndex(["previewVideoId"], "idx_video_batch_preview_video_id");
|
|
13
|
+
table.dropColumn("previewVideoId");
|
|
14
|
+
});
|
|
15
|
+
}
|
package/package.json
CHANGED
|
@@ -116,6 +116,74 @@ export class BatchDAO implements IBaseDAO<IBatch> {
|
|
|
116
116
|
});
|
|
117
117
|
}
|
|
118
118
|
|
|
119
|
+
/**
|
|
120
|
+
* Atomically decrement completedVideos counter with row-level locking.
|
|
121
|
+
* Used when reprocessing a previously completed video.
|
|
122
|
+
* Returns the updated batch with fresh counters.
|
|
123
|
+
*/
|
|
124
|
+
async decrementCompleted(id: number): Promise<IBatch> {
|
|
125
|
+
return this._knex.transaction(async (trx) => {
|
|
126
|
+
const batch = await trx("video_batch")
|
|
127
|
+
.where({ id })
|
|
128
|
+
.forUpdate()
|
|
129
|
+
.first();
|
|
130
|
+
|
|
131
|
+
if (!batch) throw new Error(`Batch ${id} not found`);
|
|
132
|
+
|
|
133
|
+
const newCompleted = Math.max(0, batch.completedVideos - 1);
|
|
134
|
+
|
|
135
|
+
const updatePayload: any = {
|
|
136
|
+
completedVideos: newCompleted,
|
|
137
|
+
updated_at: trx.fn.now()
|
|
138
|
+
};
|
|
139
|
+
|
|
140
|
+
// Reset batch status if it was in a terminal state
|
|
141
|
+
if (batch.status === 'COMPLETED' || batch.status === 'FAILED') {
|
|
142
|
+
updatePayload.status = 'IN_PROGRESS';
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
await trx("video_batch")
|
|
146
|
+
.where({ id })
|
|
147
|
+
.update(updatePayload);
|
|
148
|
+
|
|
149
|
+
return { ...batch, completedVideos: newCompleted, status: updatePayload.status || batch.status };
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/**
|
|
154
|
+
* Atomically decrement failedVideos counter with row-level locking.
|
|
155
|
+
* Used when reprocessing a previously failed video.
|
|
156
|
+
* Returns the updated batch with fresh counters.
|
|
157
|
+
*/
|
|
158
|
+
async decrementFailed(id: number): Promise<IBatch> {
|
|
159
|
+
return this._knex.transaction(async (trx) => {
|
|
160
|
+
const batch = await trx("video_batch")
|
|
161
|
+
.where({ id })
|
|
162
|
+
.forUpdate()
|
|
163
|
+
.first();
|
|
164
|
+
|
|
165
|
+
if (!batch) throw new Error(`Batch ${id} not found`);
|
|
166
|
+
|
|
167
|
+
const newFailed = Math.max(0, batch.failedVideos - 1);
|
|
168
|
+
|
|
169
|
+
const updatePayload: any = {
|
|
170
|
+
failedVideos: newFailed,
|
|
171
|
+
updated_at: trx.fn.now()
|
|
172
|
+
};
|
|
173
|
+
|
|
174
|
+
// Reset batch status if it was in a terminal state
|
|
175
|
+
if (batch.status === 'COMPLETED' || batch.status === 'FAILED') {
|
|
176
|
+
updatePayload.status = 'IN_PROGRESS';
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
await trx("video_batch")
|
|
180
|
+
.where({ id })
|
|
181
|
+
.update(updatePayload);
|
|
182
|
+
|
|
183
|
+
return { ...batch, failedVideos: newFailed, status: updatePayload.status || batch.status };
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
|
|
119
187
|
/**
|
|
120
188
|
* Get batches by folder ID
|
|
121
189
|
*/
|
|
@@ -14,7 +14,7 @@ import KnexManager from "../../KnexConnection";
|
|
|
14
14
|
* FHWA Classes:
|
|
15
15
|
* - Class 1: Motorcycles
|
|
16
16
|
* - Class 2: Cars (passenger cars)
|
|
17
|
-
* - Class 3: Pickup trucks, vans
|
|
17
|
+
* - Class 3: Pickup trucks, vans
|
|
18
18
|
* - Class 4: Buses
|
|
19
19
|
* - Class 5: Work vans (2-axle, 6-tire single units)
|
|
20
20
|
* - Classes 6-8: Single unit trucks
|
|
@@ -27,7 +27,7 @@ const DETECTION_LABEL_TO_FHWA: Record<string, number[]> = {
|
|
|
27
27
|
'motorcycle': [1],
|
|
28
28
|
'car': [2],
|
|
29
29
|
'pickup_truck': [3],
|
|
30
|
-
'motorized_vehicle': [
|
|
30
|
+
'motorized_vehicle': [2], // Maps to Class 2 (cars) - ambiguous vehicles counted as cars
|
|
31
31
|
'bus': [4],
|
|
32
32
|
'work_van': [5],
|
|
33
33
|
'single_unit_truck': [6, 7, 8], // Classes 6-8
|