WIP finalize import

Author: naglepuff

client/platform/desktop/backend/native/viame.ts

@@ -10,6 +10,7 @@ import {
 import { cleanString } from 'platform/desktop/sharedUtils';
 import { serialize } from 'platform/desktop/backend/serializers/viame';
 import { observeChild } from 'platform/desktop/backend/native/processManager';
+import sendToRenderer from 'platform/desktop/background';
 
 import { MultiType, stereoPipelineMarker, multiCamPipelineMarkers } from 'dive-common/constants';
 import * as common from './common';
@@ -130,13 +131,8 @@ async function runPipeline(
   }
 
   if (runPipelineArgs.pipeline.type === 'filter') {
-    // Create a subdirectory within the working directory to store output images
-    const outputDirectoryName = npath.join(jobWorkDir, 'output');
-    if (!fs.existsSync(outputDirectoryName)) {
-      await fs.mkdir(outputDirectoryName);
-    }
-    command.push(`-s kwa_writer:output_directory="${outputDirectoryName}"`);
-    command.push(`-s image_writer:file_name_prefix="${outputDirectoryName}/"`);
+    command.push(`-s kwa_writer:output_directory="${jobWorkDir}/"`);
+    command.push(`-s image_writer:file_name_prefix="${jobWorkDir}/"`);
   }
   if (runPipelineArgs.pipeline.type === 'transcode') {
     command.push(`-s video_writer:video_filename="${npath.join(jobWorkDir, `${datasetId}.mp4`)}"`);
@@ -216,6 +212,23 @@ async function runPipeline(
     });
   });
 
+  if (runPipelineArgs.pipeline.type === 'filter') {
+    job.on('exit', async (code) => {
+      if (code === 0) {
+        // Ingest the output into a new dataset
+        updater({
+          ...jobBase,
+          body: ['Creating dataset from output...'],
+          exitCode: code,
+          endTime: new Date(),
+        });
+        const importPayload = await common.beginMediaImport(jobWorkDir);
+        const conversionJobArgs = await common.finalizeMediaImport(settings, importPayload);
+        sendToRenderer('filter-complete', conversionJobArgs.meta);
+      }
+    });
+  }
+
   return jobBase;
 }
 

client/platform/desktop/background.ts

@@ -133,3 +133,9 @@ if (process.platform === 'win32') {
     cleanup();
   });
 }
+
+export default function sendToRenderer(channel: string, payload?: unknown) {
+  if (win) {
+    win.webContents.send(channel, payload);
+  }
+}

client/platform/desktop/constants.ts

@@ -170,6 +170,7 @@ export interface RunPipeline extends JobArgs {
   type: JobType.RunPipeline;
   datasetId: string;
   pipeline: Pipe;
+  outputDatasetName?: string;
 }
 
 export interface ExportTrainedPipeline extends JobArgs {

client/platform/desktop/frontend/store/jobs.ts

@@ -15,9 +15,11 @@ import {
   JobType,
   RunPipeline,
   RunTraining,
+  JsonMeta,
 } from 'platform/desktop/constants';
 import AsyncGpuJobQueue from './queues/asyncGpuJobQueue';
 import AsyncCpuJobQueue from './queues/asyncCpuJobQueue';
+import { setRecents } from './dataset';
 
 interface DesktopJobHistory {
   job: DesktopJob;
@@ -94,6 +96,9 @@ function init() {
       ...args, body: ['Job cancelled by user'], exitCode: cancelledJobExitCode, endTime: new Date(), cancelledJob: true,
     });
   });
+  ipcRenderer.on('filter-complete', (event, args: JsonMeta) => {
+    setRecents(args);
+  });
 }
 
 init();