@alwaysai/device-agent 0.2.0 → 1.0.0

package/src/subcommands/app/models.ts

@@ -1,5 +1,6 @@
 import {
   CliLeaf,
+  CliNumberInput,
   CliStringArrayInput,
   CliStringInput
 } from '@alwaysai/alwayscli';
@@ -75,6 +76,49 @@ export const addModelCliLeaf = CliLeaf({
   }
 });
 
+export const installModelCliLeaf = CliLeaf({
+  name: 'install-model',
+  description: 'Install an alwaysAI model to a project',
+  namedInputs: {
+    project: CliStringInput({
+      description: 'Project ID',
+      required: true
+    }),
+    modelName: CliStringInput({
+      description: 'Model Name',
+      required: true
+    }),
+    modelVersion: CliNumberInput({
+      description: 'Model Version',
+      required: true
+    })
+  },
+  async action(_, opts) {
+    const { project, modelName, modelVersion } = opts;
+    const deviceAgent = new DeviceAgentCloudConnection();
+    await deviceAgent.setupHandlers();
+    const topic = deviceAgent.getShadowTopics().projects.getAccepted;
+    const newAppCfg = await readAppCfgFile({ projectId: project });
+    newAppCfg['models'][modelName] = modelVersion;
+
+    const message = {
+      state: {
+        delta: {
+          [project]: {
+            appConfig: JSON.stringify(newAppCfg)
+          }
+        }
+      },
+      clientToken: deviceAgent.getClientId()
+    };
+    await deviceAgent.handleMessage(topic, message);
+    while (deviceAgent.isCmdInProgress(project)) {
+      await sleep(1000);
+    }
+    await deviceAgent.stop();
+  }
+});
+
 export const removeModelCliLeaf = CliLeaf({
   name: 'remove-model',
   description: 'Remove a model from an alwaysAI app',

package/src/subcommands/app/status.ts

@@ -1,7 +1,7 @@
 import { CliLeaf, CliStringInput } from '@alwaysai/alwayscli';
 import {
   getAppLogs,
-  getAppStatus,
+  getAppState,
   restartApp,
   startApp,
   stopApp
@@ -19,7 +19,7 @@ export const getAppStatusCliLeaf = CliLeaf({
   },
   async action(_, opts) {
     const { project } = opts;
-    const appStatus = await getAppStatus({ projectId: project });
+    const appStatus = await getAppState({ projectId: project });
     logger.info(JSON.stringify(appStatus, null, 2));
   }
 });

package/src/subcommands/app/version.ts

@@ -1,5 +1,9 @@
 import { CliLeaf, CliStringInput } from '@alwaysai/alwayscli';
-import { ClientMessage, keyMirrors } from '@alwaysai/device-agent-schemas';
+import {
+  AppVersionControlMessage,
+  generateTxId,
+  keyMirrors
+} from '@alwaysai/device-agent-schemas';
 import { rollbackApp } from '../../application-control';
 import { DeviceAgentCloudConnection } from '../../cloud-connection/device-agent-cloud-connection';
 import { AgentConfigFile } from '../../infrastructure/agent-config';
@@ -33,16 +37,15 @@ export const installAppCliLeaf = CliLeaf({
     const deviceAgent = new DeviceAgentCloudConnection();
     await deviceAgent.setupHandlers();
     const topic = deviceAgent.getToDeviceTopic();
-    const message: ClientMessage = {
+    const message: AppVersionControlMessage = {
       timestamp: '',
       topic,
+      messageType: keyMirrors.toDeviceAgentMessageType.app_version_control,
+      txId: generateTxId(),
       payload: {
-        messageType: keyMirrors.clientMessageType.app_version_control,
-        appVersionControl: {
-          baseCommand: keyMirrors.appVersionControl.install,
-          projectId: project,
-          appReleaseHash: releaseHash
-        }
+        baseCommand: keyMirrors.appVersionControl.install,
+        projectId: project,
+        appReleaseHash: releaseHash
       }
     };
     await deviceAgent.handleMessage(topic, message);
@@ -67,15 +70,14 @@ export const uninstallAppCliLeaf = CliLeaf({
     const deviceAgent = new DeviceAgentCloudConnection();
     await deviceAgent.setupHandlers();
     const topic = deviceAgent.getToDeviceTopic();
-    const message: ClientMessage = {
+    const message: AppVersionControlMessage = {
       timestamp: '',
       topic,
+      messageType: keyMirrors.toDeviceAgentMessageType.app_version_control,
+      txId: generateTxId(),
       payload: {
-        messageType: keyMirrors.clientMessageType.app_version_control,
-        appVersionControl: {
-          baseCommand: keyMirrors.appVersionControl.uninstall,
-          projectId: project
-        }
+        baseCommand: keyMirrors.appVersionControl.uninstall,
+        projectId: project
       }
     };
     await deviceAgent.handleMessage(topic, message);

package/src/util/logger.ts

@@ -19,10 +19,14 @@ const transports = ALWAYSAI_LOG_TO_CONSOLE
 export const logger = winston.createLogger({
   level: LOG_LEVEL,
   format: winston.format.combine(
+    winston.format.timestamp(),
     winston.format.colorize(),
     winston.format.errors({ stack: true }),
     winston.format.splat(),
-    winston.format.simple()
+    winston.format.simple(),
+    winston.format.printf(({ timestamp = '', level = '', message = '' }) => {
+      return `[${timestamp}] ${level}: ${message}`;
+    })
   ),
   transports
 });