@alwaysai/device-agent 1.3.1 → 1.5.0

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;
@@ -89,14 +89,19 @@ export async function replaceModels(props: {
     ],
     appDir
   );
+  const modelsAddPromises: Promise<void>[] = [];
   for (const modelId of modelIds) {
-    await appModelsAddComponent({
-      yes: false,
-      dir: appDir,
-      id: modelId,
-      addToProject: false
-    });
+    modelsAddPromises.push(
+      appModelsAddComponent({
+        yes: false,
+        dir: appDir,
+        id: modelId,
+        addToProject: false
+      })
+    );
   }
+  await Promise.all(modelsAddPromises);
+
   await buildApp({ appDir });
 }
 
@@ -122,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
@@ -173,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);
@@ -206,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 === '') {
@@ -126,20 +129,19 @@ export async function getAppLogs(props: {
 
   const appDir = getAppDir(projectId);
 
-  const serviceList = services
-    ? services
-    : await (async function () {
-        const composeServices = await compose.configServices({ cwd: appDir });
-        return composeServices.data.services;
-      })();
+  const serviceList =
+    services ||
+    (await (async function () {
+      const composeServices = await compose.configServices({ cwd: appDir });
+      return composeServices.data.services;
+    })());
 
-  const argsList = args ? args : [];
+  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';