maddo/Regalamiunsorriso
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Added support for new faceai parameters
All checks were successful
Publish FaceAI Container / publish (push) Successful in 9m39s
Details

Browse source
This commit is contained in:
MaddoScientisto 2026-05-09 14:46:44 +02:00
commit a026fec62b
12 changed files with 152 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
faceai/.env.development
View file

@ -18,6 +18,7 @@ FACEAI_UPLOAD_ROOT=/data/runtime/uploads
FACEAI_LOG_ROOT=/data/logs
FACEAI_PKL_ROOT=/data/pkl
FACEAI_MATCHER_BINARY=/app/bin/face_matcher
FACEAI_MATCHER_TOLERANCE=0.5
FACEAI_WORKER_CONCURRENCY=2
FACEAI_WORKER_TIMEOUT_MS=300000
FACEAI_PROCESSOR_HEARTBEAT_GRACE_MS=20000

1
faceai/.env.example
View file

@ -33,6 +33,7 @@ FACEAI_RUNTIME_BIND=/mnt/storage/data/faceai/runtime
FACEAI_LOG_BIND=/mnt/storage/data/faceai/logs
FACEAI_PKL_BIND=/mnt/nas12/nas2/RUS
FACEAI_MATCHER_BINARY=/app/bin/face_matcher
FACEAI_MATCHER_TOLERANCE=0.5
FACEAI_WORKER_CONCURRENCY=8
FACEAI_WORKER_TIMEOUT_MS=300000
FACEAI_PROCESSOR_HEARTBEAT_GRACE_MS=20000

1
faceai/.env.production
View file

@ -23,6 +23,7 @@ FACEAI_RUNTIME_BIND=/mnt/storage/data/faceai/runtime
FACEAI_LOG_BIND=/mnt/storage/data/faceai/logs
FACEAI_PKL_BIND=/mnt/nas12/nas2/RUS
FACEAI_MATCHER_BINARY=/app/bin/face_matcher
FACEAI_MATCHER_TOLERANCE=0.5
FACEAI_WORKER_CONCURRENCY=8
FACEAI_WORKER_TIMEOUT_MS=300000
FACEAI_ENABLE_LOCAL_LEGACY_STATIC=0

2
faceai/README.md
View file

