mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-03 20:02:47 +00:00 
			
		
		
		
	Remove all pjs!
This commit is contained in:
		@@ -13,30 +13,30 @@ import math
 | 
			
		||||
' A dictionary containing lists of, with corpus ids associated, Socket.IO
 | 
			
		||||
' session ids (sid). {<corpus_id>: [<sid>, ...], ...}
 | 
			
		||||
'''
 | 
			
		||||
pj_corpus_analysis_sessions = {}
 | 
			
		||||
corpus_analysis_sessions = {}
 | 
			
		||||
'''
 | 
			
		||||
' A dictionary containing Socket.IO session id - CQi client pairs.
 | 
			
		||||
' {<sid>: CQiClient, ...}
 | 
			
		||||
'''
 | 
			
		||||
pj_corpus_analysis_clients = {}
 | 
			
		||||
corpus_analysis_clients = {}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@socketio.on('pj_corpus_analysis_init')
 | 
			
		||||
@socketio.on('corpus_analysis_init')
 | 
			
		||||
@socketio_login_required
 | 
			
		||||
def pj_init_corpus_analysis(corpus_id):
 | 
			
		||||
    socketio.start_background_task(pj_corpus_analysis_session_handler,
 | 
			
		||||
def init_corpus_analysis(corpus_id):
 | 
			
		||||
    socketio.start_background_task(corpus_analysis_session_handler,
 | 
			
		||||
                                   current_app._get_current_object(),
 | 
			
		||||
                                   corpus_id, current_user.id, request.sid)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@socketio.on('pj_corpus_analysis_query')
 | 
			
		||||
@socketio.on('corpus_analysis_query')
 | 
			
		||||
@socketio_login_required
 | 
			
		||||
def pj_corpus_analysis_query(query):
 | 
			
		||||
    client = pj_corpus_analysis_clients.get(request.sid)
 | 
			
		||||
def corpus_analysis_query(query):
 | 
			
		||||
    client = corpus_analysis_clients.get(request.sid)
 | 
			
		||||
    if client is None:
 | 
			
		||||
        response = {'code': 404, 'desc': 'No client found for this session',
 | 
			
		||||
                    'msg': 'Failed Dependency'}
 | 
			
		||||
        socketio.emit('pj_corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        socketio.emit('corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        return
 | 
			
		||||
    if client.status == 'running':
 | 
			
		||||
        client.status = 'abort'
 | 
			
		||||
@@ -48,7 +48,7 @@ def pj_corpus_analysis_query(query):
 | 
			
		||||
        response = {'code': 500, 'desc': None, 'msg': 'Internal Server Error',
 | 
			
		||||
                    'payload': {'code': e.code, 'desc': e.description,
 | 
			
		||||
                                'msg': e.name}}
 | 
			
		||||
        socketio.emit('pj_corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        socketio.emit('corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        return
 | 
			
		||||
    try:
 | 
			
		||||
        query_status = corpus.query(query)
 | 
			
		||||
@@ -56,7 +56,7 @@ def pj_corpus_analysis_query(query):
 | 
			
		||||
        response = {'code': 500, 'desc': None, 'msg': 'Internal Server Error',
 | 
			
		||||
                    'payload': {'code': e.code, 'desc': e.description,
 | 
			
		||||
                                'msg': e.name}}
 | 
			
		||||
        socketio.emit('pj_corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        socketio.emit('corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        return
 | 
			
		||||
    try:
 | 
			
		||||
        results = corpus.subcorpora.get('Results')
 | 
			
		||||
@@ -64,11 +64,11 @@ def pj_corpus_analysis_query(query):
 | 
			
		||||
        response = {'code': 500, 'desc': None, 'msg': 'Internal Server Error',
 | 
			
		||||
                    'payload': {'code': e.code, 'desc': e.description,
 | 
			
		||||
                                'msg': e.name}}
 | 
			
		||||
        socketio.emit('pj_corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        socketio.emit('corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
        return
 | 
			
		||||
    response = {'code': 200, 'desc': None, 'msg': 'OK',
 | 
			
		||||
                'payload': {**query_status, 'match_count': results.size}}
 | 
			
		||||
    socketio.emit('pj_corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
    socketio.emit('corpus_analysis_query', response, room=request.sid)
 | 
			
		||||
    chunk_size = 100
 | 
			
		||||
    chunk_start = 0
 | 
			
		||||
    context = 100
 | 
			
		||||
@@ -87,17 +87,17 @@ def pj_corpus_analysis_query(query):
 | 
			
		||||
            progress = min(100, int(math.ceil(progress)))
 | 
			
		||||
        response = {'code': 200, 'desc': None, 'msg': 'OK',
 | 
			
		||||
                    'payload': {'chunk': chunk, 'progress': progress}}
 | 
			
		||||
        socketio.emit('pj_corpus_analysis_query_results', response,
 | 
			
		||||
        socketio.emit('corpus_analysis_query_results', response,
 | 
			
		||||
                      room=request.sid)
 | 
			
		||||
        chunk_start += chunk_size
 | 
			
		||||
    client.status = 'ready'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@socketio.on('pj_corpus_analysis_inspect_match')
 | 
			
		||||
@socketio.on('corpus_analysis_inspect_match')
 | 
			
		||||
@socketio_login_required
 | 
			
		||||
def pj_corpus_analysis_inspect_match(payload):
 | 
			
		||||
def corpus_analysis_inspect_match(payload):
 | 
			
		||||
    payload = payload["payload"]
 | 
			
		||||
    client = pj_corpus_analysis_clients.get(request.sid)
 | 
			
		||||
    client = corpus_analysis_clients.get(request.sid)
 | 
			
		||||
    if client is None:
 | 
			
		||||
        socketio.emit('query', '[424]: Failed Dependency',
 | 
			
		||||
                      room=request.sid)
 | 
			
		||||
@@ -108,22 +108,22 @@ def pj_corpus_analysis_inspect_match(payload):
 | 
			
		||||
    match_context = s.export(payload['first_cpos'], payload['last_cpos'],
 | 
			
		||||
                             context=3, expand_lists=False)
 | 
			
		||||
    match_context['cpos_ranges'] = True
 | 
			
		||||
    socketio.emit('pj_match_context',
 | 
			
		||||
    socketio.emit('match_context',
 | 
			
		||||
                  {'payload': match_context}, room=request.sid)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def pj_corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
 | 
			
		||||
def corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
 | 
			
		||||
    with app.app_context():
 | 
			
		||||
        ''' Setup analysis session '''
 | 
			
		||||
        corpus = Corpus.query.get(corpus_id)
 | 
			
		||||
        user = User.query.get(user_id)
 | 
			
		||||
        if corpus is None:
 | 
			
		||||
            response = {'code': 404, 'desc': None, 'msg': 'Not Found'}
 | 
			
		||||
            socketio.emit('pj_corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            socketio.emit('corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            return
 | 
			
		||||
        elif not (corpus.creator == user or user.is_administrator()):
 | 
			
		||||
            response = {'code': 403, 'desc': None, 'msg': 'Forbidden'}
 | 
			
		||||
            socketio.emit('pj_corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            socketio.emit('corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            return
 | 
			
		||||
        while corpus.status != 'analysing':
 | 
			
		||||
            db.session.refresh(corpus)
 | 
			
		||||
@@ -136,22 +136,22 @@ def pj_corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
 | 
			
		||||
                        'msg': 'Internal Server Error',
 | 
			
		||||
                        'payload': {'code': e.code, 'desc': e.description,
 | 
			
		||||
                                    'msg': e.name}}
 | 
			
		||||
            socketio.emit('pj_corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            socketio.emit('corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            return
 | 
			
		||||
        except gaierror:
 | 
			
		||||
            response = {'code': 500, 'desc': None,
 | 
			
		||||
                        'msg': 'Internal Server Error'}
 | 
			
		||||
            socketio.emit('pj_corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            socketio.emit('corpus_analysis_init', response, room=session_id)
 | 
			
		||||
            return
 | 
			
		||||
        pj_corpus_analysis_clients[session_id] = client
 | 
			
		||||
        if corpus_id not in pj_corpus_analysis_sessions:
 | 
			
		||||
            pj_corpus_analysis_sessions[corpus_id] = [session_id]
 | 
			
		||||
        corpus_analysis_clients[session_id] = client
 | 
			
		||||
        if corpus_id not in corpus_analysis_sessions:
 | 
			
		||||
            corpus_analysis_sessions[corpus_id] = [session_id]
 | 
			
		||||
        else:
 | 
			
		||||
            pj_corpus_analysis_sessions[corpus_id].append(session_id)
 | 
			
		||||
            corpus_analysis_sessions[corpus_id].append(session_id)
 | 
			
		||||
        client.status = 'ready'
 | 
			
		||||
        response = {'code': 200, 'desc': None, 'msg': 'OK',
 | 
			
		||||
                    'payload': {**connect_status}}
 | 
			
		||||
        socketio.emit('pj_corpus_analysis_init', response, room=session_id)
 | 
			
		||||
        socketio.emit('corpus_analysis_init', response, room=session_id)
 | 
			
		||||
        ''' Observe analysis session '''
 | 
			
		||||
        while session_id in connected_sessions:
 | 
			
		||||
            socketio.sleep(3)
 | 
			
		||||
@@ -164,9 +164,9 @@ def pj_corpus_analysis_session_handler(app, corpus_id, user_id, session_id):
 | 
			
		||||
            client.disconnect()
 | 
			
		||||
        except cqi.errors.CQiException:
 | 
			
		||||
            pass
 | 
			
		||||
        pj_corpus_analysis_clients.pop(session_id, None)
 | 
			
		||||
        pj_corpus_analysis_sessions[corpus_id].remove(session_id)
 | 
			
		||||
        if not pj_corpus_analysis_sessions[corpus_id]:
 | 
			
		||||
            pj_corpus_analysis_sessions.pop(corpus_id, None)
 | 
			
		||||
        corpus_analysis_clients.pop(session_id, None)
 | 
			
		||||
        corpus_analysis_sessions[corpus_id].remove(session_id)
 | 
			
		||||
        if not corpus_analysis_sessions[corpus_id]:
 | 
			
		||||
            corpus_analysis_sessions.pop(corpus_id, None)
 | 
			
		||||
            corpus.status = 'stop analysis'
 | 
			
		||||
            db.session.commit()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user