dlai-grader 1.21.3__py3-none-any.whl → 1.22.2__py3-none-any.whl

dlai_grader/__init__.py

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

dlai_grader/compiler.py

@@ -48,6 +48,8 @@ def compile_partial_module(
         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.
+        exit_on_error (bool): Whether to stop compilation if an exception is found. Defaults to False.
+        debug_mode (bool): Whether to print out cells where exceptions occurred. Defaults to False.
     Returns:
         ModuleType: The actual module that can be used to call functions/variables/etc.
     """

dlai_grader/grading.py

@@ -146,8 +146,7 @@ def graded_obj_missing(test_cases: List[test_case]) -> bool:
     Returns:
         bool: True if object is missing. False otherwise.
     """
-    if len(test_cases) == 1:
-        if test_cases[0].got == type(None) or test_cases[0].got == None:
-            return True
+    if len(test_cases) == 1 and test_cases[0].got == type(None):
+        return True
 
     return False

dlai_grader/io.py

@@ -70,7 +70,7 @@ def uneditable_notebook(path: str) -> None:
         path (str): Path to the notebook.
     """
     nb = read_notebook(path)
-    nb = add_metadata_code_cells_without_pattern(nb, {"editable": False})
+    nb = add_metadata_code_cells_without_pattern(nb, {"editable": False}, ignore_pattern="^# EDITABLE")
     jupytext.write(nb, path)
 
 

dlai_grader/notebook.py

@@ -238,27 +238,31 @@ def add_metadata_code_cells_with_pattern(
 
 
 def add_metadata_code_cells_without_pattern(
-    notebook: NotebookNode, metadata: dict, regex_pattern: str = "^# GRADED "
+    notebook: NotebookNode,
+    metadata: dict,
+    match_pattern: str = "^# GRADED ",
+    ignore_pattern: str = None
 ) -> NotebookNode:
-    """Adds metadata to code cells of a notebook that don't match a regexp pattern.
+    """Adds metadata to code cells of a notebook that don't match a regexp pattern and aren't ignored by another pattern.
+    
     Args:
         notebook (NotebookNode): Notebook to filter.
         metadata (dict): The metadata which should be a key-value pair.
-        regex_pattern (str, optional): Pattern to check. Defaults to "w[1-9]_unittest".
+        match_pattern (str, optional): Pattern to check which cells to add metadata to. Defaults to "^# GRADED ".
+        ignore_pattern (str, optional): Pattern to check which cells to ignore. If a cell matches this pattern, it will be skipped.
+        
     Returns:
         NotebookNode: The notebook with the new metadata.
     """
-    filtered_cells = []
-
     for cell in notebook["cells"]:
-        if cell["cell_type"] == "code" and not re.search(regex_pattern, cell["source"]):
-            current_metadata = cell["metadata"]
-            current_metadata.update(metadata)
-            cell["metadata"] = current_metadata
-
-        filtered_cells.append(cell)
-
-    notebook["cells"] = filtered_cells
+        if cell["cell_type"] == "code":
+            if ignore_pattern and re.search(ignore_pattern, cell["source"]):
+                continue
+            
+            if not re.search(match_pattern, cell["source"]):
+                current_metadata = cell.get("metadata", {})
+                current_metadata.update(metadata)
+                cell["metadata"] = current_metadata
 
     return notebook
 

dlai_grader/templates.py

@@ -136,7 +136,7 @@ def load_templates() -> Dict[str, str]:
 
 
     def part_1(
-        learner_mod: learner_submission, solution_mod: Optional[ModuleType]
+        learner_mod: learner_submission, solution_mod: Optional[ModuleType] = None
     ) -> grading_function:
         @object_to_grade(learner_mod, "learner_func")
         def g(learner_func: FunctionType) -> List[test_case]:
@@ -220,7 +220,7 @@ def load_templates() -> Dict[str, str]:
 
         solution_mod = compile_partial_module(solution_nb, "solution_mod", verbose=False)
 
-        g_func = handle_part_id(c.part_id)(learner_mod, solution_mod)
+        g_func = handle_part_id(c.part_id)(learner_mod)
 
         try:
             cases = g_func()

{dlai_grader-1.21.3.dist-info → dlai_grader-1.22.2.dist-info}/METADATA

@@ -1,27 +1,18 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: dlai-grader
-Version: 1.21.3
+Version: 1.22.2
 Summary: Grading utilities for DLAI courses
 Home-page: https://github.com/https-deeplearning-ai/grader
 Author: Andres Zarta
 Author-email: andrezb5@gmail.com
-License: MIT License
+License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: nbformat>=5.1.3
-Requires-Dist: jupytext>=1.13.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary
+Requires-Dist: nbformat >=5.1.3
+Requires-Dist: jupytext >=1.13.0
 
 # grader
 Automatic grading for DLAI courses. Designed to be compatible with Coursera's grading requirements.

dlai_grader-1.22.2.dist-info/RECORD

@@ -0,0 +1,16 @@
+dlai_grader/__init__.py,sha256=NJssrhk1f1ZuaTeZOoOhn2cgxdwJV9v6bXD-7WdoS7M,211
+dlai_grader/cli.py,sha256=NIwboE-AFn1LXOFmF4O70Ow0fkRxgclG_eMwmWiua38,4917
+dlai_grader/compiler.py,sha256=elbHNUCqBCoOOoNmMRXbgeNL0nt0RM57eZi0-6AqycA,3036
+dlai_grader/config.py,sha256=HQ3dzaFpRswIA_7EC8XdP8DdJH-XePsbMQMHG8Esblc,1638
+dlai_grader/grading.py,sha256=Gmft9b7M8At_y_WZDatYdW6tinZMfqQoT7bDXp6uz2I,4606
+dlai_grader/io.py,sha256=HybOy-0aPbJfxzQDjYOE2qo1myXKt0rlX90fzV1PXJo,8264
+dlai_grader/notebook.py,sha256=66-08JUF5l5AS3UETYyTOn0mDjSPJtEetP7guiz4cYQ,12125
+dlai_grader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dlai_grader/templates.py,sha256=u4BrPuDKefiyjKovxHPF0MbG73FvUIkLhgGpEWRYpL8,7843
+dlai_grader/types.py,sha256=_IIVbYL9cMmwA6in0aI5fEWCIaAMNcQbxG64X1P1CkE,335
+dlai_grader-1.22.2.dist-info/LICENSE,sha256=a_kch_UqdJPtyxk35QJr9O84K_koPixqWPYW9On4-io,1072
+dlai_grader-1.22.2.dist-info/METADATA,sha256=oQls7F3kEzBalJF1ao-tP5cvRaLOk_lD0VXA6lXyalc,8612
+dlai_grader-1.22.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+dlai_grader-1.22.2.dist-info/entry_points.txt,sha256=4OcSAUIluONXa3ymViQ7CBQ2Lk52nb6xZnfph1rlMnk,71
+dlai_grader-1.22.2.dist-info/top_level.txt,sha256=4YKtA3ztisFtx_g4hsGivy3J2NHnXxFziIMqawC8HWg,12
+dlai_grader-1.22.2.dist-info/RECORD,,

{dlai_grader-1.21.3.dist-info → dlai_grader-1.22.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dlai_grader-1.21.3.dist-info/RECORD

@@ -1,16 +0,0 @@
-dlai_grader/__init__.py,sha256=RmVoe5wZGbKwTovWgC1CeHmOu3lEF4KykNED6gcJais,211
-dlai_grader/cli.py,sha256=NIwboE-AFn1LXOFmF4O70Ow0fkRxgclG_eMwmWiua38,4917
-dlai_grader/compiler.py,sha256=ob-gIzTcqVVwER55H-gNdZogNxW50ETCguiuy3oNPps,2833
-dlai_grader/config.py,sha256=HQ3dzaFpRswIA_7EC8XdP8DdJH-XePsbMQMHG8Esblc,1638
-dlai_grader/grading.py,sha256=VnPH8JEU1j_IoJS6FiuumhmdxtekB5SKUC_5OU6ptu0,4647
-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=JDDPoFm13pqRIOwSpt5kXXtMUM7jOv2Uyz1ap8KWu4I,7850
-dlai_grader/types.py,sha256=_IIVbYL9cMmwA6in0aI5fEWCIaAMNcQbxG64X1P1CkE,335
-dlai_grader-1.21.3.dist-info/LICENSE,sha256=a_kch_UqdJPtyxk35QJr9O84K_koPixqWPYW9On4-io,1072
-dlai_grader-1.21.3.dist-info/METADATA,sha256=3L8ag_gJJP0_9mwExpOoNDxl3MhNvJ_mDc4__twN_5Q,8807
-dlai_grader-1.21.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dlai_grader-1.21.3.dist-info/entry_points.txt,sha256=4OcSAUIluONXa3ymViQ7CBQ2Lk52nb6xZnfph1rlMnk,71
-dlai_grader-1.21.3.dist-info/top_level.txt,sha256=4YKtA3ztisFtx_g4hsGivy3J2NHnXxFziIMqawC8HWg,12
-dlai_grader-1.21.3.dist-info/RECORD,,