@miso.ai/server-sdk 0.6.5-beta.9 → 0.6.6-beta.1

package/cli/upload.js

@@ -12,6 +12,10 @@ function build(yargs) {
       describe: 'Accept some lenient record schema',
       type: 'boolean',
     })
+    .option('requests-per-second', {
+      alias: ['rps'],
+      describe: 'How many requests to send per second',
+    })
     .option('records-per-request', {
       alias: ['rpr'],
       describe: 'How many records to send in a request',
@@ -47,6 +51,7 @@ const run = type => async ({
   param: params,
   ['dry-run']: dryRun,
   lenient,
+  ['requests-per-second']: requestsPerSecond,
   ['records-per-request']: recordsPerRequest,
   ['bytes-per-request']: bytesPerRequest,
   ['bytes-per-second']: bytesPerSecond,
@@ -71,6 +76,7 @@ const run = type => async ({
     dryRun,
     params,
     heartbeatInterval: logFormat === logger.FORMAT.PROGRESS ? 250 : false,
+    requestsPerSecond,
     recordsPerRequest,
     bytesPerRequest,
     bytesPerSecond,

package/cli/utils.js

@@ -1,3 +1,5 @@
+import { yargs as _yargs } from '@miso.ai/server-commons';
+
 export function buildForApi(yargs) {
   return yargs
     .option('key', {
@@ -12,7 +14,7 @@ export function buildForApi(yargs) {
       alias: ['v', 'var'],
       describe: 'Extra URL parameters',
       type: 'array',
-      coerce: yargs.coerceToArray,
+      coerce: _yargs.coerceToArray,
     })
     .option('debug', {
       describe: 'Set log level to debug',
@@ -28,8 +30,8 @@ export function buildForSearch(yargs) {
       describe: 'Filter query',
     })
     .option('fl', {
-      type: 'array',
-      coerce: yargs.coerceToArray,
+      type: 'string',
+      coerce: _yargs.coerceToArray,
       describe: 'Fields to return',
     })
     .option('rows', {

package/package.json

@@ -16,12 +16,12 @@
     "simonpai <simon.pai@askmiso.com>"
   ],
   "dependencies": {
-    "@miso.ai/server-commons": "0.6.5-beta.9",
+    "@miso.ai/server-commons": "0.6.6-beta.1",
     "axios": "^1.6.2",
     "axios-retry": "^4.5.0",
     "dotenv": "^16.0.1",
     "split2": "^4.1.0",
     "yargs": "^17.5.1"
   },
-  "version": "0.6.5-beta.9"
+  "version": "0.6.6-beta.1"
 }

package/src/axios.js

@@ -3,11 +3,15 @@ import axiosRetry from 'axios-retry';
 import version from './version.js';
 
 const DEFAULT_RETRY_OPTIONS = {
-  retries: 3,
-  retryDelay: count => count * 300,
+  retries: 5,
+  retryDelay: count => count * 500,
   retryCondition: (error) => {
-    // Only retry on 5xx server errors
-    return error.response && error.response.status >= 500 && error.response.status < 600;
+    if (!error.response) {
+      return false;
+    }
+    const { status } = error.response;
+    // Only retry on 5xx or 429 server errors
+    return (status >= 500 && status < 600) || status === 429;
   },
 };
 

package/src/stream/api-sink.js

@@ -1,10 +1,17 @@
 import { sink, trimObj } from '@miso.ai/server-commons';
 import ServiceStats from './service-stats.js';
 
+function shimOptions({ requestsPerSecond, ...options }) {
+  return {
+    ...options,
+    writesPerSecond: requestsPerSecond,
+  };
+}
+
 export default class ApiSink extends sink.BpsSink {
 
   constructor(client, options) {
-    super(options);
+    super(shimOptions(options));
     this._client = client;
     this._serviceStats = new ServiceStats();
   }

package/src/stream/upload.js

@@ -15,6 +15,7 @@ export default class UploadStream extends stream.BufferedWriteStream {
     dryRun,
     params,
     experimentId,
+    requestsPerSecond,
     recordsPerSecond,
     bytesPerSecond,
     // buffer
@@ -38,6 +39,7 @@ export default class UploadStream extends stream.BufferedWriteStream {
       dryRun,
       params,
       experimentId,
+      requestsPerSecond,
       recordsPerSecond,
       bytesPerSecond,
     });

package/src/version.js

@@ -1 +1 @@
-export default '0.6.5-beta.9';
+export default '0.6.6-beta.1';