@alwaysai/device-agent 1.4.0 → 1.5.0

package/lib/subcommands/device/restart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../src/subcommands/device/restart.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,wEAA6D;AAEhD,QAAA,cAAc,GAAG,IAAA,mBAAO,EAAC;IACpC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,oBAAoB;IACjC,WAAW,EAAE,EAAE;IACf,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,IAAA,uBAAM,GAAE,CAAC;IACjB,CAAC;CACF,CAAC,CAAC"}

package/lib/util/check-for-updates.d.ts

@@ -0,0 +1,3 @@
+export declare function getDeviceAgentVersion(): Promise<string>;
+export declare function checkForUpdatesAndPrompt(): Promise<void>;
+//# sourceMappingURL=check-for-updates.d.ts.map

package/lib/util/check-for-updates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"check-for-updates.d.ts","sourceRoot":"","sources":["../../src/util/check-for-updates.ts"],"names":[],"mappings":"AAgCA,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAY7D;AAQD,wBAAsB,wBAAwB,kBAgB7C"}

package/lib/util/check-for-updates.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkForUpdatesAndPrompt = exports.getDeviceAgentVersion = void 0;
+const logger_1 = require("../util/logger");
+const util_1 = require("alwaysai/lib/util");
+const path = require("path");
+const https_1 = require("https");
+const appPrompt = 'Please restart the Device Agent or reboot the device to update. ';
+const updatePrompt = `A new version of the Device Agent is available! \n\n`;
+function getLatestVersion(packageName) {
+    return new Promise((resolve, reject) => {
+        const url = `https://registry.npmjs.org/${packageName}/latest`;
+        (0, https_1.get)(url, (res) => {
+            let data = '';
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+            res.on('end', () => {
+                try {
+                    const latestPackage = JSON.parse(data);
+                    resolve(latestPackage.version);
+                }
+                catch (error) {
+                    reject(error);
+                }
+            });
+        }).on('error', (error) => {
+            reject(error);
+        });
+    });
+}
+async function getDeviceAgentVersion() {
+    let daVersion = '';
+    try {
+        const packagePath = path.join(__dirname, '../../');
+        const spawner = (0, util_1.JsSpawner)({ path: packagePath });
+        const output = await spawner.readFile('package.json');
+        const parsed = JSON.parse(output);
+        daVersion = parsed.version;
+    }
+    catch (e) {
+        logger_1.logger.error(`Could not retrieve the Device Agent version: $ {e}`);
+    }
+    return daVersion;
+}
+exports.getDeviceAgentVersion = getDeviceAgentVersion;
+function constructPrompt(props) {
+    const { currentVer, latestVer } = props;
+    const prompt = `${updatePrompt}${appPrompt}\nYour version: ${currentVer}. Newest version: ${latestVer}`;
+    return prompt;
+}
+async function checkForUpdatesAndPrompt() {
+    try {
+        logger_1.logger.debug('Checking for updates...');
+        const latestVersion = await getLatestVersion('@alwaysai/device-agent');
+        const version = await getDeviceAgentVersion();
+        if (version !== latestVersion) {
+            logger_1.logger.warn(constructPrompt({
+                currentVer: version,
+                latestVer: latestVersion
+            }));
+        }
+    }
+    catch (error) {
+        logger_1.logger.error(`Could not check for updates: ${error}`);
+    }
+}
+exports.checkForUpdatesAndPrompt = checkForUpdatesAndPrompt;
+//# sourceMappingURL=check-for-updates.js.map

package/lib/util/check-for-updates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"check-for-updates.js","sourceRoot":"","sources":["../../src/util/check-for-updates.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,4CAA8C;AAC9C,6BAA6B;AAC7B,iCAA4B;AAE5B,MAAM,SAAS,GACb,kEAAkE,CAAC;AACrE,MAAM,YAAY,GAAG,sDAAsD,CAAC;AAE5E,SAAS,gBAAgB,CAAC,WAAmB;IAC3C,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,8BAA8B,WAAW,SAAS,CAAC;QAE/D,IAAA,WAAG,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YACf,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,IAAI;oBACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACvC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;iBAChC;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACvB,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,qBAAqB;IACzC,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;KAC5B;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACpE;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAZD,sDAYC;AAED,SAAS,eAAe,CAAC,KAAgD;IACvE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACxC,MAAM,MAAM,GAAG,GAAG,YAAY,GAAG,SAAS,mBAAmB,UAAU,qBAAqB,SAAS,EAAE,CAAC;IACxG,OAAO,MAAM,CAAC;AAChB,CAAC;AAEM,KAAK,UAAU,wBAAwB;IAC5C,IAAI;QACF,eAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAC9C,IAAI,OAAO,KAAK,aAAa,EAAE;YAC7B,eAAM,CAAC,IAAI,CACT,eAAe,CAAC;gBACd,UAAU,EAAE,OAAO;gBACnB,SAAS,EAAE,aAAa;aACzB,CAAC,CACH,CAAC;SACH;KACF;IAAC,OAAO,KAAK,EAAE;QACd,eAAM,CAAC,KAAK,CAAC,gCAAgC,KAAK,EAAE,CAAC,CAAC;KACvD;AACH,CAAC;AAhBD,4DAgBC"}

