Prepare app for working behind a proxy (nginx).
Adapt user form
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import os
|
||||
from datetime import datetime as dt, timezone as tz
|
||||
from flask import request, redirect, url_for, flash, render_template, Blueprint, session, current_app
|
||||
from flask import request, redirect, flash, render_template, Blueprint, session, current_app
|
||||
from flask_security import roles_accepted, current_user
|
||||
from sqlalchemy import desc
|
||||
from sqlalchemy.orm import joinedload
|
||||
@@ -17,10 +17,22 @@ from common.extensions import db
|
||||
from .document_forms import AddDocumentForm, AddURLForm
|
||||
from common.utils.middleware import mw_before_request
|
||||
from common.utils.celery_utils import current_celery
|
||||
from common.utils.nginx_utils import prefixed_url_for
|
||||
|
||||
document_bp = Blueprint('document_bp', __name__, url_prefix='/document')
|
||||
|
||||
|
||||
@document_bp.before_request
|
||||
def log_before_request():
|
||||
current_app.logger.debug(f"Before request (document_bp): {request.method} {request.url}")
|
||||
|
||||
|
||||
@document_bp.after_request
|
||||
def log_after_request(response):
|
||||
current_app.logger.debug(f"After request (document_bp): {request.method} {request.url} - Status: {response.status}")
|
||||
return response
|
||||
|
||||
|
||||
@document_bp.before_request
|
||||
def before_request():
|
||||
mw_before_request()
|
||||
@@ -48,7 +60,7 @@ def add_document():
|
||||
f'Document Version {new_doc_vers.id}. '
|
||||
f'Embedding creation task: {task.id}')
|
||||
|
||||
return redirect(url_for('document_bp.documents'))
|
||||
return redirect(prefixed_url_for('document_bp.documents'))
|
||||
|
||||
return render_template('document/add_document.html', form=form)
|
||||
|
||||
@@ -85,7 +97,7 @@ def add_url():
|
||||
f'Document Version {new_doc_vers.id}. '
|
||||
f'Embedding creation task: {task.id}')
|
||||
|
||||
return redirect(url_for('document_bp.documents'))
|
||||
return redirect(prefixed_url_for('document_bp.documents'))
|
||||
|
||||
return render_template('document/add_url.html', form=form)
|
||||
|
||||
@@ -114,7 +126,7 @@ def process_version(version_id):
|
||||
if not version.processing:
|
||||
print(f'Placeholder for processing version: {version_id}')
|
||||
|
||||
return redirect(url_for('documents'))
|
||||
return redirect(prefixed_url_for('documents'))
|
||||
|
||||
|
||||
def set_logging_information(obj, timestamp):
|
||||
@@ -241,7 +253,7 @@ def upload_file_for_version(doc_vers, file, extension):
|
||||
db.session.rollback()
|
||||
flash('Error saving document.', 'error')
|
||||
current_app.logger.error(
|
||||
f'Error saving document for tenant {session["tenant"]["id"]} while uploading file: {error}')
|
||||
f'Error saving document for tenant {session["tenant"]["id"]} while uploading file: {e}')
|
||||
|
||||
current_app.logger.info(f'Succesfully saved document for tenant {session['tenant']['id']} for '
|
||||
f'document version {doc_vers.id} while uploading file.')
|
||||
|
||||
Reference in New Issue
Block a user