dlai-grader 1.20.0__py3-none-any.whl → 1.21.0__py3-none-any.whl

dlai_grader/__init__.py

@@ -6,6 +6,6 @@ from . import grading
 from . import types
 
 
-__version__ = "1.20.0"
+__version__ = "1.21.0"
 __author__ = "Andres Zarta"
 __credits__ = "DeepLearning.AI"

dlai_grader/compiler.py

@@ -1,7 +1,7 @@
 import ast
-import sys
 from types import ModuleType
 from contextlib import nullcontext
+from nbformat.notebooknode import NotebookNode
 from .io import suppress_stdout_stderr
 
 
@@ -32,6 +32,38 @@ def compile_module(
     with nullcontext() if verbose else suppress_stdout_stderr():
         module = ModuleType(module_name)
         code = compile(code_ast, f"{module_name}.py", "exec")
-        sys.modules[module_name] = module
         exec(code, module.__dict__)
         return module
+
+
+def compile_partial_module(
+    notebook: NotebookNode,
+    module_name: str,
+    verbose: bool = True,
+) -> ModuleType:
+    """Iterates over the code cells of a notebook and includes the ones that run to the compiled module.
+    Args:
+        notebook (NotebookNode): Notebook from learner.
+        module_name (str): Name of the module.
+        verbose (bool): Whether to print out streams as a result of compilation. Defaults to True.
+    Returns:
+        ModuleType: The actual module that can be used to call functions/variables/etc.
+    """
+    code_cells = [cell.source for cell in notebook.cells if cell.cell_type == "code"]
+    module = ModuleType(module_name)
+
+    for i, cell_code in enumerate(code_cells):
+        try:
+            compiled_code = compile(cell_code, f"<cell {i}>", "exec")
+
+            with nullcontext() if verbose else suppress_stdout_stderr():
+                exec(compiled_code, module.__dict__)
+
+        except Exception as e:
+            if verbose:
+                print(
+                    f"Error during execution of cell. Aborting full compilation.\n\nContents:\n\n{cell_code}\n\nException:\n\n{e}\n"
+                )
+            break
+
+    return module

dlai_grader/templates.py

@@ -165,7 +165,7 @@ def load_templates() -> Dict[str, str]:
 
     entry_py = """
     from dlai_grader.config import Config
-    from dlai_grader.compiler import compile_module
+    from dlai_grader.compiler import compile_partial_module
     from dlai_grader.io import read_notebook, copy_submission_to_workdir, send_feedback
 
     from dlai_grader.notebook import (
@@ -204,14 +204,13 @@ def load_templates() -> Dict[str, str]:
         for t in transformations:
             nb = t(nb)
 
-        script = notebook_to_script(nb)
-
         try:
-            learner_mod = compile_module(script, "learner_mod", verbose=False)
+            learner_mod = compile_partial_module(nb, "learner_mod", verbose=False)
         except Exception as e:
             send_feedback(
                 0.0,
                 f"There was a problem compiling the code from your notebook, please check that you saved before submitting. Details:\\n{str(e)}",
+                err=True,
             )
 
         solution_nb = read_notebook(c.solution_file_path)
@@ -240,7 +239,7 @@ def load_templates() -> Dict[str, str]:
 
             send_feedback(
                 0.0,
-                f"Unable to find object required for grading in your code.\\n{additional_msg}",
+                f"Object required for grading not found. If you haven't completed the exercise this is expected. Otherwise, check your solution as grader omits cells that throw errors.\n{additional_msg}",
                 err=True,
             )
 

{dlai_grader-1.20.0.dist-info → dlai_grader-1.21.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dlai-grader
-Version: 1.20.0
+Version: 1.21.0
 Summary: Grading utilities for DLAI courses
 Home-page: https://github.com/https-deeplearning-ai/grader
 Author: Andres Zarta

{dlai_grader-1.20.0.dist-info → dlai_grader-1.21.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-dlai_grader/__init__.py,sha256=WZ0vu8B3GbPKjCQEfxe19QGjcoshBZSOIO7NJr0cnec,211
+dlai_grader/__init__.py,sha256=YwnDeHfbUUK5KqiAGzDNf_Zm3CvLxy12XuzAL1hyrrA,211
 dlai_grader/cli.py,sha256=NIwboE-AFn1LXOFmF4O70Ow0fkRxgclG_eMwmWiua38,4917
-dlai_grader/compiler.py,sha256=FiORpcrAbxWKRuOnyADrknTOwsIXb_2PFO26mVaLTt4,1315
+dlai_grader/compiler.py,sha256=VuFWHXWlOLYuZgNHOm19Ef7hbWQX7kdAwk8auBAxsYs,2506
 dlai_grader/config.py,sha256=HQ3dzaFpRswIA_7EC8XdP8DdJH-XePsbMQMHG8Esblc,1638
 dlai_grader/grading.py,sha256=Gmft9b7M8At_y_WZDatYdW6tinZMfqQoT7bDXp6uz2I,4606
 dlai_grader/io.py,sha256=TB9d01AK5FIbFUQwM8AqOOfuMWzjzrit98i3MhK5AqU,8234
 dlai_grader/notebook.py,sha256=noMU6DzPVylSjkHmSBUcmquVvAz4JigbRtbQrVYJdic,11830
 dlai_grader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dlai_grader/templates.py,sha256=ENrAsFzZ1OkzmF0zC-ml4DIt7295_gzFpwsIbkFIZbQ,7797
+dlai_grader/templates.py,sha256=zDLueSS6E6RbCY36sMyQFZ0RedBfsImi9ybBIk6JtBg,7903
 dlai_grader/types.py,sha256=_IIVbYL9cMmwA6in0aI5fEWCIaAMNcQbxG64X1P1CkE,335
-dlai_grader-1.20.0.dist-info/LICENSE,sha256=a_kch_UqdJPtyxk35QJr9O84K_koPixqWPYW9On4-io,1072
-dlai_grader-1.20.0.dist-info/METADATA,sha256=kdNqFu86xpqftKounv7q8dptzoqVMCc5--d79lM5sKE,8618
-dlai_grader-1.20.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-dlai_grader-1.20.0.dist-info/entry_points.txt,sha256=4OcSAUIluONXa3ymViQ7CBQ2Lk52nb6xZnfph1rlMnk,71
-dlai_grader-1.20.0.dist-info/top_level.txt,sha256=4YKtA3ztisFtx_g4hsGivy3J2NHnXxFziIMqawC8HWg,12
-dlai_grader-1.20.0.dist-info/RECORD,,
+dlai_grader-1.21.0.dist-info/LICENSE,sha256=a_kch_UqdJPtyxk35QJr9O84K_koPixqWPYW9On4-io,1072
+dlai_grader-1.21.0.dist-info/METADATA,sha256=vvZKID0w9qu46d0tPqwsjek-YP480jiKrYcbVOoGuII,8618
+dlai_grader-1.21.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+dlai_grader-1.21.0.dist-info/entry_points.txt,sha256=4OcSAUIluONXa3ymViQ7CBQ2Lk52nb6xZnfph1rlMnk,71
+dlai_grader-1.21.0.dist-info/top_level.txt,sha256=4YKtA3ztisFtx_g4hsGivy3J2NHnXxFziIMqawC8HWg,12
+dlai_grader-1.21.0.dist-info/RECORD,,