sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-24 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Stephan Porada 2019-11-07 15:58:24 +01:00
commit e0a1514084
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/corpora/events.py
View File

@ -5,14 +5,14 @@ from flask import current_app, request
from flask_login import login_required from flask_login import login_required
from .CQiWrapper.CQiWrapper import CQiWrapper from .CQiWrapper.CQiWrapper import CQiWrapper
import logging import logging
import time
analysis_clients = {}
@socketio.on('init_corpus_analysis') @socketio.on('init_corpus_analysis')
@login_required @login_required
def init_corpus_analysis(corpus_id): def init_corpus_analysis(corpus_id):
logger = logging.getLogger(__name__)
logger.warning('init_corpus_analysis')
''' TODO: Check if current_user is allowed to subscribe to this ''' ''' TODO: Check if current_user is allowed to subscribe to this '''
socketio.start_background_task(observe_corpus_analysis_connection, socketio.start_background_task(observe_corpus_analysis_connection,
current_app._get_current_object(), current_app._get_current_object(),
@ -24,28 +24,31 @@ def init_corpus_analysis(corpus_id):
def recv_query(message): def recv_query(message):
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.warning(message) logger.warning(message)
analysis_client = analysis_clients[request.sid]
def observe_corpus_analysis_connection(app, corpus_id, session_id): def observe_corpus_analysis_connection(app, corpus_id, session_id):
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
with app.app_context(): with app.app_context():
time.sleep(5) # wait for IP of container only for dev
corpus = Corpus.query.filter_by(id=corpus_id).first() corpus = Corpus.query.filter_by(id=corpus_id).first()
logger.warning('IP adress is: {}'.format(corpus.analysis_container_ip)) while corpus.status != 'analysing':
cqi_session = CQiWrapper(username='opaque', password='opaque', db.session.refresh(corpus)
host=corpus.analysis_container_ip, port=4877) socketio.sleep(3)
cqi_session.connect() analysis_client = CQiWrapper(username='opaque', password='opaque',
logger.warning(cqi_session.corpus_list_corpora()) host='{}_analysis_container{}'.format(corpus.creator.username, corpus.id), port=4877)
analysis_clients[session_id] = analysis_client
analysis_client.connect()
logger.warning(analysis_client.corpus_list_corpora())
corpus_name = 'CORPUS' corpus_name = 'CORPUS'
result_subcorpus_name = 'Query-results' # should be set by the user somehow result_subcorpus_name = 'Query-results' # should be set by the user somehow
query = '"and";' query = '"and";'
cqi_session.create_attribute_strings(corpus_name) analysis_client.create_attribute_strings(corpus_name)
logger.warning('Log after create_attribute_strings.') logger.warning('Log after create_attribute_strings.')
cqi_session.query_subcorpus(corpus_name, result_subcorpus_name, query) analysis_client.query_subcorpus(corpus_name, result_subcorpus_name, query)
logger.warning('Log after query_subcorpus.') logger.warning('Log after query_subcorpus.')
while session_id in connected_sessions: while session_id in connected_sessions:
logger.warning('Run container, run!') logger.warning(analysis_client.ctrl_ping())
socketio.sleep(3) socketio.sleep(3)
analysis_clients.pop(session_id, None)
corpus.status = 'stop analysis' corpus.status = 'stop analysis'
db.session.commit() db.session.commit()
logger.warning('Stop container, stop!')

1
app/events.py
View File

@ -5,7 +5,6 @@ from .decorators import admin_required
from .models import User from .models import User
import json import json
import jsonpatch import jsonpatch
import logging
''' '''