tried to avoid merge conflicts
This commit is contained in:
parent
d29fe10794
commit
b99f41ebe1
1 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
from flask import Flask, request, render_template
|
from flask import Flask, request, render_template
|
||||||
from api import API
|
from api import API
|
||||||
# from voice_recognition import Voice
|
from voice_recognition import Voice
|
||||||
import sys
|
import sys
|
||||||
import threading
|
import threading
|
||||||
import pyperclip
|
import pyperclip
|
||||||
|
@ -11,7 +11,7 @@ from PyQt5.QtWidgets import *
|
||||||
|
|
||||||
APP = Flask(__name__)
|
APP = Flask(__name__)
|
||||||
api = API()
|
api = API()
|
||||||
# voice = Voice()
|
voice = Voice()
|
||||||
|
|
||||||
messages = []
|
messages = []
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ def index():
|
||||||
pyperclip.copy(messages[len(messages) - 1])
|
pyperclip.copy(messages[len(messages) - 1])
|
||||||
|
|
||||||
if option == "voice":
|
if option == "voice":
|
||||||
# user_message = voice.listen()
|
user_message = voice.listen()
|
||||||
messages.append(f"User: {user_message}")
|
messages.append(f"User: {user_message}")
|
||||||
elif option == "chat":
|
elif option == "chat":
|
||||||
user_message = request.form['user_message']
|
user_message = request.form['user_message']
|
||||||
|
|
Reference in a new issue