@alwaysai/device-agent 0.0.8 → 0.0.10

package/lib/application-control/backup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../src/application-control/backup.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,UAAU,SAAS,CAAC;AAEjC,wBAAsB,eAAe,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAQjE;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAa7D"}
+{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../src/application-control/backup.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,UAAU,SAAS,CAAC;AAEjC,wBAAsB,eAAe,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAQjE;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAe7D"}

package/lib/application-control/backup.js

@@ -22,6 +22,8 @@ async function rollbackApp(props) {
     if (!config) {
         throw new Error(`Backup doesn't exist for ${projectId}`);
     }
+    console.log(`Rolling back app ${projectId} to ${config.version}`);
+    await (0, agent_config_1.AgentConfigFile)().setAppInstalling({ projectId, version: config.version });
     const appDir = (0, utils_1.getAppDir)(projectId);
     const backupAppDir = `${appDir}${exports.BACKUP_EXT}`;
     rimraf.sync(appDir);

package/lib/application-control/backup.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/application-control/backup.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAEjC,+CAA2C;AAC3C,mCAA8C;AAC9C,iEAAiE;AAEpD,QAAA,UAAU,GAAG,MAAM,CAAC;AAE1B,KAAK,UAAU,eAAe,CAAC,KAA4B;IAChE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,GAAG,MAAM,GAAG,kBAAU,EAAE,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1B,MAAM,IAAA,kBAAO,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3D,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,iBAAiB,SAAS,OAAO,YAAY,EAAE,CAAC,CAAC;AAC/D,CAAC;AARD,0CAQC;AAEM,KAAK,UAAU,WAAW,CAAC,KAA4B;IAC5D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,EAAE,CAAC,CAAC;KAC1D;IACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,GAAG,MAAM,GAAG,kBAAU,EAAE,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,IAAA,kBAAO,EAAC,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3D,MAAM,IAAA,gBAAQ,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3B,MAAM,IAAA,8BAAe,GAAE,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAChF,OAAO,CAAC,GAAG,CAAC,mBAAmB,SAAS,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AACnE,CAAC;AAbD,kCAaC"}
+{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/application-control/backup.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAEjC,+CAA2C;AAC3C,mCAA8C;AAC9C,iEAAiE;AAGpD,QAAA,UAAU,GAAG,MAAM,CAAC;AAE1B,KAAK,UAAU,eAAe,CAAC,KAA4B;IAChE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,GAAG,MAAM,GAAG,kBAAU,EAAE,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1B,MAAM,IAAA,kBAAO,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3D,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,iBAAiB,SAAS,OAAO,YAAY,EAAE,CAAC,CAAC;AAC/D,CAAC;AARD,0CAQC;AAEM,KAAK,UAAU,WAAW,CAAC,KAA4B;IAC5D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,EAAE,CAAC,CAAC;KAC1D;IACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,SAAS,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAClE,MAAM,IAAA,8BAAe,GAAE,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,GAAG,MAAM,GAAG,kBAAU,EAAE,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,IAAA,kBAAO,EAAC,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3D,MAAM,IAAA,gBAAQ,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3B,MAAM,IAAA,8BAAe,GAAE,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAChF,OAAO,CAAC,GAAG,CAAC,mBAAmB,SAAS,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AACnE,CAAC;AAfD,kCAeC"}

package/lib/application-control/config.d.ts

@@ -0,0 +1,17 @@
+import { AppConfig } from 'alwaysai/lib/core/app';
+export declare function readAppCfg(props: {
+    projectId: string;
+}): Promise<AppConfig>;
+export declare function writeAppCfg(props: {
+    projectId: string;
+    appCfg: AppConfig;
+}): Promise<void>;
+export declare function updateAppConfig(appDir: string, newAppCfg: AppConfig): Promise<void>;
+export declare function readDockerCompose(props: {
+    projectId: string;
+}): Promise<any>;
+export declare function writeDockerCompose(props: {
+    projectId: string;
+    dockerCompose: any;
+}): Promise<void>;
+//# sourceMappingURL=config.d.ts.map

package/lib/application-control/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/application-control/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAe,MAAM,uBAAuB,CAAC;AAQ/D,wBAAsB,UAAU,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAQjF;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,iBAQhF;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,iBAIzE;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,gBAUnE;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,GAAG,CAAC;CACpB,iBAWA"}

package/lib/application-control/config.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeDockerCompose = exports.readDockerCompose = exports.updateAppConfig = exports.writeAppCfg = exports.readAppCfg = void 0;
+const app_1 = require("alwaysai/lib/core/app");
+const agent_config_1 = require("../infrastructure/agent-config");
+const yaml_1 = require("yaml");
+const utils_1 = require("./utils");
+const util_1 = require("alwaysai/lib/util");
+const docker_compose_1 = require("docker-compose");
+const lodash_1 = require("lodash");
+async function readAppCfg(props) {
+    const { projectId } = props;
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
+        throw new Error(`App ${projectId} is not ready!`);
+    }
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    const appJson = (0, app_1.AppJsonFile)(appDir);
+    return appJson.read();
+}
+exports.readAppCfg = readAppCfg;
+async function writeAppCfg(props) {
+    const { projectId, appCfg } = props;
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
+        throw new Error(`App ${projectId} is not ready!`);
+    }
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    const appJson = (0, app_1.AppJsonFile)(appDir);
+    appJson.write(appCfg);
+}
+exports.writeAppCfg = writeAppCfg;
+async function updateAppConfig(appDir, newAppCfg) {
+    const existingAppCfg = await readAppCfg({ projectId: appDir });
+    const appCfg = (0, lodash_1.assign)(existingAppCfg, (0, lodash_1.merge)(existingAppCfg, newAppCfg));
+    await writeAppCfg({ projectId: appDir, appCfg });
+}
+exports.updateAppConfig = updateAppConfig;
+async function readDockerCompose(props) {
+    const { projectId } = props;
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
+        throw new Error(`App ${projectId} is not ready!`);
+    }
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    const spawner = (0, util_1.JsSpawner)({ path: appDir });
+    const composeContents = await spawner.readFile('docker-compose.yaml');
+    const composeParsed = (0, yaml_1.parse)(composeContents);
+    return composeParsed;
+}
+exports.readDockerCompose = readDockerCompose;
+async function writeDockerCompose(props) {
+    const { projectId, dockerCompose } = props;
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
+        throw new Error(`App ${projectId} is not ready!`);
+    }
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    const spawner = (0, util_1.JsSpawner)({ path: appDir });
+    const composeOutput = (0, yaml_1.stringify)(dockerCompose);
+    // Validate new contents
+    await docker_compose_1.default.config({ cwd: appDir, configAsString: composeOutput });
+    await spawner.writeFile('docker-compose.yaml', composeOutput);
+}
+exports.writeDockerCompose = writeDockerCompose;
+//# sourceMappingURL=config.js.map

