diff --git a/app.py b/app.py index 5eab0fb83a7a745eb8fdb6bd50e195f817f5bf8d..c0f4e1bd3ae49a2eb0c38a33039f29f129bab05c 100644 --- a/app.py +++ b/app.py @@ -1,6 +1,6 @@ from flask import Flask from flask_socketio import SocketIO, send -from database import QAPair +from flask_sqlalchemy import SQLAlchemy from difflib import get_close_matches import time import threading @@ -9,6 +9,18 @@ app = Flask(__name__) app.config['SECRET_KEY'] = 'secret!' socketio = SocketIO(app, cors_allowed_origins='*') +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False +app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///qa.sqlite3' +db = SQLAlchemy(app) + +class QAPair(db.Model): + id = db.Column(db.Integer, primary_key=True) + question = db.Column(db.String(80), unique=True, nullable=False) + answer = db.Column(db.String(80), unique=True, nullable=False) + + def __repr__(self): + return self.question + waiting_time = 10 last_msg = time.time() + 12 question = QAPair.query.with_entities(QAPair.question).all() diff --git a/database.py b/database.py deleted file mode 100644 index 409d7d15a384ec880791886672c1986986555a87..0000000000000000000000000000000000000000 --- a/database.py +++ /dev/null @@ -1,15 +0,0 @@ -from flask import Flask -from flask_sqlalchemy import SQLAlchemy - -app = Flask(__name__) -app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False -app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///qa.sqlite3' -db = SQLAlchemy(app) - -class QAPair(db.Model): - id = db.Column(db.Integer, primary_key=True) - question = db.Column(db.String(80), unique=True, nullable=False) - answer = db.Column(db.String(80), unique=True, nullable=False) - - def __repr__(self): - return self.question