Merge f8bce76 into 409eae8

stanford-oval · Jul 21, 2021 · 2967e1a · 2967e1a
2 parents 409eae8 + f8bce76
commit 2967e1a
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 130 deletions.
diff --git a/eval/everything/dev/annotated.txt b/eval/everything/dev/annotated.txt
@@ -195,20 +195,10 @@ A: Hello, what can I do for you?
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_greet;
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no thanks
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # recording/70f9e38f567391dc05ef31a41047f726
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no thanks
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # log/158401
 U: hello almon
@@ -567,7 +557,7 @@ A: The current weather in Menlo Park is cloudy. The temperature is 62.4 F and th
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_display_result;
 U: What is the humidity?
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.iot.humidity.humidity();
+UT: [humidity] of @org.thingpedia.weather.current(location=new Location(37.4519671, -122.1779927, "Menlo Park"));
 ====
 # recording/db9d8bd7d3217a7100457981df813239
 U: What is the temperature here?
@@ -1782,11 +1772,6 @@ UT: @org.thingpedia.builtin.thingengine.builtin.faq_reply(question=enum about_al
 # recording/90a50a1078390e8d747cf1238ba17d2f
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # recording/a0d98f0449e864c091ae904bd6f8097a
 U: hi
@@ -1795,11 +1780,6 @@ UT: $dialogue @org.thingpedia.dialogue.transaction.greet;
 # recording/7dbccc32973ad07f3d0ff6b03ce3c2b6
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # recording/fe463257269792171d41a0484484ecc1
 U: bya
@@ -1808,11 +1788,6 @@ UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
 # recording/515163de5dbcfa5b6744976b37832b26
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # recording/b27bc4f8384a464f4104f0f398f6d04c
 U: hi
@@ -1854,7 +1829,7 @@ U: play baba riley by the who
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
 UT: @org.thingpedia.media-source.playable() filter contains(artists, null^^org.thingpedia.media-source:artist("the who")) && id =~ "baba riley" => @org.thingpedia.media-player.play(playable=id);
 C: $dialogue @org.thingpedia.dialogue.transaction.execute;
-C: (@org.thingpedia.media-source(id="org.thingpedia.media-source-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, "spotify:artist:67ea9eGLXYMsO2eYQRui3w"^^org.thingpedia.media-source:artist("The Who")) && id =~ "baba riley")[1] => @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).play(playable=id)
+C: (@org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, "spotify:artist:67ea9eGLXYMsO2eYQRui3w"^^org.thingpedia.media-source:artist("The Who")) && id =~ "baba riley")[1] => @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).play(playable=id)
 C: #[results=[
 C:   { device="XXXXXXXX"^^org.thingpedia.media-player:device, playable="spotify:track:3qiyyUfYe7CRYLucrPmulD"^^org.thingpedia.media-source:playable("Baba O'Riley"), __device="XXXXXXXX"^^tt:device_id }
 C: ]];
@@ -1864,31 +1839,31 @@ U: next song
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
 UT: @org.thingpedia.media-player.player_next();
 C: $dialogue @org.thingpedia.dialogue.transaction.execute;
-C: (@org.thingpedia.media-source(id="org.thingpedia.media-source-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, "spotify:artist:67ea9eGLXYMsO2eYQRui3w"^^org.thingpedia.media-source:artist("The Who")) && id =~ "baba riley")[1] => @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).play(playable=id)
+C: (@org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, "spotify:artist:67ea9eGLXYMsO2eYQRui3w"^^org.thingpedia.media-source:artist("The Who")) && id =~ "baba riley")[1] => @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).play(playable=id)
 C: #[results=[
 C:   { device="XXXXXXXX"^^org.thingpedia.media-player:device, playable="spotify:track:3qiyyUfYe7CRYLucrPmulD"^^org.thingpedia.media-source:playable("Baba O'Riley"), __device="XXXXXXXX"^^tt:device_id }
 C: ]];
-C: @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).player_next()
+C: @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).player_next()
 C: #[results=[]];
 A: I played the next song.
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_action_success;
 U: next please
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).player_next();
+UT: @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).player_next();
 C: $dialogue @org.thingpedia.dialogue.transaction.execute;
-C: (@org.thingpedia.media-source(id="org.thingpedia.media-source-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, "spotify:artist:67ea9eGLXYMsO2eYQRui3w"^^org.thingpedia.media-source:artist("The Who")) && id =~ "baba riley")[1] => @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).play(playable=id)
+C: (@org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, "spotify:artist:67ea9eGLXYMsO2eYQRui3w"^^org.thingpedia.media-source:artist("The Who")) && id =~ "baba riley")[1] => @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).play(playable=id)
 C: #[results=[
 C:   { device="XXXXXXXX"^^org.thingpedia.media-player:device, playable="spotify:track:3qiyyUfYe7CRYLucrPmulD"^^org.thingpedia.media-source:playable("Baba O'Riley"), __device="XXXXXXXX"^^tt:device_id }
 C: ]];
