Merge pull request #106 from fractalego/new-version

modified runners

wafl/interface/command_line_interface.py

@@ -18,9 +18,8 @@ async def output(self, text: str, silent: bool = False):
             print(text)
             return
 
-        utterance = from_bot_to_user(text)
-        print(COLOR_START + "bot> " + utterance + COLOR_END)
-        self._utterances.append((time.time(), f"bot: {text}"))
+        print(COLOR_START + "bot> " + text + COLOR_END)
+        self._insert_utterance(speaker="bot", text=text)
         self.bot_has_spoken(True)
 
     async def input(self) -> str:
@@ -29,7 +28,7 @@ async def input(self) -> str:
             await self.output("I did not quite understand that")
             text = input("user> ")
 
-        self._utterances.append((time.time(), f"user: {text}"))
+        self._insert_utterance(speaker="user", text=text)
         return text
 
     def bot_has_spoken(self, to_set: bool = None):

wafl/runners/run_from_audio.py

@@ -20,7 +20,9 @@ def run_from_audio():
         interface,
         conversation_events,
         _logger,
-        activation_word=config.get_value("waking_up_word"),
+        activation_word="",
+        max_misses=-1,
+        deactivate_on_closed_conversation=False,
     )
     scheduler = Scheduler([conversation_loop])
     scheduler.run()

wafl/runners/run_web_and_audio_interface.py

@@ -20,21 +20,21 @@
 
 
 @app.route("/create_new_instance", methods=["POST"])
-def create_new_instance():
+def create_new_web_and_audio_instance():
     conversation_id = random.randint(0, sys.maxsize)
-    result = create_scheduler_and_webserver_loop(conversation_id)
+    result = create_web_and_audio_scheduler_and_webserver_loop(conversation_id)
     add_new_routes(conversation_id, result["web_server_handler"])
     thread = threading.Thread(target=result["scheduler"].run)
     thread.start()
     return redirect(f"{conversation_id}/index")
 
 
 @app.route("/")
-async def index():
+async def index_web_and_audio_():
     return render_template("selector.html")
 
 
-def create_scheduler_and_webserver_loop(conversation_id):
+def create_web_and_audio_scheduler_and_webserver_loop(conversation_id):
     config = Configuration.load_local_config()
     interface = ListInterface([VoiceInterface(config), QueueInterface()])
     interface.activate()

wafl/runners/run_web_interface.py

@@ -19,6 +19,21 @@
 _logger = LocalFileLogger()
 
 
+@app.route("/create_new_instance", methods=["POST"])
+def create_new_web_instance():
+    conversation_id = str(random.randint(0, sys.maxsize))
+    result = create_scheduler_and_webserver_loop(conversation_id)
+    add_new_routes(conversation_id, result["web_server_handler"])
+    thread = threading.Thread(target=result["scheduler"].run)
+    thread.start()
+    return redirect(f"{conversation_id}/index")
+
+
+@app.route("/")
+async def index_web():
+    return render_template("selector.html")
+
+
 def create_scheduler_and_webserver_loop(conversation_id):
     config = Configuration.load_local_config()
     interface = QueueInterface()
@@ -46,21 +61,6 @@ def create_scheduler_and_webserver_loop(conversation_id):
     }
 
 
-@app.route("/create_new_instance", methods=["POST"])
-def create_new_instance():
-    conversation_id = str(random.randint(0, sys.maxsize))
-    result = create_scheduler_and_webserver_loop(conversation_id)
-    add_new_routes(conversation_id, result["web_server_handler"])
-    thread = threading.Thread(target=result["scheduler"].run)
-    thread.start()
-    return redirect(f"{conversation_id}/index")
-
-
-@app.route("/")
-async def index():
-    return render_template("selector.html")
-
-
 def run_server_only_app():
     app.run(
         host="0.0.0.0",