Compare commits

..

No commits in common. "ca99215ac78590709fabe89f939f2ba41ee59922" and "2eecdbaf8f50ef3be7441e123c1851b672c9d811" have entirely different histories.

4 changed files with 2 additions and 40 deletions

View File

@ -10,10 +10,6 @@ app:
SQLALCHEMY_DATABASE_URI: sqlite:///sqlite.db SQLALCHEMY_DATABASE_URI: sqlite:///sqlite.db
# SQLALCHEMY_DATABASE_URI: mysql://username:password@server/db # SQLALCHEMY_DATABASE_URI: mysql://username:password@server/db
# LOGGING_LEVEL: CRITICAL | FATAL | ERROR | WARN | WARNING | INFO | DEBUG | NOTSET
LOGGING_LEVEL: INFO
network: network:
PROXY: http://127.0.0.1:7890 PROXY: http://127.0.0.1:7890

View File

@ -1,10 +1,7 @@
from flask import Flask, request from flask import Flask
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from flask_login import LoginManager from flask_login import LoginManager
import yaml import yaml
import logging
import time
import traceback
# init SQLAlchemy so we can use it later in our models # init SQLAlchemy so we can use it later in our models
db = SQLAlchemy() db = SQLAlchemy()
@ -22,7 +19,6 @@ def create_app():
app.config['OPENAI_API_KEY'] = conf['openai']['API_KEY'] app.config['OPENAI_API_KEY'] = conf['openai']['API_KEY']
app.config['OPENAI_MODEL_NAME'] = conf['openai']['MODEL_NAME'] app.config['OPENAI_MODEL_NAME'] = conf['openai']['MODEL_NAME']
app.config['OPENAI_PROMPT'] = conf['openai']['PROMPT'] app.config['OPENAI_PROMPT'] = conf['openai']['PROMPT']
app.config['LOGGING_LEVEL'] = conf['app']['LOGGING_LEVEL']
db.init_app(app) db.init_app(app)
login_manager = LoginManager() login_manager = LoginManager()
@ -52,29 +48,3 @@ def create_app():
app = create_app() app = create_app()
logger = logging.getLogger('waitress')
logger.setLevel(app.config['LOGGING_LEVEL'])
@app.before_request
def before_request():
timestamp = time.strftime('[%Y-%b-%d %H:%M]')
logger.info('%s > %s %s %s %s', timestamp, request.remote_addr,
request.method, request.scheme, request.full_path)
@app.after_request
def after_request(response):
timestamp = time.strftime('[%Y-%b-%d %H:%M]')
logger.info('%s < %s %s %s %s %s', timestamp, request.remote_addr,
request.method, request.scheme, request.full_path, response.status)
return response
@app.errorhandler(Exception)
def exceptions(e):
tb = traceback.format_exc()
timestamp = time.strftime('[%Y-%b-%d %H:%M]')
logger.error('%s %s %s %s %s 5xx INTERNAL SERVER ERROR\n%s', timestamp,
request.remote_addr, request.method, request.scheme, request.full_path, tb)
return e.status_code

View File

@ -2,7 +2,7 @@ from flask_login import login_user, logout_user
from flask import Blueprint, render_template, redirect, url_for, request, flash from flask import Blueprint, render_template, redirect, url_for, request, flash
from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.security import generate_password_hash, check_password_hash
from flask_login import login_required, current_user, login_manager from flask_login import login_required, current_user, login_manager
from .models import User, Conversation from .models import User
from . import db from . import db
import time import time
@ -119,9 +119,6 @@ def manage_post():
account = User.query.filter_by( account = User.query.filter_by(
id=id, email=email, name=name, role=role, isActivated=isActivated).first() id=id, email=email, name=name, role=role, isActivated=isActivated).first()
if account: if account:
db.session.query(Conversation).filter(
Conversation.userid == id).delete()
db.session.commit()
if db.session.query(User).filter(User.id == id).delete() and not db.session.commit(): if db.session.query(User).filter(User.id == id).delete() and not db.session.commit():
time.sleep(0.05) time.sleep(0.05)
return "success" return "success"

View File

@ -2,6 +2,5 @@ Flask==2.2.3
Flask_Login==0.6.2 Flask_Login==0.6.2
flask_sqlalchemy==3.0.3 flask_sqlalchemy==3.0.3
openai==0.27.2 openai==0.27.2
PyYAML==6.0
SQLAlchemy==2.0.7 SQLAlchemy==2.0.7
Werkzeug==2.2.3 Werkzeug==2.2.3