From b99f41ebe1d48ca77aadacf4d2ead721cbdc9624 Mon Sep 17 00:00:00 2001 From: sageTheDM Date: Wed, 18 Sep 2024 11:11:41 +0200 Subject: [PATCH] tried to avoid merge conflicts --- py/web_flask.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/py/web_flask.py b/py/web_flask.py index ee301d9..c84db74 100755 --- a/py/web_flask.py +++ b/py/web_flask.py @@ -1,6 +1,6 @@ from flask import Flask, request, render_template from api import API -# from voice_recognition import Voice +from voice_recognition import Voice import sys import threading import pyperclip @@ -11,7 +11,7 @@ from PyQt5.QtWidgets import * APP = Flask(__name__) api = API() -# voice = Voice() +voice = Voice() messages = [] @@ -52,7 +52,7 @@ def index(): pyperclip.copy(messages[len(messages) - 1]) if option == "voice": - # user_message = voice.listen() + user_message = voice.listen() messages.append(f"User: {user_message}") elif option == "chat": user_message = request.form['user_message']