@ -328,6 +328,7 @@ Processor settings:
| --- | --- | --- | --- |
| `FACEAI_PKL_ROOT` | yes | `/data/pkl` | mounted race-to-PKL dataset root |
| `FACEAI_MATCHER_BINARY` | yes | `/app/bin/face_matcher` | matcher executable baked into the processor image |
| `FACEAI_MATCHER_TOLERANCE` | optional | `0.5` | forwarded to `face_matcher --tollerance`; must stay between `0.35` and `0.75` |
| `FACEAI_WORKER_CONCURRENCY` | optional | `2` | BullMQ worker concurrency |
| `FACEAI_WORKER_TIMEOUT_MS` | optional | `300000` | matcher timeout in milliseconds |
@ -432,6 +433,7 @@ FACEAI_UPLOAD_ROOT=/data/runtime/uploads
FACEAI_LOG_ROOT=/data/logs
FACEAI_PKL_ROOT=/data/pkl
FACEAI_MATCHER_BINARY=/app/bin/face_matcher
FACEAI_MATCHER_TOLERANCE=0.5
```
If you want FaceAI to force the older bridge-style return path instead, set `FACEAI_LEGACY_RETURN_MODE=bridge` and point `FACEAI_LEGACY_RETURN_URL` at the appropriate legacy bridge endpoint.

20
faceai/apps/processor/src/config.js
View file

@ -1,5 +1,24 @@
import path from 'node:path';
function readOptionalNumberEnv(name) {
const raw = process.env[name];
if (raw === undefined || raw === '') {
return null;
}
const value = Number(raw);
if (Number.isNaN(value)) {
throw new Error(`${name} must be a number when set`);
}
return value;
}
const matcherTolerance = readOptionalNumberEnv('FACEAI_MATCHER_TOLERANCE');
if (matcherTolerance !== null && (matcherTolerance < 0.35 || matcherTolerance > 0.75)) {
throw new Error('FACEAI_MATCHER_TOLERANCE must be between 0.35 and 0.75');
}
export const config = {
redisUrl: process.env.FACEAI_REDIS_URL || 'redis://redis:6379',
queueName: process.env.FACEAI_QUEUE_NAME || 'faceai-searches',
@ -9,6 +28,7 @@ export const config = {
logRoot: process.env.FACEAI_LOG_ROOT || path.join(process.env.FACEAI_RUNTIME_ROOT || '/data/runtime', 'logs'),
pklRoot: process.env.FACEAI_PKL_ROOT || '/data/pkl',
matcherBinary: process.env.FACEAI_MATCHER_BINARY || '/app/bin/face_matcher',
matcherTolerance,
processorHeartbeatIntervalMs: Number(process.env.FACEAI_PROCESSOR_HEARTBEAT_INTERVAL_MS || 5 * 1000),
processorHeartbeatTtlSeconds: Number(process.env.FACEAI_PROCESSOR_HEARTBEAT_TTL_SECONDS || 60),
searchTtlSeconds: Number(process.env.FACEAI_SEARCH_TTL_SECONDS || 24 * 60 * 60),

12
faceai/apps/processor/src/worker-utils.js
View file

@ -19,17 +19,23 @@ export async function resolvePklPath({ raceId, raceStorage, pklRoot }) {
return availability.pklPath;
}
export async function runFaceMatcher({ matcherBinary, selfiePath, pklPath, csvPath, logPath, timeoutMs }) {
export async function runFaceMatcher({ matcherBinary, matcherTolerance, selfiePath, pklPath, csvPath, logPath, timeoutMs }) {
await fs.mkdir(path.dirname(csvPath), { recursive: true });
await fs.mkdir(path.dirname(logPath), { recursive: true });
return new Promise((resolve, reject) => {
const child = spawn(matcherBinary, [
const matcherArgs = [
'--image', selfiePath,
'--encodings', pklPath,
'--out', csvPath,
'--log', logPath
], {
];
if (matcherTolerance !== null && matcherTolerance !== undefined) {
matcherArgs.push('--tollerance', String(matcherTolerance));
}
const child = spawn(matcherBinary, matcherArgs, {
stdio: 'ignore'
});

5
faceai/apps/processor/src/worker.js
View file

@ -34,6 +34,9 @@ async function ensureMatcherBinaryAvailable() {
}
console.log(`FaceAI processor configured matcher binary: ${config.matcherBinary}`);
if (config.matcherTolerance !== null) {
console.log(`FaceAI processor configured matcher tolerance: ${config.matcherTolerance}`);
}
async function publishProcessorHeartbeat() {
try {
@ -138,6 +141,7 @@ async function processJob(job) {
await appendSearchLog(searchLogPath, 'Running matcher', {
matcherBinary: config.matcherBinary,
matcherTolerance: config.matcherTolerance,
csvPath,
matcherLogPath: logPath,
timeoutMs: config.workerTimeoutMs
@ -146,6 +150,7 @@ async function processJob(job) {
try {
await runFaceMatcher({
matcherBinary: config.matcherBinary,
matcherTolerance: config.matcherTolerance,
selfiePath: search.selfiePath,
pklPath,
csvPath,

1
faceai/docker-compose.override.yml
View file

@ -60,6 +60,7 @@ services:
FACEAI_LOG_ROOT: ${FACEAI_LOG_ROOT:-/data/logs}
FACEAI_PKL_ROOT: ${FACEAI_PKL_ROOT:-/data/pkl}
FACEAI_MATCHER_BINARY: ${FACEAI_MATCHER_BINARY:-/app/bin/face_matcher}
FACEAI_MATCHER_TOLERANCE: ${FACEAI_MATCHER_TOLERANCE:-0.5}
FACEAI_WORKER_CONCURRENCY: ${FACEAI_WORKER_CONCURRENCY:-2}
FACEAI_WORKER_TIMEOUT_MS: ${FACEAI_WORKER_TIMEOUT_MS:-300000}
FACEAI_PROCESSOR_HEARTBEAT_INTERVAL_MS: ${FACEAI_PROCESSOR_HEARTBEAT_INTERVAL_MS:-5000}

1
faceai/docker-compose.yml
View file

@ -61,6 +61,7 @@ services:
FACEAI_LOG_ROOT: ${FACEAI_LOG_ROOT:-/data/logs}
FACEAI_PKL_ROOT: ${FACEAI_PKL_ROOT:-/data/pkl}
FACEAI_MATCHER_BINARY: ${FACEAI_MATCHER_BINARY:-/app/bin/face_matcher}
FACEAI_MATCHER_TOLERANCE: ${FACEAI_MATCHER_TOLERANCE:-0.5}
FACEAI_WORKER_CONCURRENCY: ${FACEAI_WORKER_CONCURRENCY:-8}
FACEAI_WORKER_TIMEOUT_MS: ${FACEAI_WORKER_TIMEOUT_MS:-300000}
volumes:

3
faceai/docker/processor.Dockerfile
View file

@ -20,4 +20,5 @@ COPY bin/Face_Recognition_Unix/face_matcher /app/bin/face_matcher
RUN chmod +x /app/bin/face_matcher
ENV NODE_ENV=production
ENV FACEAI_MATCHER_BINARY=/app/bin/face_matcher
ENV FACEAI_MATCHER_BINARY=/app/bin/face_matcher
ENV FACEAI_MATCHER_TOLERANCE=0.5