aws-lex-conversation 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0a95434c51f2167b1bb1fb891b650ffa120aaa91ac31dbf016fae8e590f7da
-  data.tar.gz: 20df3f469a293b19d0ec3d1bea8e0c549897141a30bad818d1c3f6f25dcf98e3
+  metadata.gz: f57f415463cb7d78d0ddb4f48232b1c0038bc91e4813fb9d6de6455fa7f0a4d9
+  data.tar.gz: 7ba9cdf27e3f2368862bc7584eb1ce555a24a253d2a1ce3dd4c1d8500264fd0c
 SHA512:
-  metadata.gz: f935b611747cbf6484f50058eeea3db776eb47fb901ac1be240e0362677c1ddca1fe99e638df6601bacd316975da6182e83edd0707e2f5ef1a65e157d3816da1
-  data.tar.gz: d8ca9865f6981a0b6e5d233681b95ce995cae0821f6ef29b9395d379bb88d5bfe0687ee1c62728ea7bbdd785e0c9f5434720921f8c4df45076d51ebecaf4795e
+  metadata.gz: 168eb69456d693dbf0f2618a23e4ec13fef7daca4921871b2d0b5a532ef39f4a1fdceb435b3122518aee7e4ae9495546b85f58e4d95bceab255fb2b91f8fcfc6
+  data.tar.gz: 2d9577a331c617a681c3f961daaa1d1825812c907f6d40ebe838db4ce471b37ea948d9f0b75985430795d449ffcf4a59968180a591f9cfbc66a8f115864d75eb

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,52 +55,40 @@ module Aws
       end
 
       def session
-        lex.session_attributes
+        lex.session_state.session_attributes
       end
 
-      # rubocop:disable Metrics/AbcSize
       def checkpoint!(opts = {})
         label = opts.fetch(:label)
-        intent = opts.fetch(:intent_name) { intent_name }
         params = {
-          checkpoint_label: label,
-          confirmation_status: opts.fetch(:confirmation_status) { lex.current_intent.confirmation_status },
+          label: label,
           dialog_action_type: opts.fetch(:dialog_action_type),
           fulfillment_state: opts[:fulfillment_state],
-          intent_name: intent,
-          slots: opts.fetch(:slots) { lex.current_intent.raw_slots },
+          intent: lex.current_intent,
           slot_to_elicit: opts[:slot_to_elicit]
         }.compact
 
-        # flag that we need to send a new checkpoint back in the response
-        stash[:checkpoint_pending] = true
-
         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
-          lex.recent_intent_summary_view.unshift(
-            Type::RecentIntentSummaryView.new(params)
+          checkpoints.unshift(
+            Type::Checkpoint.new(params)
           )
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       def checkpoint?(label:)
         !checkpoint(label: label).nil?
       end
 
       def checkpoint(label:)
-        lex.recent_intent_summary_view.find { |v| v.checkpoint_label == label }
+        checkpoints.find { |v| v.label == label }
       end
 
-      # NOTE: lex responses should only include a recent_intent_summary_view
-      # block if we want to change/add an existing checkpoint. If we don't
-      # send a recent_intent_summary_view back in the response, lex retains
-      # the previous intent history.
-      def pending_checkpoints
-        stash[:checkpoint_pending] && lex.recent_intent_summary_view
+      def checkpoints
+        lex.session_state.session_attributes.checkpoints
       end
 
       def stash

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/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: pending_checkpoints,
-                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: pending_checkpoints,
-                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: pending_checkpoints,
-                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: pending_checkpoints,
-                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: pending_checkpoints,
-                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