dlai-grader 1.20.0__tar.gz → 1.21.1__tar.gz

{dlai_grader-1.20.0 → dlai_grader-1.21.1}/PKG-INFO

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

{dlai_grader-1.20.0 → dlai_grader-1.21.1}/dlai_grader/__init__.py

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

dlai_grader-1.21.1/dlai_grader/compiler.py

@@ -0,0 +1,75 @@
+import ast
+from types import ModuleType
+from contextlib import nullcontext
+from nbformat.notebooknode import NotebookNode
+from .io import suppress_stdout_stderr
+
+
+def compile_module(
+    code_as_str: str,
+    module_name: str,
+    wipe_global_state: bool = False,
+    verbose: bool = True,
+) -> ModuleType:
+    """Compiles the string representation of some code and returns a compiled module.
+    Args:
+        code_as_str (str): Code represented as string.
+        module_name (str): Name of the module.
+        wipe_global_state (bool): If true then no global state is compiled. Defaults to False.
+        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_ast = ast.parse(code_as_str)
+
+    if wipe_global_state:
+        for node in code_ast.body[:]:
+            if not isinstance(
+                node, (ast.FunctionDef, ast.Import, ast.ImportFrom, ast.ClassDef)
+            ):
+                code_ast.body.remove(node)
+
+    with nullcontext() if verbose else suppress_stdout_stderr():
+        module = ModuleType(module_name)
+        code = compile(code_ast, f"{module_name}.py", "exec")
+        exec(code, module.__dict__)
+        return module
+
+
+def compile_partial_module(
+    notebook: NotebookNode,
+    module_name: str,
+    verbose: bool = True,
+    exit_on_error: bool = False,
+) -> 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 exit_on_error:
+                print(
+                    f"Error during execution of cell. Aborting full compilation.\n\nContents:\n\n{cell_code}\n\nException:\n\n{e}\n"
+                )
+                break
+
+            print(
+                f"Error during execution of cell but kept going.\n\nContents:\n\n{cell_code}\n\nException:\n\n{e}\n"
+            )
+            continue
+
+    return module

{dlai_grader-1.20.0 → dlai_grader-1.21.1}/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 → dlai_grader-1.21.1}/dlai_grader.egg-info/PKG-INFO

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

{dlai_grader-1.20.0 → dlai_grader-1.21.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as f:
 
 setup(
     name="dlai-grader",
-    version="1.20.0",
+    version="1.21.1",
     description="Grading utilities for DLAI courses",
     url="https://github.com/https-deeplearning-ai/grader",
     author="Andres Zarta",

dlai_grader-1.20.0/dlai_grader/compiler.py

@@ -1,37 +0,0 @@
-import ast
-import sys
-from types import ModuleType
-from contextlib import nullcontext
-from .io import suppress_stdout_stderr
-
-
-def compile_module(
-    code_as_str: str,
-    module_name: str,
-    wipe_global_state: bool = False,
-    verbose: bool = True,
-) -> ModuleType:
-    """Compiles the string representation of some code and returns a compiled module.
-    Args:
-        code_as_str (str): Code represented as string.
-        module_name (str): Name of the module.
-        wipe_global_state (bool): If true then no global state is compiled. Defaults to False.
-        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_ast = ast.parse(code_as_str)
-
-    if wipe_global_state:
-        for node in code_ast.body[:]:
-            if not isinstance(
-                node, (ast.FunctionDef, ast.Import, ast.ImportFrom, ast.ClassDef)
-            ):
-                code_ast.body.remove(node)
-
-    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