@alwaysai/device-agent 1.5.0 → 2.0.0

package/lib/util/http-client.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.microServiceHttpClient = exports.httpClient = void 0;
-const node_fetch_1 = require("node-fetch");
 const endpoints_1 = require("../endpoints");
 const infrastructure_1 = require("alwaysai/lib/infrastructure");
 const logger_1 = require("../util/logger");
+const util_1 = require("alwaysai/lib/util");
 async function httpClient(url, method, headers, data) {
     const options = Object.assign({ method }, (data ? { body: data, headers } : { headers }));
     try {
-        const response = await (0, node_fetch_1.default)(url, options);
+        const response = await fetch(url, options);
         const contentType = response.headers.get('content-type');
         if (contentType === 'application/json') {
             return await response.json();
@@ -18,7 +18,7 @@ async function httpClient(url, method, headers, data) {
         }
     }
     catch (e) {
-        logger_1.logger.error(`HTTP Client error for ${url}: ${e.message}`);
+        logger_1.logger.error(`HTTP Client error for ${url}:\n${(0, util_1.stringifyError)(e)}`);
     }
 }
 exports.httpClient = httpClient;

package/lib/util/http-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,2CAA+B;AAC/B,4CAAsD;AACtD,gEAAsE;AACtE,2CAAwC;AAEjC,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,OAAY,EACZ,IAAa;IAEb,MAAM,OAAO,mBACX,MAAM,IACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAClD,CAAC;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KAC5D;AACH,CAAC;AAtBD,gCAsBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC;AAVD,wDAUC"}
+{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,4CAAsD;AACtD,gEAAsE;AACtE,2CAAwC;AACxC,4CAAmD;AAE5C,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,OAAY,EACZ,IAAa;IAEb,MAAM,OAAO,mBACX,MAAM,IACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAClD,CAAC;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,MAAM,IAAA,qBAAc,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KACrE;AACH,CAAC;AAtBD,gCAsBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC;AAVD,wDAUC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -13,7 +13,7 @@
   },
   "engines": {
     "npm": ">=7.0.0",
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -34,44 +34,46 @@
     "publish-provisioning:prod": "node ./scripts/publish-provisioning-scripts.js prod"
   },
   "dependencies": {
-    "@alwaysai/alwayscli": "0.3.2",
-    "@alwaysai/app-configuration-schemas": "0.1.0",
-    "@alwaysai/config-nodejs": "0.3.0",
-    "@alwaysai/device-agent-schemas": "2.3.3",
+    "@alwaysai/alwayscli": "0.3.3",
+    "@alwaysai/app-configuration-schemas": "0.2.0",
+    "@alwaysai/config-nodejs": "0.3.3",
+    "@alwaysai/device-agent-schemas": "3.1.0",
     "@carnesen/coded-error": "0.4.0",
     "ajv": "8.11.0",
-    "alwaysai": "2.5.3",
+    "alwaysai": "2.6.1",
     "amqplib": "0.10.3",
-    "aws-iot-device-sdk": "2.2.12",
-    "docker-compose": "0.24.3",
+    "aws-iot-device-sdk": "2.2.15",
+    "docker-compose": "0.24.8",
     "lodash": "4.17.21",
-    "node-fetch": "2.6.1",
     "node-os-utils": "1.3.7",
     "rimraf": "4.4.0",
+    "serialize-error": "8.1.0",
     "systeminformation": "5.21.13",
     "uuid": "9.0.0",
     "winston": "3.13.0",
     "winston-daily-rotate-file": "5.0.0",
-    "yaml": "2.2.1"
+    "yaml": "2.5.0"
   },
   "devDependencies": {
-    "@alwaysai/eslint-config": "0.1.0",
+    "@alwaysai/eslint-config": "0.1.3",
     "@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",
+    "@types/jest": "29.1.2",
+    "@types/node": "18.11.9",
     "@types/node-os-utils": "^1.3.4",
+    "@types/rimraf": "3.0.2",
     "@types/sinon": "10.0.6",
+    "@types/tar": "6.1.2",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
-    "aws-sdk": "^2.1046.0",
+    "aws-sdk": "^2.1663.0",
     "cp-cli": "2.0.0",
     "get-stream": "6.0.1",
-    "jest": "28.1.1",
+    "jest": "29.7.0",
     "sinon": "12.0.1",
     "tempy": "0.7.1",
-    "ts-jest": "28.0.5",
+    "ts-jest": "29.2.3",
     "ts-mock-imports": "1.3.8",
     "ts-node": "10.8.1",
     "typescript": "4.6.4"

package/readme.md

@@ -28,7 +28,6 @@ change.
   - [Control the application](#control-the-application)
   - [Manage application models](#manage-application-models)
     - [Update models to new version of the same model ID](#update-models-to-new-version-of-the-same-model-id)
-    - [Replace models for an application for new ID](#replace-models-for-an-application-for-new-id)
     - [Manually download a model package](#manually-download-a-model-package)
   - [Set and update environment variables](#set-and-update-environment-variables)
 - [Device Cleaning and Uninstalling](#device-cleaning-and-uninstalling)
@@ -86,15 +85,18 @@ Provisioning the device performs the following:
 Run the following command on the target device to provision it:
 
 ```bash
-$ curl -fsSL https://artifacts.alwaysai.co/device-agent/provision.sh | bash -s -- --email <email> --password <password> [--device-name <device_name>]
+$ curl -fsSL https://artifacts.alwaysai.co/device-agent/provision.sh | bash -s -- --email <email> --password <password> [--device-name <device_name>] [--pm2-overwrite] [--agent-tag <agent_tag>]
 ```
 
-Where:
-* `email` is the email associated with your alwaysAI account.
-* `password` is the password for your alwaysAI account.
-* `device_name` is an optional device name, which will be displayed on the
-  devices page of the alwaysAI Dashboard. If a device name is not provided, one
-  will be generated for you and logged to the console for reference.
+
+| Options         | Details                                                                                                                                                                                                                                  |
+|:----------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| --email         | [REQUIRED] The email associated with your alwaysAI account.                                                                                                                                                                              |
+| --password      | [REQUIRED] The password associated with your alwaysAI account                                                                                                                                                                            |
+| --device-name   | [OPTIONAL] A device name to be associated with this device. It will be displayed on the devices page of the alwaysAI Dashboard. If a device name is not provided, one will be generated for you and logged to the console for reference. |
+| --pm2-overwrite | [OPTIONAL] Overwrite any existing pm2 configuration with the latest provided by the script. The default   behavior is to leave existing pm2 configurations as-is.                                                                        |
+| --agent-tag     | [OPTIONAL] Select a specific release tag for the alwaysAI Device Agent. The default option is latest, which tracks the latest production release from alwaysAI.                                                                          |
+
 
 **Important note**: If your password contains one or more special characters and you receive an error message that your password does not match your username but you are sure that it is correctly entered, please try preceding every special character in your password with a backslash, and re-running the provisioning command. You can also reset your password at https://console.alwaysai.co/dashboard by logging out, navigating to the sign in page, and clicking '`Forgot Password?`'.
 
@@ -303,7 +305,6 @@ Subcommands:
    app uninstall         : Remove an alwaysAI app
    app show-models       : Show the application models
    app add-model         : Add a model to an alwaysAI app
-   app remove-model      : Remove a model from an alwaysAI app
    app get-all-envs      : Get environment variables for an application
    app set-env           : Set environment variables for a service
    app get-analytics-cfg : Get analytics configuration for an application
@@ -362,32 +363,11 @@ There are several ways to manage the models for your application.
 #### Update models to new version of the same model ID
 
 If a new version of a model is published for an existing model ID, and an
-application is already configured to be using that model ID, updating to the
+application is already configured to be using that model ID, updating the
 new model can simply be done with:
 
 ```bash
-$ aai-agent app stop --project <project_id>
-$ aai-agent app update-models --project <project_id>
-$ aai-agent app start --project <project_id>
-```
-
-#### Replace models for an application for new ID
-
-If you'd like to install an entirely new model to an application, replacing the
-model the app was originally configured with, run the following command:
-
-```bash
-$ aai-agent app stop --project <project_id>
-$ aai-agent app replace-models --project <project_id> --models <model_id_1> [<model_id_2> ...]
-$ aai-agent app start --project <project_id>
-```
-
-If you plan on using this method, you can make your application source model ID
-agnostic by providing the model ID to edgeIQ in the following way:
-
-Select the first model in the config list:
-```python
-obj_detect = edgeiq.ObjectDetection(edgeiq._globals.MODEL_ID_LIST[0])
+$ aai-agent app add-model --project <ProjectID> --model <ModelID> --version <ModelVersion>
 ```
 
 #### Manually download a model package

package/src/application-control/config.ts

@@ -6,13 +6,14 @@ import {
   requireAppInstalled,
   requireAppReady
 } from './utils';
-import { JsSpawner } from 'alwaysai/lib/util';
+import { JsSpawner, stringifyError } from 'alwaysai/lib/util';
 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';
 import { isAppStarted, restartApp } from './status';
 import { logger } from '../util/logger';
+import AaiError from '../util/aai-error';
 
 export async function readAppCfgFile(props: {
   projectId: string;
@@ -27,11 +28,9 @@ export async function readAppCfgFile(props: {
   try {
     return appJson.read();
   } catch (e) {
-    throw new Error(
-      `Error reading app config for ${projectId}:\n${
-        e.message
-      }\n${appJson.getErrors()}`
-    );
+    throw new AaiError(`Error reading app config for ${projectId}`, {
+      cause: appJson.getErrors()
+    });
   }
 }
 
@@ -45,11 +44,9 @@ export async function writeAppCfgFile(props: {
   try {
     appJson.write(appCfg);
   } catch (e) {
-    throw new Error(
-      `Error writing app config for ${projectId}:\n${
-        e.message
-      }\n${appJson.getErrors()}`
-    );
+    throw new AaiError(`Error writing app config for ${projectId}`, {
+      cause: appJson.getErrors()
+    });
   }
 }
 
@@ -124,7 +121,7 @@ export async function writeDockerCompose(props: {
   try {
     await compose.config({ cwd: appDir, configAsString: composeOutput });
   } catch (e) {
-    logger.error(JSON.stringify(e));
+    logger.error(stringifyError(e));
   }
   await spawner.writeFile('docker-compose.yaml', composeOutput);
 }

package/src/application-control/environment-variables.test.ts

@@ -91,6 +91,24 @@ describe('Test environment variable get and set', () => {
         edgeiq: { TEST3: '5', TEST4: '6' }
       });
     });
+    test('get all envs with one service and one cleared env', async () => {
+      const compose = {
+        services: {
+          alwaysai: {
+            environment: ['TEST=', 'TEST2=2']
+          }
+        }
+      };
+      jest.mocked(readDockerCompose).mockResolvedValue(compose);
+
+      const envVars = await getAllEnvs({ projectId: projectId1 });
+      expect(jest.mocked(readDockerCompose)).toBeCalledWith({
+        projectId: projectId1
+      });
+      expect(envVars).toEqual({
+        alwaysai: { TEST: '', TEST2: '2' }
+      });
+    });
   });
   describe('Test setEnv()', () => {
     test('Set one env', async () => {
@@ -126,7 +144,7 @@ describe('Test environment variable get and set', () => {
       };
       jest.mocked(readDockerCompose).mockResolvedValue(compose);
 
-      const envVars = { alwaysai: { TEST1: '2' } };
+      const envVars = { alwaysai: { TEST1: '2', TEST2: '2' } };
       await setEnv({ projectId: projectId1, envVars });
       expect(jest.mocked(readDockerCompose)).toBeCalledWith({
         projectId: projectId1
@@ -152,7 +170,10 @@ describe('Test environment variable get and set', () => {
       };
       jest.mocked(readDockerCompose).mockResolvedValue(compose);
 
-      const envVars = { alwaysai: { TEST1: '2' } };
+      const envVars = {
+        alwaysai: { TEST1: '2', TEST2: '4' },
+        other: { OTHER_TEST: '1' }
+      };
       await setEnv({ projectId: projectId1, envVars });
       expect(jest.mocked(readDockerCompose)).toBeCalledWith({
         projectId: projectId1
@@ -171,7 +192,7 @@ describe('Test environment variable get and set', () => {
         }
       });
     });
-    test('Remove one env', async () => {
+    test('Unset an envvar', async () => {
       const environment = ['TEST1=1', 'TEST2=2'];
       const compose = {
         services: {
@@ -180,7 +201,7 @@ describe('Test environment variable get and set', () => {
       };
       jest.mocked(readDockerCompose).mockResolvedValue(compose);
 
-      const envVars = { alwaysai: { TEST1: null } };
+      const envVars = { alwaysai: { TEST1: '', TEST2: '2' } };
       await setEnv({ projectId: projectId1, envVars });
       expect(jest.mocked(readDockerCompose)).toBeCalledWith({
         projectId: projectId1
@@ -190,7 +211,7 @@ describe('Test environment variable get and set', () => {
         dockerCompose: {
           services: {
             alwaysai: {
-              environment: ['TEST2=2']
+              environment: ['TEST1=', 'TEST2=2']
             }
           }
         }
@@ -199,12 +220,12 @@ describe('Test environment variable get and set', () => {
   });
   describe('Test helpers', () => {
     test('convertStringEnvsToKeyVal', () => {
-      const stringEnvs: string[] = ['TEST1=', 'TEST2=test2', 'TEST3=null'];
+      const stringEnvs: string[] = ['TEST1=', 'TEST2=test2', 'TEST3='];
       const envVars = convertStringEnvsToKeyVal(stringEnvs);
       expect(envVars).toEqual({
         TEST1: '',
         TEST2: 'test2',
-        TEST3: 'null'
+        TEST3: ''
       });
     });
   });

package/src/application-control/environment-variables.ts

@@ -4,13 +4,7 @@ import { buildApp, getAppDir, requireAppReady } from './utils';
 import { logger } from '../util/logger';
 import { AgentConfigFile } from '../infrastructure/agent-config';
 import { isAppStarted, restartApp } from './status';
-import { replaceFalseyWithNull } from '../util/parsing';
-
-export interface EnvVars {
-  [service: string]: {
-    [name: string]: string | null;
-  };
-}
+import { EnvVars } from '@alwaysai/device-agent-schemas';
 
 export async function setEnv(props: { projectId: string; envVars: EnvVars }) {
   const { projectId, envVars } = props;
@@ -28,44 +22,27 @@ export async function setEnv(props: { projectId: string; envVars: EnvVars }) {
     throw new Error(`Docker compose file for ${projectId} has no services!`);
   }
   const services: string[] = Object.keys(envVars);
-  for (const s of services) {
-    if (!Object.keys(composeParsed['services']).includes(s)) {
+  const composeServices = composeParsed['services'];
+
+  services.forEach((s) => {
+    if (!Object.keys(composeServices).includes(s)) {
       throw new Error(
-        `Service ${s} not found in ${JSON.stringify(
-          composeParsed['services'],
-          null,
-          2
-        )}`
+        `Service ${s} not found in ${JSON.stringify(composeServices, null, 2)}`
       );
     }
 
-    const service = composeParsed['services'][s];
-    const oldEnv: string[] | undefined = service['environment'];
+    const service = composeServices[s];
     const envVarsForService = envVars[s];
 
-    const newEnvVarsObj = {};
-    oldEnv?.forEach((envVarStr: string) => {
-      const envVarSplit = envVarStr.split('=');
-      const key = envVarSplit[0];
-      const value = envVarSplit[1];
-      if (envVarsForService[key] !== null) {
-        newEnvVarsObj[key] = value;
+    const envVarList: string[] = Object.keys(envVarsForService).map(
+      (envVar) => {
+        const value = envVarsForService[envVar];
+        return `${envVar}=${value}`;
       }
-    });
-
-    for (const envVar of Object.keys(envVarsForService)) {
-      if (envVarsForService[envVar] !== null) {
-        newEnvVarsObj[envVar] = envVarsForService[envVar];
-      }
-    }
-
-    const envVarList: string[] = [];
-    for (const envVar of Object.keys(newEnvVarsObj)) {
-      envVarList.push(`${envVar}=${newEnvVarsObj[envVar]}`);
-    }
+    );
 
     service['environment'] = envVarList;
-  }
+  });
 
   await writeDockerCompose({ projectId, dockerCompose: composeParsed });
 
@@ -138,9 +115,5 @@ export async function getAllEnvs(props: {
       }
     }
   }
-
-  // Device shadow needs null to delete
-  replaceFalseyWithNull(envVars, true);
-
   return envVars;
 }

package/src/application-control/index.ts

@@ -9,7 +9,7 @@ import {
   restartApp
 } from './status';
 import { ModelDetails } from './types';
-import { EnvVars, getAllEnvs, setEnv } from './environment-variables';
+import { getAllEnvs, setEnv } from './environment-variables';
 
 export {
   readAppCfgFile,
@@ -23,24 +23,11 @@ export {
   stopApp,
   restartApp,
   ModelDetails,
-  EnvVars,
   getAllEnvs,
   setEnv
 };
 
 // CLI-mode only
-import {
-  getAppModels,
-  removeModel,
-  replaceModels,
-  updateModels,
-  updateModelsWithPresignedUrls
-} from './models';
+import { getAppModels, updateModelsWithPresignedUrls } from './models';
 
-export {
-  getAppModels,
-  removeModel,
-  replaceModels,
-  updateModels,
-  updateModelsWithPresignedUrls
-};
+export { getAppModels, updateModelsWithPresignedUrls };

package/src/application-control/install.ts

@@ -2,8 +2,8 @@ import { rimraf } from 'rimraf';
 import * as fs from 'fs';
 import * as path from 'path';
 import { buildDockerImage } from 'alwaysai/lib/util/docker';
-import { JsSpawner, Spawner } from 'alwaysai/lib/util';
-import { getAppDir, downloadPackageUsingPresignedUrl, buildApp } from './utils';
+import { JsSpawner, Spawner, stringifyError } from 'alwaysai/lib/util';
+import { getAppDir, buildApp } from './utils';
 import { AppDetails } from '@alwaysai/device-agent-schemas';
 import { BACKUP_EXT } from './backup';
 import { startApp, stopApp, isAppStarted } from './status';
@@ -15,7 +15,7 @@ import {
   TargetJsonFile,
   appCleanDocker,
   getPythonVenvPaths,
-  installPythonVenv,
+  createPythonVenv,
   installPythonReqs
 } from 'alwaysai/lib/core/app';
 import { DOCKER_IMAGE_ID_INITIAL_VALUE } from 'alwaysai/lib/constants';
@@ -29,6 +29,7 @@ import {
   LOCAL_CONNECTION_ROUTING_KEY
 } from '../local-connection/constants';
 import { DOCKERFILE, PYTHON_REQUIREMENTS_FILE_NAME } from 'alwaysai/lib/paths';
+import { downloadToFile } from '../util/file';
 
 type SignedUrlPayloadType = {
   appInstallPayload: {
@@ -72,9 +73,11 @@ export async function installApp(props: {
       logger.info('Application currently running. Stopping...');
       try {
         await stopApp({ projectId });
-      } catch (error) {
+      } catch (e) {
         logger.error(
-          'Could not stop the application. Old container might still be present after installation.'
+          `Could not stop the application. Old container might still be present after installation.\n${stringifyError(
+            e
+          )}`
         );
       }
     }
@@ -96,9 +99,9 @@ export async function installApp(props: {
   // download app package
   const localDest = path.join(appDir, `${path.basename(appReleaseHash)}.tgz`);
   const { appSignedUrl } = signedUrlsPayload.appInstallPayload;
-  await downloadPackageUsingPresignedUrl({
-    localDest,
-    presignedUrl: appSignedUrl
+  await downloadToFile({
+    path: localDest,
+    url: appSignedUrl
   });
 
   // Unpack app package and remove tar file
@@ -176,7 +179,7 @@ async function installAppBuildReqs(props: { appDir: string }) {
 
       const targetSpawner = targetJsonFile.readContainerSpawner();
       const pythonVenvPaths = await getPythonVenvPaths({ targetCfg });
-      await installPythonVenv({ targetSpawner, pythonVenvPaths, logger });
+      await createPythonVenv({ targetSpawner, pythonVenvPaths, logger });
       if (await hostSpawner.exists(PYTHON_REQUIREMENTS_FILE_NAME)) {
         await installPythonReqs({
           reqFilePath: PYTHON_REQUIREMENTS_FILE_NAME,
@@ -236,7 +239,9 @@ export async function uninstallApp(props: {
     await stopApp({ projectId });
   } catch (e) {
     logger.warn(
-      `Failed to stop ${projectId}, may be left running...\n${e.message}`
+      `Failed to stop ${projectId}, may be left running...\n${stringifyError(
+        e
+      )}`
     );
   }
   await AgentConfigFile().setAppUninstalled({ projectId });

package/src/application-control/models.ts

@@ -1,29 +1,17 @@
 import { ModelInstallPayload } from '@alwaysai/device-agent-schemas';
-import {
-  appModelsAddComponent,
-  appModelsRemoveAllComponent,
-  appModelsRemoveComponent,
-  appModelsUpdateComponent
-} from 'alwaysai/lib/components/app';
 import { JsSpawner } from 'alwaysai/lib/util';
 import { logger } from '../util/logger';
 import { existsSync, createReadStream } from 'fs';
 import { join, dirname } from 'path';
 import { AgentConfigFile } from '../infrastructure/agent-config';
 import { copyDir } from '../util/copy-dir';
-import { runInDir } from '../util/run-in-dir';
 import { isAppStarted, restartApp } from './status';
 import { ModelDetails } from './types';
-import {
-  buildApp,
-  downloadPackageUsingPresignedUrl,
-  getAppDir,
-  requireAppReady
-} from './utils';
+import { buildApp, getAppDir, requireAppReady } from './utils';
 import { MODEL_JSON_FILE_NAME } from 'alwaysai/lib/core/model';
 import { writeAppCfgFile } from './config';
 import { APP_MODELS_DIRECTORY_NAME } from 'alwaysai/lib/paths';
-import { pruneDir } from '../util/file';
+import { downloadToFile, pruneDir } from '../util/file';
 import { AppConfig } from '@alwaysai/app-configuration-schemas';
 
 export async function getAppModels(props: { projectId: string }) {
@@ -48,75 +36,6 @@ export async function getAppModels(props: { projectId: string }) {
   return modelDetails;
 }
 
-export async function removeModel(props: {
-  projectId: string;
-  modelId: string;
-}) {
-  const { projectId, modelId } = props;
-  await requireAppReady({ projectId });
-
-  const appDir = getAppDir(projectId);
-
-  await runInDir(
-    appModelsRemoveComponent,
-    [
-      {
-        id: modelId,
-        purge: true,
-        removeFromProject: false
-      }
-    ],
-    appDir
-  );
-}
-
-export async function replaceModels(props: {
-  projectId: string;
-  modelIds: string[];
-}) {
-  const { projectId, modelIds } = props;
-  await requireAppReady({ projectId });
-
-  const appDir = getAppDir(projectId);
-
-  await runInDir(
-    appModelsRemoveAllComponent,
-    [
-      {
-        purge: true,
-        removeFromProject: false
-      }
-    ],
-    appDir
-  );
-  const modelsAddPromises: Promise<void>[] = [];
-  for (const modelId of modelIds) {
-    modelsAddPromises.push(
-      appModelsAddComponent({
-        yes: false,
-        dir: appDir,
-        id: modelId,
-        addToProject: false
-      })
-    );
-  }
-  await Promise.all(modelsAddPromises);
-
-  await buildApp({ appDir });
-}
-
-export async function updateModels(props: { projectId: string }) {
-  const { projectId } = props;
-  await requireAppReady({ projectId });
-
-  const appDir = getAppDir(projectId);
-  await appModelsUpdateComponent({
-    yes: false,
-    dir: appDir
-  });
-  await buildApp({ appDir });
-}
-
 export async function installModelsWithPresignedURLs(
   modelPayloads: ModelInstallPayload[],
   targetDir: string
@@ -130,9 +49,9 @@ export async function installModelsWithPresignedURLs(
       const modelDest = join(targetDir, payload.id);
       await spawner.mkdirp(modelDest);
       const localDest = join(modelDest, `${payload.version}.tar.gz`);
-      await downloadPackageUsingPresignedUrl({
-        localDest,
-        presignedUrl: payload.modelSignedUrl
+      await downloadToFile({
+        path: localDest,
+        url: payload.modelSignedUrl
       });
       await spawner.untar(createReadStream(localDest), dirname(modelDest));
       await updateModelJson(modelDest, (modelJson) => ({
@@ -222,7 +141,7 @@ export async function pruneModels(props: {
 }) {
   const { projectId, appCfg, path } = props;
 
-  const modelsPath = path || join(getAppDir(projectId), 'models');
+  const modelsPath = path ?? join(getAppDir(projectId), 'models');
 
   if (!existsSync(modelsPath)) {
     logger.error(