Refactoring part 1

Some changes for workers, but stopped due to refactoring
This commit is contained in:
Josako
2024-05-06 21:30:07 +02:00
parent d925477e68
commit 8e5ad5f312
34 changed files with 193 additions and 109 deletions

View File

@@ -1,15 +1,17 @@
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_security import hash_password, roles_required, roles_accepted, current_user
from flask_security import roles_accepted, current_user
from sqlalchemy import desc
from sqlalchemy.orm import joinedload
from werkzeug.utils import secure_filename
from ..models.document import Document, DocumentLanguage, DocumentVersion
from ..extensions import db
from common.models import Document, DocumentLanguage, DocumentVersion
from common.extensions import db
from .document_forms import AddDocumentForm
from ..utils.middleware import mw_before_request
from common.utils.middleware import mw_before_request
from eveai_workers.tasks import create_embeddings
document_bp = Blueprint('document_bp', __name__, url_prefix='/document')
@@ -68,11 +70,17 @@ def add_document():
if error is None:
flash('Document added successfully.', 'success')
upload_file_for_version(new_doc_vers, file, extension)
create_embeddings.delay(tenant_id=session['tenant']['id'],
document_version_id=new_doc_vers.id,
default_embedding_model=session['default_embedding_model'])
current_app.logger.info(f'Document processing started for tenant {session["tenant"]["id"]}, '
f'Document Version {new_doc_vers.id}')
print('Processing should start soon')
else:
flash('Error adding document.', 'error')
current_app.logger.error(f'Error adding document for tenant {session["tenant"]["id"]}: {error}')
# return render_template('document/add_document.html', form=form)
return render_template('document/add_document.html', form=form)
@document_bp.route('/documents', methods=['GET', 'POST'])

View File

@@ -3,7 +3,7 @@ from flask_wtf import FlaskForm
from wtforms import (StringField, PasswordField, BooleanField, SubmitField, EmailField, IntegerField, DateField,
SelectField, SelectMultipleField, FieldList, FormField)
from wtforms.validators import DataRequired, Length, Email, NumberRange, Optional
from ..models.user import User, Role
from common.models import Role
class TenantForm(FlaskForm):

View File

@@ -4,10 +4,10 @@ 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_security import hash_password, roles_required, roles_accepted
from ..models.user import User, Tenant, Role
from ..extensions import db
from common.models import User, Tenant, Role
from common.extensions import db
from .user_forms import TenantForm, CreateUserForm, EditUserForm
from ..utils.database import Database
from common.utils.database import Database
user_bp = Blueprint('user_bp', __name__, url_prefix='/user')