Merge "Minor change to agent template"

dialogflow · Nov 28, 2018 · f2a7d5d · f2a7d5d
2 parents 43a5cf7 + 40a8d39
commit f2a7d5d
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 59 deletions.
diff --git a/dialogflow-agent.zip b/dialogflow-agent.zip
diff --git a/dialogflow-agent/agent.json b/dialogflow-agent/agent.json
@@ -4,6 +4,7 @@
   "disableInteractionLogs": false,
   "disableStackdriverLogs": true,
   "googleAssistant": {
+    "autoPreviewEnabled": true,
     "googleAssistantCompatible": true,
     "project": "basic-slotfilling",
     "welcomeIntentSignInRequired": false,
@@ -19,14 +20,13 @@
     "voiceType": "MALE_1",
     "capabilities": [],
     "protocolVersion": "V2",
-    "autoPreviewEnabled": true,
     "isDeviceAgent": false
   },
   "defaultTimezone": "America/Los_Angeles",
   "webhook": {
     "url": "https://us-central1-basic-slotfilling.cloudfunctions.net/dialogflowFirebaseFulfillment",
     "headers": {
-      "":""
+      "": ""
     },
     "available": true,
     "useForDomains": false,
@@ -40,5 +40,6 @@
   "onePlatformApiVersion": "v2",
   "analyzeQueryTextSentiment": false,
   "enabledKnowledgeBaseNames": [],
-  "knowledgeServiceConfidenceAdjustment": -0.4
+  "knowledgeServiceConfidenceAdjustment": -0.4,
+  "dialogBuilderMode": false
 }
diff --git a/dialogflow-agent/intents/Default Welcome Intent.json b/dialogflow-agent/intents/Default Welcome Intent.json
@@ -16,7 +16,7 @@
           "speech": "Hey there, welcome to Ad Libs! All I need is a country, year, and color for a great story."
         }
       ],
-      "defaultResponsePlatforms": {},
+      "defaultResponsePlatforms": { "google": true },
       "speech": []
     }
   ],
@@ -30,4 +30,4 @@
       "name": "WELCOME"
     }
   ]
