Merge pull request #16 from SEPIA-Framework/dev

v2.2.2 b1

Xtensions/Assistant/answers/answers_de.txt

@@ -25,7 +25,7 @@ ok_0c;;		rep=0|mood=5;;		Ok, ist erledigt.		;;char=neutral
 default_ask_parameter_0a;;		rep=0|mood=5;;		Hmm, die Anfrage ist scheinbar unvollständig, was ist der fehlende Parameter? ;;char=polite,neutral
 default_ask_parameter_0a;;		rep=1|mood=5;;		Und der nächste fehlende Parameter? ;;char=cool,rude,neutral
 default_ask_parameter_0a;;		rep=2|mood=5;;		Und noch einen Parameter bitte! ;;char=cool,rude
-default_ask_parameter_0b;;		rep=0|mood=5;;		Hmm, die Anfrage ist scheinbar unvollständig, was ist der fehlende Parameter? ;;char=neutral
+default_ask_parameter_0b;;		rep=0|mood=5;;		Hmm, die Anfrage ist scheinbar unvollständig, wie lautet der Wert des fehlende Parameters? ;;char=neutral
 default_ask_parameter_0b;;		rep=1|mood=5;;		Ne, hat nicht funktioniert, versuch noch mal bitte. ;;char=cool
 default_ask_parameter_0b;;		rep=2|mood=5;;		Nein, auch das hat nicht geklappt. Einmal noch bitte. ;;char=neutral
 default_ask_action_0a;;		rep=0|mood=5;;		Welche Aktion soll ich ausführen? ;;char=neutral
@@ -45,6 +45,7 @@ default_open_link_0a;;		rep=0|mood=5;;		Mist, da gibts scheinbar ein Problem mit
 default_open_link_1a;;		rep=0|mood=5;;		Ok, ich öffne den Link für dich. ;;char=neutral
 default_open_link_1a;;		rep=0|mood=5;;		Eine Sekunde, ich öffne den Link. ;;char=neutral
 default_under_construction_0a;;		rep=0|mood=5;;		Daran wird noch gearbeitet, sorry.  ;;char=neutral
+default_under_construction_0b;;		rep=0|mood=5;;		Oh, hab mich vertan, sorry! Daran wird noch gearbeitet.  ;;char=neutral
 default_abort_no_change_0a;;		rep=0|mood=5;;		Ok, dann lasse ich mal alles so.  ;;char=neutral
 default_not_possible_0a;;			rep=0|mood=5;;		Sorry aber das ist nicht möglich, glaube ich.  ;;char=neutral
 yes_no_ask_0a;;		rep=0|mood=5;;		ja oder nein <user_name>? ;;char=cool,rude,neutral
@@ -164,8 +165,15 @@ music_0c;;		rep=0|mood=5;;		Im Moment kann ich <1> leider nicht abspielen, sorry
 music_0d;;		rep=0|mood=5;;		Im Moment kann ich <1> von <2> leider nicht abspielen, sorry. Hast du schon eine Radio Suche probiert? ;;char=cool,polite,neutral
 music_ask_0a;;	rep=0|mood=5;;		Welche Musik soll ich für dich suchen? ;;char=neutral
 music_ask_0a;;	rep=0|mood=5;;		Wie heißt der Titel, Künstler oder das Genre das ich suchen soll? ;;char=polite,neutral
+music_ask_0b;;	rep=0|mood=5;;		Möchtest du einen Song, einen Künstler oder eine Playlist hören? ;;char=neutral
+music_ask_0b;;	rep=1|mood=5;;		Sorry sagtest du Song, Künstler oder Playlist? ;;char=neutral
+music_ask_0b;;	rep=2|mood=5;;		Sorry <user_name>, habs immer noch nicht verstanden. Du kannst wählen zwischen Song, Künstler oder Playlist. Was soll es sein? ;;char=neutral
+music_ask_1a;;	rep=0|mood=5;;		Wie heißt der Song, den ich suchen soll? ;;char=neutral
+music_ask_1b;;	rep=0|mood=5;;		Wie heißt der Künstler, den ich suchen soll? ;;char=neutral
+music_ask_1c;;	rep=0|mood=5;;		Wie heißt die Playlist, die ich suchen soll? ;;char=neutral
 music_1a;;		rep=0|mood=5;;		Sekunde, ich lade <1> von <2>. ;;char=polite,neutral
 music_1b;;		rep=0|mood=5;;		Alles klar, ich starte dann mal <1>. ;;char=cool,polite,neutral
