Merge pull request #24 from stephenrob/builtin-intents

Add support for custom built in intent definitions

Author: stephenrob

lib/BotManager/client.rb

@@ -31,6 +31,7 @@ def initialize release, release_file, alexa_config={}
       @intent_versions = {}
       @bots = {}
       @bot_versions = {}
+      @builtin_intents = {}
       @alexa_amazon_intents = ["AMAZON.FallbackIntent", "AMAZON.CancelIntent", "AMAZON.HelpIntent", "AMAZON.StopIntent", "AMAZON.YesIntent", "AMAZON.NoIntent"]
       @lex_valid_amazon_intents = ["AMAZON.HelpIntent"]
       @lex_manager = Lex::Manager.new
@@ -44,7 +45,11 @@ def load_slot_type slot_type_file
 
     def load_intent intent_file
       parsed_intent = Parsers::IntentParser.new intent_file
-      @intents[parsed_intent.name] = parsed_intent
+      if !parsed_intent.type.nil? && parsed_intent.type.start_with?('AMAZON.')
+        @builtin_intents[parsed_intent.type] = parsed_intent
+      else
+        @intents[parsed_intent.name] = parsed_intent
+      end
     end
 
     def load_bot bot_file
@@ -206,20 +211,43 @@ def register_bots_with_lex
 
           next unless @lex_valid_amazon_intents.include? builtin_intent[:type]
 
-          intent_name = generate_lex_full_name builtin_intent[:name]
+          if @builtin_intents[builtin_intent[:type]].nil?
 
-          lex_intent = Lex::BuiltInIntent.new builtin_intent[:type], intent_name
+            intent_name = generate_lex_full_name builtin_intent[:name]
 
-          fulfillment_activity = builtin_intent[:fulfillment_activity]
+            lex_intent = Lex::BuiltInIntent.new builtin_intent[:type], intent_name
 
-          if !fulfillment_activity.nil? && !fulfillment_activity.empty?
-            lex_fulfillment_activity = Lex::CodeHookFulfillmentActivity.new fulfillment_activity[:uri]
-            lex_intent.set_fulfillment_activity lex_fulfillment_activity
-          end
+            fulfillment_activity = builtin_intent[:fulfillment_activity]
+
+            if !fulfillment_activity.nil? && !fulfillment_activity.empty?
+              lex_fulfillment_activity = Lex::CodeHookFulfillmentActivity.new fulfillment_activity[:uri]
+              lex_intent.set_fulfillment_activity lex_fulfillment_activity
+            end
+
+            version = @lex_manager.register_intent lex_intent
+
+            lex_bot.register_intent intent_name, version
+
+          else
+
+            custom_builtin_intent = @builtin_intents[builtin_intent[:type]]
+
+            intent_name = generate_lex_full_name custom_builtin_intent.name
 
-          version = @lex_manager.register_intent lex_intent
+            lex_intent = Lex::BuiltInIntent.new builtin_intent[:type], intent_name
 
-          lex_bot.register_intent intent_name, version
+            fulfillment_activity = custom_builtin_intent.lex[:fulfillment_activity]
+
+            if !fulfillment_activity.nil? && !fulfillment_activity.empty?
+              lex_fulfillment_activity = Lex::CodeHookFulfillmentActivity.new fulfillment_activity[:uri]
+              lex_intent.set_fulfillment_activity lex_fulfillment_activity
+            end
+
+            version = @lex_manager.register_intent lex_intent
+
+            lex_bot.register_intent intent_name, version
+
+          end
 
         end
 
@@ -598,6 +626,15 @@ def register_interaction_model_with_alexa
 
         language_intent = BotManager::Alexa::LanguageModel::Intent.new intent_name
 
+        if !@builtin_intents[intent_name].nil?
+
+          custom_builtin_intent = @builtin_intents[intent_name]
+
+          custom_builtin_intent.sample_utterances.each do |utterance|
+            language_intent.add_sample utterance
+          end
+        end
+
         language_intents[intent_name] = language_intent
 
       end

lib/BotManager/parsers/intent_parser.rb

@@ -22,6 +22,10 @@ def description
         @intent[:description]
       end
 
+      def type
+        @intent[:type]
+      end
+
       def sample_utterances
         @intent[:sample_utterances]
       end