aws-lex-conversation 3.1.0 → 4.1.0

data/lib/aws/lex/conversation/type/message/content_type.rb

@@ -8,9 +8,10 @@ module Aws
           class ContentType
             include Enumeration
 
+            enumeration('CustomPayload')
+            enumeration('ImageResponseCard')
             enumeration('PlainText')
             enumeration('SSML')
-            enumeration('CustomPayload')
           end
         end
       end

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

@@ -7,10 +7,9 @@ module Aws
         class Response
           include Base
 
-          required :dialog_action
-          optional :session_attributes
-          optional :recent_intent_summary_view
-          optional :active_contexts
+          required :session_state
+          required :messages
+          required :request_attributes
         end
       end
     end

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

@@ -7,14 +7,13 @@ module Aws
         class ResponseCard
           include Base
 
-          optional :version
-          optional :content_type, default: 'application/vnd.amazonaws.card.generic'
-          required :generic_attachments
+          required :title
+          required :buttons, default: -> { [] }
+          optional :sub_title
+          optional :image_url
 
           coerce(
-            version: integer!,
-            content_type: ResponseCard::ContentType,
-            generic_attachments: Array[GenericAttachment]
+            buttons: Array[ResponseCard::Button]
           )
         end
       end

data/lib/aws/lex/conversation/type/{sentiment_label.rb → sentiment.rb}

@@ -4,7 +4,7 @@ module Aws
   module Lex
     class Conversation
       module Type
-        class SentimentLabel
+        class Sentiment
           include Enumeration
 
           enumeration('POSITIVE')

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

@@ -7,12 +7,12 @@ module Aws
         class SentimentResponse
           include Base
 
-          required :sentiment_label
+          required :sentiment
           required :sentiment_score
 
           coerce(
-            sentiment_label: SentimentLabel,
-            sentiment_score: ->(v) { SentimentScore.parse_string(v) }
+            sentiment_label: Sentiment,
+            sentiment_score: SentimentScore
           )
         end
       end

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

@@ -7,27 +7,17 @@ module Aws
         class SentimentScore
           include Base
 
-          required :positive, from: :Positive
-          required :negative, from: :Negative
-          required :neutral, from: :Neutral
-          required :mixed, from: :Mixed
+          required :mixed
+          required :negative
+          required :neutral
+          required :positive
 
-          class << self
-            def parse_string(str)
-              parts = str
-                      .gsub(/[{}]/, '') # remove '{' or '}' chars
-                      .split(',') # break into components
-                      .map { |c| c.gsub(/\s/, '').split(':') }
-
-              params = parts.each_with_object({}) do |part, hash|
-                label = part.first
-                value = part.last.to_f
-                hash[label] = value
-              end
-
-              shrink_wrap(params)
-            end
-          end
+          coerce(
+            mixed: float!(nilable: true),
+            negative: float!(nilable: true),
+            neutral: float!(nilable: true),
+            positive: float!(nilable: true)
+          )
         end
       end
     end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Aws
