- Correct default language when adding Documents and URLs
This commit is contained in:
@@ -27,6 +27,7 @@ class AddDocumentForm(FlaskForm):
|
|||||||
super().__init__()
|
super().__init__()
|
||||||
self.language.choices = [(language, language) for language in
|
self.language.choices = [(language, language) for language in
|
||||||
session.get('tenant').get('allowed_languages')]
|
session.get('tenant').get('allowed_languages')]
|
||||||
|
self.language.data = session.get('tenant').get('default_language')
|
||||||
|
|
||||||
|
|
||||||
class AddURLForm(FlaskForm):
|
class AddURLForm(FlaskForm):
|
||||||
@@ -42,6 +43,7 @@ class AddURLForm(FlaskForm):
|
|||||||
super().__init__()
|
super().__init__()
|
||||||
self.language.choices = [(language, language) for language in
|
self.language.choices = [(language, language) for language in
|
||||||
session.get('tenant').get('allowed_languages')]
|
session.get('tenant').get('allowed_languages')]
|
||||||
|
self.language.data = session.get('tenant').get('default_language')
|
||||||
|
|
||||||
|
|
||||||
class AddURLsForm(FlaskForm):
|
class AddURLsForm(FlaskForm):
|
||||||
@@ -57,6 +59,7 @@ class AddURLsForm(FlaskForm):
|
|||||||
super().__init__()
|
super().__init__()
|
||||||
self.language.choices = [(language, language) for language in
|
self.language.choices = [(language, language) for language in
|
||||||
session.get('tenant').get('allowed_languages')]
|
session.get('tenant').get('allowed_languages')]
|
||||||
|
self.language.data = session.get('tenant').get('default_language')
|
||||||
|
|
||||||
|
|
||||||
class AddYoutubeForm(FlaskForm):
|
class AddYoutubeForm(FlaskForm):
|
||||||
|
|||||||
@@ -22,8 +22,7 @@ from common.utils.document_utils import validate_file_type, create_document_stac
|
|||||||
process_multiple_urls, prepare_youtube_document, create_version_for_document, upload_file_for_version
|
process_multiple_urls, prepare_youtube_document, create_version_for_document, upload_file_for_version
|
||||||
from common.utils.eveai_exceptions import EveAIInvalidLanguageException, EveAIUnsupportedFileType, \
|
from common.utils.eveai_exceptions import EveAIInvalidLanguageException, EveAIUnsupportedFileType, \
|
||||||
EveAIDoubleURLException, EveAIYoutubeError
|
EveAIDoubleURLException, EveAIYoutubeError
|
||||||
from .document_forms import AddDocumentForm, AddURLForm, EditDocumentForm, EditDocumentVersionForm, AddYoutubeForm, \
|
from .document_forms import AddDocumentForm, AddURLForm, EditDocumentForm, EditDocumentVersionForm, AddURLsForm
|
||||||
AddURLsForm
|
|
||||||
from common.utils.middleware import mw_before_request
|
from common.utils.middleware import mw_before_request
|
||||||
from common.utils.celery_utils import current_celery
|
from common.utils.celery_utils import current_celery
|
||||||
from common.utils.nginx_utils import prefixed_url_for
|
from common.utils.nginx_utils import prefixed_url_for
|
||||||
@@ -170,42 +169,6 @@ def add_urls():
|
|||||||
return render_template('document/add_urls.html', form=form)
|
return render_template('document/add_urls.html', form=form)
|
||||||
|
|
||||||
|
|
||||||
@document_bp.route('/add_youtube', methods=['GET', 'POST'])
|
|
||||||
@roles_accepted('Super User', 'Tenant Admin')
|
|
||||||
def add_youtube():
|
|
||||||
form = AddYoutubeForm()
|
|
||||||
|
|
||||||
if form.validate_on_submit():
|
|
||||||
try:
|
|
||||||
tenant_id = session['tenant']['id']
|
|
||||||
url = form.url.data
|
|
||||||
|
|
||||||
api_input = {
|
|
||||||
'name': form.name.data,
|
|
||||||
'language': form.language.data,
|
|
||||||
'user_context': form.user_context.data,
|
|
||||||
'valid_from': form.valid_from.data
|
|
||||||
}
|
|
||||||
|
|
||||||
new_doc, new_doc_vers = prepare_youtube_document(url, tenant_id, api_input)
|
|
||||||
task_id = start_embedding_task(tenant_id, new_doc_vers.id)
|
|
||||||
|
|
||||||
flash(
|
|
||||||
f'Processing on YouTube document {new_doc.name}, version {new_doc_vers.id} started. Task ID: {task_id}.',
|
|
||||||
'success')
|
|
||||||
return redirect(prefixed_url_for('document_bp.documents'))
|
|
||||||
|
|
||||||
except EveAIYoutubeError as e:
|
|
||||||
flash(str(e), 'error')
|
|
||||||
except (EveAIInvalidLanguageException, EveAIUnsupportedFileType) as e:
|
|
||||||
flash(str(e), 'error')
|
|
||||||
except Exception as e:
|
|
||||||
current_app.logger.error(f'Error adding YouTube document: {str(e)}')
|
|
||||||
flash('An error occurred while adding the YouTube document.', 'error')
|
|
||||||
|
|
||||||
return render_template('document/add_youtube.html', form=form)
|
|
||||||
|
|
||||||
|
|
||||||
@document_bp.route('/documents', methods=['GET', 'POST'])
|
@document_bp.route('/documents', methods=['GET', 'POST'])
|
||||||
@roles_accepted('Super User', 'Tenant Admin')
|
@roles_accepted('Super User', 'Tenant Admin')
|
||||||
def documents():
|
def documents():
|
||||||
|
|||||||
Reference in New Issue
Block a user