allow admin to reload topic and regenerate QFactory

Miguel Barão
1 parent f2ee3414
Showing 2 changed files with 63 additions and 48 deletions Show diff stats
aprendizations/learnapp.py
aprendizations/student.py
@@ -78,7 +78,6 @@ class LearnApp(object):
         logger.info(f'{len(t):>6} topics in {courses}')
         for f in config.get('topics_from', []):
             c = load_yaml(f)    # course configuration
-
             # FIXME set defaults??
             logger.info(f'{len(c["topics"]):>6} topics imported from {f}')
             self.populate_graph(c)
@@ -302,6 +301,10 @@ class LearnApp(object):
     # ------------------------------------------------------------------------
     async def start_topic(self, uid: str, topic: str) -> None:
         student = self.online[uid]['state']
+        if uid == '0':
+            logger.warning(f'Reloading "{topic}"')
+            self.factory.update(self.factory_for(topic))
+
         try:
             await student.start_topic(topic)
         except Exception as e:
@@ -393,66 +396,78 @@ class LearnApp(object):
     # ------------------------------------------------------------------------
     # Buils dictionary of question factories
+    #   - visits each topic in the graph,
+    #   - adds factory for each topic.
     # ------------------------------------------------------------------------
     def make_factory(self) -> Dict[str, QFactory]:
         logger.info('Building questions factory:')
-        factory = {}
+        factory = dict()
         g = self.deps
         for tref in g.nodes():
-            t = g.nodes[tref]
+            factory.update(self.factory_for(tref))
-            # load questions as list of dicts
-            topicpath: str = path.join(g.graph['prefix'], tref)
-            try:
-                fullpath: str = path.join(topicpath, t['file'])
-            except Exception:
-                msg1 = f'Invalid topic "{tref}"'
-                msg2 = f'Check dependencies of {", ".join(g.successors(tref))}'
-                raise LearnException(f'{msg1}. {msg2}')
+        logger.info(f'Factory has {len(factory)} questions')
+        return factory
-            logger.debug(f'  Loading {fullpath}')
-            try:
-                questions: List[QDict] = load_yaml(fullpath)
-            except Exception:
-                msg = f'Failed to load "{fullpath}"'
-                logger.error(msg)
-                raise LearnException(msg)
+    # ------------------------------------------------------------------------
+    # makes factory for a single topic
+    # ------------------------------------------------------------------------
+    def factory_for(self, tref: str) -> Dict[str, QFactory]:
+        factory = {}
+        g = self.deps
+        t = g.nodes[tref]  # get node
-            if not isinstance(questions, list):
-                msg = f'File "{fullpath}" must be a list of questions'
-                raise LearnException(msg)
+        # load questions as list of dicts
+        topicpath: str = path.join(g.graph['prefix'], tref)
+        try:
+            fullpath: str = path.join(topicpath, t['file'])
+        except Exception:
+            msg1 = f'Invalid topic "{tref}"'
+            msg2 = f'Check dependencies of {", ".join(g.successors(tref))}'
+            raise LearnException(f'{msg1}. {msg2}')
-            # update refs to include topic as prefix.
-            # refs are required to be unique only within the file.
-            # undefined are set to topic:n, where n is the question number
-            # within the file
-            localrefs: Set[str] = set()  # refs in current file
-            for i, q in enumerate(questions):
-                qref = q.get('ref', str(i))  # ref or number
-                if qref in localrefs:
-                    msg = f'Duplicate ref "{qref}" in "{topicpath}"'
-                    raise LearnException(msg)
-                localrefs.add(qref)
+        logger.debug(f'  Loading {fullpath}')
+        try:
+            questions: List[QDict] = load_yaml(fullpath)
+        except Exception:
+            msg = f'Failed to load "{fullpath}"'
+            logger.error(msg)
+            raise LearnException(msg)
+
+        if not isinstance(questions, list):
+            msg = f'File "{fullpath}" must be a list of questions'
+            raise LearnException(msg)
+
+        # update refs to include topic as prefix.
+        # refs are required to be unique only within the file.
+        # undefined are set to topic:n, where n is the question number
+        # within the file
+        localrefs: Set[str] = set()  # refs in current file
+        for i, q in enumerate(questions):
+            qref = q.get('ref', str(i))  # ref or number
+            if qref in localrefs:
+                msg = f'Duplicate ref "{qref}" in "{topicpath}"'
+                raise LearnException(msg)
+            localrefs.add(qref)
-                q['ref'] = f'{tref}:{qref}'
-                q['path'] = topicpath
-                q.setdefault('append_wrong', t['append_wrong'])
+            q['ref'] = f'{tref}:{qref}'
+            q['path'] = topicpath
+            q.setdefault('append_wrong', t['append_wrong'])
-            # if questions are left undefined, include all.
-            if not t['questions']:
-                t['questions'] = [q['ref'] for q in questions]
+        # if questions are left undefined, include all.
+        if not t['questions']:
+            t['questions'] = [q['ref'] for q in questions]
-            t['choose'] = min(t['choose'], len(t['questions']))
+        t['choose'] = min(t['choose'], len(t['questions']))
-            for q in questions:
-                if q['ref'] in t['questions']:
-                    factory[q['ref']] = QFactory(q)
-                    logger.debug(f'       + {q["ref"]}')
+        for q in questions:
+            if q['ref'] in t['questions']:
+                factory[q['ref']] = QFactory(q)
+                logger.debug(f'       + {q["ref"]}')
-            logger.info(f'{len(t["questions"]):6} questions in {tref}')
+        logger.info(f'{len(t["questions"]):6} questions in {tref}')
-        logger.info(f'Factory has {len(factory)} questions')
         return factory
     # ------------------------------------------------------------------------
@@ -501,7 +516,7 @@ class LearnApp(object):
     # ------------------------------------------------------------------------
     def get_current_public_dir(self, uid: str) -> str:
-        topic: str = self.online[uid]['state'].get_current_topic()  # FIXME returns None if its the last question in the topic
+        topic: str = self.online[uid]['state'].get_current_topic()
         prefix: str = self.deps.graph['prefix']
         return path.join(prefix, topic, 'public')
@@ -75,12 +75,12 @@ class StudentState(object):
         logger.debug(f'start topic "{topic}"')
         # avoid regenerating questions in the middle of the current topic
-        if self.current_topic == topic:
+        if self.current_topic == topic and self.uid != '0':
             logger.info('Restarting current topic is not allowed.')
             return
         # do not allow locked topics
-        if self.is_locked(topic):
+        if self.is_locked(topic) and self.uid != '0':
             logger.debug(f'is locked "{topic}"')
             return
	@@ -75,12 +75,12 @@ class StudentState(object):		@@ -75,12 +75,12 @@ class StudentState(object):
75	logger.debug(f'start topic "{topic}"')	75	logger.debug(f'start topic "{topic}"')
76		76
77	# avoid regenerating questions in the middle of the current topic	77	# avoid regenerating questions in the middle of the current topic
78	- if self.current_topic == topic:	78	+ if self.current_topic == topic and self.uid != '0':
79	logger.info('Restarting current topic is not allowed.')	79	logger.info('Restarting current topic is not allowed.')
80	return	80	return
81		81
82	# do not allow locked topics	82	# do not allow locked topics
83	- if self.is_locked(topic):	83	+ if self.is_locked(topic) and self.uid != '0':
84	logger.debug(f'is locked "{topic}"')	84	logger.debug(f'is locked "{topic}"')
85	return	85	return
86		86