+music_1c;;		rep=0|mood=5;;		Eine Sekunde, Musik wird gesucht. ;;char=cool,polite,neutral
 music_radio_0a;;		rep=0|mood=5;;		<user_name>, ich kann gerade leider kein Radio finden. Weiß auch nicht wieso. ;;char=cool,rude
 music_radio_0b;;		rep=0|mood=5;;		<user_name>, zu diesem Suchbegriff habe ich leider kein Radio gefunden. ;;char=polite,neutral
 music_radio_ask_0a;;	rep=0|mood=5;;		Welchen Radiosender, welches Genre oder welche Band soll ich für dich suchen? ;;char=cool,polite,neutral 

Xtensions/Assistant/answers/answers_en.txt

@@ -25,7 +25,7 @@ ok_0c;;		rep=0|mood=5;;		Ok, it's done.		;;char=neutral
 default_ask_parameter_0a;;		rep=0|mood=5;;		Hmm the request seems incomplete, what is the missing parameter? ;;char=neutral
 default_ask_parameter_0a;;		rep=1|mood=5;;		And the next missing parameter? ;;char=neutral
 default_ask_parameter_0a;;		rep=2|mood=5;;		And another missing parameter? ;;char=neutral
-default_ask_parameter_0b;;		rep=0|mood=5;;		Hmm the request seems incomplete, what is the missing parameter? ;;char=neutral
+default_ask_parameter_0b;;		rep=0|mood=5;;		Hmm the request seems incomplete, what is the value of the missing parameter? ;;char=neutral
 default_ask_parameter_0b;;		rep=1|mood=5;;		No that did not work, try again please. ;;char=neutral
 default_ask_parameter_0b;;		rep=2|mood=5;;		No, still not working, try once more please. ;;char=neutral
 default_ask_action_0a;;		rep=0|mood=5;;		Which action should I perform? ;;char=neutral
@@ -45,6 +45,7 @@ default_open_link_0a;;		rep=0|mood=5;;		I'm afraid there seems to be a problem w
 default_open_link_1a;;		rep=0|mood=5;;		Ok, let me open that link for you. ;;char=neutral
 default_open_link_1a;;		rep=0|mood=5;;		One second, opening the link. ;;char=neutral
 default_under_construction_0a;;		rep=0|mood=5;;		This is still under construction, sorry.  ;;char=neutral
+default_under_construction_0b;;		rep=0|mood=5;;		Oh sorry I forgot! This is still under construction.  ;;char=neutral
 default_abort_no_change_0a;;		rep=0|mood=5;;		Ok, I'll leave everything as is.  ;;char=neutral
 default_not_possible_0a;;			rep=0|mood=5;;		Sorry this is not possible, I think.  ;;char=neutral
 yes_no_ask_0a;;		rep=0|mood=5;;		yes or no <user_name>? ;;char=rude,neutral
@@ -152,8 +153,15 @@ music_0c;;		rep=0|mood=5;;		Right now I can't play <1>, sorry. Did you try a rad
 music_0d;;		rep=0|mood=5;;		Right now I can't play <1> by <2>, sorry. Did you try a radio search? ;;char=polite,neutral
 music_ask_0a;;	rep=0|mood=5;;		What kind of song or music do you want me to search? ;;char=neutral
 music_ask_0a;;	rep=0|mood=5;;		What is the name of the song, the artist or genre I should look for? ;;char=neutral
+music_ask_0b;;	rep=0|mood=5;;		Do you want to hear a song an artist or a playlist? ;;char=neutral
+music_ask_0b;;	rep=1|mood=5;;		Sorry did you say song, artist or playlist? ;;char=neutral
+music_ask_0b;;	rep=2|mood=5;;		Sorry <user_name>, still didn't get that. You can choose between song, artist or playlist. What should it be? ;;char=neutral
+music_ask_1a;;	rep=0|mood=5;;		What is the name of the song? ;;char=neutral
+music_ask_1b;;	rep=0|mood=5;;		What is the name of the artist? ;;char=neutral
+music_ask_1c;;	rep=0|mood=5;;		What is the name of the playlist? ;;char=neutral
 music_1a;;		rep=0|mood=5;;		One moment, I'm loading <1> by <2>. ;;char=neutral
 music_1b;;		rep=0|mood=5;;		Ok, I'll start <1>. ;;char=neutral