package/lib/application-control/config.js.map

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

package/lib/application-control/environment-variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment-variables.d.ts","sourceRoot":"","sources":["../../src/application-control/environment-variables.ts"],"names":[],"mappings":"AAMA,wBAAsB,MAAM,CAAC,KAAK,EAAE;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,iBAkCA;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,eAiC5D"}
+{"version":3,"file":"environment-variables.d.ts","sourceRoot":"","sources":["../../src/application-control/environment-variables.ts"],"names":[],"mappings":"AAOA,wBAAsB,MAAM,CAAC,KAAK,EAAE;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,iBA4BA;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,eAgC5D"}

package/lib/application-control/environment-variables.js

@@ -2,19 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllEnvs = exports.setEnv = void 0;
 const util_1 = require("alwaysai/lib/util");
-const docker_compose_1 = require("docker-compose");
-const yaml_1 = require("yaml");
 const agent_config_1 = require("../infrastructure/agent-config");
+const config_1 = require("./config");
 const utils_1 = require("./utils");
 async function setEnv(props) {
     const { projectId, vars } = props;
     if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
         throw new Error(`App ${projectId} is not ready!`);
     }
-    const appDir = (0, utils_1.getAppDir)(projectId);
-    const spawner = (0, util_1.JsSpawner)({ path: appDir });
-    const composeContents = await spawner.readFile('docker-compose.yaml');
-    const composeParsed = (0, yaml_1.parse)(composeContents);
+    const composeParsed = await (0, config_1.readDockerCompose)({ projectId });
     if ('services' in composeParsed) {
         let services = Object.keys(composeParsed['services']);
         if (props.service) {
@@ -38,10 +34,7 @@ async function setEnv(props) {
             }
         }
     }
