fix error where dependencies could fail to load

Miguel Barão
1 parent 977fa070
Showing 1 changed file with 10 additions and 9 deletions Show diff stats
aprendizations/learnapp.py
@@ -376,12 +376,7 @@ class LearnApp(object):
         for tref, attr in topics.items():
             logger.debug(f'       + {tref}')
             for d in attr.get('deps', []):
-                if d not in g.nodes():
-                    logger.error(f'Topic "{tref}" depends on "{d}" but it '
-                                 f'does not exist')
-                    raise LearnException()
-                else:
-                    g.add_edge(d, tref)
+                g.add_edge(d, tref)
  
             t = g.nodes[tref]  # get current topic node
             t['name'] = attr.get('name', tref)
@@ -409,14 +404,20 @@ class LearnApp(object):
  
             # load questions as list of dicts
             topicpath: str = path.join(g.graph['prefix'], tref)
-            fullpath: str = path.join(topicpath, t['file'])
+            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.debug(f'  Loading {fullpath}')
-            # questions: List[QDict] = load_yaml(fullpath, default=[])
             try:
                 questions: List[QDict] = load_yaml(fullpath)
             except Exception:
-                raise LearnException(f'Failed to load "{fullpath}"')
+                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'
...	...	@@ -376,12 +376,7 @@ class LearnApp(object):
376	376	for tref, attr in topics.items():
377	377	logger.debug(f' + {tref}')
378	378	for d in attr.get('deps', []):
379		- if d not in g.nodes():
380		- logger.error(f'Topic "{tref}" depends on "{d}" but it '
381		- f'does not exist')
382		- raise LearnException()
383		- else:
384		- g.add_edge(d, tref)
	379	+ g.add_edge(d, tref)
385	380
386	381	t = g.nodes[tref] # get current topic node
387	382	t['name'] = attr.get('name', tref)
...	...	@@ -409,14 +404,20 @@ class LearnApp(object):
409	404
410	405	# load questions as list of dicts
411	406	topicpath: str = path.join(g.graph['prefix'], tref)
412		- fullpath: str = path.join(topicpath, t['file'])
	407	+ try:
	408	+ fullpath: str = path.join(topicpath, t['file'])
	409	+ except Exception:
	410	+ msg1 = f'Invalid topic "{tref}"'
	411	+ msg2 = f'Check dependencies of {", ".join(g.successors(tref))}'
	412	+ raise LearnException(f'{msg1}. {msg2}')
413	413
414	414	logger.debug(f' Loading {fullpath}')
415		- # questions: List[QDict] = load_yaml(fullpath, default=[])
416	415	try:
417	416	questions: List[QDict] = load_yaml(fullpath)
418	417	except Exception:
419		- raise LearnException(f'Failed to load "{fullpath}"')
	418	+ msg = f'Failed to load "{fullpath}"'
	419	+ logger.error(msg)
	420	+ raise LearnException(msg)
420	421
421	422	if not isinstance(questions, list):
422	423	msg = f'File "{fullpath}" must be a list of questions'
...	...