-C: @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).player_next()
+C: @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).player_next()
 C: #[results=[]];
-C: @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).player_next()
+C: @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).player_next()
 C: #[results=[]];
 A: I played the next song.
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_action_success;
 U: play the who
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.media-source.playable() filter contains(artists, null^^org.thingpedia.media-source:artist("the who")) => @org.thingpedia.media-player(id="org.thingpedia.media-player-XXXXXXXX"^^tt:device_id).play(playable=id);
+UT: @org.thingpedia.media-source.playable() filter contains(artists, null^^org.thingpedia.media-source:artist("the who")) => @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).play(playable=id);
 ====
 # recording/8d1d57109d0565e79262c53b2a3a7702
 U: can you tell me a good japanese restaurant

diff --git a/eval/everything/train/annotated.txt b/eval/everything/train/annotated.txt
@@ -70,20 +70,10 @@ UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
 # recording/a6bdb647534ed0a5a29f997c49d4d598
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # recording/6348bd611b59e53055b947a050457268
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # log/158327
 U: hello, almond
@@ -790,11 +780,6 @@ A: Hi, how can I help you?
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_greet;
 U: bye
 UT: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-C: $dialogue @org.thingpedia.dialogue.transaction.cancel;
-A: Is there anything else I can help you with?
-AT: $dialogue @org.thingpedia.dialogue.transaction.sys_anything_else;
-U: no
-UT: $dialogue @org.thingpedia.dialogue.transaction.end;
 ====
 # recording/d1e3878b6fd3c673a87d3da6ccb09566
 U: hey

diff --git a/main/com.spotify/eval/dev/annotated.txt b/main/com.spotify/eval/dev/annotated.txt
@@ -4586,7 +4586,7 @@ A: Sorry, failed to play: you must first click play from inside the Spotify app,
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_action_error;
 U: play the podcast all the presidents lawyers
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.media-source.show() filter id =~ "all the presidents lawyers" => @org.thingpedia.media-player.play(playable=id);
+UT: @org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).show() filter id =~ "all the presidents lawyers" => @org.thingpedia.media-player(id="com.spotify-XXXXXXXX"^^tt:device_id).play(playable=id);
 ====
 # recording/7a3c7291e1eb2b0e67766797e75f05c0
 U: play the podcast left right and center
@@ -4827,7 +4827,7 @@ A: The most popular singers is Juice WRLD. It is a melodic rap singers.
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_recommend_one;
 U: play the beatles
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).song() filter contains(artists, null^^org.thingpedia.media-source:artist("beatles")) => @org.thingpedia.media-player.play(playable=id);
+UT: @org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, null^^org.thingpedia.media-source:artist("beatles")) => @org.thingpedia.media-player.play(playable=id);
 ====
 # recording/71c8b187b0b9d1e8138d488111c20658
 U: play a song
@@ -4841,12 +4841,12 @@ A: Sorry, failed to play: try playing from the Spotify app.
 AT: $dialogue @org.thingpedia.dialogue.transaction.sys_action_error;
 U: play queen
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).song() filter contains(artists, null^^org.thingpedia.media-source:artist("queen")) => @org.thingpedia.media-player.play(playable=id);
+UT: @org.thingpedia.media-source(id="com.spotify-XXXXXXXX"^^tt:device_id).playable() filter contains(artists, null^^org.thingpedia.media-source:artist("queen")) => @org.thingpedia.media-player.play(playable=id);
 ====
 # recording/81aaec26692917513ce3b40e47156cf1
 U: play the artist queen
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.media-source.song() filter contains(artists, null^^org.thingpedia.media-source:artist("queen")) => @org.thingpedia.media-player.play(playable=id);
+UT: @org.thingpedia.media-source.playable() filter contains(artists, null^^org.thingpedia.media-source:artist("queen")) => @org.thingpedia.media-player.play(playable=id);
 ====
 # recording/a53d3b895cc837844eba4092fd9ef472
 U: pause
@@ -6639,7 +6639,7 @@ UT: @org.thingpedia.media-source.song() filter contains(artists, null^^org.thing
 # log-dev/5204
 U: yes, show me information of jay chou
 UT: $dialogue @org.thingpedia.dialogue.transaction.execute;
-UT: @org.thingpedia.media-source.artist() filter id == null^^org.thingpedia.media-source:artist("jay chou");
+UT: @org.thingpedia.media-source.artist() filter id =~ "jay chou";
 ====
 # log-dev/8754
 U: d rock classic.