edge-impulse-linux 1.7.0 → 1.8.3

package/cli/linux/runner.ts

@@ -7,7 +7,6 @@ import { AudioClassifier } from '../../library/classifier/audio-classifier';
 import { ImageClassifier } from '../../library/classifier/image-classifier';
 import { Imagesnap } from '../../library/sensors/imagesnap';
 import inquirer from 'inquirer';
-import { Config } from '../config';
 import { initCliApp, setupCliApp } from '../init-cli-app';
 import fs from 'fs';
 import os from 'os';
@@ -23,9 +22,15 @@ import { AudioRecorder } from '../../library';
 import { ips } from '../get-ips';
 import { Prophesee } from '../../library/sensors/prophesee';
 import { asyncMiddleware } from './webserver/middleware/asyncMiddleware';
+import { RemoteMgmt, RemoteMgmtConfig, RemoteMgmtInferenceDevice } from './remote-mgmt-service';
+import { EventEmitter } from "tsee";
+import TypedEmitter from "typed-emitter";
+import WebSocket from 'ws';
+import { Config, EdgeImpulseConfig } from "../config";
 import multer from 'multer';
 import util from 'util';
 import { InferenceServerModelViewModel, InferenceServerViewModel, renderInferenceServerView } from './webserver/views/inference-server-view';
+import { ModelMonitor } from './model-monitor';
 
 const RUNNER_PREFIX = '\x1b[33m[RUN]\x1b[0m';
 const BUILD_PREFIX = '\x1b[32m[BLD]\x1b[0m';
@@ -48,6 +53,7 @@ program
     .option('--force-target <target>', 'Do not autodetect the target system, but set it by hand (e.g. "runner-linux-aarch64")')
     .option('--force-engine <engine>', 'Do not autodetect the inference engine, but set it by hand (e.g. "tflite")')
     .option('--run-http-server <port>', 'Do not run using a sensor, but instead expose an API server at the specified port')
