sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-25 02:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Do not manually emit corpus changes via socket.

Browse Source
This commit is contained in:
Patrick Jentsch 2021-08-23 12:29:31 +02:00
parent c7b2c413d3
commit a5782f932c
2 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
app/corpora/events.py
View File

@ -2,6 +2,7 @@ from datetime import datetime
from flask import current_app, request from flask import current_app, request
from flask_login import current_user from flask_login import current_user
from socket import gaierror from socket import gaierror
from werkzeug.utils import secure_filename
from .. import db, socketio from .. import db, socketio
from ..decorators import socketio_login_required from ..decorators import socketio_login_required
from ..socketio_events import socketio_sessions from ..socketio_events import socketio_sessions
@ -43,24 +44,12 @@ def init_corpus_analysis(corpus_id):
if corpus.status == 'prepared': if corpus.status == 'prepared':
corpus.status = 'start analysis' corpus.status = 'start analysis'
db.session.commit() db.session.commit()
event = 'user_{}_patch'.format(corpus.user_id)
jsonpatch = [{'op': 'replace', 'path': '/corpora/{}/status'.format(corpus.id), 'value': corpus.status}] # noqa
room = 'user_{}'.format(corpus.user_id)
socketio.emit(event, jsonpatch, room=room)
socketio.start_background_task(corpus_analysis_session_handler, socketio.start_background_task(corpus_analysis_session_handler,
current_app._get_current_object(), current_app._get_current_object(),
corpus_id, current_user.id, request.sid) corpus_id, current_user.id, request.sid)
def corpus_analysis_session_handler(app, corpus_id, user_id, session_id): def corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
def change_corpus_status(status):
corpus.status = status
db.session.commit()
event = 'user_{}_patch'.format(corpus.user_id)
jsonpatch = [{'op': 'replace', 'path': '/corpora/{}/status'.format(corpus.id), 'value': corpus.status}] # noqa
room = 'user_{}'.format(corpus.user_id)
socketio.emit(event, jsonpatch, room=room)
with app.app_context(): with app.app_context():
''' Setup analysis session ''' ''' Setup analysis session '''
corpus = Corpus.query.get(corpus_id) corpus = Corpus.query.get(corpus_id)
@ -71,7 +60,8 @@ def corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
if retry_counter == 0: if retry_counter == 0:
response = {'code': 408, 'desc': None, 'msg': 'Request Timeout'} # noqa response = {'code': 408, 'desc': None, 'msg': 'Request Timeout'} # noqa
socketio.emit('corpus_analysis_init', response, room=request.sid) # noqa socketio.emit('corpus_analysis_init', response, room=request.sid) # noqa
change_corpus_status('stop analysis') corpus.status = 'stop analysis'
db.session.commit()
return return
socketio.sleep(3) socketio.sleep(3)
client = cqi.CQiClient('cqpserver_{}'.format(corpus_id)) client = cqi.CQiClient('cqpserver_{}'.format(corpus_id))
@ -80,12 +70,14 @@ def corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
payload = {'code': connect_status, 'msg': cqi.api.specification.lookup[connect_status]} # noqa payload = {'code': connect_status, 'msg': cqi.api.specification.lookup[connect_status]} # noqa
except cqi.errors.CQiException as e: except cqi.errors.CQiException as e:
handle_cqi_exception('corpus_analysis_init', e, session_id) handle_cqi_exception('corpus_analysis_init', e, session_id)
change_corpus_status('stop analysis') corpus.status = 'stop analysis'
db.session.commit()
return return
except gaierror: except gaierror:
response = {'code': 500, 'desc': None, 'msg': 'Internal Server Error'} # noqa response = {'code': 500, 'desc': None, 'msg': 'Internal Server Error'} # noqa
socketio.emit('corpus_analysis_init', response, room=session_id) socketio.emit('corpus_analysis_init', response, room=session_id)
change_corpus_status('stop analysis') corpus.status = 'stop analysis'
db.session.commit()
return return
corpus_analysis_clients[session_id] = client corpus_analysis_clients[session_id] = client
if corpus_id in corpus_analysis_sessions: if corpus_id in corpus_analysis_sessions:
@ -102,7 +94,7 @@ def corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
if client.status == 'running': if client.status == 'running':
client.status = 'abort' client.status = 'abort'
while client.status != 'ready': while client.status != 'ready':
socketio.sleep(0.1) socketio.sleep(0.3)
try: try:
client.disconnect() client.disconnect()
except cqi.errors.CQiException: except cqi.errors.CQiException:
@ -111,7 +103,8 @@ def corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
corpus_analysis_sessions[corpus_id].remove(session_id) corpus_analysis_sessions[corpus_id].remove(session_id)
if not corpus_analysis_sessions[corpus_id]: if not corpus_analysis_sessions[corpus_id]:
corpus_analysis_sessions.pop(corpus_id, None) corpus_analysis_sessions.pop(corpus_id, None)
change_corpus_status('stop analysis') corpus.status = 'stop analysis'
db.session.commit()
@socketio.on('corpus_analysis_meta_data') @socketio.on('corpus_analysis_meta_data')
@ -127,24 +120,23 @@ def corpus_analysis_get_meta_data(corpus_id):
db_corpus.last_edited_date.isoformat() db_corpus.last_edited_date.isoformat()
client = corpus_analysis_clients.get(request.sid) client = corpus_analysis_clients.get(request.sid)
if client is None: if client is None:
response = {'code': 424, 'desc': 'No client found for this session', response = {'code': 424, 'desc': None, 'msg': 'Failed Dependency'}
'msg': 'Failed Dependency'}
socketio.emit('corpus_analysis_meta_data', response, room=request.sid) socketio.emit('corpus_analysis_meta_data', response, room=request.sid)
return return
# check if client is busy or not # check if client is busy or not
if client.status == 'running': if client.status == 'running':
client.status = 'abort' client.status = 'abort'
while client.status != 'ready': while client.status != 'ready':
socketio.sleep(0.1) socketio.sleep(0.3)
# get meta data from corpus in cqp server # get meta data from corpus in cqp server
client.status = 'running' client.status = 'running'
try: try:
client_corpus = client.corpora.get('CORPUS') cwb_corpus = client.corpora.get('CORPUS')
metadata['corpus_properties'] = client_corpus.attrs['properties'] metadata['corpus_properties'] = cwb_corpus.attrs['properties']
metadata['corpus_size_tokens'] = client_corpus.attrs['size'] metadata['corpus_size_tokens'] = cwb_corpus.attrs['size']
text_attr = client_corpus.structural_attributes.get('text') text_attr = cwb_corpus.structural_attributes.get('text')
struct_attrs = client_corpus.structural_attributes.list( struct_attrs = cwb_corpus.structural_attributes.list(
filters={'part_of': text_attr}) filters={'part_of': text_attr})
text_ids = range(0, (text_attr.attrs['size'])) text_ids = range(0, (text_attr.attrs['size']))
texts_metadata = {} texts_metadata = {}
@ -162,15 +154,10 @@ def corpus_analysis_get_meta_data(corpus_id):
# write some metadata to the db # write some metadata to the db
db_corpus.current_nr_of_tokens = metadata['corpus_size_tokens'] db_corpus.current_nr_of_tokens = metadata['corpus_size_tokens']
db.session.commit() db.session.commit()
event = 'user_{}_patch'.format(db_corpus.user_id)
jsonpatch = [{'op': 'replace', 'path': '/corpora/{}/current_nr_of_tokens'.format(db_corpus.id), 'value': db_corpus.current_nr_of_tokens}] # noqa
room = 'user_{}'.format(db_corpus.user_id)
socketio.emit(event, jsonpatch, room=room)
# emit data # emit data
payload = metadata payload = metadata
response = {'code': 200, 'desc': 'Corpus meta data', 'msg': 'OK', response = {'code': 200, 'desc': None, 'msg': 'OK', 'payload': payload}
'payload': payload}
socketio.emit('corpus_analysis_meta_data', response, room=request.sid) socketio.emit('corpus_analysis_meta_data', response, room=request.sid)
except cqi.errors.CQiException as e: except cqi.errors.CQiException as e:
payload = {'code': e.code, 'desc': e.description, 'msg': e.name} payload = {'code': e.code, 'desc': e.description, 'msg': e.name}
@ -185,14 +172,13 @@ def corpus_analysis_get_meta_data(corpus_id):
def corpus_analysis_query(query): def corpus_analysis_query(query):
client = corpus_analysis_clients.get(request.sid) client = corpus_analysis_clients.get(request.sid)
if client is None: if client is None:
response = {'code': 424, 'desc': 'No client found for this session', response = {'code': 424, 'desc': None, 'msg': 'Failed Dependency'}
'msg': 'Failed Dependency'}
socketio.emit('corpus_analysis_query', response, room=request.sid) socketio.emit('corpus_analysis_query', response, room=request.sid)
return return
if client.status == 'running': if client.status == 'running':
client.status = 'abort' client.status = 'abort'
while client.status != 'ready': while client.status != 'ready':
socketio.sleep(0.1) socketio.sleep(0.3)
client.status = 'running' client.status = 'running'
try: try:
corpus = client.corpora.get('CORPUS') corpus = client.corpora.get('CORPUS')
@ -248,7 +234,7 @@ def corpus_analysis_get_match_with_full_context(payload):
if client.status == 'running': if client.status == 'running':
client.status = 'abort' client.status = 'abort'
while client.status != 'ready': while client.status != 'ready':
socketio.sleep(0.1) socketio.sleep(0.3)
client.status = 'running' client.status = 'running'
try: try:
corpus = client.corpora.get('CORPUS') corpus = client.corpora.get('CORPUS')
@ -295,13 +281,15 @@ def export_corpus(corpus_id):
# delete old corpus archive if it exists/has been build before # delete old corpus archive if it exists/has been build before
if corpus.archive_file is not None and os.path.isfile(corpus.archive_file): if corpus.archive_file is not None and os.path.isfile(corpus.archive_file):
os.remove(corpus.archive_file) os.remove(corpus.archive_file)
zip_name = corpus.title archive_file_base_name = '[corpus]_' + secure_filename(corpus.title)
zip_path = os.path.join(current_user.path, 'corpora', zip_name) corpus.archive_file = archive_file_base_name + '.zip'
corpus.archive_file = os.path.join(corpus.path, zip_name) + '.zip'
db.session.commit() db.session.commit()
shutil.make_archive(zip_path, 'zip', corpus.path) shutil.make_archive(
shutil.move(zip_path + '.zip', corpus.archive_file) os.path.join(corpus.creator.path, 'corpora', archive_file_base_name),
socketio.emit('export_corpus_' + str(corpus.id), room=request.sid) 'zip',
corpus.path
)
socketio.emit('export_corpus_{}'.format(corpus.id), room=request.sid)
def handle_cqi_exception(event, exception, room): def handle_cqi_exception(event, exception, room):

11
app/corpora/views.py
View File

@ -131,11 +131,12 @@ def download_corpus(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id) corpus = Corpus.query.get_or_404(corpus_id)
if not (corpus.creator == current_user or current_user.is_administrator()): if not (corpus.creator == current_user or current_user.is_administrator()):
abort(403) abort(403)
# TODO: Check what happens here return send_from_directory(
dir = os.path.dirname(corpus.archive_file) as_attachment=True,
filename = os.path.basename(corpus.archive_file) directory=os.path.join(corpus.creator.path, 'corpora'),
return send_from_directory(as_attachment=True, directory=dir, filename=corpus.archive_file,
filename=filename, mimetype='zip') mimetype='zip'
)
@corpora.route('/<int:corpus_id>/analyse') @corpora.route('/<int:corpus_id>/analyse')