Merge pull request #40 from Millasdur/update/dialog

Update sdk

Author: hlely

README.md

@@ -90,7 +90,7 @@ Learn more about:
 
 ## License
 
-Copyright (c) [2016] [Recast.AI](https://recast.ai)
+Copyright (c) [2018] [Recast.AI](https://recast.ai)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,6 +1,6 @@
 {
   "name": "recastai",
-  "version": "3.7.0",
+  "version": "4.0.0",
   "description": "Recast.AI official SDK in NodeJs",
   "main": "lib/index.js",
   "types": "index.d.ts",

spec/test.js

@@ -120,44 +120,6 @@ describe('Client class', () => {
         })
     })
   })
-
-  describe('fileRequest', () => {
-    nock('https://api.recast.ai')
-      .post('/v2/request')
-      .once()
-      .reply(200, json)
-
-    nock('https://api.recast.ai')
-      .post('/v2/request')
-      .once()
-      .reply(404, 'invalid parameter')
-
-    it('should perform a voice request', function (done) {
-      this.timeout(15000)
-      client.request.analyseFile(path.join(__dirname, '/resource/test.wav'))
-        .then(res => {
-          assert.equal(res.status, 200)
-          done()
-        })
-    })
-
-    it('should return an error on 404', done => {
-      client.request.analyseFile('spec/resource/test.wav')
-        .catch(() => {
-          done()
-        })
-    })
-
-    it('should throw an error on missing token', (done) => {
-      const clientWithoutToken = new Client()
-      clientWithoutToken.request.analyseFile(path.resolve(__dirname, '/resource/test.wav'))
-        .catch(err => {
-          expect(err).to.be.an.instanceof(Error)
-          assert.equal(err.message, 'Parameter token is missing')
-          done()
-        })
-    })
-  })
 })
 
 describe('Response class', () => {

src/apis/build/index.js

@@ -13,43 +13,55 @@ export default class Build {
     this.language = language
   }
 
-  dialog = (message, options = {}) => {
+  dialog = (message, options = {}, memory = null, log_level = 'info') => {
     const token = options.token || this.token
+    const proxy = options.proxy
     const data = {
       message,
       conversation_id: options.conversationId,
       language: options.language || this.language,
+      log_level: log_level,
     }
+		if (memory)
+			data['memory'] = memory
 
-    return agent('POST', `${constants.DIALOG_ENDPOINT}/dialog`)
+    const request = agent('POST', `${constants.DIALOG_ENDPOINT}/dialog`)
       .set('Authorization', `Token ${token}`)
-      .send(data)
-      .then(res => res.body.results)
+    if (proxy) { request.proxy(proxy) }
+    return request.send(data).then(res => res.body.results)
   }
 
   getConversation = (user, bot, conversationId, options = {}) => {
     const token = options.token || this.token
-    return agent('GET', `${constants.DIALOG_ENDPOINT}/users/${user}/bots/${bot}/builders/v1/conversation_states/${conversationId}`)
+    const proxy = options.proxy
+
+    const request = agent('GET', `${constants.DIALOG_ENDPOINT}/users/${user}/bots/${bot}/builders/v1/conversation_states/${conversationId}`)
       .set('Authorization', `Token ${token}`)
-      .send()
+    if (proxy) { request.proxy(proxy) }
+    return request.send()
   }
 
   updateConversation = (user, bot, conversationId, data = {}, options = {}) => {
     const token = options.token || this.token
+    const proxy = options.proxy
     if (data.memory && data.memory.constructor !== Object) {
       return Promise.reject('Invalid memory parameter')
     }
 
-    return agent('PUT', `${constants.DIALOG_ENDPOINT}/users/${user}/bots/${bot}/builders/v1/conversation_states/${conversationId}`)
+    const request = agent('PUT', `${constants.DIALOG_ENDPOINT}/users/${user}/bots/${bot}/builders/v1/conversation_states/${conversationId}`)
       .set('Authorization', `Token ${token}`)
-      .send(data)
+    if (proxy) { request.proxy(proxy) }
+    return request.send(data)
   }
 
   deleteConversation = (user, bot, conversationId, options = {}) => {
     const token = options.token || this.token
-    return agent('DELETE', `${constants.DIALOG_ENDPOINT}/users/${user}/bots/${bot}/builders/v1/conversation_states/${conversationId}`)
+    const proxy = options.proxy
+
+    const request = agent('DELETE', `${constants.DIALOG_ENDPOINT}/users/${user}/bots/${bot}/builders/v1/conversation_states/${conversationId}`)
       .set('Authorization', `Token ${token}`)
-      .send()
+    if (proxy) { request.proxy(proxy) }
+    return request.send()
   }
 
 }

src/apis/request/index.js

@@ -31,22 +31,6 @@ export default class Request {
     return new Response(res.body.results)
   }
 
-  /*
-   * /request (with audio file)
-   */
-  analyseFile = async (file, options = {}) => {
-    const token = options.token || this.token
-    const proxy = options.proxy
-    if (!token) { throw new RecastError('Parameter token is missing') }
-
-    const request = agent('POST', constants.REQUEST_ENDPOINT)
-      .set('Authorization', `Token ${token}`)
-    if (proxy) { request.proxy(proxy) }
-
-    const res = await request.attach('voice', file).send()
-    return new Response(res.body.results)
-  }
-
   /*
    * /converse
    */
@@ -69,22 +53,4 @@ export default class Request {
     return new Conversation({ ...res.body.results, recastToken: this.token })
   }
 
-  converseFile = async (file, options = {}) => {
-    const token = options.token || this.token
-    const proxy = options.proxy
-    const data = {
-      language: options.language || this.language,
-      conversation_token: options.conversationToken,
-    }
-
-    if (!token) { throw new RecastError('Parameter token is missing') }
-
-    const request = agent('POST', constants.CONVERSE_ENDPOINT)
-      .set('Authorization', `Token ${token}`)
-    if (proxy) { request.proxy(proxy) }
-
-    const res = await request.attach('voice', file).send(data)
-    return new Conversation({ ...res.body.results, recastToken: this.token })
-  }
-
 }