dlai-grader 2.0b2__tar.gz → 2.1.0__tar.gz

{dlai_grader-2.0b2/dlai_grader.egg-info → dlai_grader-2.1.0}/PKG-INFO

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

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/__init__.py

@@ -6,6 +6,6 @@ from . import grading
 from . import types
 
 
-__version__ = "2.0b2"
+__version__ = "2.1.0"
 __author__ = "Andres Zarta"
 __credits__ = "DeepLearning.AI"

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/io.py

@@ -257,6 +257,15 @@ def init_grader() -> None:
     os.makedirs("mount")
     os.makedirs("submission")
 
+    extra_file_name = template_dict["extra_file_name"]
+    if extra_file_name:
+        write_file_from_template(f"./learner/{extra_file_name}", "")
+        write_file_from_template(f"./mount/{extra_file_name}", "")
+
+    write_file_from_template(
+        "./mount/submission.ipynb", template_dict["submission_ipynb"]
+    )
+
     if "COPY data/ /grader/data/" in template_dict["dockerfile"]:
         os.makedirs("data")
 

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/templates/Makefile

@@ -3,6 +3,8 @@
 include .conf
 
 PARTIDS = 123 456
+COURSERA_PARTIDS = "123 456"
+
 OS := $(shell uname)
 
 sync:
@@ -12,7 +14,8 @@ sync:
 
 learner:
 	dlai_grader --learner --output_notebook=./learner/$(ASSIGNMENT_NAME).ipynb
-	rsync -a --exclude="submission.ipynb" --exclude="__pycache__" --exclude=".mypy_cache" ./mount/ ./learner/
+	jupyter nbconvert --clear-output --inplace ./learner/$(ASSIGNMENT_NAME).ipynb
+# 	rsync -a --exclude="submission.ipynb" --exclude="__pycache__" --exclude=".*" ./mount/ ./learner/
 
 build:
 	docker build -t $(IMAGE_NAME):$(TAG_ID) .
@@ -48,7 +51,7 @@ upgrade:
 	dlai_grader --upgrade
 
 coursera:
-	dlai_grader --grade --partids="$(PARTIDS)" --docker=$(IMAGE_NAME):$(TAG_ID) --memory=$(MEMORY_LIMIT) --submission=$(SUB_DIR)
+	dlai_grader --grade --partids=$(COURSERA_PARTIDS) --docker=$(IMAGE_NAME):$(TAG_ID) --memory=$(MEMORY_LIMIT) --submission=$(SUB_DIR)
 
 zip:
 	zip -r $(IMAGE_NAME)$(TAG_ID).zip .

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/templates/entry_py/solution_n_file_n.py

@@ -1,10 +1,12 @@
 import traceback
-from dlai_grader.config import Config, get_part_id
+
+from grader import handle_part_id
+
 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 keep_tagged_cells
+from dlai_grader.config import Config, get_part_id
 from dlai_grader.grading import compute_grading_score, graded_obj_missing
-from grader import handle_part_id
+from dlai_grader.io import copy_submission_to_workdir, read_notebook, send_feedback
+from dlai_grader.notebook import keep_tagged_cells
 
 
 def notebook_grading(config, compile_solution=False):
@@ -15,6 +17,7 @@ def notebook_grading(config, compile_solution=False):
         send_feedback(0.0, msg, err=True)
 
     transformations = [keep_tagged_cells()]
+
     for t in transformations:
         nb = t(nb)
 
@@ -27,8 +30,10 @@ def notebook_grading(config, compile_solution=False):
     solution_mod = None
     if compile_solution:
         solution_nb = read_notebook(config.solution_file_path)
+
         for t in transformations:
             solution_nb = t(solution_nb)
