wit 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8238be41a9a6f12e9b5ca05aa47e2df2bb174de7
-  data.tar.gz: 2cb886d831857aaffa697a17443714db24a38214
+  metadata.gz: 79a8e68599e29e35430b0cae7ed26691435dbd38
+  data.tar.gz: 5934e10cb348235ab7f619ef6030d5e1e4bce06d
 SHA512:
-  metadata.gz: 0777a1f0a9ca34416275ac36080a2caf8563edba3960d8e269a193106e5c03b1c5b18e21b9f6de01a806b884f65ac11d70a2fd4858343e1659f61baadc79f150
-  data.tar.gz: 7612bc8d01ba0499ea9a374251fbe2d9a8b1f884d9f1dde14d4fd64b90024585880ac49e6ebfee02afc0fedd10952f62b69a5a654d04cdc6ade03f1b4a2bc831
+  metadata.gz: a61fc72b671a939e0970487825ee000743ba14d3537f002e9455fc9841ea965db400294c5f230aefa6d7aef288e4f883a38647ecc32ebd3d4bc4c59e3e760904
+  data.tar.gz: 1b9c4d937a90aafc671282e88a5444b463fc6c71e7f81235f5084c0543813cea1ebf9ec57abfd7f1162959c2b5d2e1d881f99fe4b76f1fa667c29ac7a6f4f486

data/CHANGES.md

@@ -1,3 +1,11 @@
+## v4.1.0
+
+- `converse` now takes `reset` as optional parameter.
+
+### Breaking changes
+
+- `run_actions` now resets the last turn on new messages and errors.
+
 ## v4.0.0
 
 After a lot of internal dogfooding and bot building, we decided to change the API in a backwards-incompatible way. The changes are described below and aim to simplify user code and accommodate upcoming features.

data/README.md

@@ -77,6 +77,7 @@ puts("Yay, got Wit.ai response: #{rsp}")
 ### .run_actions()
 
 A higher-level method to the Wit converse API.
+`run_actions` resets the last turn on new messages and errors.
 
 Takes the following parameters:
 * `session_id` - a unique identifier describing the user session
@@ -102,6 +103,7 @@ Takes the following parameters:
 * `session_id` - a unique identifier describing the user session
 * `msg` - the text received from the user
 * `context` - the `Hash` representing the session state
+* `reset` - (optional) whether to reset the last turn
 
 Example:
 ```ruby

data/lib/wit.rb

@@ -71,6 +71,8 @@ class Wit
     if opts[:actions]
       @actions = validate_actions(logger, opts[:actions])
     end
+
+    @_sessions = {}
   end
 
   def logger
@@ -88,18 +90,19 @@ class Wit
     return res
   end
 
-  def converse(session_id, msg, context={})
+  def converse(session_id, msg, context={}, reset=nil)
     if !context.is_a?(Hash)
       raise WitException.new('context should be a Hash')
     end
     params = {}
     params[:q] = msg unless msg.nil?
     params[:session_id] = session_id
+    params[:reset] = true if reset
     res = req(logger, @access_token, Net::HTTP::Post, '/converse', params, context)
     return res
   end
 
-  def __run_actions(session_id, message, context, i)
+  def __run_actions(session_id, current_request, message, context, i)
     if i <= 0
       raise WitException.new('Max steps reached, stopping.')
     end
@@ -107,6 +110,9 @@ class Wit
     if json['type'].nil?
       raise WitException.new('Couldn\'t find type in Wit response')
     end
+    if current_request != @_sessions[session_id]
+      return context
+    end
 
     logger.debug("Context: #{context}")
     logger.debug("Response type: #{json['type']}")
@@ -150,7 +156,11 @@ class Wit
       raise WitException.new("unknown type: #{json['type']}")
     end
 
-    return __run_actions(session_id, nil, context, i - 1)
+    if current_request != @_sessions[session_id]
+      return context
+    end
+
+    return __run_actions(session_id, current_request, nil, context, i - 1)
   end
 
   def run_actions(session_id, message, context={}, max_steps=DEFAULT_MAX_STEPS)
@@ -160,7 +170,25 @@ class Wit
     if !context.is_a?(Hash)
       raise WitException.new('context should be a Hash')
     end
-    return __run_actions(session_id, message, context, max_steps)
+
+    # Figuring out whether we need to reset the last turn.
+    # Each new call increments an index for the session.
+    # We only care about the last call to run_actions.
+    # All the previous ones are discarded (preemptive exit).
+    current_request = 1
+    if @_sessions.has_key?(session_id)
+      current_request = @_sessions[session_id] + 1
+    end
+    @_sessions[session_id] = current_request
+
+    context = __run_actions(session_id, current_request, message, context, max_steps)
+
+    # Cleaning up once the last call to run_actions finishes.
+    if current_request == @_sessions[session_id]
+      @_sessions.delete(session_id)
+    end
+
+    return context
   end
 
   def interactive(context={}, max_steps=DEFAULT_MAX_STEPS)

data/wit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'wit'
-  s.version = '4.0.0'
+  s.version = '4.1.0'
   s.date = Date.today.to_s
   s.summary = 'Ruby SDK for Wit.ai'
   s.description = 'Ruby SDK for Wit.ai'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wit
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - The Wit Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies: []
 description: Ruby SDK for Wit.ai
 email: help@wit.ai
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for Wit.ai