-    const composeOutput = (0, yaml_1.stringify)(composeParsed);
-    // Validate new contents
-    await docker_compose_1.default.config({ cwd: appDir, configAsString: composeOutput });
-    await spawner.writeFile('docker-compose.yaml', composeOutput);
+    await (0, config_1.writeDockerCompose)({ projectId, dockerCompose: composeParsed });
 }
 exports.setEnv = setEnv;
 async function getAllEnvs(props) {
@@ -52,8 +45,7 @@ async function getAllEnvs(props) {
     const appDir = (0, utils_1.getAppDir)(projectId);
     const spawner = (0, util_1.JsSpawner)({ path: appDir });
     const envVars = {};
-    const composeContents = await spawner.readFile('docker-compose.yaml');
-    const composeParsed = (0, yaml_1.parse)(composeContents);
+    const composeParsed = await (0, config_1.readDockerCompose)({ projectId });
     if ('services' in composeParsed) {
         const services = Object.keys(composeParsed['services']);
         for (const s of services) {

package/lib/application-control/environment-variables.js.map

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

package/lib/application-control/index.d.ts

@@ -1,9 +1,10 @@
+import { readAppCfg, writeAppCfg, readDockerCompose, writeDockerCompose } from './config';
 import { installApp, uninstallApp } from './install';
 import { rollbackApp } from './backup';
 import { listAppReleases, listAppLatestRelease, getAppStatus, startApp, getAppLogs, stopApp, restartApp } from './status';
 import { ModelDetails } from './types';
 import { getAllEnvs, setEnv } from './environment-variables';
-export { installApp, uninstallApp, rollbackApp, listAppReleases, listAppLatestRelease, getAppStatus, startApp, getAppLogs, stopApp, restartApp, ModelDetails, getAllEnvs, setEnv, };
+export { readAppCfg, writeAppCfg, readDockerCompose, writeDockerCompose, installApp, uninstallApp, rollbackApp, listAppReleases, listAppLatestRelease, getAppStatus, startApp, getAppLogs, stopApp, restartApp, ModelDetails, getAllEnvs, setEnv, };
 import { addModel, getAppModels, removeModel, replaceModels, updateModels } from './models';
 export { addModel, getAppModels, removeModel, replaceModels, updateModels };
 //# sourceMappingURL=index.d.ts.map

package/lib/application-control/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACV,YAAY,EACZ,UAAU,EACV,MAAM,GACP,CAAC;AAGF,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EACL,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACV,YAAY,EACZ,UAAU,EACV,MAAM,GACP,CAAC;AAGF,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC"}

package/lib/application-control/index.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateModels = exports.replaceModels = exports.removeModel = exports.getAppModels = exports.addModel = exports.setEnv = exports.getAllEnvs = exports.restartApp = exports.stopApp = exports.getAppLogs = exports.startApp = exports.getAppStatus = exports.listAppLatestRelease = exports.listAppReleases = exports.rollbackApp = exports.uninstallApp = exports.installApp = void 0;
+exports.updateModels = exports.replaceModels = exports.removeModel = exports.getAppModels = exports.addModel = exports.setEnv = exports.getAllEnvs = exports.restartApp = exports.stopApp = exports.getAppLogs = exports.startApp = exports.getAppStatus = exports.listAppLatestRelease = exports.listAppReleases = exports.rollbackApp = exports.uninstallApp = exports.installApp = exports.writeDockerCompose = exports.readDockerCompose = exports.writeAppCfg = exports.readAppCfg = void 0;
+const config_1 = require("./config");
+Object.defineProperty(exports, "readAppCfg", { enumerable: true, get: function () { return config_1.readAppCfg; } });
+Object.defineProperty(exports, "writeAppCfg", { enumerable: true, get: function () { return config_1.writeAppCfg; } });
+Object.defineProperty(exports, "readDockerCompose", { enumerable: true, get: function () { return config_1.readDockerCompose; } });
+Object.defineProperty(exports, "writeDockerCompose", { enumerable: true, get: function () { return config_1.writeDockerCompose; } });
 const install_1 = require("./install");
 Object.defineProperty(exports, "installApp", { enumerable: true, get: function () { return install_1.installApp; } });
 Object.defineProperty(exports, "uninstallApp", { enumerable: true, get: function () { return install_1.uninstallApp; } });

package/lib/application-control/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AAenD,2FAfO,oBAAU,OAeP;AACV,6FAhBmB,sBAAY,OAgBnB;AAfd,qCAAuC;AAgBrC,4FAhBO,oBAAW,OAgBP;AAfb,qCAQkB;AAQhB,gGAfA,wBAAe,OAeA;AACf,qGAfA,6BAAoB,OAeA;AACpB,6FAfA,qBAAY,OAeA;AACZ,yFAfA,iBAAQ,OAeA;AACR,2FAfA,mBAAU,OAeA;AACV,wFAfA,gBAAO,OAeA;AACP,2FAfA,mBAAU,OAeA;AAZZ,mEAA6D;AAc3D,2FAdO,kCAAU,OAcP;AACV,uFAfmB,8BAAM,OAenB;AAGR,gBAAgB;AAChB,qCAMkB;AAET,yFAPP,iBAAQ,OAOO;AAAE,6FANjB,qBAAY,OAMiB;AAAE,4FAL/B,oBAAW,OAK+B;AAAE,8FAJ5C,sBAAa,OAI4C;AAAE,6FAH3D,qBAAY,OAG2D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":";;;AAAA,qCAA0F;AAgBxF,2FAhBO,mBAAU,OAgBP;AACV,4FAjBmB,oBAAW,OAiBnB;AACX,kGAlBgC,0BAAiB,OAkBhC;AACjB,mGAnBmD,2BAAkB,OAmBnD;AAlBpB,uCAAqD;AAmBnD,2FAnBO,oBAAU,OAmBP;AACV,6FApBmB,sBAAY,OAoBnB;AAnBd,qCAAuC;AAoBrC,4FApBO,oBAAW,OAoBP;AAnBb,qCAQkB;AAYhB,gGAnBA,wBAAe,OAmBA;AACf,qGAnBA,6BAAoB,OAmBA;AACpB,6FAnBA,qBAAY,OAmBA;AACZ,yFAnBA,iBAAQ,OAmBA;AACR,2FAnBA,mBAAU,OAmBA;AACV,wFAnBA,gBAAO,OAmBA;AACP,2FAnBA,mBAAU,OAmBA;AAhBZ,mEAA6D;AAkB3D,2FAlBO,kCAAU,OAkBP;AACV,uFAnBmB,8BAAM,OAmBnB;AAGR,gBAAgB;AAChB,qCAMkB;AAET,yFAPP,iBAAQ,OAOO;AAAE,6FANjB,qBAAY,OAMiB;AAAE,4FAL/B,oBAAW,OAK+B;AAAE,8FAJ5C,sBAAa,OAI4C;AAAE,6FAH3D,qBAAY,OAG2D"}

package/lib/application-control/install.d.ts

@@ -1,20 +1,22 @@
 import { AppDetailsPacket } from '@alwaysai/device-agent-schemas';
+declare type SignedUrlPayloadType = {
+    appInstallPayload: {
+        appSignedUrl: string;
+    };
+    modelsInstallPayload: {
+        id: string;
+        version: number;
+        modelSignedUrl: string;
+    }[];
+};
 export declare function getInstalledApps(): Promise<AppDetailsPacket[]>;
 export declare function installApp(props: {
     projectId: string;
     appReleaseHash: string;
-    signedUrlsPayload?: {
-        appInstallPayload: {
-            appSignedUrl: string;
-        };
-        modelsInstallPayload: {
-            id: string;
-            version: number;
-            modelSignedUrl: string;
-        }[];
-    };
+    signedUrlsPayload?: SignedUrlPayloadType;
 }): Promise<void>;
 export declare function uninstallApp(props: {
     projectId: string;
 }): Promise<void>;
+export {};
 //# sourceMappingURL=install.d.ts.map

package/lib/application-control/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/application-control/install.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,gCAAgC,CAAC;AAMvF,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAQpE;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE;QAClB,iBAAiB,EAAE;YACjB,YAAY,EAAE,MAAM,CAAC;SACtB,CAAC;QACF,oBAAoB,EAAE;YACpB,EAAE,EAAE,MAAM,CAAC;YACX,OAAO,EAAE,MAAM,CAAC;YAChB,cAAc,EAAE,MAAM,CAAC;SACxB,EAAE,CAAC;KACL,CAAC;CACH,GAAG,OAAO,CAAC,IAAI,CAAC,CAkFhB;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/application-control/install.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,gCAAgC,CAAC;AAoBvF,aAAK,oBAAoB,GAAG;IAC1B,iBAAiB,EAAE;QACjB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,oBAAoB,EAAE;QACpB,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL,CAAC;AAEF,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAQpE;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,oBAAoB,CAAC;CAC1C,GAAG,OAAO,CAAC,IAAI,CAAC,CA4EhB;AA6DD,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E"}

package/lib/application-control/install.js

@@ -9,7 +9,14 @@ const utils_1 = require("./utils");
 const backup_1 = require("./backup");
 const status_1 = require("./status");
 const agent_config_1 = require("../infrastructure/agent-config");
-const run_cli_cmd_1 = require("../util/run-cli-cmd");
+const project_1 = require("alwaysai/lib/core/project");
+const app_1 = require("alwaysai/lib/core/app");
+const app_2 = require("alwaysai/lib/components/app");
+const app_install_component_1 = require("alwaysai/lib/components/app/app-install-component");
+const constants_1 = require("alwaysai/lib/constants");
+const release_1 = require("alwaysai/lib/components/release");
+const run_in_dir_1 = require("../util/run-in-dir");
+const models_1 = require("./models");
 async function getInstalledApps() {
     const apps = await (0, agent_config_1.AgentConfigFile)().getApps();
     const appDetails = [];
@@ -28,9 +35,8 @@ async function installApp(props) {
         if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
             throw new Error('Application already has installation in progress!');
         }
-        await (0, agent_config_1.AgentConfigFile)().setAppInstalling({ projectId, version: appReleaseHash });
         console.log('Application is already installed, updating');
-        await (0, backup_1.createAppBackup)({ projectId });
+        await (0, agent_config_1.AgentConfigFile)().setAppInstalling({ projectId, version: appReleaseHash });
         await spawner.rimraf(appDir);
     }
     else {
@@ -40,60 +46,92 @@ async function installApp(props) {
     // download app package
     const localDest = path.join(appDir, `${path.basename(appReleaseHash)}.tgz`);
     if (!signedUrlsPayload) {
-        await (0, run_cli_cmd_1.runCliCmd)({
-            cmd: [
-                'release',
-                'pull',
-                '--yes',
-                '--project',
-                projectId,
-                '--releaseHash',
-                appReleaseHash,
-            ],
-            cwd: appDir,
-        });
+        await (0, run_in_dir_1.runInDir)(release_1.appReleasePullComponent, [
+            {
+                yes: true,
+                project: projectId,
+                releaseHash: appReleaseHash,
+            },
+        ], appDir);
     }
     else {
         const { appSignedUrl } = signedUrlsPayload.appInstallPayload;
         await (0, utils_1.downloadPackageUsingPresignedUrl)({ localDest, presignedUrl: appSignedUrl });
     }
     // Unpack app package and remove tar file
-    await spawner.untar(fs.createReadStream(localDest), appDir);
-    await spawner.rimraf(localDest);
-    // write target json
-    await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: ['app', 'configure', '--yes', '--protocol', 'docker:', '--skip-model-sync'],
-        cwd: appDir,
-    });
+    await unPackApp({ spawner, localDest, appDir });
+    // The following changes replace the runCliCmd for 'app configure'
+    // This part replaces findOrWriteProjectJsonFile() due to the
+    // calls that check the user is logged in and also for project collaboration
+    // NOTE: this process no longer checks project collaboration
+    await checkValidProjectFiles({ appDir });
     // install models, python venv, and docker image
     if (!signedUrlsPayload) {
-        await (0, run_cli_cmd_1.runCliCmd)({
-            cmd: ['app', 'install', '--yes', '--clean', '--pull'],
-            cwd: appDir,
-        });
+        await (0, run_in_dir_1.runInDir)(app_install_component_1.appInstallComponent, [
+            {
+                yes: true,
+                pull: true,
+                clean: true,
+                skipModels: false,
+                source: false,
+            },
+        ], appDir);
     }
     else {
-        await (0, run_cli_cmd_1.runCliCmd)({
-            cmd: ['app', 'install', '--yes', '--clean', '--pull', '--skip-models'],
-            cwd: appDir,
-        });
-        await Promise.all(signedUrlsPayload.modelsInstallPayload.map(async (payload) => {
-            const modelDest = `${appDir}/models/${payload.id}`;
-            await spawner.mkdirp(modelDest);
-            const localDest = `${modelDest}/${payload.version}.tar.gz`;
-            await (0, utils_1.downloadPackageUsingPresignedUrl)({
-                localDest,
-                presignedUrl: payload.modelSignedUrl,
-            });
-            await spawner.untar(fs.createReadStream(localDest), path.dirname(modelDest));
-            await spawner.rimraf(localDest);
-        }));
+        await installAppBuildReqs({ appDir });
+        await (0, models_1.installModelsWithPresignedURLs)(signedUrlsPayload.modelsInstallPayload, path.join(appDir, 'models'));
     }
     await (0, utils_1.buildApp)({ appDir });
     await (0, agent_config_1.AgentConfigFile)().setAppInstalled({ projectId, version: appReleaseHash });
     console.log(`Installed app version ${appReleaseHash} from project ${projectId} to ${appDir}.`);
 }
 exports.installApp = installApp;
+async function installAppBuildReqs(props) {
+    const { appDir } = props;
+    const targetJsonFile = (0, app_1.TargetJsonFile)(appDir);
+    const targetJson = targetJsonFile.readIfExists();
+    if (!targetJson) {
+        throw new Error('Target json file does not exist!');
+    }
+    await (0, run_in_dir_1.runInDir)(async () => {
+        const targetHostSpawner = targetJsonFile.readHostSpawner();
+        await (0, app_2.appCleanDockerComponent)({ targetHostSpawner });
+        await (0, app_2.buildDocker)({
+            targetJson,
+            targetJsonFile,
+            targetHostSpawner,
+            pull: true,
+        });
+        await (0, app_install_component_1.installVenv)({
+            targetJson,
+            sourceSpawner: targetHostSpawner,
+            targetJsonFile,
+        });
+    }, [], appDir);
+}
+async function unPackApp(props) {
+    const { spawner, localDest, appDir } = props;
+    await spawner.untar(fs.createReadStream(localDest), appDir);
+    await spawner.rimraf(localDest);
+}
+async function checkValidProjectFiles({ appDir }) {
+    if (!(0, project_1.ProjectJsonFile)(appDir).readIfExists()) {
+        throw new Error('Project JSON file does not exist!');
+    }
+    // check for app json file and app.py files
+    if (!(0, app_1.AppJsonFile)(appDir).readIfExists()) {
+        throw new Error('App JSON file does not exist!');
+    }
+    // write target json
+    if (!fs.existsSync(path.join(appDir, constants_1.DOCKERFILE))) {
+        throw new Error('No Dockerfile found for application!');
+    }
+    (0, app_1.TargetJsonFile)(appDir).write({
+        targetProtocol: 'docker:',
+        dockerImageId: constants_1.DOCKER_IMAGE_ID_INITIAL_VALUE,
+        targetHardware: await (0, app_1.getTargetHardwareType)({}),
+    });
+}
 async function uninstallApp(props) {
     const { projectId } = props;
     if (!(await (0, agent_config_1.AgentConfigFile)().isAppPresent({ projectId }))) {

package/lib/application-control/install.js.map

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

package/lib/application-control/models.d.ts

@@ -1,3 +1,4 @@
+import { ModelInstallPayload } from '@alwaysai/device-agent-schemas';
 import { ModelDetails } from './types';
 export declare function getAppModels(props: {
     projectId: string;
@@ -17,4 +18,6 @@ export declare function replaceModels(props: {
 export declare function updateModels(props: {
     projectId: string;
 }): Promise<void>;
+export declare function installModelsWithPresignedURLs(modelPayloads: ModelInstallPayload[], targetDir: string): Promise<void>;
+export declare function updateModelsWithPresignedUrls(project: string, modelInstallPayloads: ModelInstallPayload[]): Promise<void>;
 //# sourceMappingURL=models.d.ts.map

package/lib/application-control/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/application-control/models.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGvC,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,2BAoB9D;AAED,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAU3E;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAS9E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,iBAgBnF;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAU9D"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/application-control/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAgBjF,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAQvC,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,2BAoB9D;AAED,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAY3E;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAiB9E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,iBAyBnF;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAU9D;AAED,wBAAsB,8BAA8B,CAClD,aAAa,EAAE,mBAAmB,EAAE,EACpC,SAAS,EAAE,MAAM,iBAgBlB;AAED,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,MAAM,EACf,oBAAoB,EAAE,mBAAmB,EAAE,iBAoD5C"}

package/lib/application-control/models.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateModels = exports.replaceModels = exports.removeModel = exports.addModel = exports.getAppModels = void 0;
+exports.updateModelsWithPresignedUrls = exports.installModelsWithPresignedURLs = exports.updateModels = exports.replaceModels = exports.removeModel = exports.addModel = exports.getAppModels = void 0;
+const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
+const app_1 = require("alwaysai/lib/components/app");
 const util_1 = require("alwaysai/lib/util");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const agent_config_1 = require("../infrastructure/agent-config");
-const run_cli_cmd_1 = require("../util/run-cli-cmd");
+const copy_dir_1 = require("../util/copy-dir");
+const run_in_dir_1 = require("../util/run-in-dir");
+const status_1 = require("./status");
 const utils_1 = require("./utils");
 async function getAppModels(props) {
     const { projectId } = props;
@@ -32,9 +36,11 @@ async function addModel(props) {
     const { projectId, modelId } = props;
     await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
-    await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: ['app', 'models', 'add', modelId],
-        cwd: appDir,
+    await (0, app_1.appModelsAddComponent)({
+        yes: false,
+        dir: appDir,
+        id: modelId,
+        addToProject: false,
     });
     await (0, utils_1.buildApp)({ appDir });
 }
@@ -43,24 +49,31 @@ async function removeModel(props) {
     const { projectId, modelId } = props;
     await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
-    await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: ['app', 'models', 'remove', modelId, '--purge'],
-        cwd: appDir,
-    });
+    await (0, run_in_dir_1.runInDir)(app_1.appModelsRemoveComponent, [
+        {
+            id: modelId,
+            purge: true,
+            removeFromProject: false,
+        },
+    ], appDir);
 }
 exports.removeModel = removeModel;
 async function replaceModels(props) {
     const { projectId, modelIds } = props;
     await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
-    await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: ['app', 'models', 'remove-all', '--purge'],
-        cwd: appDir,
-    });
+    await (0, run_in_dir_1.runInDir)(app_1.appModelsRemoveAllComponent, [
+        {
+            purge: true,
+            removeFromProject: false,
+        },
+    ], appDir);
     for (const modelId of modelIds) {
-        await (0, run_cli_cmd_1.runCliCmd)({
-            cmd: ['app', 'models', 'add', modelId],
-            cwd: appDir,
+        await (0, app_1.appModelsAddComponent)({
+            yes: false,
+            dir: appDir,
+            id: modelId,
+            addToProject: false,
         });
     }
     await (0, utils_1.buildApp)({ appDir });
@@ -70,11 +83,71 @@ async function updateModels(props) {
     const { projectId } = props;
     await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
-    await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: ['app', 'models', 'update'],
-        cwd: appDir,
+    await (0, app_1.appModelsUpdateComponent)({
+        yes: false,
+        dir: appDir,
     });
     await (0, utils_1.buildApp)({ appDir });
 }
 exports.updateModels = updateModels;
+async function installModelsWithPresignedURLs(modelPayloads, targetDir) {
+    const spawner = (0, util_1.JsSpawner)();
+    await Promise.all(modelPayloads.map(async (payload) => {
+        const modelDest = `${targetDir}/${payload.id}`;
+        await spawner.mkdirp(modelDest);
+        const localDest = `${modelDest}/${payload.version}.tar.gz`;
+        await (0, utils_1.downloadPackageUsingPresignedUrl)({
+            localDest,
+            presignedUrl: payload.modelSignedUrl,
+        });
+        await spawner.untar((0, fs_1.createReadStream)(localDest), (0, path_1.dirname)(modelDest));
+        await spawner.rimraf(localDest);
+    }));
+}
+exports.installModelsWithPresignedURLs = installModelsWithPresignedURLs;
+async function updateModelsWithPresignedUrls(project, modelInstallPayloads) {
+    // create temp dir with all untouched models
+    const spawner = (0, util_1.JsSpawner)();
+    const appDir = (0, utils_1.getAppDir)(project);
+    const ogDir = `${appDir}/models`;
+    const tmpDir = `${ogDir}.tmp`;
+    const restoreDir = `${ogDir}.restore`;
+    await (0, copy_dir_1.copyDir)({ srcPath: ogDir, destPath: restoreDir });
+    await spawner.rimraf(tmpDir);
+    try {
+        // Move unchanged models
+        const existingModels = await getAppModels({ projectId: project });
+        for (const model of existingModels) {
+            if (!modelInstallPayloads
+                .map((newModel) => newModel.id)
+                .includes(model.modelId)) {
+                // model does not need to be updated
+                await (0, copy_dir_1.copyDir)({
+                    srcPath: `${ogDir}/${model.modelId}`,
+                    destPath: `${tmpDir}/${model.modelId}`,
+                });
+            }
+        }
+        // install model packages
+        await installModelsWithPresignedURLs(modelInstallPayloads, tmpDir);
+        await spawner.rimraf(ogDir);
+        await (0, copy_dir_1.copyDir)({ srcPath: tmpDir, destPath: ogDir });
+        await spawner.rimraf(tmpDir);
+        await (0, utils_1.buildApp)({ appDir: (0, utils_1.getAppDir)(project) });
+        const appStatus = await (0, status_1.getAppStatus)({ projectId: project });
+        const appIsRunning = appStatus.services.length &&
+            appStatus.services[0].state !== device_agent_schemas_1.keyMirrors.appState.stopped;
+        if (appIsRunning) {
+            (0, status_1.restartApp)({ projectId: project });
+        }
+        console.log(`Models installed for project ${project}`);
+    }
+    catch (e) {
+        console.error(e, 'Error updating app models from presigned URL, restoring models.');
+        await spawner.rimraf(tmpDir);
+        await spawner.rimraf(ogDir);
+        await (0, copy_dir_1.copyDir)({ srcPath: restoreDir, destPath: ogDir });
+    }
+}
+exports.updateModelsWithPresignedUrls = updateModelsWithPresignedUrls;
 //# sourceMappingURL=models.js.map