dlai-grader 1.14.0__tar.gz → 1.16.0__tar.gz

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/PKG-INFO

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

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/dlai_grader/__init__.py

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

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/dlai_grader/cli.py

@@ -5,6 +5,7 @@ from .io import (
     update_notebook_version,
     tag_notebook,
     undeletable_notebook,
+    uneditable_notebook,
     init_grader,
     generate_learner_version,
     grade_parts,
@@ -47,6 +48,12 @@ def parse_dlai_grader_args() -> None:
         action="store_true",
         help="Make all code cells of notebook not deletable.",
     )
+    parser.add_argument(
+        "-ue",
+        "--uneditable",
+        action="store_true",
+        help="Make all non-graded code cells of notebook not editable.",
+    )
     parser.add_argument(
         "-l",
         "--learner",
@@ -109,6 +116,8 @@ def parse_dlai_grader_args() -> None:
         tag_notebook("./mount/submission.ipynb")
     if args.undeletable:
         undeletable_notebook("./mount/submission.ipynb")
+    if args.uneditable:
+        uneditable_notebook("./mount/submission.ipynb")
 
     if args.learner:
         filename_source = "./mount/submission.ipynb"

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/dlai_grader/grading.py

@@ -40,7 +40,13 @@ def compute_grading_score(
     """
 
     num_cases = len(test_cases)
-    failed_cases = [t for t in test_cases if t.failed == True]
+    if num_cases == 0:
+        return (
+            0.0,
+            "The grader was unable to generate test cases for your implementation. This suggests a bug with your code, please revise your solution and try again.",
+        )
+
+    failed_cases = [t for t in test_cases if t.failed]
     score = 1.0 - len(failed_cases) / num_cases
     feedback_msg = "All tests passed! Congratulations!"
 
@@ -68,7 +74,7 @@ def compute_aggregated_grading_score(
     for test_cases in aggregated_test_cases:
         feedback_msg = f"All tests passed for {test_cases.test_name}!\n"
         num_cases = len(test_cases.tests)
-        failed_cases = [t for t in test_cases.tests if t.failed == True]
+        failed_cases = [t for t in test_cases.tests if t.failed]
         score = 1.0 - len(failed_cases) / num_cases
         score = round(score, 2)
         scores.append(score)
@@ -117,7 +123,7 @@ def print_feedback(test_cases: List[test_case]) -> None:
     Args:
         test_cases (List[test_case]): List of public test cases.
     """
-    failed_cases = [t for t in test_cases if t.failed == True]
+    failed_cases = [t for t in test_cases if t.failed]
     feedback_msg = "\033[92m All tests passed!"
 
     if failed_cases:

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/dlai_grader/io.py

@@ -12,7 +12,7 @@ from nbformat.notebooknode import NotebookNode
 from contextlib import contextmanager, redirect_stderr, redirect_stdout
 from .notebook import (
     add_metadata_all_code_cells,
-    add_metadata_code_cells_with_pattern,
+    add_metadata_code_cells_without_pattern,
     tag_code_cells,
     solution_to_learner_format,
 )
@@ -53,14 +53,24 @@ def tag_notebook(
 
 
 def undeletable_notebook(path: str) -> None:
-    """Makes all code cells of a notebook non-deletable and cells with public tests non-editable.
+    """Makes all code cells of a notebook non-deletable.
 
     Args:
         path (str): Path to the notebook.
     """
     nb = read_notebook(path)
     nb = add_metadata_all_code_cells(nb, {"deletable": False})
-    nb = add_metadata_code_cells_with_pattern(nb, {"editable": False})
+    jupytext.write(nb, path)
+
+
+def uneditable_notebook(path: str) -> None:
+    """Makes all non-graded code cells of a notebook non-editable.
+
+    Args:
+        path (str): Path to the notebook.
+    """
+    nb = read_notebook(path)
+    nb = add_metadata_code_cells_without_pattern(nb, {"editable": False})
     jupytext.write(nb, path)
 
 

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/dlai_grader/notebook.py

@@ -237,6 +237,32 @@ def add_metadata_code_cells_with_pattern(
     return notebook
 
 
+def add_metadata_code_cells_without_pattern(
+    notebook: NotebookNode, metadata: dict, regex_pattern: str = "^# GRADED "
+) -> NotebookNode:
+    """Adds metadata to code cells of a notebook that don't match a regexp 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".
+    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
+
+    return notebook
+
+
 def notebook_version(
     notebook: NotebookNode,
 ) -> str:

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/dlai_grader/templates.py

@@ -47,7 +47,7 @@ def load_templates() -> Dict[str, str]:
     """
 
     makefile = """
-	.PHONY: learner build entry submit-solution upgrade test grade mem zip clean upload move-zip move-learner tag undeletable versioning upgrade sync
+	.PHONY: learner build entry submit-solution upgrade test grade mem zip clean upload move-zip move-learner tag undeletable uneditable versioning upgrade sync
 
 	include .conf
 
@@ -79,6 +79,9 @@ def load_templates() -> Dict[str, str]:
 	undeletable:
 		dlai_grader --undeletable
 
+	uneditable:
+		dlai_grader --uneditable
+
 	upgrade:
 		dlai_grader --upgrade
 

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/dlai_grader.egg-info/PKG-INFO

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

{dlai-grader-1.14.0 → dlai-grader-1.16.0}/setup.py

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