@miso.ai/server-sdk 0.6.3-beta.0 → 0.6.3-beta.2

package/cli/index.js

@@ -5,6 +5,7 @@ import upload from './upload.js';
 import del from './delete.js';
 import ids from './ids.js';
 import transform from './transform.js';
+import status from './status.js';
 
 const interactions = {
   command: 'interactions',
@@ -21,7 +22,8 @@ const products = {
   builder: yargs => _buildForApi(yargs)
     .command(upload('products'))
     .command(del('products'))
-    .command(ids('products')),
+    .command(ids('products'))
+    .command(status('products')),
 };
 
 const users = {
@@ -31,7 +33,8 @@ const users = {
   builder: yargs => _buildForApi(yargs)
     .command(upload('users'))
     .command(del('users'))
-    .command(ids('users')),
+    .command(ids('users'))
+    .command(status('users')),
 };
 
 const experiments = {
@@ -80,5 +83,9 @@ function _buildForApi(yargs) {
       type: 'array',
       coerce: yargs.coerceToArray,
     })
+    .option('debug', {
+      describe: 'Set log level to debug',
+      type: 'boolean',
+    })
     .demandOption(['key'], 'API key is required.');
 }

package/cli/status.js

@@ -0,0 +1,49 @@
+import split2 from 'split2';
+import { stream } from '@miso.ai/server-commons';
+import { MisoClient } from '../src/index.js';
+
+const build = type => yargs => {
+  return yargs;
+};
+
+const run = type => async ({
+  key,
+  server,
+  taskId,
+}) => {
+  const client = new MisoClient({ key, server });
+  if (taskId) {
+    runOne(client, type, taskId);
+  } else {
+    runStream(client, type, { key, server });
+  }
+};
+
+async function runOne(client, type, taskId) {
+  try {
+    console.log(await client.api[type].status(taskId));
+  } catch (err) {
+    console.error(err);
+    throw err;
+  }
+}
+
+async function runStream(client, type) {
+  await stream.pipeline([
+    process.stdin,
+    split2(),
+    client.api[type].statusStream(),
+    new stream.OutputStream({
+      objectMode: true,
+    }),
+  ]);
+}
+
+export default function(type) {
+  return {
+    command: 'status [taskId]',
+    description: false,
+    builder: build(type),
+    handler: run(type),
+  };
+}

package/cli/transform.js

@@ -1,10 +1,6 @@
-import { join } from 'path';
-import { Transform } from 'stream';
 import split2 from 'split2';
 import { stream } from '@miso.ai/server-commons';
 
-const PWD = process.env.PWD;
-
 function build(yargs) {
   return yargs
     .positional('file', {
@@ -14,7 +10,7 @@ function build(yargs) {
 }
 
 async function run({ file }) {
-  const transform = await getTransformStream(file);
+  const transform = await stream.getTransformStream(file);
   const streams = [
     process.stdin,
     split2(),
@@ -30,26 +26,6 @@ async function run({ file }) {
   await stream.pipeline(...streams);
 }
 
-async function getTransformStream(loc) {
-  const mod = await import(join(PWD, loc));
-  return mod.default ? new mod.default() : new Transform(normalizeOptions(mod));
-}
-
-function normalizeOptions({
-  objectMode,
-  readableObjectMode,
-  writableObjectMode,
-  ...options
-} = {}) {
-  readableObjectMode = readableObjectMode !== undefined ? readableObjectMode : objectMode !== undefined ? objectMode : true;
-  writableObjectMode = writableObjectMode !== undefined ? writableObjectMode : objectMode !== undefined ? objectMode : true;
-  return {
-    readableObjectMode,
-    writableObjectMode,
-    ...options
-  };
-}
-
 export default {
   command: 'transform [file]',
   alias: ['t'],

package/cli/upload.js

@@ -24,10 +24,6 @@ function build(yargs) {
       alias: ['bps'],
       describe: 'How many bytes to send per second',
     })
-    .option('debug', {
-      describe: 'Set log level to debug',
-      type: 'boolean',
-    })
     .option('progress', {
       alias: ['p'],
       describe: 'Set log format progress',
@@ -75,7 +71,6 @@ const run = type => async ({
     dryRun,
     params,
     heartbeatInterval: logFormat === logger.FORMAT.PROGRESS ? 250 : false,
-    //heartbeat: logFormat === logger.FORMAT.PROGRESS ? 250 : undefined,
     recordsPerRequest,
     bytesPerRequest,
     bytesPerSecond,

package/package.json

@@ -16,11 +16,11 @@
     "simonpai <simon.pai@askmiso.com>"
   ],
   "dependencies": {
-    "@miso.ai/server-commons": "0.6.3-beta.0",
+    "@miso.ai/server-commons": "0.6.3-beta.2",
     "axios": "^0.27.2",
     "dotenv": "^16.0.1",
     "split2": "^4.1.0",
     "yargs": "^17.5.1"
   },
-  "version": "0.6.3-beta.0"
+  "version": "0.6.3-beta.2"
 }

package/src/api/base.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import { upload, batchDelete, buildUrl } from './helpers.js';
 import UploadStream from '../stream/upload.js';
 import DeleteStream from '../stream/delete.js';
+import StatusStream from '../stream/status.js';
 
 export class Queries {
 
@@ -59,4 +60,13 @@ export class Entities extends Writable {
     return new DeleteStream(this._client, this._type, options);
   }
 
+  async status(taskId) {
+    const url = buildUrl(this._client, `${this._type}/_status/${taskId}`);
+    return (await axios.get(url)).data;
+  }
+
+  statusStream() {
+    return new StatusStream(this._client, this._type);
+  }
+
 }

package/src/stream/status.js

@@ -0,0 +1,45 @@
+import { Transform } from 'stream';
+
+export default class StatusStream extends Transform {
+
+  constructor(client, type) {
+    super({
+      objectMode: true,
+    });
+    this._client = client;
+    this._type = type;
+  }
+
+  async _transform(task_id, _) {
+    try {
+      this.push({
+        task_id,
+        ...(await this._client.api[this._type].status(task_id)),
+      });
+    } catch (err) {
+      this.push({
+        task_id,
+        errors: true,
+        error: summarizeError(err),
+      });
+    }
+  }
+
+}
+
+function summarizeError(error) {
+  if (error.response) {
+    const { status, data } = error.response;
+    return {
+      response: { status, data },
+    };
+  } else if (error.message) {
+    return {
+      message: error.message,
+    };
+  } else {
+    return {
+      message: `${error}`,
+    };
+  }
+}

package/src/stream/upload-sink.js

@@ -36,8 +36,8 @@ class ExperimentEventUploadSink extends UploadSink {
 
   async _execute(payload) {
     const { experimentId } = this._options;
-    const response = await this._client.api.experiments.uploadEvent(experimentId, payload);
-    return response.data;
+    const { data } = await this._client.api.experiments.uploadEvent(experimentId, payload);
+    return data;
   }
 
 }

package/src/version.js

@@ -1 +1 @@
-export default '0.6.3-beta.0';
+export default '0.6.3-beta.2';