- correction of tests is now asynchronous. Each question is sent to the default executor.

Miguel Barão
1 parent 27e15117
Showing 5 changed files with 21 additions and 15 deletions Show diff stats
BUGS.md
app.py
questions.py
serve.py
test.py
@@ -9,14 +9,14 @@ ou usar push (websockets?)
 - pymips: nao pode executar syscalls do spim.
 - perguntas checkbox [right,wrong] com pelo menos uma opção correcta.
 - questions.py textarea has a abspath which does not make sense! why is it there? not working for perguntations, but seems to work for aprendizations
-- o eventloop está a bloquear. correção do teste é blocking. usar threadpoolexecutor?
 - submissao faz um post ajax.
 - eventos unfocus?
 - servidor nao esta a lidar com eventos scroll/resize. ignorar?
 # TODO
-- gerar teste qd o prof autoriza.
+- decorador para user 0, evita o "if uid==0" em muitas funcoes.
+- gerar teste qd o prof autoriza? melhor nao, pode apagar o teste em curso.
 - enviar resposta de cada pergunta individualmente.
 - experimentar gerador de svg que inclua no markdown da pergunta e ver se funciona. 
 - suportar cotacao to teste diferente de 20 (e.g. para juntar perguntas em papel). opcao "points: 18" que normaliza total para 18 em vez de 20.
@@ -37,7 +37,6 @@ ou usar push (websockets?)
 - fazer renderer para linguagem assembly mips?
 - permitir eliminar teste a decorrer
 - cancelar teste no menu admin. Dado o numero de aluno remove teste e faz logout do aluno.
-- decorador para user 0, evita o "if uid==0" em muitas funcoes.
 - mathjax-node:
     sudo pkg install node npm
     npm install mathjax-node mathjax-node-cli    # pacotes em ~/node_modules
@@ -61,6 +60,8 @@ ou usar push (websockets?)
 # FIXED
+- o eventloop está a bloquear. correção do teste é blocking. usar threadpoolexecutor?
+- substituir get_event_loop por get_runnint_loop (ver https://docs.python.org/3/library/asyncio-eventloop.html)
 - review nao esta a funcionar
 - servir imagens das perguntas não funciona. Necessario passar a ref da pergunta no link para poder ajustar o path no FileHandler.
 - a primeira coluna da tabela admin deveria estar sempre ordenada.
@@ -26,7 +26,7 @@ class AppException(Exception):
 # ============================================================================
 async def check_password(try_pw, password):
     try_pw = try_pw.encode('utf-8')
-    loop = asyncio.get_event_loop()
+    loop = asyncio.get_running_loop()
     hashed_pw = await loop.run_in_executor(None, bcrypt.hashpw, try_pw, password)
     return password == hashed_pw
@@ -150,10 +150,10 @@ class App(object):
     # -----------------------------------------------------------------------
     # ans is a dictionary {question_index: answer, ...}
     # for example:  {0:'hello', 1:[1,2]}
-    def correct_test(self, uid, ans):
+    async def correct_test(self, uid, ans):
         t = self.online[uid]['test']
         t.update_answers(ans)
-        grade = t.correct()
+        grade = await t.correct()
         # save test in JSON format
         fname = ' -- '.join((t['student']['number'], t['ref'], str(t['finish_time']))) + '.json'
@@ -4,6 +4,7 @@ import random
 import re
 from os import path
 import logging
+import asyncio
 # user installed libraries
 import yaml
@@ -49,6 +50,11 @@ class Question(dict):
         self['grade'] = 0.0
         return 0.0
+    async def correct_async(self):
+        loop = asyncio.get_running_loop()
+        grade = await loop.run_in_executor(None, self.correct)
+        return grade
+
     def set_defaults(self, d):
         'Add k:v pairs from default dict d for nonexistent keys'
         for k,v in d.items():
@@ -75,7 +75,6 @@ class LoginHandler(BaseHandler):
     def get(self):
         self.render('login.html', error='')
-    # async 
     async def post(self):
         uid = self.get_body_argument('uid')
         pw = self.get_body_argument('pw')
@@ -181,8 +180,7 @@ class TestHandler(BaseHandler):
     # POST
     @tornado.web.authenticated
-    # async 
-    def post(self):
+    async def post(self):
         uid = self.current_user
         # self.request.arguments = {'answered-0': [b'on'], '0': [b'13.45']}
@@ -205,9 +203,7 @@ class TestHandler(BaseHandler):
                                    'numeric-interval'):
                     ans[i] = ans[i][0]
-        # loop = asyncio.get_event_loop()
-        # await loop.run_in_executor(None, self.testapp.correct_test, uid, ans)
-        self.testapp.correct_test(uid, ans)
+        await self.testapp.correct_test(uid, ans)
         self.testapp.logout(uid)
         self.clear_cookie('user')
@@ -231,12 +231,15 @@ class Test(dict):
     # -----------------------------------------------------------------------
     # Corrects all the answers and computes the final grade
-    def correct(self):
+    async def correct(self):
         self['finish_time'] = datetime.now()
         self['state'] = 'FINISHED'
-        grade = sum(q.correct()*q['points'] for q in self['questions'])
-        self['grade'] = max(0, round(grade, 1)) # truncate FIXME scale?
+        grade = 0.0
+        for q in self['questions']:
+            grade += await q.correct_async() * q['points']
+
+        self['grade'] = max(0, round(grade, 1)) # avoid negative final grades
         logger.info(f'Student {self["student"]["number"]}:  correction gave {self["grade"]} points.')
         return self['grade']
	@@ -26,7 +26,7 @@ class AppException(Exception):		@@ -26,7 +26,7 @@ class AppException(Exception):
26	# ============================================================================	26	# ============================================================================
27	async def check_password(try_pw, password):	27	async def check_password(try_pw, password):
28	try_pw = try_pw.encode('utf-8')	28	try_pw = try_pw.encode('utf-8')
29	- loop = asyncio.get_event_loop()	29	+ loop = asyncio.get_running_loop()
30	hashed_pw = await loop.run_in_executor(None, bcrypt.hashpw, try_pw, password)	30	hashed_pw = await loop.run_in_executor(None, bcrypt.hashpw, try_pw, password)
31	return password == hashed_pw	31	return password == hashed_pw
32		32
	@@ -150,10 +150,10 @@ class App(object):		@@ -150,10 +150,10 @@ class App(object):
150	# -----------------------------------------------------------------------	150	# -----------------------------------------------------------------------
151	# ans is a dictionary {question_index: answer, ...}	151	# ans is a dictionary {question_index: answer, ...}
152	# for example: {0:'hello', 1:[1,2]}	152	# for example: {0:'hello', 1:[1,2]}
153	- def correct_test(self, uid, ans):	153	+ async def correct_test(self, uid, ans):
154	t = self.online[uid]['test']	154	t = self.online[uid]['test']
155	t.update_answers(ans)	155	t.update_answers(ans)
156	- grade = t.correct()	156	+ grade = await t.correct()
157		157
158	# save test in JSON format	158	# save test in JSON format
159	fname = ' -- '.join((t['student']['number'], t['ref'], str(t['finish_time']))) + '.json'	159	fname = ' -- '.join((t['student']['number'], t['ref'], str(t['finish_time']))) + '.json'