aws-lex-conversation 4.2.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b9a6aa5e59e3f2c016255c6fbd46f30631ece6c981fa81d45c2b300f676041
-  data.tar.gz: a49c289a1c5cf5189f3f87e971a32947dc5ab2a6380189b39c8544c1d5792c20
+  metadata.gz: 46556f575fd08ac0ded8d8fc50692be70388fbf1e3d96ff8d236c82a5e8eb860
+  data.tar.gz: c5456ec5961936b210d80491bb9edaebf503c71daba5acf755257b36ae211875
 SHA512:
-  metadata.gz: c94e997fba06c3658c53d0a51dd4b67a0c3f75118fddd7ba0430ecba2e8433d4e601ba9da5e14d7307d200c97bdda47f74e35809b0e4ae95883c6572365e311e
-  data.tar.gz: 8734811c21883cc5ba09a234bbd04a1cd6fcf5b98f189406da843c30ea631c19fc0e32ae2a95a7bfdda6985f849ba4e2804f3e3897a3a46eebc9b2de6eb2396d
+  metadata.gz: dfcf7591d2c9667d17f3863dde180724c4dc5ec5b2f623173be6c11b6cbf9548d99b39ae1ad809e25adb6069fea9239dc58c3a8776bc85340ec07c9752a3c976
+  data.tar.gz: 6cd97d779b1e482c19300db5cb63e9d36f01278be04c896dc603138b0a293d0baf8fa8cfadfd95d27896b4a467d81211607bb0cb551e960f72d3efd740a5a9cf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.3.0 - August 25, 2021
+
+* Slot elicitor can now be passed an Aws::Lex::Conversation::Type::Message as part of the DSL/callback and properly formats the response as such
+
 # 4.1.0 - July 21, 2021
 
 * Don't set the `intent` property in the response for `ElicitIntent`

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

@@ -5,42 +5,32 @@ module Aws
     class Conversation
       module Slot
         class Elicitation
-          attr_accessor :name, :elicit, :message, :follow_up_message,
-                        :content_type, :fallback, :maximum_elicitations,
-                        :conversation
+          attr_accessor :name, :elicit, :messages, :follow_up_messages,
+                        :fallback, :maximum_elicitations, :conversation
 
           def initialize(opts = {})
             self.name = opts.fetch(:name)
             self.elicit = opts.fetch(:elicit) { ->(_c) { true } }
-            self.message = opts.fetch(:message)
-            self.follow_up_message = opts.fetch(:follow_up_message) { opts.fetch(:message) }
-            self.content_type = opts.fetch(:content_type) do
-              Aws::Lex::Conversation::Type::Message::ContentType.new('PlainText')
-            end
-            self.fallback = opts.fetch(:fallback) { ->(_c) {} }
+            self.messages = opts.fetch(:messages)
+            self.follow_up_messages = opts.fetch(:follow_up_messages) { opts.fetch(:messages) }
+            self.fallback = opts[:fallback]
             self.maximum_elicitations = opts.fetch(:maximum_elicitations) { 0 }
           end
 
           def elicit!
+            return false unless elicit?
             return fallback.call(conversation) if maximum_elicitations?
 
             increment_slot_elicitations!
             conversation.elicit_slot(
               slot_to_elicit: name,
-              messages: [
-                {
-                  contentType: message_content_type,
-                  content: elicitation_content
-                }
-              ]
+              messages: elicitation_messages
             )
           end
 
-          def message_content_type
-            content_type.is_a?(Proc) ? content_type.call(conversation) : content_type
-          end
-
           def elicit?
+            return false if maximum_elicitations? && fallback.nil?
+
             elicit.call(conversation) && !slot.filled?
           end
 
@@ -50,11 +40,11 @@ module Aws
             conversation.slots[name.to_sym]
           end
 
-          def elicitation_content
-            first_elicitation? ? compose_message(message) : compose_message(follow_up_message)
+          def elicitation_messages
+            first_elicitation? ? compose_messages(messages) : compose_messages(follow_up_messages)
           end
 
-          def compose_message(msg)
+          def compose_messages(msg)
             msg.is_a?(Proc) ? msg.call(conversation) : msg
           end
 

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

@@ -9,8 +9,10 @@ module Aws
             def close(opts = {})
               params = {
                 session_state: lex.session_state,
-                request_attributes: lex.request_attributes
+                request_attributes: lex.request_attributes,
+                intent: lex.current_intent
               }.merge(opts)
+              lex.session_state.intent = params.fetch(:intent)
               Response::Close.new(params).to_lex
             end
 
@@ -27,16 +29,20 @@ module Aws
             def delegate(opts = {})
               params = {
                 session_state: lex.session_state,
-                request_attributes: lex.request_attributes
+                request_attributes: lex.request_attributes,
+                intent: lex.current_intent
               }.merge(opts)
+              lex.session_state.intent = params.fetch(:intent)
               Response::Delegate.new(params).to_lex
             end
 
             def elicit_intent(opts = {})
               params = {
                 session_state: lex.session_state,
-                request_attributes: lex.request_attributes
+                request_attributes: lex.request_attributes,
+                intent: lex.current_intent
               }.merge(opts)
+              lex.session_state.intent = params.fetch(:intent)
               Response::ElicitIntent.new(params).to_lex
             end
 

data/lib/aws/lex/conversation/type/checkpoint.rb

@@ -20,11 +20,12 @@ module Aws
             fulfillment_state: FulfillmentState
           )
 
-          # rubocop:disable Metrics/MethodLength
+          # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           def restore(conversation, opts = {})
             case dialog_action_type.raw
             when 'Close'
               conversation.close(
+                intent: intent,
                 fulfillment_state: opts.fetch(:fulfillment_state) { fulfillment_state },
                 messages: opts.fetch(:messages)
               )
@@ -34,9 +35,12 @@ module Aws
                 messages: opts.fetch(:messages)
               )
             when 'Delegate'
-              conversation.delegate
+              conversation.delegate(
+                intent: intent
+              )
             when 'ElicitIntent'
               conversation.elicit_intent(
+                intent: intent,
                 messages: opts.fetch(:messages)
               )
             when 'ElicitSlot'
@@ -49,7 +53,7 @@ module Aws
               raise ArgumentError, "invalid DialogActionType: `#{dialog_action_type.raw}`"
             end
           end
-          # rubocop:enable Metrics/MethodLength
+          # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
         end
       end
     end

data/lib/aws/lex/conversation/type/session_attributes.rb

@@ -20,7 +20,7 @@ module Aws
           def to_lex
             merge(
               checkpoints: Base64.urlsafe_encode64(checkpoints.map(&:to_lex).to_json, padding: false)
-            )
+            ).to_h
           end
         end
       end

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

@@ -3,7 +3,7 @@
 module Aws
   module Lex
     class Conversation
-      VERSION = '4.2.0'
+      VERSION = '5.1.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-lex-conversation
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Jesse Doyle
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrink_wrap