@alwaysai/device-agent 0.0.6 → 0.0.8

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

@@ -0,0 +1 @@
+{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../src/util/sleep.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAAE,EAAE,MAAM,oBAIvC"}

package/lib/util/sleep.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function sleep(ms) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}
+exports.default = sleep;
+//# sourceMappingURL=sleep.js.map

package/lib/util/sleep.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../src/util/sleep.ts"],"names":[],"mappings":";;AAAA,SAAwB,KAAK,CAAC,EAAU;IACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,wBAIC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -31,7 +31,7 @@
   "dependencies": {
     "@alwaysai/alwayscli": "0.3.1",
     "@alwaysai/config-nodejs": "0.1.0",
-    "@alwaysai/device-agent-schemas": "0.0.3",
+    "@alwaysai/device-agent-schemas": "0.0.9",
     "@carnesen/coded-error": "0.4.0",
     "@types/mkdirp": "1.0.2",
     "@types/pump": "1.1.1",
@@ -39,7 +39,7 @@
     "@types/signal-exit": "3.0.1",
     "@types/tar": "6.1.1",
     "ajv": "8.11.0",
-    "alwaysai": "1.8.0",
+    "alwaysai": "1.9.0",
     "aws-iot-device-sdk": "2.2.12",
     "docker-compose": "0.23.17",
     "express": "4.17.3",
@@ -60,6 +60,7 @@
     "@alwaysai/tsconfig": "0.0.1",
     "@alwaysai/tslint-config": "0.0.4",
     "@carnesen/run-and-catch": "0.4.3",
+    "@types/destroy": "1.0.0",
     "@types/jest": "27.0.3",
     "@types/node": "16.11.12",
     "@types/sinon": "10.0.6",

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

@@ -10,7 +10,7 @@ export async function setEnv(props: {
   service?: string;
 }) {
   const { projectId, vars } = props;
-  if (!AgentConfigFile().isAppReady({ projectId })) {
+  if (!(await AgentConfigFile().isAppReady({ projectId }))) {
     throw new Error(`App ${projectId} is not ready!`);
   }
   const appDir = getAppDir(projectId);
@@ -46,7 +46,7 @@ export async function setEnv(props: {
 
 export async function getAllEnvs(props: { projectId: string }) {
   const { projectId } = props;
-  if (!AgentConfigFile().isAppReady({ projectId })) {
+  if (!(await AgentConfigFile().isAppReady({ projectId }))) {
     throw new Error(`App ${projectId} is not ready!`);
   }
   const appDir = getAppDir(projectId);

package/src/application-control/install.ts

@@ -1,19 +1,17 @@
 import * as rimraf from 'rimraf';
 import * as fs from 'fs';
 import * as path from 'path';
-import nodeFetch, { Response } from 'node-fetch';
 import { JsSpawner } from 'alwaysai/lib/util';
-
-import { runCliCmd } from '../util/run-cli-cmd';
-import { buildApp, getAppDir } from './utils';
-import { AppDetails } from '@alwaysai/device-agent-schemas';
+import { getAppDir, downloadPackageUsingPresignedUrl, buildApp } from './utils';
+import { AppDetailsPacket, ModelInstallPayload } from '@alwaysai/device-agent-schemas';
 import { BACKUP_EXT, createAppBackup } from './backup';
 import { stopApp } from './status';
 import { AgentConfigFile } from '../infrastructure/agent-config';
+import { runCliCmd } from '../util/run-cli-cmd';
 
-export async function getInstalledApps(): Promise<AppDetails[]> {
+export async function getInstalledApps(): Promise<AppDetailsPacket[]> {
   const apps = await AgentConfigFile().getApps();
-  const appDetails: AppDetails[] = [];
+  const appDetails: AppDetailsPacket[] = [];
   for (const app of apps) {
     const { projectId, version } = app;
     appDetails.push({ projectId, version });
@@ -21,54 +19,41 @@ export async function getInstalledApps(): Promise<AppDetails[]> {
   return appDetails;
 }
 
-export type InstallAppProps = {
+export async function installApp(props: {
   projectId: string;
-  releaseHash: string;
-  presignedAppUrl?: string;
-};
-
-export async function installAppPackage({ localDest, presignedUrl }): Promise<void> {
-  const response = await nodeFetch(presignedUrl);
-  if (response.status !== 200) {
-    // If the URL is invalid; I think we shouldn't get here with the new changes
-    throw new Error(
-      `Status Code: ${response.status}, ${response.statusText}. Response: ${response.body}`,
-    );
-  }
+  appReleaseHash: string;
+  signedUrlsPayload?: {
+    appInstallPayload: {
+      appSignedUrl: string;
+    };
+    modelsInstallPayload: {
+      id: string;
+      version: number;
+      modelSignedUrl: string;
+    }[];
+  };
+}): Promise<void> {
+  const { projectId, appReleaseHash, signedUrlsPayload } = props;
 
-  /**
-   * Write the app package to the hash directory
-   */
-  const stream = response.body.pipe(fs.createWriteStream(localDest));
-  await new Promise((resolve, reject) => {
-    stream.on('finish', resolve);
-    stream.on('error', reject);
-  });
-}
-
-export async function installApp(props: InstallAppProps): Promise<void> {
-  const { projectId, releaseHash, presignedAppUrl } = props;
   const appDir = getAppDir(projectId);
   const spawner = JsSpawner();
   if (await AgentConfigFile().isAppPresent({ projectId })) {
     if (!(await AgentConfigFile().isAppReady({ projectId }))) {
       throw new Error('Application already has installation in progress!');
     }
-    await AgentConfigFile().setAppInstalling({ projectId, version: releaseHash });
+    await AgentConfigFile().setAppInstalling({ projectId, version: appReleaseHash });
     console.log('Application is already installed, updating');
     await createAppBackup({ projectId });
     await spawner.rimraf(appDir);
   } else {
-    await AgentConfigFile().setAppInstalling({ projectId, version: releaseHash });
+    await AgentConfigFile().setAppInstalling({ projectId, version: appReleaseHash });
   }
 
-  /**
-   * Prep directory and fetch the app package
-   */
   await spawner.mkdirp(appDir);
-  const localDest = path.join(appDir, `${path.basename(releaseHash)}.tgz`);
-  if (!presignedAppUrl) {
-    // Download the application using the CLI
+
+  // download app package
+  const localDest = path.join(appDir, `${path.basename(appReleaseHash)}.tgz`);
+  if (!signedUrlsPayload) {
     await runCliCmd({
       cmd: [
         'release',
@@ -77,33 +62,58 @@ export async function installApp(props: InstallAppProps): Promise<void> {
         '--project',
         projectId,
         '--releaseHash',
-        releaseHash,
+        appReleaseHash,
       ],
       cwd: appDir,
     });
   } else {
-    await installAppPackage({ localDest, presignedUrl: presignedAppUrl });
+    const { appSignedUrl } = signedUrlsPayload.appInstallPayload;
+    await downloadPackageUsingPresignedUrl({ localDest, presignedUrl: appSignedUrl });
   }
 
-  /**
-   * Unpack app package
-   */
+  // Unpack app package and remove tar file
   await spawner.untar(fs.createReadStream(localDest), appDir);
-  console.log(`Unpacked application to ${appDir}`);
+  await spawner.rimraf(localDest);
+
+  // write target json
+  await runCliCmd({
+    cmd: ['app', 'configure', '--yes', '--protocol', 'docker:', '--skip-model-sync'],
+    cwd: appDir,
+  });
+
+  // install models, python venv, and docker image
+  if (!signedUrlsPayload) {
+    await runCliCmd({
+      cmd: ['app', 'install', '--yes', '--clean', '--pull'],
+      cwd: appDir,
+    });
+  } else {
+    await runCliCmd({
+      cmd: ['app', 'install', '--yes', '--clean', '--pull', '--skip-models'],
+      cwd: appDir,
+    });
+    await Promise.all(
+      signedUrlsPayload.modelsInstallPayload.map(async (payload: ModelInstallPayload) => {
+        const modelDest = `${appDir}/models/${payload.id}`;
+        await spawner.mkdirp(modelDest);
+        const localDest = `${modelDest}/${payload.version}.tar.gz`;
+        await downloadPackageUsingPresignedUrl({
+          localDest,
+          presignedUrl: payload.modelSignedUrl,
+        });
+        await spawner.untar(fs.createReadStream(localDest), path.dirname(modelDest));
+        await spawner.rimraf(localDest);
+      }),
+    );
+  }
 
-  /**
-   * Build app
-   * ToDo: migrate the model pull to use MQTT workflow
-   */
   await buildApp({ appDir });
 
-  /**
-   * Remove tar file
-   */
-  await spawner.rimraf(localDest);
+  await AgentConfigFile().setAppInstalled({ projectId, version: appReleaseHash });
 
-  await AgentConfigFile().setAppInstalled({ projectId, version: releaseHash });
-  console.log(`Installed ${projectId} to ${appDir}`);
+  console.log(
+    `Installed app version ${appReleaseHash} from project ${projectId} to ${appDir}.`,
+  );
 }
 
 export async function uninstallApp(props: { projectId: string }): Promise<void> {

package/src/application-control/models.ts

@@ -1,6 +1,7 @@
 import { JsSpawner } from 'alwaysai/lib/util';
 import { existsSync } from 'fs';
 import { join } from 'path';
+import { AgentConfigFile } from '../infrastructure/agent-config';
 
 import { runCliCmd } from '../util/run-cli-cmd';
 import { ModelDetails } from './types';
@@ -8,7 +9,9 @@ import { buildApp, getAppDir, requireAppInstalled } from './utils';
 
 export async function getAppModels(props: { projectId: string }) {
   const { projectId } = props;
-  await requireAppInstalled({ projectId });
+  if (!(await AgentConfigFile().isAppPresent({ projectId }))) {
+    throw new Error('Application is not installed');
+  }
 
   const appDir = getAppDir(projectId);
   const appCfgPath = join(appDir, 'alwaysai.app.json');

package/src/application-control/status.ts

@@ -4,7 +4,12 @@ import { JsSpawner } from 'alwaysai/lib/util';
 
 import { runDockerLogin } from '../docker/docker-cmd';
 import { getAppDir, requireAppInstalled } from './utils';
-import { AppStateValue, ServiceStatus, AppState } from '@alwaysai/device-agent-schemas';
+import {
+  ServiceStatusPacket,
+  AppStatePacket,
+  keyMirrors,
+  AppStateValue,
+} from '@alwaysai/device-agent-schemas';
 import { AgentConfigFile } from '../infrastructure/agent-config';
 
 export async function listAppReleases(props: { projectId: string }) {
@@ -22,7 +27,9 @@ export async function listAppLatestRelease(props: { projectId: string }) {
   return undefined;
 }
 
-export async function getAppStatus(props: { projectId: string }): Promise<AppState> {
+export async function getAppStatus(props: {
+  projectId: string;
+}): Promise<AppStatePacket> {
   const { projectId } = props;
   if (!(await AgentConfigFile().isAppPresent({ projectId }))) {
     throw new Error('Application is not installed');
@@ -49,7 +56,7 @@ export async function getAppStatus(props: { projectId: string }): Promise<AppSta
     );
   }
 
-  const services: ServiceStatus[] = [];
+  const services: ServiceStatusPacket[] = [];
   const spawner = JsSpawner({ path: appDir });
   for (const name of composeServices.data.services) {
     // Get container name for service
@@ -60,7 +67,7 @@ export async function getAppStatus(props: { projectId: string }): Promise<AppSta
     });
     if (containerId === '') {
       // The service was not yet started or failed to start
-      services.push({ name, state: 'Stopped' });
+      services.push({ name, state: keyMirrors.appState.stopped });
     } else {
       const slashContainerName = await spawner.run({
         exe: 'docker',
@@ -75,14 +82,14 @@ export async function getAppStatus(props: { projectId: string }): Promise<AppSta
         }
         let state: AppStateValue;
         if (container.state.includes('Up')) {
-          state = 'Up';
+          state = keyMirrors.appState.up;
         } else if (
           container.state.includes('Stopped') ||
           container.state.includes('Exit')
         ) {
-          state = 'Stopped';
+          state = keyMirrors.appState.stopped;
         } else if (container.state.includes('Restarting')) {
-          state = 'Restarting';
+          state = keyMirrors.appState.restarting;
         } else {
           throw new Error(`Unknown state for service! (${container.state})`);
         }
@@ -106,8 +113,9 @@ export async function getAppStatus(props: { projectId: string }): Promise<AppSta
 export async function getAppLogs(props: {
   projectId: string;
   services?: string[];
+  args?: string[];
 }): Promise<NodeJS.ReadableStream> {
-  const { projectId, services } = props;
+  const { projectId, services, args } = props;
   await requireAppInstalled({ projectId });
 
   const appDir = getAppDir(projectId);
@@ -119,10 +127,12 @@ export async function getAppLogs(props: {
         return composeServices.data.services;
       })();
 
+  const argsList = args ? args : [];
+
   // Use direct command with spawner in order to get a readable stream
   return await JsSpawner().runStreaming({
     exe: 'docker-compose',
-    args: ['logs', '-f', ...serviceList],
+    args: ['logs', '-f', ...argsList, ...serviceList],
     cwd: appDir,
   });
 }

package/src/application-control/utils.ts

@@ -5,6 +5,7 @@ import { AAI_DIR } from 'alwaysai/lib/constants';
 
 import { runCliCmd } from '../util/run-cli-cmd';
 import { AgentConfigFile } from '../infrastructure/agent-config';
+import nodeFetch from 'node-fetch';
 
 export const APP_ROOT = path.join(AAI_DIR, 'applications');
 const DOCKER_COMPOSE_FILENAME = 'docker-compose.yaml';
@@ -26,11 +27,7 @@ export async function requireAppInstalled(props: { projectId: string }) {
 
 export async function buildApp(props: { appDir: string }) {
   const { appDir } = props;
-  await runCliCmd({
-    cmd: ['app', 'configure', '--yes', '--protocol', 'docker:', '--skip-model-sync'],
-    cwd: appDir,
-  });
-  await runCliCmd({ cmd: ['app', 'install', '--yes', '--clean', '--pull'], cwd: appDir });
+  console.log(appDir);
 
   // Build standalone image and docker-compose
   if (!fs.existsSync(path.join(appDir, DOCKER_COMPOSE_FILENAME))) {
@@ -41,9 +38,32 @@ export async function buildApp(props: { appDir: string }) {
   }
 
   const buildOut = await compose.buildAll({ cwd: appDir });
+  console.log(buildOut);
   if (buildOut.exitCode !== 0) {
     throw new Error(
       `Failed to build application! stdout=${buildOut.out} stderr=${buildOut.err}`,
     );
   }
 }
+
+export async function downloadPackageUsingPresignedUrl({
+  localDest,
+  presignedUrl,
+}): Promise<void> {
+  const response = await nodeFetch(presignedUrl);
+  if (response.status !== 200) {
+    // If the URL is invalid; I think we shouldn't get here with the new changes
+    throw new Error(
+      `Status Code: ${response.status}, ${response.statusText}. Response: ${response.body}`,
+    );
+  }
+
+  /**
+   * Write the app package to the hash directory
+   */
+  const stream = response.body.pipe(fs.createWriteStream(localDest));
+  await new Promise((resolve, reject) => {
+    stream.on('finish', resolve);
+    stream.on('error', reject);
+  });
+}