-}
+}
diff --git a/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json b/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json
@@ -1,9 +1,9 @@
 [
   {
-    "id": "92ba1374-fb90-488a-bcc2-aee8386ff6ce",
+    "id": "6e863af7-b867-4fdb-8543-4148bccac618",
     "data": [
       {
-        "text": "just going to say hi",
+        "text": "hello hi",
         "userDefined": false
       }
     ],
@@ -12,10 +12,10 @@
     "updated": 0
   },
   {
-    "id": "88784995-6838-434e-8432-d4203ff45911",
+    "id": "ba9487ab-d740-4f50-93de-8b6ecaad7ecb",
     "data": [
       {
-        "text": "a good day",
+        "text": "hi",
         "userDefined": false
       }
     ],
@@ -24,10 +24,10 @@
     "updated": 0
   },
   {
-    "id": "921059e3-55de-4263-a715-92d194b64d53",
+    "id": "8ed23d0a-81a7-47d4-a4bf-04ddccf14cc1",
     "data": [
       {
-        "text": "hey there",
+        "text": "hello there",
         "userDefined": false
       }
     ],
@@ -36,10 +36,10 @@
     "updated": 0
   },
   {
-    "id": "6e863af7-b867-4fdb-8543-4148bccac618",
+    "id": "43997ccc-52d1-4a4a-9ef5-12113d694798",
     "data": [
       {
-        "text": "hello hi",
+        "text": "hello",
         "userDefined": false
       }
     ],
@@ -60,10 +60,10 @@
     "updated": 0
   },
   {
-    "id": "ba9487ab-d740-4f50-93de-8b6ecaad7ecb",
+    "id": "65b9e20a-2157-4daa-981e-8af1bc147c7f",
     "data": [
       {
-        "text": "hi",
+        "text": "hey",
         "userDefined": false
       }
     ],
@@ -72,10 +72,10 @@
     "updated": 0
   },
   {
-    "id": "a7977d0c-87dd-42c4-b70f-9ebb3679166d",
+    "id": "88784995-6838-434e-8432-d4203ff45911",
     "data": [
       {
-        "text": "greetings",
+        "text": "a good day",
         "userDefined": false
       }
     ],
@@ -84,10 +84,10 @@
     "updated": 0
   },
   {
-    "id": "cccf2add-5470-4f21-bdfa-850f4b818a8b",
+    "id": "921059e3-55de-4263-a715-92d194b64d53",
     "data": [
       {
-        "text": "howdy",
+        "text": "hey there",
         "userDefined": false
       }
     ],
@@ -108,22 +108,22 @@
     "updated": 0
   },
   {
-    "id": "228474be-7b90-4e1f-9290-770d3ee5a5bb",
+    "id": "a6a4458c-a511-4eae-81fd-35a11a4394a9",
     "data": [
       {
-        "text": "heya",
+        "text": "hi there",
         "userDefined": false
       }
     ],
     "isTemplate": false,
-    "count": 0,
+    "count": 1,
     "updated": 0
   },
   {
-    "id": "8ed23d0a-81a7-47d4-a4bf-04ddccf14cc1",
+    "id": "c1cb51d6-d229-469a-8c63-1f50365f9273",
     "data": [
       {
-        "text": "hello there",
+        "text": "hello again",
         "userDefined": false
       }
     ],
@@ -132,22 +132,22 @@
     "updated": 0
   },
   {
-    "id": "a6a4458c-a511-4eae-81fd-35a11a4394a9",
+    "id": "4ff5bca4-e61e-4450-aca4-e43167dc5c77",
     "data": [
       {
-        "text": "hi there",
+        "text": "lovely day isn\u0027t it",
         "userDefined": false
       }
     ],
     "isTemplate": false,
-    "count": 1,
+    "count": 0,
     "updated": 0
   },
   {
-    "id": "43997ccc-52d1-4a4a-9ef5-12113d694798",
+    "id": "cccf2add-5470-4f21-bdfa-850f4b818a8b",
     "data": [
       {
-        "text": "hello",
+        "text": "howdy",
         "userDefined": false
       }
     ],
@@ -156,10 +156,10 @@
     "updated": 0
   },
   {
-    "id": "c1cb51d6-d229-469a-8c63-1f50365f9273",
+    "id": "a7977d0c-87dd-42c4-b70f-9ebb3679166d",
     "data": [
       {
-        "text": "hello again",
+        "text": "greetings",
         "userDefined": false
       }
     ],
@@ -168,10 +168,10 @@
     "updated": 0
   },
   {
-    "id": "65b9e20a-2157-4daa-981e-8af1bc147c7f",
+    "id": "92ba1374-fb90-488a-bcc2-aee8386ff6ce",
     "data": [
       {
-        "text": "hey",
+        "text": "just going to say hi",
         "userDefined": false
       }
     ],
@@ -180,10 +180,10 @@
     "updated": 0
   },
   {
-    "id": "4ff5bca4-e61e-4450-aca4-e43167dc5c77",
+    "id": "228474be-7b90-4e1f-9290-770d3ee5a5bb",
     "data": [
       {
-        "text": "lovely day isn\u0027t it",
+        "text": "heya",
         "userDefined": false
       }
     ],

diff --git a/dialogflow-agent/intents/makeAdlibStory.json b/dialogflow-agent/intents/makeAdlibStory.json
@@ -17,7 +17,7 @@
           "prompts": [
             {
               "lang": "en",
-              "value": "Oops you forgot $geo-country"
+              "value": "I need a country!"
             }
           ],
           "isList": false
@@ -31,7 +31,7 @@
           "prompts": [
             {
               "lang": "en",
-              "value": "You forgot $number, give me any number"
+              "value": "What\u0027s a random year?"
             }
           ],
           "isList": false
@@ -45,7 +45,7 @@
           "prompts": [
             {
               "lang": "en",
-              "value": "Please tell me a $color"
+              "value": "Give me a random color"
             }
           ],
           "isList": false
@@ -55,7 +55,7 @@
         {
           "type": 0,
           "lang": "en",
-          "speech": "So according to David Attenborough, back in the year $number, the nearly extinct yet exquisite, $color -bellied fox was introduced to $geo-country and now flourishes in over 236 distinct regions."
+          "speech": "So according to Professor David, back in the year $number, the nearly  extinct yet exquisite, $color -bellied fox was introduced to $geo-country and now flourishes in over 236 distinct regions."
         }
       ],
       "defaultResponsePlatforms": {},
@@ -65,7 +65,7 @@
   "priority": 500000,
   "webhookUsed": true,
   "webhookForSlotFilling": true,
-  "lastUpdate": 1534450427,
+  "lastUpdate": 1543435799,
   "fallbackIntent": false,
   "events": []
 }
