aws-lex-conversation 2.1.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50a4b4cc2a28aa4251723f715953de0a102e7cabb0268db095e50470e49e2772
-  data.tar.gz: a5bd7550ef4a7391c0d9221ac86b3c1760053b03dda9932d8416778f4ea319e5
+  metadata.gz: 476f05cfb93c1025db506486915dedc693c7ad4d89579841a6eb5400d96c29bd
+  data.tar.gz: db5be62a9dc9239d9fbdaaa93bef25ecd1fe7add316712d9c63e3cacd0b0b75b
 SHA512:
-  metadata.gz: 48883e2e7ce637dc0b6a327bdf839b9e233a3a1bc06f99b318f5bdbf83e91c762fb8c2bbe1ffc597ac8a6900d7a01ee4dfab7a67a52c2f941595754e13f8cb06
-  data.tar.gz: 3bf93255a75da95213ffc74a7a3a86785bba94ea70d758c53dbad1c351b3567f5bb6f23adffafbf67e7581ad9f4a9ece31a489ef35b9cd3ad31311121a209105
+  metadata.gz: 7d6b36def37b7daf757b05a769877ebc35186e0639c99847317457e8786d50d0def6e2b8d539bab73ad0d43c704d3325702f8331387bf5549361b70cf7ecf055
+  data.tar.gz: f6ac291760737662ea7452ad6ebc092f225aaefbccbcdc20f549c42b0aa1661267669b827bd82696a3d7d10c06c31e6deeaa4c9a2365cfc90739ab4dac3093f6

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+# 4.0.1 - July 16, 2021
+
+* Fix a bug with the `Aws::Lex::Conversation::Handler::Echo` class because it
+  didn't correctly return an array of messages required for Lex V2.
+* Drop a call to `Hash#deep_symbolize_keys` so we don't implicitly rely on
+  ActiveSupport.
+* Call `Hash#compact` when transforming a Lex response so we don't include any
+  `nil` values in the response.
+
+# 4.0.0 - July 14, 2021
+
+**breaking change** - Drop support for the Lex runtime version 1. If you are using Lex Version 1, please lock this gem to `~> 3.0.0`.
+**breaking change** - Implement support and types for [Lex Version 2](https://docs.aws.amazon.com/lexv2/latest/dg/what-is.html), which implements a new Lambda [input/output event format](https://docs.aws.amazon.com/lexv2/latest/dg/lambda.html#lambda-input-format).
+
+# 3.1.0 - June 1, 2021
+
+* Default both `request_attributes` and `session_attributes`
+  to an empty Hash when the values from the event are `null`.
+  It is much easier to reason and write logic when you can
+  assume that these values are always at least a hash.
+
+# 3.0.0 - May 20, 2021
+
+* **breaking change** - Don't pass the `recentIntentSummaryView` back
+  in the Lex response unless we have modified or added an existing
+  checkpoint. Lex will persist the previous intent summary/history
+  if we do not send a `recentIntentSummaryView` value back in the
+  response (see [1]).
+* Add a few helper methods to the `Aws::Lex::Conversation::Type::Slot`
+  instances:
+
+  - `active?`: returns true if the slot is defined (either optional or
+             required) for the current intent.
+  - `requestable?`: returns true if the slot is active for the current
+                  intent and it is not filled.
+
+[1]: https://docs.aws.amazon.com/lex/latest/dg/lambda-input-response-format.html#lambda-response-recentIntentSummaryView
+
 # 2.0.0 - August 19, 2020
 
 * **breaking change:** Rename `Aws::Lex::Conversation::Type::CurrentIntent` to `Aws::Lex::Conversation::Type::Intent`.

data/README.md

@@ -6,10 +6,30 @@ Have you played around with [AWS Lex](https://aws.amazon.com/lex/) and quickly r
 
 ## Installation
 
+### Lex V1
+
+Version 3.x is the last major version of this gem that will support Lex V1.
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'aws-lex-conversation', '~> 3.0'
+```
+
+And then execute:
+
+```bash
+bundle install
+```
+
+### Lex V2
+
+Version 4.x and higher support Lex V2.
+
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'aws-lex-conversation'
+gem 'aws-lex-conversation', '>= 4.0'
 ```
 
 And then execute:
@@ -73,15 +93,17 @@ class SayHello < Aws::Lex::Conversation::Handler::Base
     #
     # conversation.close(
     #   fulfillment_state: 'Fulfilled',
-    #   message: { content: "Hello, #{name}!", contentType: 'PlainText' }
+    #   messages: [{ content: "Hello, #{name}!", contentType: 'PlainText' }]
     # )
     #
     conversation.close(
       fulfillment_state: Aws::Lex::Conversation::Type::FulfillmentState.new('Fulfilled'),
-      message: Aws::Lex::Conversation::Type::Message.new(
-        content: "Hello, #{name}!",
-        content_type: Aws::Lex::Conversation::Type::Message::ContentType.new('PlainText')
-      )
+      messages: [
+        Aws::Lex::Conversation::Type::Message.new(
+          content: "Hello, #{name}!",
+          content_type: Aws::Lex::Conversation::Type::Message::ContentType.new('PlainText')
+        )
+      ]
     )
   end
 end

data/lib/aws/lex/conversation.rb

@@ -55,7 +55,44 @@ module Aws
       end
 
       def session
-        lex.session_attributes
+        lex.session_state.session_attributes
+      end
+
+      def checkpoint!(opts = {})
+        label = opts.fetch(:label)
+        params = {
+          label: label,
+          dialog_action_type: opts.fetch(:dialog_action_type),
+          fulfillment_state: opts[:fulfillment_state],
+          intent: lex.current_intent,
+          slot_to_elicit: opts[:slot_to_elicit]
+        }.compact
+
+        if checkpoint?(label: label)
+          # update the existing checkpoint
+          checkpoint(label: label).assign_attributes!(params)
+        else
+          # push a new checkpoint to the recent_intent_summary_view
+          checkpoints.unshift(
+            Type::Checkpoint.new(params)
+          )
+        end
+      end
+
+      def checkpoint?(label:)
+        !checkpoint(label: label).nil?
+      end
+
+      def checkpoint(label:)
+        checkpoints.find { |v| v.label == label }
+      end
+
+      def checkpoints
+        lex.session_state.session_attributes.checkpoints
+      end
+
+      def stash
+        @stash ||= {}
       end
     end
   end

data/lib/aws/lex/conversation/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'base64'
 require 'json'
 require 'shrink/wrap'
 
@@ -18,29 +19,31 @@ require_relative 'slot/elicitation'
 require_relative 'slot/elicitor'
 require_relative 'type/base'
 require_relative 'type/enumeration'
-require_relative 'type/sentiment_label'
+require_relative 'type/input_mode'
+require_relative 'type/sentiment'
 require_relative 'type/sentiment_score'
 require_relative 'type/sentiment_response'
 require_relative 'type/invocation_source'
 require_relative 'type/dialog_action_type'
-require_relative 'type/confirmation_status'
+require_relative 'type/dialog_action'
+require_relative 'type/confirmation_state'
 require_relative 'type/fulfillment_state'
 require_relative 'type/intent_confidence'
 require_relative 'type/time_to_live'
-require_relative 'type/recent_intent_summary_view'
+require_relative 'type/slot_shape'
+require_relative 'type/slot_value'
 require_relative 'type/slot'
-require_relative 'type/slot_resolution'
-require_relative 'type/slot_detail'
 require_relative 'type/context'
 require_relative 'type/intent'
-require_relative 'type/output_dialog_mode'
+require_relative 'type/checkpoint'
+require_relative 'type/session_attributes'
+require_relative 'type/session_state'
+require_relative 'type/interpretation'
 require_relative 'type/bot'
-require_relative 'type/message/content_type'
-require_relative 'type/message'
-require_relative 'type/response_card/content_type'
 require_relative 'type/response_card/button'
-require_relative 'type/response_card/generic_attachment'
 require_relative 'type/response_card'
+require_relative 'type/message/content_type'
+require_relative 'type/message'
 require_relative 'type/response'
 require_relative 'type/event'
 require_relative 'handler/base'

data/lib/aws/lex/conversation/handler/delegate.rb

@@ -6,9 +6,7 @@ module Aws
       module Handler
         class Delegate < Base
           def response(conversation)
-            conversation.delegate(
-              slots: conversation.lex.current_intent.slots
-            )
+            conversation.delegate
           end
         end
       end

data/lib/aws/lex/conversation/handler/echo.rb

@@ -11,10 +11,12 @@ module Aws
             fulfillment_state = options.fetch(:fulfillment_state) { Type::FulfillmentState.new('Fulfilled') }
             conversation.close(
               fulfillment_state: fulfillment_state,
-              message: Type::Message.new(
-                content: content,
-                content_type: content_type
-              )
+              messages: [
+                Type::Message.new(
+                  content: content,
+                  content_type: content_type
+                )
+              ]
             )
           end
         end

data/lib/aws/lex/conversation/response/base.rb

@@ -6,15 +6,17 @@ module Aws
       module Response
         class Base
           attr_accessor(
-            :active_contexts,
-            :recent_intent_summary_view,
-            :session_attributes
+            :session_state,
+            :messages,
+            :request_attributes,
+            :fulfillment_state
           )
 
           def initialize(opts = {})
-            self.active_contexts = opts[:active_contexts]
-            self.recent_intent_summary_view = opts[:recent_intent_summary_view]
-            self.session_attributes = opts[:session_attributes]
+            self.session_state = opts[:session_state]
+            self.messages = opts[:messages]
+            self.request_attributes = opts[:request_attributes]
+            session_state.intent.state = opts.fetch(:fulfillment_state) { session_state.intent.state }
           end
 
           def dialog_action
@@ -23,10 +25,9 @@ module Aws
 
           def to_lex
             Type::Response.new(
-              active_contexts: active_contexts,
-              dialog_action: dialog_action,
-              recent_intent_summary_view: recent_intent_summary_view,
-              session_attributes: session_attributes
+              session_state: session_state,
+              messages: messages,
+              request_attributes: request_attributes
             ).to_lex
           end
         end

data/lib/aws/lex/conversation/response/close.rb

@@ -5,22 +5,16 @@ module Aws
     class Conversation
       module Response
         class Close < Base
-          attr_accessor :fulfillment_state, :message, :response_card
-
           def initialize(opts = {})
             super
-            self.fulfillment_state = opts.fetch(:fulfillment_state)
-            self.message = opts[:message]
-            self.response_card = opts[:response_card]
+            session_state.dialog_action = dialog_action
+            session_state.intent.state = opts.fetch(:fulfillment_state)
           end
 
           def dialog_action
-            {
-              type: 'Close',
-              fulfillmentState: fulfillment_state,
-              message: message,
-              responseCard: response_card
-            }.compact
+            Aws::Lex::Conversation::Type::DialogAction.shrink_wrap(
+              type: 'Close'
+            )
           end
         end
       end

data/lib/aws/lex/conversation/response/confirm_intent.rb

@@ -5,24 +5,15 @@ module Aws
     class Conversation
       module Response
         class ConfirmIntent < Base
-          attr_accessor :intent_name, :message, :response_card, :slots
-
           def initialize(opts = {})
             super
-            self.intent_name = opts.fetch(:intent_name)
-            self.slots = opts[:slots]
-            self.message = opts[:message]
-            self.response_card = opts[:response_card]
+            session_state.dialog_action = dialog_action
           end
 
           def dialog_action
-            {
-              type: 'ConfirmIntent',
-              intentName: intent_name,
-              slots: slots,
-              message: message,
-              responseCard: response_card
-            }.compact
+            Aws::Lex::Conversation::Type::DialogAction.shrink_wrap(
+              type: 'ConfirmIntent'
+            )
           end
         end
       end

data/lib/aws/lex/conversation/response/delegate.rb

@@ -5,22 +5,15 @@ module Aws
     class Conversation
       module Response
         class Delegate < Base
-          attr_accessor :slots, :kendra_query_request_payload, :kendra_query_filter_string
-
           def initialize(opts = {})
             super
-            self.slots = opts[:slots]
-            self.kendra_query_request_payload = opts[:kendra_query_request_payload]
-            self.kendra_query_filter_string = opts[:kendra_query_filter_string]
+            session_state.dialog_action = dialog_action
           end
 
           def dialog_action
-            {
-              type: 'Delegate',
-              slots: slots,
-              kendraQueryRequestPayload: kendra_query_request_payload,
-              kendraQueryFilterString: kendra_query_filter_string
-            }.compact
+            Aws::Lex::Conversation::Type::DialogAction.shrink_wrap(
+              type: 'Delegate'
+            )
           end
         end
       end

data/lib/aws/lex/conversation/response/elicit_intent.rb

@@ -9,16 +9,13 @@ module Aws
 
           def initialize(opts = {})
             super
-            self.message = opts[:message]
-            self.response_card = opts[:response_card]
+            session_state.dialog_action = dialog_action
           end
 
           def dialog_action
-            {
-              type: 'ElicitIntent',
-              message: message,
-              responseCard: response_card
-            }.compact
+            Aws::Lex::Conversation::Type::DialogAction.shrink_wrap(
+              type: 'ElicitIntent'
+            )
           end
         end
       end

data/lib/aws/lex/conversation/response/elicit_slot.rb

@@ -5,26 +5,19 @@ module Aws
     class Conversation
       module Response
         class ElicitSlot < Base
-          attr_accessor :intent_name, :message, :response_card, :slots, :slot_to_elicit
+          attr_accessor :slot_to_elicit
 
           def initialize(opts = {})
             super
-            self.intent_name = opts.fetch(:intent_name)
             self.slot_to_elicit = opts.fetch(:slot_to_elicit)
-            self.slots = opts.fetch(:slots)
-            self.message = opts[:message]
-            self.response_card = opts[:response_card]
+            session_state.dialog_action = dialog_action
           end
 
           def dialog_action
-            {
+            Aws::Lex::Conversation::Type::DialogAction.shrink_wrap(
               type: 'ElicitSlot',
-              intentName: intent_name,
-              slots: slots,
-              slotToElicit: slot_to_elicit,
-              message: message,
-              responseCard: response_card
-            }.compact
+              slotToElicit: slot_to_elicit
+            )
           end
         end
       end

data/lib/aws/lex/conversation/slot/elicitation.rb

@@ -27,10 +27,12 @@ module Aws
             increment_slot_elicitations!
             conversation.elicit_slot(
               slot_to_elicit: name,
-              message: {
-                contentType: content_type,
-                content: elicitation_content
-              }
+              messages: [
+                {
+                  contentType: content_type,
+                  content: elicitation_content
+                }
+              ]
             )
           end
 

data/lib/aws/lex/conversation/support/mixins/responses.rb

@@ -8,51 +8,45 @@ module Aws
           module Responses
             def close(opts = {})
               params = {
-                active_contexts: lex.active_contexts,
-                recent_intent_summary_view: lex.recent_intent_summary_view,
-                session_attributes: lex.session_attributes
+                session_state: lex.session_state,
+                request_attributes: lex.request_attributes
               }.merge(opts)
               Response::Close.new(params).to_lex
             end
 
             def confirm_intent(opts = {})
               params = {
-                active_contexts: lex.active_contexts,
-                intent_name: lex.current_intent.name,
-                recent_intent_summary_view: lex.recent_intent_summary_view,
-                session_attributes: lex.session_attributes,
-                slots: lex.current_intent.slots
+                session_state: lex.session_state,
+                request_attributes: lex.request_attributes,
+                intent: lex.current_intent
               }.merge(opts)
+              lex.session_state.intent = params.fetch(:intent)
               Response::ConfirmIntent.new(params).to_lex
             end
 
             def delegate(opts = {})
               params = {
-                active_contexts: lex.active_contexts,
-                recent_intent_summary_view: lex.recent_intent_summary_view,
-                session_attributes: lex.session_attributes,
-                slots: lex.current_intent.slots
+                session_state: lex.session_state,
+                request_attributes: lex.request_attributes
               }.merge(opts)
               Response::Delegate.new(params).to_lex
             end
 
             def elicit_intent(opts = {})
               params = {
-                active_contexts: lex.active_contexts,
-                recent_intent_summary_view: lex.recent_intent_summary_view,
-                session_attributes: lex.session_attributes
+                session_state: lex.session_state,
+                request_attributes: lex.request_attributes
               }.merge(opts)
               Response::ElicitIntent.new(params).to_lex
             end
 
             def elicit_slot(opts = {})
               params = {
-                active_contexts: lex.active_contexts,
-                intent_name: lex.current_intent.name,
-                recent_intent_summary_view: lex.recent_intent_summary_view,
-                session_attributes: lex.session_attributes,
-                slots: lex.current_intent.slots
+                session_state: lex.session_state,
+                request_attributes: lex.request_attributes,
+                intent: lex.current_intent
               }.merge(opts)
+              lex.session_state.intent = params.fetch(:intent)
               Response::ElicitSlot.new(params).to_lex
             end
           end