Refactoring part 2

Necessary changes to ensure correct working of eveai_app

eveai_app/__init__.py

@@ -11,8 +11,7 @@ from common.models.user import User, Role
 from config.logging_config import LOGGING
 from common.utils.security import set_tenant_session_data
 from .errors import register_error_handlers
-from eveai_workers.celery_utils import init_celery
-
+from common.celery_config import make_celery, init_celery
 
 def create_app(config_file=None):
     app = Flask(__name__)
@@ -31,8 +30,11 @@ def create_app(config_file=None):
     logging.config.dictConfig(LOGGING)
     register_extensions(app)
 
-    # Initialize celery
-    init_celery(app)
+    app.celery = make_celery(app.name, app.config)
+    init_celery(app.celery, app)
+
+    print(app.celery.conf.broker_url)
+    print(app.celery.conf.result_backend)
 
     # Setup Flask-Security-Too
     user_datastore = SQLAlchemyUserDatastore(db, User, Role)

eveai_app/views/document_views.py

@@ -6,11 +6,10 @@ from sqlalchemy import desc
 from sqlalchemy.orm import joinedload
 from werkzeug.utils import secure_filename
 
-from common.models import Document, DocumentLanguage, DocumentVersion
+from common.models.document import Document, DocumentLanguage, DocumentVersion
 from common.extensions import db
 from .document_forms import AddDocumentForm
 from common.utils.middleware import mw_before_request
-from eveai_workers.tasks import create_embeddings
 
 
 document_bp = Blueprint('document_bp', __name__, url_prefix='/document')
@@ -70,11 +69,14 @@ 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'])
+            task = current_app.celery.send_task('tasks.create_embeddings', args=[
+                session['tenant']['id'],
+                new_doc_vers.id,
+                session['default_embedding_model'],
+            ])
             current_app.logger.info(f'Document processing started for tenant {session["tenant"]["id"]}, '
-                                    f'Document Version {new_doc_vers.id}')
+                                    f'Document Version {new_doc_vers.id}, '
+                                    f'Task ID {task.id}')
             print('Processing should start soon')
         else:
             flash('Error adding document.', 'error')

eveai_app/views/user_forms.py

@@ -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 common.models import Role
+from common.models.user import Role
 
 
 class TenantForm(FlaskForm):

eveai_app/views/user_views.py

@@ -4,7 +4,7 @@ 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 common.models import User, Tenant, Role
+from common.models.user import User, Tenant, Role
 from common.extensions import db
 from .user_forms import TenantForm, CreateUserForm, EditUserForm
 from common.utils.database import Database