+
         solution_mod = compile_partial_module(
             solution_nb,
             "solution_mod",

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/templates/entry_py/solution_n_file_y.py

@@ -1,14 +1,17 @@
 import traceback
-from dlai_grader.config import Config, get_part_id
+from pathlib import Path
+
+from grader import handle_part_id
+
 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 keep_tagged_cells
+from dlai_grader.config import Config, get_part_id
 from dlai_grader.grading import (
+    LearnerSubmission,
     compute_grading_score,
     graded_obj_missing,
-    LearnerSubmission,
 )
-from grader import handle_part_id
+from dlai_grader.io import copy_submission_to_workdir, read_notebook, send_feedback
+from dlai_grader.notebook import keep_tagged_cells
 
 
 def notebook_grading(config, compile_solution=False):
@@ -19,6 +22,7 @@ def notebook_grading(config, compile_solution=False):
         send_feedback(0.0, msg, err=True)
 
     transformations = [keep_tagged_cells()]
+
     for t in transformations:
         nb = t(nb)
 
@@ -31,8 +35,10 @@ def notebook_grading(config, compile_solution=False):
     solution_mod = None
     if compile_solution:
         solution_nb = read_notebook(config.solution_file_path)
+
         for t in transformations:
             solution_nb = t(solution_nb)
+
         solution_mod = compile_partial_module(
             solution_nb,
             "solution_mod",
@@ -43,6 +49,10 @@ def notebook_grading(config, compile_solution=False):
 
 
 def non_notebook_grading(config):
+    if Path(config.submission_file_path).stat().st_size == 0:
+        msg = "Dummy file detected. Make sure you saved the correct file before submitting."
+        send_feedback(0.0, msg, err=True)
+
     try:
         with open(config.submission_file_path, "r") as file:
             contents = file.read()
@@ -57,7 +67,7 @@ def main() -> None:
     part_id = get_part_id()
 
     match part_id:
-        case "123":
+        case "456":
             copy_submission_to_workdir(file_name="{{EXTRA_FILE_NAME}}")
             c = Config(submission_file="{{EXTRA_FILE_NAME}}")
             learner_mod = non_notebook_grading(c)

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/templates/entry_py/solution_y_file_n.py

@@ -1,10 +1,12 @@
 import traceback
-from dlai_grader.config import Config, get_part_id
+
+from grader import handle_part_id
+
 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 keep_tagged_cells
+from dlai_grader.config import Config, get_part_id
 from dlai_grader.grading import compute_grading_score, graded_obj_missing
-from grader import handle_part_id
+from dlai_grader.io import copy_submission_to_workdir, read_notebook, send_feedback
+from dlai_grader.notebook import keep_tagged_cells
 
 
 def notebook_grading(config, compile_solution=False):
@@ -15,6 +17,7 @@ def notebook_grading(config, compile_solution=False):
         send_feedback(0.0, msg, err=True)
 
     transformations = [keep_tagged_cells()]
+
     for t in transformations:
         nb = t(nb)
 
@@ -27,8 +30,10 @@ def notebook_grading(config, compile_solution=False):
     solution_mod = None
     if compile_solution:
         solution_nb = read_notebook(config.solution_file_path)
+
         for t in transformations:
             solution_nb = t(solution_nb)
+
         solution_mod = compile_partial_module(
             solution_nb,
             "solution_mod",

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/templates/entry_py/solution_y_file_y.py

@@ -1,14 +1,17 @@
 import traceback
-from dlai_grader.config import Config, get_part_id
+from pathlib import Path
+
+from grader import handle_part_id
+
 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 keep_tagged_cells
+from dlai_grader.config import Config, get_part_id
 from dlai_grader.grading import (
+    LearnerSubmission,
     compute_grading_score,
     graded_obj_missing,
-    LearnerSubmission,
 )
-from grader import handle_part_id
+from dlai_grader.io import copy_submission_to_workdir, read_notebook, send_feedback
+from dlai_grader.notebook import keep_tagged_cells
 
 
 def notebook_grading(config, compile_solution=False):
@@ -19,6 +22,7 @@ def notebook_grading(config, compile_solution=False):
         send_feedback(0.0, msg, err=True)
 
     transformations = [keep_tagged_cells()]
+
     for t in transformations:
         nb = t(nb)
 
@@ -31,8 +35,10 @@ def notebook_grading(config, compile_solution=False):
     solution_mod = None
     if compile_solution:
         solution_nb = read_notebook(config.solution_file_path)
+
         for t in transformations:
             solution_nb = t(solution_nb)
+
         solution_mod = compile_partial_module(
             solution_nb,
             "solution_mod",
@@ -43,6 +49,10 @@ def notebook_grading(config, compile_solution=False):
 
 
 def non_notebook_grading(config):
+    if Path(config.submission_file_path).stat().st_size == 0:
+        msg = "Dummy file detected. Make sure you saved the correct file before submitting."
+        send_feedback(0.0, msg, err=True)
+
     try:
         with open(config.submission_file_path, "r") as file:
             contents = file.read()
@@ -57,10 +67,10 @@ def main() -> None:
     part_id = get_part_id()
 
     match part_id:
-        case "123":
+        case "456":
             copy_submission_to_workdir(file_name="{{EXTRA_FILE_NAME}}")
             c = Config(submission_file="{{EXTRA_FILE_NAME}}")
-            learner_mod = non_notebook_grading(c)
+            learner_mod, solution_mod = non_notebook_grading(c), None
         case _:
             copy_submission_to_workdir()
             c = Config()

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/templates/grader.py

@@ -9,7 +9,6 @@ def part_1(
 ) -> grading_function:
     @object_to_grade(learner_mod, "learner_func")
     def g(learner_func: FunctionType) -> list[test_case]:
-
         cases: list[test_case] = []
 
         t = test_case()
@@ -27,6 +26,6 @@ def part_1(
 
 def handle_part_id(part_id: str) -> grading_wrapper:
     grader_dict: dict[str, grading_wrapper] = {
-        "": part_1,
+        "123": part_1,
     }
-    return grader_dict[part_id]
+    return grader_dict[part_id]

dlai_grader-2.1.0/dlai_grader/templates/submission.ipynb

@@ -0,0 +1,45 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "60acce47",
+   "metadata": {},
+   "source": [
+    "## Replace dummy submission with actual assignment"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ecf4869a",
+   "metadata": {
+    "deletable": false,
+    "tags": [
+     "graded"
+    ]
+   },
+   "outputs": [],
+   "source": [
+    "# GRADED FUNCTION: learner_func\n",
+    "\n",
+    "\n",
+    "def learner_func():\n",
+    "    return \"dummy submission\""
+   ]
+  }
+ ],
+ "metadata": {
+  "grader_version": "1",
+  "kernelspec": {
+   "display_name": "adlp",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "name": "python",
+   "version": "3.11.13"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader/templates.py

@@ -138,6 +138,17 @@ def copy_grader_py() -> str:
     return src.read_text(encoding="utf-8")
 
 
+def copy_submission_ipynb() -> str:
+    base_dir = Path(__file__).parent
+    src = base_dir / "templates" / "submission.ipynb"
+
+    if not src.exists():
+        raise FileNotFoundError(f"Template not found: {src}")
+
+    # shutil.copy(src, dst)
+    return src.read_text(encoding="utf-8")
+
+
 def load_templates() -> dict[str, str]:
     specialization = input("Name of the specialization: ")
     course = input("Number of the course: ")
@@ -159,30 +170,31 @@ def load_templates() -> dict[str, str]:
         unit_test_filename = unit_test_filename if unit_test_filename else "unittests"
         # version = input("Version of the grader (leave empty for version 1): ")
         version = "1"
-        data_dir_required = input(
-            "Do you require a data dir? y/n (leave empty for n): "
-        )
-        data_dir_required = data_dir_required if data_dir_required else "n"
-
-        if data_dir_required not in ["y", "n"]:
-            print("invalid option selected")
-            sys.exit(1)
 
-        sol_dir_required = input(
-            "Do you require a solution file? y/n (leave empty for n): "
-        )
-        sol_dir_required = sol_dir_required if sol_dir_required else "n"
-        if sol_dir_required not in ["y", "n"]:
-            print("invalid option selected")
-            sys.exit(1)
+        data_dir_required = ""
+        while data_dir_required not in ["y", "n"]:
+            data_dir_required = input(
+                "Do you require a data dir? y/n (leave empty for n): ",
+            )
+            if data_dir_required == "":
+                data_dir_required = "n"
+            # data_dir_required = data_dir_required if data_dir_required else "n"
+
+        sol_dir_required = ""
+        while sol_dir_required not in ["y", "n"]:
+            sol_dir_required = input(
+                "Do you require a solution file? y/n (leave empty for n): ",
+            )
+            if sol_dir_required == "":
+                sol_dir_required = "n"
 
-        non_notebook_grading = input(
-            "Will you grade a file different from a notebook? y/n (leave empty for n): ",
-        )
-        non_notebook_grading = non_notebook_grading if non_notebook_grading else "n"
-        if non_notebook_grading not in ["y", "n"]:
-            print("invalid option selected")
-            sys.exit(1)
+        non_notebook_grading = ""
+        while non_notebook_grading not in ["y", "n"]:
+            non_notebook_grading = input(
+                "Will you grade a file different from a notebook? y/n (leave empty for n): ",
+            )
+            if non_notebook_grading == "":
+                non_notebook_grading = "n"
 
         extra_file_name = ""
         if non_notebook_grading == "y":
@@ -190,17 +202,17 @@ def load_templates() -> dict[str, str]:
                 "Name of the extra file to grade: ",
             )
 
-        cpus = input("CPU Units (leave empty for 0.25): ")
-        cpus = cpus if cpus else "0.25"
-
-        if cpus not in ["0.25", "0.5", "0.75", "1"]:
-            print("invalid option selected")
-            sys.exit(1)
+        cpus = ""
+        while cpus not in ["0.25", "0.5", "0.75", "1"]:
+            cpus = input("CPU Units (leave empty for 0.25): ")
+            if cpus == "":
+                cpus = "0.25"
 
-        soft_memory = input("Memory Reservation (leave empty for 512m): ")
-        soft_memory = soft_memory if soft_memory else "512m"
+            if cpus not in ["0.25", "0.5", "0.75", "1"]:
+                print(f"Options are: {['0.25', '0.5', '0.75', '1']}")
 
-        if soft_memory not in [
+        soft_memory = ""
+        soft_memory_options = [
             "512m",
             "768m",
             "1024m",
@@ -211,14 +223,17 @@ def load_templates() -> dict[str, str]:
             "2g",
             "4g",
             "8g",
-        ]:
-            print("invalid option selected")
-            sys.exit(1)
+        ]
+        while soft_memory not in soft_memory_options:
+            soft_memory = input("Memory Reservation (leave empty for 512m): ")
+            if soft_memory == "":
+                soft_memory = "512m"
 
-        hard_memory = input("Memory Limit (leave empty for 1g): ")
-        hard_memory = hard_memory if hard_memory else "1g"
+            if soft_memory not in soft_memory_options:
+                print(f"Options are: {soft_memory_options}")
 
-        if hard_memory not in [
+        hard_memory = ""
+        hard_memory_options = [
             "1024m",
             "2048m",
             "4096m",
@@ -229,9 +244,14 @@ def load_templates() -> dict[str, str]:
             "4g",
             "8g",
             "15g",
-        ]:
-            print("invalid option selected")
-            sys.exit(1)
+        ]
+        while hard_memory not in hard_memory_options:
+            hard_memory = input("Memory Limit (leave empty for 1g): ")
+            if hard_memory == "":
+                hard_memory = "1g"
+
+            if hard_memory not in hard_memory_options:
+                print(f"Options are: {hard_memory_options}")
 
     if grader_mvp == "y":
         unit_test_filename = "unittests"
@@ -257,23 +277,25 @@ def load_templates() -> dict[str, str]:
     TAG_ID=V$(GRADER_VERSION)
     SUB_DIR=mount
     MEMORY_LIMIT=4096
-    HARD_MEMORY={hard_memory}
     CPUS={cpus}
     SOFT_MEMORY={soft_memory}
+    HARD_MEMORY={hard_memory}
     """
 
-    # assignment_name = f"C{course}M{module}_Assignment.ipynb"
+    assignment_name = f"C{course}M{module}_Assignment.ipynb"
 
-    # copy_assignment_to_submission_sh = generate_copy_assignment_script(
-    #     extra_file_required=non_notebook_grading,
-    #     assignment_name=assignment_name,
-    #     extra_file_name=extra_file_name,
-    # )
+    copy_assignment_to_submission_sh = generate_copy_assignment_script(
+        extra_file_required=non_notebook_grading,
+        assignment_name=assignment_name,
+        extra_file_name=extra_file_name,
+    )
 
     makefile = copy_makefile()
 
     grader_py = copy_grader_py()
 
+    submission_ipynb = copy_submission_ipynb()
+
     entry_py = copy_entry_script(
         sol_dir_required=sol_dir_required,
         non_notebook_grading=non_notebook_grading,
@@ -286,7 +308,12 @@ def load_templates() -> dict[str, str]:
         "conf": dedent(conf[1:]),
         "grader_py": dedent(grader_py),
         "entry_py": dedent(entry_py),
+        "extra_file_name": extra_file_name,
+        "submission_ipynb": submission_ipynb,
         # "copy_assignment_to_submission_sh": dedent(copy_assignment_to_submission_sh),
     }
 
+    if extra_file_name:
+        template_dict.update({"extra_file_name": extra_file_name})
+
     return template_dict

{dlai_grader-2.0b2 → dlai_grader-2.1.0/dlai_grader.egg-info}/PKG-INFO

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

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/dlai_grader.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ dlai_grader.egg-info/requires.txt
 dlai_grader.egg-info/top_level.txt
 dlai_grader/templates/Makefile
 dlai_grader/templates/grader.py
+dlai_grader/templates/submission.ipynb
 dlai_grader/templates/copy_assignment_sh/extrafile_n
 dlai_grader/templates/copy_assignment_sh/extrafile_y
 dlai_grader/templates/dockerfile/data_n_solution_n

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dlai-grader"
-version = "2.0b2"
+version = "2.1.0"
 description = "Grading utilities for DLAI courses"
 readme = "README.md"
 authors = [

{dlai_grader-2.0b2 → dlai_grader-2.1.0}/setup.py

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