@miso.ai/client-sdk-core 1.10.3 → 1.10.4-beta.0

package/dist/cjs/api/ask.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _commons = require("@miso.ai/commons");
 var _base = _interopRequireDefault(require("./base.js"));
-const _excluded = ["pollingInterval", "signal", "stallTimeout"];
+var _iterable = require("./iterable.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 const {
   GROUP,
   NAME
@@ -19,18 +18,18 @@ class Ask extends _base.default {
   }
   async questions(payload) {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if (typeof payload === 'string' && payload.charAt(0) !== '{') {
-      return new Answer(this, {
-        question_id: payload
-      }, options);
+    if (isId(payload)) {
+      return new Answer(this, payload, options);
     }
-    const response = await this._run(NAME.QUESTIONS, payload, options);
-    return new Answer(this, response, options);
+    const {
+      question_id
+    } = await this._run(NAME.QUESTIONS, payload, options);
+    return new Answer(this, question_id, options);
   }
   async _questions(payload, options) {
     return this._run(NAME.QUESTIONS, payload, options);
   }
-  async _get(questionId, options) {
+  async _questionGet(questionId, options) {
     return this._run(`${NAME.QUESTIONS}/${questionId}/answer`, undefined, Object.assign({}, options, {
       method: 'GET'
     }));
@@ -39,63 +38,40 @@ class Ask extends _base.default {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return this._run(NAME.RELATED_QUESTIONS, payload, options);
   }
+  async search(payload) {
+    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    const response = await this._run(NAME.SEARCH, payload, options);
+    return response.question_id ? new SearchResult(this, response, options) : response;
+  }
+  async _searchGet(questionId, options) {
+    return this._run(`${NAME.SEARCH}/${questionId}/answer`, undefined, Object.assign({}, options, {
+      method: 'GET'
+    }));
+  }
 }
 exports.default = Ask;
-class Answer {
-  constructor(api, _ref) {
-    let {
-      question_id
-    } = _ref;
+class Answer extends _iterable.IdBasedIterableApiStub {
+  constructor(api, questionId) {
     let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    this._api = api;
-    this._questionId = question_id;
-    this._ac = new AbortController();
-    this._options = options;
+    super(api, '_questionGet', questionId, options);
   }
   get questionId() {
-    return this._questionId;
-  }
-  async get(options) {
-    return this._api._get(this._questionId, Object.assign({}, this._options, options));
+    return this._id;
   }
-  abort(reason) {
-    this._ac.abort(reason);
+}
+class SearchResult extends _iterable.IdBasedIterableApiStub {
+  constructor(api, response) {
+    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    super(api, '_searchGet', response.question_id, options);
+    (0, _commons.defineValues)(this, response);
+    this._response = response;
   }
-  [Symbol.asyncIterator]() {
-    var _this = this;
-    const fetch = async function () {
-      let {
-        signal
-      } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      // TODO: pass signal
-      const response = await _this.get();
-      return [response, response.finished, response.revision];
-    };
-    let _this$_options = this._options,
-      {
-        pollingInterval: interval,
-        signal,
-        stallTimeout = 120000
-      } = _this$_options,
-      options = _objectWithoutPropertiesLoose(_this$_options, _excluded);
-    const stac = new _commons.StallTimeoutAbortController(stallTimeout);
-    signal = _commons.signals.any(this._ac.signal, stac.signal, signal);
-    let prevResponse;
-    const onResponse = (response, finished) => {
-      if (finished) {
-        stac.clear();
-      } else if (isUpdated(prevResponse, response)) {
-        stac.touch();
-      }
-      prevResponse = response;
-    };
-    return (0, _commons.polling)(fetch, Object.assign({
-      interval,
-      signal,
-      onResponse
-    }, options))[Symbol.asyncIterator]();
+  get questionId() {
+    return this._id;
   }
 }
-function isUpdated(prev, curr) {
-  return !prev || prev.answer_stage !== curr.answer_stage || prev.answer.length !== curr.answer.length;
+
+// helpers //
+function isId(value) {
+  return typeof value === 'string' && value.charAt(0) !== '{';
 }

package/dist/cjs/api/iterable.js

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.IterableApiStub = exports.IdBasedIterableApiStub = void 0;
+var _commons = require("@miso.ai/commons");
+const _excluded = ["pollingInterval", "signal", "stallTimeout"];
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+class IterableApiStub {
+  constructor() {
+    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    this._ac = new AbortController();
+    this._options = options;
+  }
+  async get(options) {
+    return this._get(Object.assign({}, this._options, options));
+  }
+  _get(options) {
+    throw new Error('Not implemented');
+  }
+  abort(reason) {
+    this._ac.abort(reason);
+  }
+  [Symbol.asyncIterator]() {
+    var _this = this;
+    const fetch = async function () {
+      let {
+        signal
+      } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      // TODO: pass signal
+      const response = await _this.get();
+      return [response, _this._isFinished(response), _this._revisionOf(response)];
+    };
+    let _this$_options = this._options,
+      {
+        pollingInterval: interval,
+        signal,
+        stallTimeout = 120000
+      } = _this$_options,
+      options = _objectWithoutPropertiesLoose(_this$_options, _excluded);
+    const stac = new _commons.StallTimeoutAbortController(stallTimeout);
+    signal = _commons.signals.any(this._ac.signal, stac.signal, signal);
+    let prevResponse;
+    const onResponse = (response, finished) => {
+      if (finished) {
+        stac.clear();
+      } else if (this._isUpdated(prevResponse, response)) {
+        stac.touch();
+      }
+      prevResponse = response;
+    };
+    return (0, _commons.polling)(fetch, Object.assign({
+      interval,
+      signal,
+      onResponse
+    }, options))[Symbol.asyncIterator]();
+  }
+  _isFinished(response) {
+    return !!(response && response.finished);
+  }
+  _isUpdated(previousResponse, newResponse) {
+    return !previousResponse || previousResponse.answer_stage !== newResponse.answer_stage || previousResponse.answer.length !== newResponse.answer.length;
+  }
+  _revisionOf(response) {
+    return response && response.revision;
+  }
+}
+exports.IterableApiStub = IterableApiStub;
+class IdBasedIterableApiStub extends IterableApiStub {
+  constructor(api, method, id, options) {
+    super(options);
+    this._api = api;
+    this._method = method;
+    this._id = id;
+  }
+  async _get(options) {
+    return this._api[this._method](this._id, options);
+  }
+}
+exports.IdBasedIterableApiStub = IdBasedIterableApiStub;

package/dist/cjs/version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = exports.default = '1.10.3';
+var _default = exports.default = '1.10.4-beta.0';

package/package.json

@@ -29,7 +29,7 @@
     "url": "https://github.com/MisoAI/miso-client-js-sdk/issues"
   },
   "dependencies": {
-    "@miso.ai/commons": "1.10.3"
+    "@miso.ai/commons": "1.10.4-beta.0"
   },
-  "version": "1.10.3"
+  "version": "1.10.4-beta.0"
 }

package/src/api/ask.js

@@ -1,5 +1,6 @@
-import { polling, signals, StallTimeoutAbortController, API } from '@miso.ai/commons';
+import { API, defineValues, isNullLike } from '@miso.ai/commons';
 import ApiBase from './base.js';
+import { IdBasedIterableApiStub } from './iterable.js';
 
 const { GROUP, NAME } = API;
 
@@ -10,18 +11,18 @@ export default class Ask extends ApiBase {
   }
 
   async questions(payload, options = {}) {
-    if (typeof payload === 'string' && payload.charAt(0) !== '{') {
-      return new Answer(this, { question_id: payload }, options);
+    if (isId(payload)) {
+      return new Answer(this, payload, options);
     }
-    const response = await this._run(NAME.QUESTIONS, payload, options);
-    return new Answer(this, response, options);
+    const { question_id } = await this._run(NAME.QUESTIONS, payload, options);
+    return new Answer(this, question_id, options);
   }
 
   async _questions(payload, options) {
     return this._run(NAME.QUESTIONS, payload, options);
   }
 
-  async _get(questionId, options) {
+  async _questionGet(questionId, options) {
     return this._run(`${NAME.QUESTIONS}/${questionId}/answer`, undefined, { ...options, method: 'GET' });
   }
 
@@ -29,53 +30,44 @@ export default class Ask extends ApiBase {
     return this._run(NAME.RELATED_QUESTIONS, payload, options);
   }
 
+  async search(payload, options = {}) {
+    const response = await this._run(NAME.SEARCH, payload, options);
+    return response.question_id ? new SearchResult(this, response, options) : response;
+  }
+
+  async _searchGet(questionId, options) {
+    return this._run(`${NAME.SEARCH}/${questionId}/answer`, undefined, { ...options, method: 'GET' });
+  }
+
 }
 
-class Answer {
+class Answer extends IdBasedIterableApiStub {
 
-  constructor(api, { question_id }, options = {}) {
-    this._api = api;
-    this._questionId = question_id;
-    this._ac = new AbortController();
-    this._options = options;
+  constructor(api, questionId, options = {}) {
+    super(api, '_questionGet', questionId, options);
   }
 
   get questionId() {
-    return this._questionId;
+    return this._id;
   }
 
-  async get(options) {
-    return this._api._get(this._questionId, { ...this._options, ...options });
-  }
+}
 
-  abort(reason) {
-    this._ac.abort(reason);
+class SearchResult extends IdBasedIterableApiStub {
+
+  constructor(api, response, options = {}) {
+    super(api, '_searchGet', response.question_id, options);
+    defineValues(this, response);
+    this._response = response;
   }
 
-  [Symbol.asyncIterator]() {
-    const fetch = async ({ signal } = {}) => {
-      // TODO: pass signal
-      const response = await this.get();
-      return [response, response.finished, response.revision];
-    };
-    let { pollingInterval: interval, signal, stallTimeout = 120000, ...options } = this._options;
-    const stac = new StallTimeoutAbortController(stallTimeout);
-    signal = signals.any(this._ac.signal, stac.signal, signal);
-
-    let prevResponse;
-    const onResponse = (response, finished) => {
-      if (finished) {
-        stac.clear();
-      } else if (isUpdated(prevResponse, response)) {
-        stac.touch();
-      }
-      prevResponse = response;
-    };
-    return polling(fetch, { interval, signal, onResponse, ...options })[Symbol.asyncIterator]();
+  get questionId() {
+    return this._id;
   }
 
 }
 
-function isUpdated(prev, curr) {
-  return !prev || prev.answer_stage !== curr.answer_stage || prev.answer.length !== curr.answer.length;
+// helpers //
+function isId(value) {
+  return typeof value === 'string' && value.charAt(0) !== '{';
 }

package/src/api/iterable.js

@@ -0,0 +1,71 @@
+import { polling, signals, StallTimeoutAbortController } from '@miso.ai/commons';
+
+export class IterableApiStub {
+
+  constructor(options = {}) {
+    this._ac = new AbortController();
+    this._options = options;
+  }
+
+  async get(options) {
+    return this._get({ ...this._options, ...options });
+  }
+
+  _get(options) {
+    throw new Error('Not implemented');
+  }
+
+  abort(reason) {
+    this._ac.abort(reason);
+  }
+
+  [Symbol.asyncIterator]() {
+    const fetch = async ({ signal } = {}) => {
+      // TODO: pass signal
+      const response = await this.get();
+      return [response, this._isFinished(response), this._revisionOf(response)];
+    };
+    let { pollingInterval: interval, signal, stallTimeout = 120000, ...options } = this._options;
+    const stac = new StallTimeoutAbortController(stallTimeout);
+    signal = signals.any(this._ac.signal, stac.signal, signal);
+
+    let prevResponse;
+    const onResponse = (response, finished) => {
+      if (finished) {
+        stac.clear();
+      } else if (this._isUpdated(prevResponse, response)) {
+        stac.touch();
+      }
+      prevResponse = response;
+    };
+    return polling(fetch, { interval, signal, onResponse, ...options })[Symbol.asyncIterator]();
+  }
+
+  _isFinished(response) {
+    return !!(response && response.finished);
+  }
+
+  _isUpdated(previousResponse, newResponse) {
+    return !previousResponse || previousResponse.answer_stage !== newResponse.answer_stage || previousResponse.answer.length !== newResponse.answer.length;
+  }
+
+  _revisionOf(response) {
+    return response && response.revision;
+  }
+
+}
+
+export class IdBasedIterableApiStub extends IterableApiStub {
+
+  constructor(api, method, id, options) {
+    super(options);
+    this._api = api;
+    this._method = method;
+    this._id = id;
+  }
+
+  async _get(options) {
+    return this._api[this._method](this._id, options);
+  }
+
+}

package/src/version.js

@@ -1 +1 @@
-export default '1.10.3';
+export default '1.10.4-beta.0';