+    .option('--monitor', 'Enable model monitoring', false)
     .option('--clean', 'Clear credentials')
     .option('--silent', `Run in silent mode, don't prompt for credentials`)
     .option('--quantized', 'Download int8 quantized neural networks, rather than the float32 neural networks. ' +
@@ -73,6 +79,7 @@ const modelFileArgv = <string | undefined>program.modelFile;
 const downloadArgv = <string | undefined>program.download;
 const forceTargetArgv = <string | undefined>program.forceTarget;
 const forceEngineArgv = <string | undefined>program.forceEngine;
+const monitorArgv: boolean = !!program.monitor;
 const listTargetsArgv: boolean = !!program.listTargets;
 const gstLaunchArgsArgv = <string | undefined>program.gstLaunchArgs;
 const runHttpServerPort = program.runHttpServer ? Number(program.runHttpServer) : undefined;
@@ -131,31 +138,163 @@ const onSignal = async () => {
 process.on('SIGHUP', onSignal);
 process.on('SIGINT', onSignal);
 
-// tslint:disable-next-line: no-floating-promises
+class LinuxDevice extends (EventEmitter as new () => TypedEmitter<{
+    snapshot: (buffer: Buffer, filename: string) => void
+}>) implements RemoteMgmtInferenceDevice  {
+
+    constructor() {
+        // eslint-disable-next-line constructor-super
+        super();
+    }
+
+    async getDeviceId() {
+        return ips.length > 0 ? ips[0].mac : '00:00:00:00:00:00';
+    }
+
+    getDeviceType() {
+        let id = (ips.length > 0 ? ips[0].mac : '00:00:00:00:00:00').toLowerCase();
+
+        if (id.startsWith('dc:a6:32') || id.startsWith('b8:27:eb')) {
+            return 'RASPBERRY_PI';
+        }
+
+        if (id.startsWith('00:04:4b') || id.startsWith('48:b0:2d')) {
+            return 'NVIDIA_JETSON_NANO';
+        }
+
+        return 'EDGE_IMPULSE_LINUX';
+    }
+}
+
+async function downloadModel(projectId: number | undefined,
+                             config: EdgeImpulseConfig): Promise<{
+                                modelFile: string,
+                                modelPath: RunnerModelPath }> {
+
+    if (!projectId) {
+        throw new Error('No project ID found');
+    }
+
+    // configFactory should be set by now (global variable)
+    if (!configFactory) {
+        throw new Error('No config factory found');
+    }
+
+    const studioUrl = await configFactory.getStudioUrl(null);
+    let projectStudioUrl = studioUrl + '/studio/' + projectId;
+    let modelPath: RunnerModelPath | undefined;
+    let modelFile: string;
+
+    await configFactory.setLinuxProjectId(projectId);
+
+    const downloader = new RunnerDownloader(projectId, quantizedArgv ? 'int8' : 'float32',
+                                            config, forceTargetArgv, forceEngineArgv);
+    downloader.on('build-progress', msg => {
+        console.log(BUILD_PREFIX, msg);
+    });
+    modelPath = new RunnerModelPath(projectId, quantizedArgv ? 'int8' : 'float32',
+        forceTargetArgv, forceEngineArgv);
+
+    // no new version? and already downloaded? return that model
+    let currVersion = await downloader.getLastDeploymentVersion();
+    if (currVersion && await checkFileExists(modelPath.getModelPath(currVersion))) {
+        modelFile = modelPath.getModelPath(currVersion);
+        console.log(RUNNER_PREFIX, 'Already have model', modelFile, 'not downloading...');
+    }
+    else {
+        console.log(RUNNER_PREFIX, 'Downloading model...');
+
+        let deployment = await downloader.downloadDeployment();
+        let tmpDir = await fs.promises.mkdtemp(Path.join(os.tmpdir(), 'ei-' + Date.now()));
+        tmpDir = Path.join(os.tmpdir(), tmpDir);
+        await fs.promises.mkdir(tmpDir, { recursive: true });
+        let ret = await downloader.getDownloadType();
+        modelFile = Path.join(tmpDir, ret[0]);
+        await fs.promises.writeFile(modelFile, deployment);
+        await fs.promises.chmod(modelFile, 0o755);
+
+        console.log(RUNNER_PREFIX, 'Downloading model OK');
+    }
+
+    if (downloadArgv) {
+        await fs.promises.mkdir(Path.dirname(downloadArgv), { recursive: true });
+        await fs.promises.copyFile(modelFile, downloadArgv);
+        console.log(RUNNER_PREFIX, 'Stored model in', Path.resolve(downloadArgv));
+        return process.exit(0);
+    }
+
+    return { modelFile, modelPath };
+}
+
+function audioClassifierHelloMsg(model: ModelInformation) {
+    let param = model.modelParameters;
+    console.log(RUNNER_PREFIX, 'Starting the audio classifier for',
+        model.project.owner + ' / ' + model.project.name, '(v' + model.project.deploy_version + ')');
+    console.log(RUNNER_PREFIX, 'Parameters', 'freq', param.frequency + 'Hz',
+        'window length', ((param.input_features_count / param.frequency / param.axis_count) * 1000) + 'ms.',
+        'classes', param.labels);
+}
+
+function imageClassifierHelloMsg(model: ModelInformation) {
+    let param = model.modelParameters;
+    let labels = param.labels;
+
+    if (param.has_anomaly === RunnerHelloHasAnomaly.VisualGMM) {
+        labels.push('anomaly');
+    }
+
+    console.log(RUNNER_PREFIX, 'Starting the image classifier for',
+        model.project.owner + ' / ' + model.project.name, '(v' + model.project.deploy_version + ')');
+    console.log(RUNNER_PREFIX, 'Parameters',
+        'image size', param.image_input_width + 'x' + param.image_input_height + ' px (' +
+            param.image_channel_count + ' channels)',
+        'classes', labels);
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {
     try {
-        let modelFile;
-
-        if (listTargetsArgv && modelFile) {
+        if (listTargetsArgv && modelFileArgv) {
+            // TODO: why? List targets and display the warning...
             throw new Error('Cannot combine --list-targets and --model-file');
         }
 
+        let modelFile;
+        let remoteMgmt: RemoteMgmt | undefined;
         let modelPath: RunnerModelPath | undefined;
         let projectStudioUrl: string | undefined;
+        let config: EdgeImpulseConfig;
+        // projectId keeps the Studio project ID, not the EIM/model project ID
+        // currently they can differ, as user can use EIM form the other project than the projct
+        // the user selected during the login
+        let projectId: number | undefined;
+        let devKeys: { apiKey: string, hmacKey: string };
+        let modelMonitor: ModelMonitor | undefined;
+        let runner: LinuxImpulseRunner;
+        let model: ModelInformation;
 
         // no model file passed in? then build / download the latest deployment...
-        if (!modelFileArgv) {
+        if (!modelFileArgv || monitorArgv) {
             const init = await initCliApp(cliOptions);
-            const config = init.config;
+            config = init.config;
             configFactory = init.configFactory;
 
-            const { projectId } = await setupCliApp(configFactory, config, cliOptions, undefined);
-
-            const studioUrl = await configFactory.getStudioUrl(null);
-            projectStudioUrl = studioUrl + '/studio/' + projectId;
+            ({ projectId, devKeys } = await setupCliApp(configFactory, config, cliOptions, undefined));
 
+            // store project id in case user just selected one
             await configFactory.setLinuxProjectId(projectId);
+        }
+        else {
+            configFactory = new Config();
+            config = await configFactory.verifyLogin(devArgv, apiKeyArgv);
+            projectId = await configFactory.getLinuxProjectId() || -1;
+            devKeys = {
+                apiKey: apiKeyArgv ?? '',
+                hmacKey: ''
+            };
+        }
 
+        if (!modelFileArgv) {
             if (listTargetsArgv) {
                 const targets = await config.api.deployment.listDeploymentTargetsForProjectDataSources(projectId);
                 console.log('Listing all available targets');
@@ -168,41 +307,7 @@ process.on('SIGINT', onSignal);
                 process.exit(0);
             }
 
-            const downloader = new RunnerDownloader(projectId, quantizedArgv ? 'int8' : 'float32',
-                config, forceTargetArgv, forceEngineArgv);
-            downloader.on('build-progress', msg => {
-                console.log(BUILD_PREFIX, msg);
-            });
-
-            modelPath = new RunnerModelPath(projectId, quantizedArgv ? 'int8' : 'float32',
-                forceTargetArgv, forceEngineArgv);
-
-            // no new version? and already downloaded? return that model
-            let currVersion = await downloader.getLastDeploymentVersion();
-            if (currVersion && await checkFileExists(modelPath.getModelPath(currVersion))) {
-                modelFile = modelPath.getModelPath(currVersion);
-                console.log(RUNNER_PREFIX, 'Already have model', modelFile, 'not downloading...');
-            }
-            else {
-                console.log(RUNNER_PREFIX, 'Downloading model...');
-
-                let deployment = await downloader.downloadDeployment();
-                let tmpDir = await fs.promises.mkdtemp(Path.join(os.tmpdir(), 'ei-' + Date.now()));
-                tmpDir = Path.join(os.tmpdir(), tmpDir);
-                await fs.promises.mkdir(tmpDir, { recursive: true });
-                let ret = await downloader.getDownloadType();
-                modelFile = Path.join(tmpDir, ret[0]);
-                await fs.promises.writeFile(modelFile, deployment);
-                await fs.promises.chmod(modelFile, 0o755);
-
-                console.log(RUNNER_PREFIX, 'Downloading model OK');
-            }
-            if (downloadArgv) {
-                await fs.promises.mkdir(Path.dirname(downloadArgv), { recursive: true });
-                await fs.promises.copyFile(modelFile, downloadArgv);
-                console.log(RUNNER_PREFIX, 'Stored model in', Path.resolve(downloadArgv));
-                return process.exit(0);
-            }
+            ({ modelFile, modelPath } = await downloadModel(projectId, config));
         }
         else {
             if (downloadArgv) {
@@ -213,8 +318,8 @@ process.on('SIGINT', onSignal);
             await fs.promises.chmod(modelFile, 0o755);
         }
 
-        const runner = new LinuxImpulseRunner(modelFile);
-        const model = await runner.init();
+        runner = new LinuxImpulseRunner(modelFile);
+        model = await runner.init();
 
         // if downloaded? then store...
         if (!modelFileArgv && modelPath) {
@@ -232,6 +337,77 @@ process.on('SIGINT', onSignal);
         }
 
         let param = model.modelParameters;
+        if (monitorArgv) {
+            let device = new LinuxDevice();
+            modelMonitor = await ModelMonitor.getModelMonitor(configFactory, model);
+            let storageStatus = await modelMonitor?.getStorageStatus();
+
+            remoteMgmt = new RemoteMgmt(projectId, {
+                projectId: model.project.id,
+                projectName: model.project.name,
+                projectOwner: model.project.owner,
+                deploymentVersion: model.project.deploy_version,
+                modelType: model.modelParameters.model_type,
+            }, devKeys, Object.assign({
+                command: <'edge-impulse-linux'>'edge-impulse-linux'
+            }, config), device, modelMonitor,
+                url => new WebSocket(url),
+                async (currName) => {
+                    let nameDevice = <{ nameDevice: string }>await inquirer.prompt([{
+                        type: 'input',
+                        message: 'What name do you want to give this device?',
+                        name: 'nameDevice',
+                        default: currName
+                    }]);
+                    return nameDevice.nameDevice;
+                });
+            await remoteMgmt.connect();
+
+            // wait 30 sec for the connection to be established (WS connection + setting device name by user)
+            let isConnected = false;
+            let timeout = 0;
+            while (!isConnected && timeout < 30) {
+                await new Promise(resolve => setTimeout(resolve, 1000));
+                isConnected = await remoteMgmt.isConnected;
+                timeout++;
+            }
+
+            modelMonitor.on('inference-summary', remoteMgmt?.inferenceSummaryListener.bind(remoteMgmt));
+            modelMonitor.on('impulse-record', remoteMgmt?.impulseRecordListener.bind(remoteMgmt));
+            modelMonitor.on('impulse-records-response', remoteMgmt?.impulseRecordsResponseListener.bind(remoteMgmt));
+        }
+
+        remoteMgmt?.on('newModelAvailable', async ( ) => {
+            console.log(RUNNER_PREFIX, 'New model available, downloading...');
+            try {
+                ({ modelFile, modelPath } = await downloadModel(projectId, config));
+
+                // pause features streaming
+                imageClassifier?.pause();
+                audioClassifier?.pause();
+
+                // load the new model
+                model = await runner?.init(modelFile);
+
+                console.log(RUNNER_PREFIX, 'Model updated successfully');
+                // resume (refresh the model info internally as well)
+                if (model.modelParameters.sensorType === 'microphone') {
+                    audioClassifierHelloMsg(model);
+                    audioClassifier?.resume();
+                    await remoteMgmt?.sendModelUpdateStatus(model, true);
+                }
+                else if (model.modelParameters.sensorType === 'camera') {
+                    imageClassifierHelloMsg(model);
+                    imageClassifier?.resume();
+                    await remoteMgmt?.sendModelUpdateStatus(model, true);
+                }
+            }
+            catch (ex) {
+                let exErr = <Error>ex;
+                await remoteMgmt?.sendModelUpdateStatus(model, false);
+                throw Error('Model update failed: ' + exErr.message);
+            }
+        });
 
         if (runHttpServerPort) {
             console.log(RUNNER_PREFIX, 'Starting HTTP server for',
@@ -259,11 +435,7 @@ process.on('SIGINT', onSignal);
         }
 
         if (param.sensorType === 'microphone') {
-            console.log(RUNNER_PREFIX, 'Starting the audio classifier for',
-                model.project.owner + ' / ' + model.project.name, '(v' + model.project.deploy_version + ')');
-            console.log(RUNNER_PREFIX, 'Parameters', 'freq', param.frequency + 'Hz',
-                'window length', ((param.input_features_count / param.frequency / param.axis_count) * 1000) + 'ms.',
-                'classes', param.labels);
+            audioClassifierHelloMsg(model);
 
             if (enableCameraArgv) {
                 await connectCamera(configFactory);
@@ -312,12 +484,19 @@ process.on('SIGINT', onSignal);
 
             await audioClassifier.start(audioDevice);
 
-            audioClassifier.on('result', (ev, timeMs, audioAsPcm) => {
+            audioClassifier.on('result', async (ev, timeMs, audioAsPcm) => {
                 if (!ev.result.classification) return;
 
+                if (modelMonitor) {
+                    await modelMonitor.processResult(ev, {
+                        type: 'wav',
+                        buffer: audioAsPcm,
+                    });
+                }
+
                 // print the raw predicted values for this frame
                 // (turn into string here so the content does not jump around)
-                // tslint:disable-next-line: no-unsafe-any
+                // eslint-disable-next-line
                 let c = <{ [k: string]: string | number }>(<any>ev.result.classification);
                 for (let k of Object.keys(c)) {
                     c[k] = (<number>c[k]).toFixed(4);
@@ -329,17 +508,7 @@ process.on('SIGINT', onSignal);
             });
         }
         else if (param.sensorType === 'camera') {
-            let labels = param.labels;
-            if (param.has_anomaly === RunnerHelloHasAnomaly.VisualGMM) {
-                labels.push('anomaly');
-            }
-
-            console.log(RUNNER_PREFIX, 'Starting the image classifier for',
-                model.project.owner + ' / ' + model.project.name, '(v' + model.project.deploy_version + ')');
-            console.log(RUNNER_PREFIX, 'Parameters',
-                'image size', param.image_input_width + 'x' + param.image_input_height + ' px (' +
-                    param.image_channel_count + ' channels)',
-                'classes', labels);
+            imageClassifierHelloMsg(model);
 
             let camera = await connectCamera(configFactory);
 
@@ -353,11 +522,18 @@ process.on('SIGINT', onSignal);
                 'Go to http://' + (ips.length > 0 ? ips[0].address : 'localhost') + ':' + webserverPort);
             console.log('');
 
-            imageClassifier.on('result', (ev, timeMs, imgAsJpg) => {
+            imageClassifier.on('result', async (ev, timeMs, imgAsJpg) => {
+                if (modelMonitor) {
+                    await modelMonitor.processResult(ev, {
+                        type: 'jpg',
+                        buffer: imgAsJpg,
+                    });
+                }
+
                 if (ev.result.classification) {
                     // print the raw predicted values for this frame
                     // (turn into string here so the content does not jump around)
-                    // tslint:disable-next-line: no-unsafe-any
+                    // eslint-disable-next-line
                     let c = <{ [k: string]: string | number }>(<any>ev.result.classification);
                     for (let k of Object.keys(c)) {
                         c[k] = (<number>c[k]).toFixed(4);
@@ -388,6 +564,9 @@ process.on('SIGINT', onSignal);
                 'shared library to run this model. Learn more at https://docs.edgeimpulse.com/docs/edge-impulse-for-linux/flex-delegates');
             console.log('');
         }
+        else if (verboseArgv) {
+            console.log(ex);
+        }
 
         if (audioClassifier) {
             await audioClassifier.stop();
@@ -471,20 +650,20 @@ function buildWavFileBuffer(data: Buffer, intervalMs: number) {
     let headerArr = new Uint8Array(44);
     let h = [
         0x52, 0x49, 0x46, 0x46, // RIFF
-        // tslint:disable-next-line: no-bitwise
+        // eslint-disable-next-line no-bitwise
         fileSize & 0xff, (fileSize >> 8) & 0xff, (fileSize >> 16) & 0xff, (fileSize >> 24) & 0xff,
         0x57, 0x41, 0x56, 0x45, // WAVE
         0x66, 0x6d, 0x74, 0x20, // fmt
         0x10, 0x00, 0x00, 0x00, // length of format data
         0x01, 0x00, // type of format (1=PCM)
         0x01, 0x00, // number of channels
-        // tslint:disable-next-line: no-bitwise
+        // eslint-disable-next-line no-bitwise
         wavFreq & 0xff, (wavFreq >> 8) & 0xff, (wavFreq >> 16) & 0xff, (wavFreq >> 24) & 0xff,
-        // tslint:disable-next-line: no-bitwise
+        // eslint-disable-next-line no-bitwise
         srBpsC8 & 0xff, (srBpsC8 >> 8) & 0xff, (srBpsC8 >> 16) & 0xff, (srBpsC8 >> 24) & 0xff,
         0x02, 0x00, 0x10, 0x00,
         0x64, 0x61, 0x74, 0x61, // data
-        // tslint:disable-next-line: no-bitwise
+        // eslint-disable-next-line no-bitwise
         dataSize & 0xff, (dataSize >> 8) & 0xff, (dataSize >> 16) & 0xff, (dataSize >> 24) & 0xff,
     ];
     for (let hx = 0; hx < 44; hx++) {
@@ -524,13 +703,15 @@ function startWebServer(model: ModelInformation, camera: ICamera, imgClassifier:
         if (model.modelParameters.image_channel_count === 3) {
             img = sharp(data).resize({
                 height: model.modelParameters.image_input_height,
-                width: model.modelParameters.image_input_width
+                width: model.modelParameters.image_input_width,
+                fastShrinkOnLoad: false
             });
         }
         else {
             img = sharp(data).resize({
                 height: model.modelParameters.image_input_height,
-                width: model.modelParameters.image_input_width
+                width: model.modelParameters.image_input_width,
+                fastShrinkOnLoad: false
             }).toColourspace('b-w');
         }
 

package/cli/linux/webserver/public/assets/logo-rgb.svg

@@ -1,43 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.6, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 872 147" style="enable-background:new 0 0 872 147;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FEBA06;}
-	.st1{fill:#A3D008;}
-	.st2{fill:#F8562C;}
-	.st3{fill:#39BFCE;}
-</style>
-<g>
-	<path class="st0" d="M107.81,62.16c-5.84,0-10.57,4.73-10.57,10.57c0,5.84,4.73,10.57,10.57,10.57h34.94l-8.04-21.13H107.81z"/>
-	<path class="st1" d="M26.94,83.29h51.28c5.84,0,10.57-4.73,10.57-10.57c0-5.83-4.73-10.57-10.57-10.57H26.94
-		c-5.84,0-10.57,4.73-10.57,10.57C16.37,78.56,21.1,83.29,26.94,83.29z"/>
-	<path class="st2" d="M148.14,98.71H38.86c-2.76-3.28-6.89-5.38-11.51-5.38c-8.3,0-15.02,6.73-15.02,15.02
-		c0,8.3,6.73,15.02,15.02,15.02c4.62,0,8.75-2.09,11.51-5.38h116.62L148.14,98.71z"/>
-	<path class="st3" d="M121.86,27.14H39.08c-2.75-3.44-6.98-5.66-11.73-5.66c-8.3,0-15.02,6.73-15.02,15.02
-		c0,8.3,6.73,15.02,15.02,15.02c4.49,0,8.5-1.98,11.25-5.1h90.6L121.86,27.14z"/>
-	<g>
-		<g>
-			<path d="M197.13,51.77v15.21h25.86v12.54h-25.86v12.65h31.64v12.54h-44.74V39.22h44.74v12.54H197.13z"/>
-			<path d="M265.95,104.72h-23.31V39.22h21.98c14.21,0,31.41,7.99,31.41,31.75C296.04,98.17,277.83,104.72,265.95,104.72z
-				 M282.94,71.3c0-16.1-8.99-19.54-18.09-19.54h-9.1v40.41h8.77C271.84,92.17,282.94,89.95,282.94,71.3z"/>
-			<path d="M362.98,68.97v27.2c-6.11,6.88-15.99,9.21-23.31,9.21c-11.99,0-32.52-6.33-32.52-34.41c0-23.76,17.98-32.3,32.41-32.3
-				c7.44,0,15.32,2.11,21.54,7.66c-2.67,3.44-4.77,5.66-7.44,8.88c-4.55-3.55-9.21-4-14.21-4c-8.99,0-19.2,3.77-19.2,20.09
-				c0,18.65,11.99,21.54,19.2,21.54c3.66,0,6.99-0.78,10.43-2.66v-8.66h-9.21V68.97H362.98z"/>
-			<path d="M390.18,51.77v15.21h25.86v12.54h-25.86v12.65h31.64v12.54h-44.74V39.22h44.74v12.54H390.18z"/>
-			<path d="M460.56,39.22h13.1v65.49h-13.1V39.22z"/>
-			<path d="M514.96,91.06l-12.54-20.2v33.86H489.2V39.22h9.21l21.65,34.86l21.65-34.86h9.21v65.49h-13.21V70.86l-12.54,20.2H514.96z
-				"/>
-			<path d="M565.91,39.22h30.42c9.32,0,21.09,6.44,21.09,22.2c0,18.65-11.54,23.42-20.76,23.42h-17.65v19.87h-13.1V39.22z
-				 M579.01,51.77V72.3h17.21c3.78,0,8.1-1.67,8.1-10.88c0-7.66-4.11-9.66-8.1-9.66H579.01z"/>
-			<path d="M629.08,74.86V39.22h13.1V74.3c0,14.65,6.33,18.54,13.54,18.54c7.22,0,13.54-3.89,13.54-18.54V39.22h13.1v35.63
-				c0,25.98-14.65,30.42-26.64,30.53C643.73,105.27,629.08,100.83,629.08,74.86z"/>
-			<path d="M709.9,92.17h29.31v12.54H696.8V39.22h13.1V92.17z"/>
-			<path d="M794.27,41.89v11.88c0,0-11.88-2.55-17.98-2.55c-5.44,0-13.88,0.89-13.88,6.33c0,8.88,37.52,8.44,37.52,28.86
-				c0,13.21-10.32,18.98-25.31,18.98c-12.21,0-19.98-3.66-22.98-5.88V88.84c0,0,13.54,4,20.31,4c3.33,0,14.88,0,14.88-6.33
-				c0-8.1-37.63-8.88-37.63-28.2c0-16.54,12.77-19.65,26.09-19.65C786.83,38.67,791.6,40.55,794.27,41.89z"/>
-			<path d="M824.69,51.77v15.21h25.86v12.54h-25.86v12.65h31.64v12.54h-44.74V39.22h44.74v12.54H824.69z"/>
-		</g>
-	</g>
-</g>
+<svg width="702" height="96" viewBox="0 0 351 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M45.1353 19.1642C42.3746 19.1642 40.1387 21.3925 40.1387 24.1437C40.1387 26.8949 42.3746 29.1232 45.1353 29.1232H61.652L57.8514 19.1689H45.1353V19.1642Z" fill="#FEBA06"/>
+<path d="M6.90678 29.1184H31.1477C33.9084 29.1184 36.1443 26.8901 36.1443 24.1389C36.1443 21.3924 33.9084 19.1594 31.1477 19.1594H6.90678C4.14611 19.1594 1.91016 21.3877 1.91016 24.1389C1.91016 26.8901 4.14611 29.1184 6.90678 29.1184Z" fill="#A3D008"/>
+<path d="M64.1997 36.3828H12.5412C11.2365 34.8376 9.28416 33.8483 7.10021 33.8483C3.17666 33.8483 0 37.0187 0 40.9241C0 44.8342 3.18139 48 7.10021 48C9.28416 48 11.2365 47.0154 12.5412 45.4655H67.6695L64.1997 36.3828Z" fill="#F8562C"/>
+<path d="M51.7767 2.66641H12.6452C11.3452 1.04583 9.34562 0 7.10021 0C3.17666 0 0 3.17048 0 7.07587C0 10.986 3.18139 14.1517 7.10021 14.1517C9.22271 14.1517 11.1183 13.219 12.4183 11.7491H55.2465L51.7767 2.66641Z" fill="#39BFCE"/>
+<path d="M88.6699 36.3113H107.418V31.4923H94.0517V26.3216H105.66V21.5026H94.0517V16.5077H107.242V11.6887H88.6699V36.3113Z" fill="black"/>
+<path d="M111.685 36.3113H121.288C129.026 36.3113 134.373 30.9295 134.373 24V23.9297C134.373 17.0002 129.026 11.6887 121.288 11.6887H111.685V36.3113ZM121.288 16.5781C125.72 16.5781 128.71 19.6383 128.71 24V24.0704C128.71 28.4321 125.72 31.422 121.288 31.422H117.102V16.5781H121.288Z" fill="black"/>
+<path d="M150.504 36.7334C155.007 36.7334 158.489 34.9747 161.022 32.829V22.1357H150.328V26.814H155.781V30.3316C154.409 31.3165 152.65 31.8089 150.68 31.8089C146.318 31.8089 143.223 28.5024 143.223 24V23.9297C143.223 19.7438 146.354 16.2615 150.293 16.2615C153.142 16.2615 154.831 17.176 156.73 18.7589L160.142 14.6434C157.575 12.4626 154.901 11.2666 150.469 11.2666C143.012 11.2666 137.56 17.0002 137.56 24V24.0704C137.56 31.3516 142.836 36.7334 150.504 36.7334Z" fill="black"/>
+<path d="M165.684 36.3113H184.433V31.4923H171.066V26.3216H182.674V21.5026H171.066V16.5077H184.257V11.6887H165.684V36.3113Z" fill="black"/>
+<path d="M198.942 36.3113H204.359V11.6887H198.942V36.3113Z" fill="black"/>
+<path d="M209.963 36.3113H215.274V20.3418L222.133 30.7537H222.274L229.203 20.2363V36.3113H234.585V11.6887H228.746L222.274 22.1006L215.802 11.6887H209.963V36.3113Z" fill="black"/>
+<path d="M239.951 36.3113H245.368V28.9245H249.483C255.006 28.9245 259.438 25.9698 259.438 20.2715V20.2011C259.438 15.171 255.885 11.6887 250.011 11.6887H239.951V36.3113ZM245.368 24.1055V16.5781H249.554C252.262 16.5781 253.95 17.8795 253.95 20.3066V20.377C253.95 22.4875 252.368 24.1055 249.659 24.1055H245.368Z" fill="black"/>
+<path d="M273.168 36.6983C279.781 36.6983 283.967 33.04 283.967 25.5829V11.6887H278.55V25.794C278.55 29.6984 276.545 31.7034 273.239 31.7034C269.932 31.7034 267.927 29.6281 267.927 25.6181V11.6887H262.51V25.7588C262.51 33.0049 266.555 36.6983 273.168 36.6983Z" fill="black"/>
+<path d="M288.935 36.3113H306.628V31.3868H294.352V11.6887H288.935V36.3113Z" fill="black"/>
+<path d="M318.922 36.6631C324.234 36.6631 327.962 33.9194 327.962 29.0301V28.9597C327.962 24.6684 325.148 22.8744 320.154 21.5729C315.897 20.4825 314.842 19.9549 314.842 18.3368V18.2665C314.842 17.0705 315.932 16.1208 318.008 16.1208C320.083 16.1208 322.229 17.0353 324.41 18.5479L327.224 14.4675C324.726 12.4626 321.666 11.337 318.078 11.337C313.048 11.337 309.46 14.2917 309.46 18.7589V18.8293C309.46 23.7186 312.661 25.0905 317.621 26.3568C321.736 27.412 322.581 28.1155 322.581 29.4874V29.5577C322.581 30.9999 321.244 31.8793 319.028 31.8793C316.214 31.8793 313.892 30.7185 311.676 28.8894L308.475 32.7235C311.43 35.3616 315.194 36.6631 318.922 36.6631Z" fill="black"/>
+<path d="M332.114 36.3113H350.862V31.4923H337.496V26.3216H349.104V21.5026H337.496V16.5077H350.686V11.6887H332.114V36.3113Z" fill="black"/>
 </svg>

package/cli/linux/webserver/public/webserver.js

@@ -72,6 +72,7 @@ window.WebServer = async () => {
 
         if (result.classification) {
             if (isFirstClassification) {
+                // eslint-disable-next-line @typescript-eslint/prefer-for-of
                 for (let ix = 0; ix < Object.keys(result.classification).length; ix++) {
                     const key = Object.keys(result.classification)[ix];
 

package/cli/linux/webserver/views/escape-html-template-tag/escape.ts

@@ -22,6 +22,7 @@ export function join(array: (string | HtmlSafeString)[], separator: string | Htm
     if (array.length <= 0) {
         return new HtmlSafeString([''], []);
     }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     return new HtmlSafeString(['', ...Array(array.length - 1).fill(separator), ''], array);
 }
 
@@ -34,6 +35,7 @@ function escapehtml(unsafe: unknown): string {
         return unsafe.toString();
     }
     if (Array.isArray(unsafe)) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         return join(unsafe, '').toString();
     }
     return String(unsafe).replace(ENT_REGEX, (char) => ENTITIES[char]);

package/examples/js/classify-audio.js

@@ -3,7 +3,7 @@ const { AudioClassifier, LinuxImpulseRunner, AudioRecorder } = require("../../bu
 // This script expects one argument:
 // 1. The model file
 
-// tslint:disable-next-line: no-floating-promises
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {
     try  {
         if (!process.argv[2]) {

package/examples/js/classify-camera.js

@@ -1,6 +1,6 @@
 const { ImageClassifier, LinuxImpulseRunner, Ffmpeg, ICamera, Imagesnap, RunnerHelloHasAnomaly } = require('../../build/library');
 
-// tslint:disable-next-line: no-floating-promises
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {
     try  {
 

package/examples/js/classify-custom.js

@@ -6,7 +6,7 @@ const fs = require('fs');
 // 2. A features file with raw data. You can get this by going to **Live classification > Load sample**
 //    then copy the features from the 'Raw features' block.
 
-// tslint:disable-next-line: no-floating-promises
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {
     try  {
         if (!process.argv[2]) {

package/examples/js/collect-custom.js

@@ -4,7 +4,7 @@ const { DataForwarder, getIps } = require('../../build/library');
 const API_KEY = process.env.API_KEY || 'ei_...';
 const HMAC_KEY = process.env.HMAC_KEY || '0';
 
-// tslint:disable-next-line: no-floating-promises
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {
     try {
         // instantiate a DataForwarder object to collect custom data from a sensor