+music_1c;;		rep=0|mood=5;;		One second, searching music. ;;char=cool,polite,neutral
 music_radio_0a;;		rep=0|mood=5;;		<user_name>, I can't find any radio station. Seems there is some problem. ;;char=neutral
 music_radio_0b;;		rep=0|mood=5;;		<user_name>, I haven't found any radio station for this. ;;char=neutral
 music_radio_ask_0a;;	rep=0|mood=5;;		What's the name of the radio station, genre or band you want to hear? ;;char=neutral

Xtensions/ServiceProperties/news-outlets.json

@@ -1,8 +1,8 @@
 {
 	"outlets":[
-		{ "name": "SPIEGEL ONLINE", "url": "http://www.spiegel.de/schlagzeilen/tops/index.rss", "name_html": "<span style='color:#950000;'><b>SPIEGEL</b> ONLINE</span>" },
+		{ "name": "SPIEGEL ONLINE", "url": "https://www.spiegel.de/schlagzeilen/tops/index.rss", "name_html": "<span style='color:#950000;'><b>SPIEGEL</b> ONLINE</span>" },
 		{ "name": "bento", "url": "https://www.bento.de/rss/nachrichten/", "name_html": "<span style='color:#000;'><b>bento</b></span>" },
-		{ "name": "Tagesschau", "url": "http://www.tagesschau.de/xml/rss2", "name_html": "<span style='color:#0065BE; font-family:serif'><b>tagesschau</b>.de</span>" },
+		{ "name": "Tagesschau", "url": "http://www.tagesschau.de/xml/rss2", "name_html": "<span style='color:#0065BE; font-family:serif;'><b>tagesschau</b>.de</span>" },
 		{ "name": "Süddeutsche", "url": "http://rss.sueddeutsche.de/rss/Topthemen", "name_html": "<span style='color:#000; font-family:serif'><b>Süddeutsche Zeitung</b></span>" },
 		{ "name": "FAZ", "url": "https://www.faz.net/rss/aktuell/", "name_html": "<span style='color:#000; font-family:serif'><b>Frankfurter Allgemeine</b></span>" },
 		{ "name": "Bild", "url": "https://www.bild.de/rssfeeds/vw-home/vw-home-16725562,sort=1,view=rss2.bild.xml", "name_html": "<b><span style='color:#D91918;'>Bild</span><span style='color:#000;'>.de</span></b>" },
@@ -17,8 +17,10 @@
 		{ "name": "11FREUNDE", "url": "https://www.11freunde.de/feed", "name_html": "<span style='color:#000;'>11<b>FREUNDE</b></span>" },
 		{ "name": "golem.de", "url": "http://rss.golem.de/rss.php?feed=RSS2.0", "name_html": "<b><span style='color:#000;'>golem.</span><span style='color:#6EC5CD;'>d</span><span style='color:#9AC54B;'>e</span></b>" },
 		{ "name": "heise online", "url": "https://www.heise.de/rss/heise-top-atom.xml", "name_html": "<b><span style='color:#999898;'>heise online</span></b>" },
-		{ "name": "PCGames", "url": "http://www.pcgames.de/feed.cfm?menu_alias=home", "name_html": "<b><span style='color:#1F83B5;'>PC</span><span style='color:#FBDB21;'>Games</span></b>" },
-		{ "name": "GameStar", "url": "http://www.pcgames.de/feed.cfm?menu_alias=home", "name_html": "<span style='color:#003372;'><b>GameStar</b></span>" },
+		{ "name": "heise Developer", "url": "https://www.heise.de/developer/rss/news-atom.xml", "name_html": "<b><span style='color:#999898;'>heise </span><span style='color:#6d1124;'>Developer</span></b>" },
+		{ "name": "heise Make", "url": "https://www.heise.de/make/rss/hardware-hacks-atom.xml", "name_html": "<b><span style='color:#999898;'>heise </span><span style='color:#e2001a;'>Make</span></b>" },
+		{ "name": "PCGames", "url": "https://www.pcgames.de/feed.cfm?menu_alias=home", "name_html": "<b><span style='color:#1F83B5;'>PC</span><span style='color:#FBDB21;'>Games</span></b>" },
+		{ "name": "GameStar", "url": "https://www.gamestar.de/news/rss/news.rss", "name_html": "<span style='color:#003372;'><b>GameStar</b></span>" },
 		{ "name": "t3n", "url": "https://t3n.de/rss.xml", "name_html": "<b><span style='color:#000;'>t</span><span style='color:#FF0000;'>3</span><span style='color:#000000;'>n</span></b>" },
 		{ "name": "Business Punk", "url": "https://www.business-punk.com/feed/", "name_html": "<span style='color:#2C2C2C; font-family:serif;'><b>Business Punk</b></span>" },
 		{ "name": "RollingStone", "url": "https://www.rollingstone.com/music/feed/", "name_html": "<span style='color:#C81429; font-family:serif;'><b>RollingStone</b></span>" },
@@ -27,9 +29,10 @@
 		{ "name": "Filmstarts.de - aktuell", "url": "http://rss.filmstarts.de/fs/kinos/aktuelle?format=xml", "name_html": "<b><span style='color:#3d59ba;'>Filmstarts.de</span><span style='color:#000000;'> - aktuell</span></b>" },
 		{ "name": "Filmstarts.de - bald", "url": "http://rss.filmstarts.de/fs/kinos/bald?format=xml", "name_html": "<b><span style='color:#3d59ba;'>Filmstarts.de</span><span style='color:#000000;'> - bald</span></b>" },
 		{ "name": "Filmstarts.de - Serien", "url": "http://rss.filmstarts.de/fs/news/serien?format=xml", "name_html": "<b><span style='color:#3d59ba;'>Filmstarts.de</span><span style='color:#000000;'> - Serien</span></b>" },
-		{ "name": "SPIEGEL Kino", "url": "http://www.spiegel.de/kultur/kino/index.rss", "name_html": "<span style='color:#950000;'><b>SPIEGEL</b> Kino</span>" },
+		{ "name": "SPIEGEL Kino", "url": "https://www.spiegel.de/kultur/kino/index.rss", "name_html": "<span style='color:#950000;'><b>SPIEGEL</b> Kino</span>" },
 		{ "name": "Kino.de - Film-News", "url": "https://www.kino.de/rss/movienews", "name_html": "<b><span style='color:#039cfd;'>Kino.de</span><span style='color:#000000;'> - Film-News</span></b>" },
-		{ "name": "deutsche startups", "url": "https://www.deutsche-startups.de/feed/", "name_html": "<b><span style='color:#3b65b1;'>deutsche startups</span></b>" }
+		{ "name": "deutsche startups", "url": "https://www.deutsche-startups.de/feed/", "name_html": "<b><span style='color:#3b65b1;'>deutsche startups</span></b>" },
+		{ "name": "wissenschaft.de", "url": "https://www.wissenschaft.de/feed-wissenschaft", "name_html": "<span style='color:#004e9e;'><b>wissenschaft.de</b>.de</span>" }
 	],
 	"deprecated":[
 		{ "name": "RevierSport", "url": "https://abo.reviersport.de/?news-rss-ama", "name_html": "<span style='color:#000;'>RevierSport</span>" },
@@ -40,8 +43,8 @@
 			{"section": "main", "group": ["SPIEGEL ONLINE", "Süddeutsche", "FAZ", "Bild", "Tagesschau", "golem.de", "Gruenderszene", "jetzt.de", "bento"]},
 			{"section": "economy", "group": ["SPIEGEL ONLINE", "Süddeutsche", "FAZ", "Tagesschau", "Gruenderszene"]},
 			{"section": "politics", "group": ["SPIEGEL ONLINE", "Süddeutsche", "FAZ", "Bild", "Tagesschau"]},
-			{"section": "science", "group": ["Wired.de", "t3n", "golem.de", "heise online"]},
-			{"section": "tech", "group": ["golem.de", "t3n", "heise online", "PCGames", "Wired.de"]},
+			{"section": "science", "group": ["wissenschaft.de", "t3n", "golem.de", "heise online"]},
+			{"section": "tech", "group": ["golem.de", "t3n", "heise online", "heise Developer", "heise Make", "PCGames"]},
 			{"section": "sports", "group": ["Sport1", "Sportschau", "Kicker"]},
 			{"section": "soccer", "group": ["Sportschau - Fussball", "Kicker", "Sport1", "11FREUNDE"]},
 			{"section": "games", "group": ["PCGames", "GameStar"]},

Xtensions/assist.custom.properties

@@ -3,6 +3,7 @@ assistant_name=Sepia
 assistant_id=uid1005
 assistant_email=assistant@sepia.localhost
 assistant_pwd=4be708b703c518d10a97e4db421f0f75b66f9ff8c0ae65b6c5c13684a01f804d
+assistant_allow_follow_ups=true
 module_account=elasticsearch
 #module_account=dynamo_db
 module_answers=file
@@ -52,6 +53,8 @@ amazon_dynamoDB_secret=
 google_maps_key=
 graphhopper_key=
 forecast_io_key=
+spotify_client_id=
+spotify_client_secret=
 openhab_host=
 dirble_key=
 acapela_vaas_app=

Xtensions/assist.properties

@@ -3,6 +3,7 @@ assistant_name=Sepia
 assistant_id=uid1005
 assistant_email=assistant@sepia.localhost
 assistant_pwd=4be708b703c518d10a97e4db421f0f75b66f9ff8c0ae65b6c5c13684a01f804d
+assistant_allow_follow_ups=true
 module_account=elasticsearch
 #module_account=dynamo_db
 module_answers=file
@@ -51,6 +52,8 @@ amazon_dynamoDB_secret=
 google_maps_key=
 graphhopper_key=
 forecast_io_key=
+spotify_client_id=
+spotify_client_secret=
 openhab_host=
 dirble_key=
 acapela_vaas_app=

Xtensions/assist.test.properties

@@ -3,6 +3,7 @@ assistant_name=Sepia
 assistant_id=uid1005
 assistant_email=assistant@sepia.localhost
 assistant_pwd=4be708b703c518d10a97e4db421f0f75b66f9ff8c0ae65b6c5c13684a01f804d
+assistant_allow_follow_ups=true
 module_account=elasticsearch
 #module_account=dynamo_db
 module_answers=file
@@ -52,6 +53,8 @@ amazon_dynamoDB_secret=
 google_maps_key=
 graphhopper_key=
 forecast_io_key=
+spotify_client_id=
+spotify_client_secret=
 openhab_host=
 dirble_key=
 acapela_vaas_app=

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>net.b07z.sepia.server.assist</groupId>
 	<artifactId>sepia-assist-API</artifactId>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<name>SEPIA Assist API</name>
 	<description>Core server of the SEPIA Framework for personal digital assistants. Responsible for NLU, conversation, smart-service integration, user-accounts and more.</description>
 	<url>https://sepia-framework.github.io</url>
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>net.b07z.sepia.websockets</groupId>
 			<artifactId>sepia-websockets</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1</version>
 		</dependency>
 		<!-- included in sepia-websockets 
 		<dependency>

src/main/java/net/b07z/sepia/server/assist/chats/HowAreYou.java

@@ -40,6 +40,23 @@ public static ServiceResult get(NluResult nluResult){
 		//anything else?
 		api.context = CMD.CHAT;		//how do we handle chat contexts? Just like that and do the rest with cmd_summary?
 
+		//DEBUG
+		/*
+		if (nluResult.input.isDuplexConnection()){
+			System.out.println(nluResult.input.connection);
+			System.out.println(nluResult.input.msgId);
+			System.out.println(nluResult.input.duplexData);
+			api.runInBackground(3000, () -> {
+				//initialize follow-up result
+				ServiceBuilder service = new ServiceBuilder(nluResult);
+				service.answer = Answers.getAnswerString(nluResult, "<direct>Ach was ich noch sagen wollte. Habs vergessen.");
+				service.status = "success";
+				boolean wasSent = service.sendFollowUpMessage(nluResult.input, service.buildResult());
+				return;
+			});
+		}
+		*/
+
 		//finally build the API_Result
 		ServiceResult result = api.buildResult();