+  module Lex
+    class Conversation
+      module Type
+        class SessionAttributes < Hash
+          include Base
+
+          optional :checkpoints
+
+          def checkpoints
+            @checkpoints ||= JSON.parse(
+              Base64.urlsafe_decode64(fetch(:checkpoints) { Base64.urlsafe_encode64([].to_json, padding: false) })
+            ).map do |checkpoint|
+              Checkpoint.shrink_wrap(checkpoint)
+            end
+          end
+
+          def to_lex
+            merge(
+              checkpoints: Base64.urlsafe_encode64(checkpoints.map(&:to_lex).to_json, padding: false)
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Aws
+  module Lex
+    class Conversation
+      module Type
+        class SessionState
+          include Base
+
+          optional :active_contexts, default: -> { [] }
+          optional :dialog_action
+          required :intent, default: -> { {} }
+          required :session_attributes, default: -> { {} }
+
+          coerce(
+            active_contexts: Array[Context],
+            dialog_action: DialogAction,
+            intent: Intent,
+            session_attributes: ->(v) { SessionAttributes[v.transform_keys(&:to_sym)] }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -7,17 +7,57 @@ module Aws
         class Slot
           include Base
 
-          required :current_intent, from: :current_intent, virtual: true
-          required :name
-          required :value
-          optional :active, virtual: true
+          required :shape, default: -> { 'Scalar' }
+          optional :name, virtual: true
+          required :lex_value, from: :value, default: -> { {} }, virtual: true
+          required :lex_values, from: :values, default: -> { [] }, virtual: true
+          required :active, default: -> { false }, virtual: true
 
-          def as_json(_opts = {})
-            to_lex
-          end
+          coerce(
+            shape: SlotShape,
+            lex_value: SlotValue,
+            lex_values: Array[Slot]
+          )
 
           def to_lex
-            value
+            super.merge(
+              value: transform_to_lex(lex_value),
+              values: transform_to_lex(lex_values)
+            )
+          end
+
+          def value=(val)
+            raise TypeError, 'use values= for List-type slots' if shape.list?
+
+            lex_value.interpreted_value = val
+          end
+
+          def value
+            raise TypeError, 'use values for List-type slots' if shape.list?
+
+            lex_value.interpreted_value
+          end
+
+          # takes an array of slot values
+          def values=(vals)
+            raise TypeError, 'use value= for Scalar-type slots' if shape.scalar?
+
+            self.lex_values = vals.map do |val|
+              Slot.shrink_wrap(
+                active: true,
+                value: {
+                  interpretedValue: val,
+                  originalValue: val,
+                  resolvedValues: [val]
+                }
+              )
+            end
+          end
+
+          def values
+            raise TypeError, 'use value for Scalar-type slots' if shape.scalar?
+
+            lex_values.map(&:value)
           end
 
           def active?
@@ -25,43 +65,28 @@ module Aws
           end
 
           def filled?
-            value.to_s != ''
+            shape.list? ? values.any? : value != '' && !value.nil?
           end
 
           def blank?
             !filled?
           end
 
-          def value=(other)
-            @value = other
-            current_intent.raw_slots[name] = @value
-          end
-
           def resolve!(index: 0)
-            self.value = resolved(index: index)
-          end
+            return if shape.list?
 
-          def resolved(index: 0)
-            details.resolutions.fetch(index) { SlotResolution.new(value: value) }.value
-          end
-
-          def original_value
-            details.original_value
+            lex_value.resolve!(index: index)
           end
 
           def resolvable?
-            details.resolutions.any?
+            return false if shape.list?
+
+            lex_value.resolvable?
           end
 
           def requestable?
             active? && blank?
           end
-
-          def details
-            @details ||= current_intent.slot_details.fetch(name.to_sym) do
-              SlotDetail.new(name: name, resolutions: [], original_value: value)
-            end
-          end
         end
       end
     end

data/lib/aws/lex/conversation/type/{slot_resolution.rb → slot_shape.rb}

@@ -4,10 +4,11 @@ module Aws
   module Lex
     class Conversation
       module Type
-        class SlotResolution
-          include Base
+        class SlotShape
+          include Enumeration
 
-          required :value
+          enumeration('List')
+          enumeration('Scalar')
         end
       end
     end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Aws
+  module Lex
+    class Conversation
+      module Type
+        class SlotValue
+          include Base
+
+          optional :original_value
+          optional :interpreted_value
+          required :resolved_values, default: -> { [] }
+
+          alias_method :value, :interpreted_value
+          alias_method :value=, :interpreted_value=
+
+          def to_lex
+            {
+              interpretedValue: interpreted_value,
+              originalValue: original_value,
+              resolvedValues: resolved_values
+            }
+          end
+
+          def resolve!(index: 0)
+            self.interpreted_value = resolved(index: index)
+          end
+
+          def resolved(index: 0)
+            resolved_values.fetch(index) { interpreted_value }
+          end
+
+          def resolvable?
+            resolved_values.any?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Aws
   module Lex
     class Conversation
-      VERSION = '3.1.0'
+      VERSION = '4.1.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-lex-conversation
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Jesse Doyle
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrink_wrap
@@ -74,30 +74,32 @@ files:
 - lib/aws/lex/conversation/support/mixins/slot_elicitation.rb
 - lib/aws/lex/conversation/type/base.rb
 - lib/aws/lex/conversation/type/bot.rb
-- lib/aws/lex/conversation/type/confirmation_status.rb
+- lib/aws/lex/conversation/type/checkpoint.rb
+- lib/aws/lex/conversation/type/confirmation_state.rb
 - lib/aws/lex/conversation/type/context.rb
+- lib/aws/lex/conversation/type/dialog_action.rb
 - lib/aws/lex/conversation/type/dialog_action_type.rb
 - lib/aws/lex/conversation/type/enumeration.rb
 - lib/aws/lex/conversation/type/event.rb
 - lib/aws/lex/conversation/type/fulfillment_state.rb
+- lib/aws/lex/conversation/type/input_mode.rb
 - lib/aws/lex/conversation/type/intent.rb
 - lib/aws/lex/conversation/type/intent_confidence.rb
+- lib/aws/lex/conversation/type/interpretation.rb
 - lib/aws/lex/conversation/type/invocation_source.rb
 - lib/aws/lex/conversation/type/message.rb
 - lib/aws/lex/conversation/type/message/content_type.rb
-- lib/aws/lex/conversation/type/output_dialog_mode.rb
-- lib/aws/lex/conversation/type/recent_intent_summary_view.rb
 - lib/aws/lex/conversation/type/response.rb
 - lib/aws/lex/conversation/type/response_card.rb
 - lib/aws/lex/conversation/type/response_card/button.rb
-- lib/aws/lex/conversation/type/response_card/content_type.rb
-- lib/aws/lex/conversation/type/response_card/generic_attachment.rb
-- lib/aws/lex/conversation/type/sentiment_label.rb
+- lib/aws/lex/conversation/type/sentiment.rb
 - lib/aws/lex/conversation/type/sentiment_response.rb
 - lib/aws/lex/conversation/type/sentiment_score.rb
+- lib/aws/lex/conversation/type/session_attributes.rb
+- lib/aws/lex/conversation/type/session_state.rb
 - lib/aws/lex/conversation/type/slot.rb
-- lib/aws/lex/conversation/type/slot_detail.rb
-- lib/aws/lex/conversation/type/slot_resolution.rb
+- lib/aws/lex/conversation/type/slot_shape.rb
+- lib/aws/lex/conversation/type/slot_value.rb
 - lib/aws/lex/conversation/type/time_to_live.rb
 - lib/aws/lex/conversation/version.rb
 homepage: https://github.com/amaabca/aws-lex-conversation

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

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Aws
-  module Lex
-    class Conversation
-      module Type
-        class RecentIntentSummaryView
-          include Base
-
-          required :intent_name
-          required :slots
-          required :confirmation_status
-          required :dialog_action_type
-
-          optional :checkpoint_label
-          optional :fulfillment_state
-          optional :slot_to_elicit
-
-          coerce(
-            slots: symbolize_hash!,
-            confirmation_status: ConfirmationStatus,
-            dialog_action_type: DialogActionType,
-            fulfillment_state: FulfillmentState
-          )
-
-          # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-          def restore(conversation, opts = {})
-            case dialog_action_type.raw
-            when 'Close'
-              conversation.close(
-                fulfillment_state: opts.fetch(:fulfillment_state) { fulfillment_state },
-                message: opts.fetch(:message),
-                response_card: opts[:response_card]
-              )
-            when 'ConfirmIntent'
-              conversation.confirm_intent(
-                intent_name: intent_name,
-                message: opts.fetch(:message),
-                response_card: opts[:response_card],
-                slots: slots
-              )
-            when 'Delegate'
-              conversation.delegate(
-                kendra_query_request_payload: opts[:kendra_query_request_payload],
-                kendra_query_filter_string: opts[:kendra_query_filter_string],
-                slots: slots
-              )
-            when 'ElicitIntent'
-              conversation.elicit_intent(
-                message: opts.fetch(:message),
-                response_card: opts[:response_card]
-              )
-            when 'ElicitSlot'
-              conversation.elicit_slot(
-                intent_name: intent_name,
-                message: opts.fetch(:message),
-                response_card: opts[:response_card],
-                slots: slots,
-                slot_to_elicit: slot_to_elicit
-              )
-            else
-              raise ArgumentError, "invalid DialogActionType: `#{dialog_action_type.raw}`"
-            end
-          end
-          # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-        end
-      end
-    end
-  end
-end