package/lib/util/file.d.ts

@@ -0,0 +1,7 @@
+export declare function safeRimraf(path: string): Promise<void>;
+export declare function pruneDir({ path, exclude, recurse }: {
+    path: string;
+    exclude?: string[];
+    recurse?: boolean;
+}): Promise<boolean>;
+//# sourceMappingURL=file.d.ts.map

package/lib/util/file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"AAKA,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAU5C;AAED,wBAAsB,QAAQ,CAAC,EAC7B,IAAI,EACJ,OAAO,EACP,OAAO,EACR,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,oBAkDA"}

package/lib/util/file.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pruneDir = exports.safeRimraf = void 0;
+const rimraf_1 = require("rimraf");
+const logger_1 = require("../util/logger");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+async function safeRimraf(path) {
+    logger_1.logger.debug(`Removing ${path}`);
+    try {
+        await (0, rimraf_1.rimraf)(path);
+    }
+    catch (e) {
+        logger_1.logger.error(`Failed to remove ${path}. Please manually delete the file or directory.`);
+        logger_1.logger.debug(`Error removing ${path}: ${e}`);
+    }
+}
+exports.safeRimraf = safeRimraf;
+async function pruneDir({ path, exclude, recurse }) {
+    /**
+     * Deletes all files and directories in a given directory path, excluding specific paths.
+     * Will not delete top-level directory
+     * @param  {string} path  path of directory to prune.
+     * @param  {string[]} exclude list of paths to exclude when pruning
+     * @param  {boolean} recurse flag to prune recursively into directories
+     */
+    try {
+        const files = await (0, promises_1.readdir)(path);
+        let canPruneParent = true;
+        for (const file of files) {
+            const filePath = (0, path_1.join)(path, file);
+            const isExcluded = exclude === null || exclude === void 0 ? void 0 : exclude.some((excludePath) => filePath.endsWith(excludePath));
+            if (isExcluded) {
+                logger_1.logger.debug(`Excluding file ${filePath} during pruning.`);
+                canPruneParent = false;
+                continue;
+            }
+            const fileStats = await (0, promises_1.stat)(filePath);
+            if (fileStats.isDirectory()) {
+                if (recurse) {
+                    const dirIsEmpty = await pruneDir({
+                        path: filePath,
+                        exclude,
+                        recurse
+                    });
+                    if (dirIsEmpty) {
+                        await (0, promises_1.rmdir)(filePath);
+                    }
+                    else {
+                        canPruneParent = false;
+                    }
+                }
+            }
+            else {
+                await (0, promises_1.unlink)(filePath);
+            }
+        }
+        return canPruneParent;
+    }
+    catch (error) {
+        logger_1.logger.error(`Error pruning directory ${path}: ${JSON.stringify(error)}`);
+        return false;
+    }
+}
+exports.pruneDir = pruneDir;
+//# sourceMappingURL=file.js.map

package/lib/util/file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,2CAAwC;AACxC,0CAA2D;AAC3D,+BAA4B;AAErB,KAAK,UAAU,UAAU,CAAC,IAAY;IAC3C,eAAM,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjC,IAAI;QACF,MAAM,IAAA,eAAM,EAAC,IAAI,CAAC,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CACV,oBAAoB,IAAI,iDAAiD,CAC1E,CAAC;QACF,eAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;KAC9C;AACH,CAAC;AAVD,gCAUC;AAEM,KAAK,UAAU,QAAQ,CAAC,EAC7B,IAAI,EACJ,OAAO,EACP,OAAO,EAKR;IACC;;;;;;OAMG;IACH,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,CAAC,CAAC;QAElC,IAAI,cAAc,GAAG,IAAI,CAAC;QAE1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAElC,MAAM,UAAU,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAC/C,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAC/B,CAAC;YAEF,IAAI,UAAU,EAAE;gBACd,eAAM,CAAC,KAAK,CAAC,kBAAkB,QAAQ,kBAAkB,CAAC,CAAC;gBAC3D,cAAc,GAAG,KAAK,CAAC;gBACvB,SAAS;aACV;YAED,MAAM,SAAS,GAAG,MAAM,IAAA,eAAI,EAAC,QAAQ,CAAC,CAAC;YACvC,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE;gBAC3B,IAAI,OAAO,EAAE;oBACX,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC;wBAChC,IAAI,EAAE,QAAQ;wBACd,OAAO;wBACP,OAAO;qBACR,CAAC,CAAC;oBAEH,IAAI,UAAU,EAAE;wBACd,MAAM,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC;qBACvB;yBAAM;wBACL,cAAc,GAAG,KAAK,CAAC;qBACxB;iBACF;aACF;iBAAM;gBACL,MAAM,IAAA,iBAAM,EAAC,QAAQ,CAAC,CAAC;aACxB;SACF;QACD,OAAO,cAAc,CAAC;KACvB;IAAC,OAAO,KAAK,EAAE;QACd,eAAM,CAAC,KAAK,CAAC,2BAA2B,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1E,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AA1DD,4BA0DC"}