diff --git a/dialogflow-agent/intents/makeAdlibStory_usersays_en.json b/dialogflow-agent/intents/makeAdlibStory_usersays_en.json
@@ -1,66 +1,66 @@
 [
   {
-    "id": "193c247d-1614-4cce-8ec1-89f47fd3fb15",
+    "id": "7ae7e292-ce3e-4fcc-b6cd-9ef068ffb025",
     "data": [
       {
-        "text": "Canada",
-        "alias": "geo-country",
-        "meta": "@sys.geo-country",
+        "text": "orange",
+        "alias": "color",
+        "meta": "@sys.color",
         "userDefined": true
       },
       {
         "text": " ",
         "userDefined": false
       },
       {
-        "text": "green",
-        "alias": "color",
-        "meta": "@sys.color",
+        "text": "Iceland",
+        "alias": "geo-country",
+        "meta": "@sys.geo-country",
         "userDefined": true
       },
       {
         "text": " ",
         "userDefined": false
       },
       {
-        "text": "1955",
+        "text": "1985",
         "alias": "number",
         "meta": "@sys.number",
-        "userDefined": true
+        "userDefined": false
       }
     ],
     "isTemplate": false,
     "count": 0,
     "updated": 1534441427
   },
   {
-    "id": "7ae7e292-ce3e-4fcc-b6cd-9ef068ffb025",
+    "id": "193c247d-1614-4cce-8ec1-89f47fd3fb15",
     "data": [
       {
-        "text": "orange",
-        "alias": "color",
-        "meta": "@sys.color",
+        "text": "Canada",
+        "alias": "geo-country",
+        "meta": "@sys.geo-country",
         "userDefined": true
       },
       {
         "text": " ",
         "userDefined": false
       },
       {
-        "text": "Iceland",
-        "alias": "geo-country",
-        "meta": "@sys.geo-country",
+        "text": "green",
+        "alias": "color",
+        "meta": "@sys.color",
         "userDefined": true
       },
       {
         "text": " ",
         "userDefined": false
       },
       {
-        "text": "1985",
+        "text": "1955",
         "alias": "number",
         "meta": "@sys.number",
-        "userDefined": false
+        "userDefined": true
       }
     ],
     "isTemplate": false,

diff --git a/functions/index.js b/functions/index.js
@@ -44,7 +44,7 @@
      else if (missingSlots.length === 3){
          agent.add(`Ok, I need all 3 things still: a ${missingSlots[0]}, ${missingSlots[1]}, and ${missingSlots[2]}`);
      } else {
-       agent.add(`So according to David Attenborough, back in the year
+       agent.add(`So according to Professor David, back in the year
        ${year}, the nearly extinct yet exquisite,
        ${color}-bellied fox was introduced to ${nation} and now flourishes in over 361 regions.`);
      }