Merge branch 'stanford-oval:master' into master

main/com.spotify/database-map.tsv

@@ -1,5 +1,5 @@
-com.spotify:song	simulation/spotify_song_db.json
-com.spotify:artist	simulation/spotify_artist_db.json
-com.spotify:album	simulation/spotify_album_db.json
-com.spotify:playable	simulation/spotify_song_db.json
-com.spotify:play_song	simulation/spotify_play_song.json
+org.thingpedia.media-source:song	simulation/spotify_song_db.json
+org.thingpedia.media-source:artist	simulation/spotify_artist_db.json
+org.thingpedia.media-source:album	simulation/spotify_album_db.json
+org.thingpedia.media-source:playable	simulation/spotify_song_db.json
+org.thingpedia.media-player:play	simulation/spotify_play_song.json

main/com.spotify/eval/scenarios.txt

@@ -154,7 +154,7 @@ A: >> expecting = null
 U: \t $dialogue @org.thingpedia.dialogue.transaction.execute;
 U: now => @org.thingpedia.media-player.player_pause();
 
-A: I paused playback( for you)?\.?
+A: I stopped (playing|playback)( for you)?\.?
 A: >> expecting = null
 
 ====

main/com.tunein/eval/scenarios.txt

@@ -14,7 +14,7 @@ A: >> expecting = yesno
 U: \t $dialogue @org.thingpedia.dialogue.transaction.execute;
 U: now => @com.tunein.most_popular_stations() => notify;
 
-A: I (see|have( found)?) .*, .*, and .*\. *.* is a most popular radio stations currently streaming .*\.
+A: I (see|have( found)?) .*, .*, and .*\. *.* is a most popular radio stations currently streaming .*
 A: rdl: .* http://opml.radiotime.com/Tune.ashx\?id=.*
 A: rdl: .* http://opml.radiotime.com/Tune.ashx\?id=.*
 A: rdl: .* http://opml.radiotime.com/Tune.ashx\?id=.*
@@ -26,7 +26,7 @@ A: >> expecting = null
 U: \t $dialogue @org.thingpedia.dialogue.transaction.execute;
 U: now => @com.tunein.local_stations() => notify;
 
-A: I (see|have( found)?) .*, .*, and .*\. *.* is a local radio stations currently streaming .*\.
+A: I (see|have( found)?) .*, .*, and .*\. *.* is a local radio stations currently streaming .*
 A: rdl: .* http://opml.radiotime.com/Tune.ashx\?id=.*
 A: rdl: .* http://opml.radiotime.com/Tune.ashx\?id=.*
 A: rdl: .* http://opml.radiotime.com/Tune.ashx\?id=.*

main/org.thingpedia.media-player/manifest.tt

@@ -26,13 +26,13 @@ abstract class @org.thingpedia.media-player
     #[confirm=false];
 
     action player_pause()
-    #_[canonical=["pause playback",
+    #_[canonical=["stop playing",
+                  "stop playback",
+                  "stop the music",
+                  "pause playback",
                   "pause my spotify",
                   "pause the music",
-                  "pause playing",
-                  "stop playing",
-                  "stop playback",
-                  "stop the music"]]
+                  "pause playing"]]
     #_[confirmation="pause playback"]
     #_[on_error={no_active_device=["you must open the spotify app first", "no spotify player is active"],
     disallowed_action=["music is already paused"],

scripts/make-calibration-ood.sh

@@ -16,7 +16,6 @@ genie dialog-to-contextual -o staging-devtrain.tsv --thingpedia eval/staging/sch
   --side user --flags E --id-prefix staging/ --deduplicate --no-tokenized --ignore-errors \
   staging/*/eval/dev/annotated.txt staging/*/eval/train/annotated.txt
 
-sed -E -e 's/\t\$dialogue [^\t]*$/\t\$ood ;/' staging-devtrain.tsv \
-  staging/*/eval/paraphrase.tsv >> calibration-ood.tsv
+sed -E -e 's/\t\$dialogue [^\t]*$/\t\$ood ;/' staging-devtrain.tsv >> calibration-ood.tsv
 
 aws s3 cp calibration-ood.tsv s3://geniehai/gcampax/calibration-ood.tsv