package/lib/util/file.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=file.test.d.ts.map

package/lib/util/file.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file.test.d.ts","sourceRoot":"","sources":["../../src/util/file.test.ts"],"names":[],"mappings":""}

package/lib/util/file.test.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const file_1 = require("../../src/util/file");
+const promises_1 = require("fs/promises");
+jest.mock('fs/promises');
+describe('pruneDir function', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+    it('should return true if directory is successfully pruned', async () => {
+        const path = '/path/to/directory';
+        const files = ['file1.txt', 'file2.txt'];
+        promises_1.readdir.mockResolvedValue(files);
+        promises_1.stat.mockResolvedValue({ isDirectory: () => false });
+        const result = await (0, file_1.pruneDir)({ path });
+        expect(result).toBe(true);
+        expect(promises_1.readdir).toHaveBeenCalledWith(path);
+        expect(promises_1.stat).toHaveBeenCalledTimes(2); // Called for each file
+        expect(promises_1.unlink).toHaveBeenCalledTimes(2); // Called for each file
+    });
+    it('should exclude specified files from pruning', async () => {
+        const path = '/path/to/directory';
+        const files = ['file1.txt', 'file2.txt'];
+        const exclude = ['file1.txt']; // Exclude file1.txt
+        promises_1.readdir.mockResolvedValue(files);
+        promises_1.stat.mockResolvedValue({ isDirectory: () => false });
+        const result = await (0, file_1.pruneDir)({ path, exclude });
+        expect(result).toBe(false);
+        expect(promises_1.readdir).toHaveBeenCalledWith(path);
+        expect(promises_1.stat).toHaveBeenCalledTimes(1); // Called only for file2.txt
+        expect(promises_1.unlink).toHaveBeenCalledTimes(1); // Called only for file2.txt
+    });
+    it('should recursively prune directories if recurse option is true', async () => {
+        const rootPath = '/path/to/directory';
+        const subDirPath = '/path/to/directory/subdir';
+        const files = ['file1.txt', 'subdir'];
+        const subDirFiles = ['file2.txt'];
+        promises_1.readdir.mockImplementation((path) => {
+            if (path === rootPath)
+                return files;
+            if (path === subDirPath)
+                return subDirFiles;
+        });
+        promises_1.stat.mockImplementation((path) => {
+            if (path === `${rootPath}/file1.txt`)
+                return { isDirectory: () => false };
+            if (path === subDirPath)
+                return { isDirectory: () => true };
+            if (path === `${subDirPath}/file2.txt`)
+                return { isDirectory: () => false };
+        });
+        const result = await (0, file_1.pruneDir)({ path: rootPath, recurse: true });
+        expect(result).toBe(true);
+        expect(promises_1.readdir).toHaveBeenCalledWith(rootPath);
+        expect(promises_1.readdir).toHaveBeenCalledWith(subDirPath);
+        expect(promises_1.stat).toHaveBeenCalledTimes(3); // Called for file1.txt, subdir, and file2.txt
+        expect(promises_1.unlink).toHaveBeenCalledWith(`${rootPath}/file1.txt`);
+        expect(promises_1.unlink).toHaveBeenCalledWith(`${subDirPath}/file2.txt`);
+        expect(promises_1.rmdir).toHaveBeenCalledWith(subDirPath);
+    });
+    it('should not recurse into directories if recurse option is false', async () => {
+        const rootPath = '/path/to/directory';
+        const subDirPath = '/path/to/directory/subdir';
+        const files = ['file1.txt', 'subdir'];
+        const subDirFiles = ['file2.txt'];
+        promises_1.readdir.mockImplementation((path) => {
+            if (path === rootPath)
+                return files;
+            if (path === subDirPath)
+                return subDirFiles;
+        });
+        promises_1.stat.mockImplementation((path) => {
+            if (path === `${rootPath}/file1.txt`)
+                return { isDirectory: () => false };
+            if (path === subDirPath)
+                return { isDirectory: () => true };
+        });
+        const result = await (0, file_1.pruneDir)({ path: rootPath, recurse: false });
+        expect(result).toBe(true);
+        expect(promises_1.readdir).toHaveBeenCalledWith(rootPath);
+        expect(promises_1.stat).toHaveBeenCalledTimes(2); // Called for file1.txt and subdir
+        expect(promises_1.unlink).toHaveBeenCalledWith(`${rootPath}/file1.txt`);
+        expect(promises_1.unlink).not.toHaveBeenCalledWith(`${subDirPath}/file2.txt`);
+        expect(promises_1.rmdir).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=file.test.js.map

package/lib/util/file.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file.test.js","sourceRoot":"","sources":["../../src/util/file.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -37,26 +37,27 @@
     "@alwaysai/alwayscli": "0.3.2",
     "@alwaysai/app-configuration-schemas": "0.1.0",
     "@alwaysai/config-nodejs": "0.3.0",
-    "@alwaysai/device-agent-schemas": "2.3.1",
+    "@alwaysai/device-agent-schemas": "2.3.3",
     "@carnesen/coded-error": "0.4.0",
     "ajv": "8.11.0",
-    "alwaysai": "2.2.0",
+    "alwaysai": "2.5.3",
     "amqplib": "0.10.3",
     "aws-iot-device-sdk": "2.2.12",
-    "docker-compose": "0.23.17",
+    "docker-compose": "0.24.3",
     "lodash": "4.17.21",
     "node-fetch": "2.6.1",
     "node-os-utils": "1.3.7",
     "rimraf": "4.4.0",
     "systeminformation": "5.21.13",
     "uuid": "9.0.0",
-    "winston": "3.8.2",
-    "winston-daily-rotate-file": "4.7.1",
+    "winston": "3.13.0",
+    "winston-daily-rotate-file": "5.0.0",
     "yaml": "2.2.1"
   },
   "devDependencies": {
-    "@alwaysai/tsconfig": "0.0.1",
     "@alwaysai/eslint-config": "0.1.0",
+    "@alwaysai/tsconfig": "0.0.1",
+    "@types/amqplib": "0.10.5",
     "@types/destroy": "1.0.0",
     "@types/jest": "28.1.2",
     "@types/node": "16.11.12",

package/readme.md

@@ -42,13 +42,13 @@ change.
 
 * Supported OS:
     * Debian Bookworm, Bullseye
-    * Ubuntu 23.10, 22.04, 20.04, 18.04
-    * NVIDIA Jetpack 5.1, 4.6.x
+    * Ubuntu 24.04, 23.10, 22.04, 20.04
+    * NVIDIA JetPack 5.1.1, 5.1
 * Supported target architecture
     * amd64
     * aarch64
 * `docker` >= 19.03
-* `docker-compose` >= 1.29.0; < 2.0.0
+* `docker-compose` >= 1.29.0
 * `curl` installed (required to download provisioning scripts)
 * Passwordless `sudo` for `npm` if using `pm2`
 * Passwordless `sudo` for `/sbin/shutdown` for device restart functionality

package/src/application-control/config.ts

@@ -7,7 +7,7 @@ import {
   requireAppReady
 } from './utils';
 import { JsSpawner } from 'alwaysai/lib/util';
-import compose from 'docker-compose';
+import { compose } from '../docker/docker-compose';
 import { assign, merge } from 'lodash';
 import { AppJsonFile } from 'alwaysai/lib/core/app';
 import { AppConfig } from '@alwaysai/app-configuration-schemas';

package/src/application-control/install.ts

@@ -231,6 +231,7 @@ export async function uninstallApp(props: {
     logger.info(`Application ${projectId} not installed`);
     return;
   }
+  await AgentConfigFile().setAppUninstalling({ projectId });
   try {
     await stopApp({ projectId });
   } catch (e) {

package/src/application-control/models.ts

@@ -1,4 +1,3 @@
-import * as path from 'path';
 import { ModelInstallPayload } from '@alwaysai/device-agent-schemas';
 import {
   appModelsAddComponent,
@@ -23,8 +22,9 @@ import {
 } from './utils';
 import { MODEL_JSON_FILE_NAME } from 'alwaysai/lib/core/model';
 import { writeAppCfgFile } from './config';
-import { AppConfig } from '@alwaysai/app-configuration-schemas';
 import { APP_MODELS_DIRECTORY_NAME } from 'alwaysai/lib/paths';
+import { pruneDir } from '../util/file';
+import { AppConfig } from '@alwaysai/app-configuration-schemas';
 
 export async function getAppModels(props: { projectId: string }) {
   const { projectId } = props;
@@ -127,9 +127,9 @@ export async function installModelsWithPresignedURLs(
     modelPayloads.map(async (payload: ModelInstallPayload) => {
       logger.info(`Installing ${payload.id}: ${payload.version}`);
       const version = payload.version;
-      const modelDest = path.join(targetDir, payload.id);
+      const modelDest = join(targetDir, payload.id);
       await spawner.mkdirp(modelDest);
-      const localDest = path.join(modelDest, `${payload.version}.tar.gz`);
+      const localDest = join(modelDest, `${payload.version}.tar.gz`);
       await downloadPackageUsingPresignedUrl({
         localDest,
         presignedUrl: payload.modelSignedUrl
@@ -178,20 +178,21 @@ export async function updateModelsWithPresignedUrls(props: {
     version: appReleaseHash
   });
 
-  const ogDir = path.join(appDir, APP_MODELS_DIRECTORY_NAME);
-  // Copy all current models to restore dir in case of failure
-  const restoreDir = `${ogDir}.restore`;
-  await spawner.rimraf(restoreDir);
-  await copyDir({ srcPath: ogDir, destPath: restoreDir });
-
-  // Create temp dir to install new models
+  const ogDir = join(appDir, APP_MODELS_DIRECTORY_NAME);
   const tmpDir = `${ogDir}.tmp`;
 
   try {
     await spawner.rimraf(tmpDir);
     await copyDir({ srcPath: ogDir, destPath: tmpDir });
+
+    await pruneModels({
+      projectId,
+      appCfg: newAppCfg,
+      path: tmpDir
+    });
+
     await installModelsWithPresignedURLs(modelInstallPayloads, tmpDir);
-    // TODO: Purge outdated models
+
     await spawner.rimraf(ogDir);
     await copyDir({ srcPath: tmpDir, destPath: ogDir });
     await spawner.rimraf(tmpDir);
@@ -211,6 +212,28 @@ export async function updateModelsWithPresignedUrls(props: {
     logger.info(`Models installed for project ${projectId}`);
   } finally {
     await spawner.rimraf(tmpDir);
-    await spawner.rimraf(restoreDir);
   }
 }
+
+export async function pruneModels(props: {
+  projectId: string;
+  appCfg: AppConfig;
+  path?: string;
+}) {
+  const { projectId, appCfg, path } = props;
+
+  const modelsPath = path || join(getAppDir(projectId), 'models');
+
+  if (!existsSync(modelsPath)) {
+    logger.error(
+      `Attempted to prune models from ${modelsPath} for project app ${projectId} that does not exist or has no models dir.`
+    );
+    return;
+  }
+
+  await pruneDir({
+    path: modelsPath,
+    exclude: Object.keys(appCfg.models),
+    recurse: true
+  });
+}

package/src/application-control/status.ts

@@ -1,4 +1,8 @@
-import compose from 'docker-compose';
+import {
+  compose,
+  runStreamingDockerComposeCmd,
+  runDockerComposeCmd
+} from '../docker/docker-compose';
 import { JsSpawner } from 'alwaysai/lib/util';
 
 import { runDockerLogin } from '../docker/docker-cmd';
@@ -48,9 +52,8 @@ export async function getAppState(props: {
   const spawner = JsSpawner({ path: appDir });
   for (const name of composeServices.data.services) {
     // Get container name for service
-    const containerId = await spawner.run({
-      exe: 'docker-compose',
-      cwd: appDir,
+    const containerId = await runDockerComposeCmd({
+      dir: appDir,
       args: ['ps', '-q', name]
     });
     if (containerId === '') {
@@ -136,10 +139,9 @@ export async function getAppLogs(props: {
   const argsList = args || [];
 
   // Use direct command with spawner in order to get a readable stream
-  return await JsSpawner().runStreaming({
-    exe: 'docker-compose',
+  return await runStreamingDockerComposeCmd({
     args: ['logs', '-f', ...argsList, ...serviceList],
-    cwd: appDir
+    dir: appDir
   });
 }
 

package/src/application-control/utils.ts

@@ -1,4 +1,4 @@
-import compose from 'docker-compose';
+import { compose } from '../docker/docker-compose';
 import * as path from 'path';
 import * as fs from 'fs';