@corva/create-app 0.54.0-2 → 0.54.0-rc.0

package/lib/flows/lib/api.js

@@ -172,10 +172,11 @@ export class Api {
    * @param {string} wellId
    * @param {string[]} appDatasetsNames
    * @param {string} streamId
+   * @param {number} appConnectionId
    *
    * @returns  {object}
    */
-  async queueAppRun(appId, version, interval, wellId, appDatasetsNames, streamId) {
+  async queueAppRun(appId, version, interval, wellId, appDatasetsNames, streamId, appConnectionId) {
     const json = {
       app_run: {
         app_stream_id: streamId,
@@ -189,6 +190,7 @@ export class Api {
           start: 0,
         },
       },
+      app_connection_id: appConnectionId,
     };
 
     if (interval) {

package/lib/flows/steps/rerun/create-task.js

@@ -18,17 +18,21 @@ export const CREATE_TASK_STEP = {
     api,
     version,
     interval,
-    CORVA_API_ENV,
+    corvaUrl,
   }) => {
     if (!assets.length) {
       logger.write(`\n\n${chalk.yellow.bold('There is no asset ID to create a new task')}`);
     }
 
+    logger.write(`\n    ${corvaUrl}/dev-center/apps/${app.id}/runner`);
+
     let i = 1;
 
     for (const assetId of assets) {
       const wellId = mappedAssetsToWells.get(parseInt(assetId)).id;
-      const streamId = mappedAssetsToStreams.get(parseInt(assetId)).id;
+      const stream = mappedAssetsToStreams.get(parseInt(assetId));
+      const streamId = stream.id;
+      const connectedApps = stream.app_connections.filter((connectedApp) => connectedApp.app_id === Number(app.id));
 
       if (!wellId || !streamId) {
         logger.write(
@@ -41,23 +45,22 @@ export const CREATE_TASK_STEP = {
       }
 
       try {
-        const result = await api
-          .queueAppRun(app.id, version, interval, wellId, appDatasetsNames, streamId)
-          .catch((e) => {
-            console.log(e.response.body);
+        for (const connectedApp of connectedApps) {
+          const extraNotification = connectedApps.length > 1 ? `(connected app ID ${connectedApp.id})` : '';
+          const result = await api
+            .queueAppRun(app.id, version, interval, wellId, appDatasetsNames, stream.id, connectedApp.id)
+            .catch((e) => {
+              console.log(e.response.body);
 
-            throw e;
-          });
+              throw e;
+            });
 
-        logger.write(
-          `\n    ${i}. Created a new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(assetId)}`,
-        );
+          logger.write(`
+            \n${i}/${assets.length}. Re-run ID ${chalk.yellow(
+            result.id,
+          )} for the asset - ${corvaUrl}/assets/${assetId} ${extraNotification}`);
+        }
 
-        logger.write(
-          `\n    Task link - https://app${
-            CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`
-          }corva.ai/dev-center/apps/${app.id}/runner`,
-        );
         i++;
       } catch (e) {
         logger.write(

package/lib/flows/steps/rerun/ensure-that-app-in-stream.js

@@ -9,11 +9,11 @@ export const ENSURE_APP_IN_STREAM_TASK_STEP = {
    * @param {object} context
    */
   fn: async (context) => {
-    const { mappedAssetsToStreams, app, api, manifest } = context;
+    const { mappedAssetsToStreams, app, api, manifest, corvaUrl } = context;
 
     await Promise.all(
       [...mappedAssetsToStreams].map(([assetId, stream]) => {
-        return ensureAppIsInTheStream(assetId, stream, app.id, api, manifest);
+        return ensureAppIsInTheStream(assetId, stream, app.id, api, manifest, corvaUrl);
       }),
     );
 
@@ -29,16 +29,27 @@ export const ENSURE_APP_IN_STREAM_TASK_STEP = {
  * @param {string} appId
  * @param {import('../lib/api').Api} api
  * @param {object} manifest
+ * @param {string} corvaUrl
  *
  * @returns {void}
  */
-const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) => {
-  const connectedApp = stream.app_connections.find((connection) => connection.app_id === parseInt(appId));
+const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest, corvaUrl) => {
+  const connectedApps = stream.app_connections.filter((connection) => connection.app_id === parseInt(appId));
+
+  if (connectedApps.length) {
+    if (connectedApps.length > 1) {
+      logger.write(
+        `\n\n${chalk.black.underline.bold(
+          `Attention, this app connected to the stream more than once: ${corvaUrl}/config/streams/${stream.id}, Asset ID: ${assetId}. Logic will make a rerun per each app`,
+        )}`,
+      );
+
+      return;
+    }
 
-  if (connectedApp) {
     logger.write(
       `\n\n${chalk.black.underline.bold(
-        `App has been already connected to the stream ID: ${stream.id}, for asset ID: ${assetId}`,
+        `App has been already connected to the stream: ${corvaUrl}/config/streams/${stream.id}, Asset ID: ${assetId}`,
       )}`,
     );
 
@@ -49,7 +60,7 @@ const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) =>
 
   logger.write(
     `\n\n${chalk.black.underline.bold(
-      `Added app to the stream, connect ID - ${chalk.green(newConnection.id)}, for asset ID: ${assetId}`,
+      `Added app to the stream: ${corvaUrl}/config/streams/${stream.id} App: ${corvaUrl}/config/streams/${stream.id}/apps/${newConnection.id}, Asset ID: ${assetId}`,
     )}`,
   );
 };

package/lib/flows/steps/rerun/prepare-data.js

@@ -9,7 +9,7 @@ const MAX_ASSET_IDS_COUNT = 300;
 export const PREPARE_DATA_TASK_STEP = {
   message: 'Preparing and checking data...',
   fn: async (context) => {
-    const { manifest, options, api } = context;
+    const { manifest, options, api, CORVA_API_ENV } = context;
     let { assets, interval, companyId } = options;
 
     if (companyId) {
@@ -51,8 +51,11 @@ export const PREPARE_DATA_TASK_STEP = {
       }
     }
 
+    const corvaUrl = `https://app${CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`}corva.ai`;
+
     return {
       assets,
+      corvaUrl,
       app,
       options,
       manifest,

package/lib/flows/steps/rerun/prepare-well-and-stream-data.js

@@ -152,7 +152,7 @@ const prepareWellAndStreamData = async (assets, api, manifest) => {
       const streams = await api.getStreamsByAssetIds([assetId], manifest.manifest.application.segments);
 
       if (!streams || !streams.length) {
-        throw new Error(`Could not found streams for asset ID - ${assetId}`);
+        throw new Error(`Could not found streams in Complete status for the asset ID - ${assetId}`);
       }
 
       const stream = await getStreamWithPrompt(streams);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.54.0-2",
+  "version": "0.54.0-rc.0",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [