dlai-grader 2.0b3__py3-none-any.whl → 2.1.0__py3-none-any.whl

dlai_grader/__init__.py

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

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/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/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/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/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/templates/entry_py/solution_y_file_y.py

@@ -1,4 +1,5 @@
 import traceback
+from pathlib import Path
 
 from grader import handle_part_id
 
@@ -21,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)
 
@@ -33,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",
@@ -45,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()
@@ -59,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, solution_mod = non_notebook_grading(c), None

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/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/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: ")
@@ -283,6 +294,8 @@ def load_templates() -> dict[str, str]:
 
     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,
@@ -295,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.0b3.dist-info → dlai_grader-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dlai-grader
-Version: 2.0b3
+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.1.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+dlai_grader/__init__.py,sha256=eSSeMZvJT85eAYGnh15B6EpWIP_pnZNdBJWJTKPvdjk,210
+dlai_grader/cli.py,sha256=NIwboE-AFn1LXOFmF4O70Ow0fkRxgclG_eMwmWiua38,4917
+dlai_grader/compiler.py,sha256=elbHNUCqBCoOOoNmMRXbgeNL0nt0RM57eZi0-6AqycA,3036
+dlai_grader/config.py,sha256=DokK1tVF_r7v0p9tWpBN-7lOAlPmHSpFXDZiI8cGw7s,1821
+dlai_grader/grading.py,sha256=BMIoZ_loQDuNCEk1Dj3on4IWz-FGgIbnhbDyk8HmQ7c,5041
+dlai_grader/io.py,sha256=0kMumpaOpKO0O5J00CbXZL-FZrsQ2-RobozDs5vDxnA,9573
+dlai_grader/notebook.py,sha256=MgxZFuetTXwwZ-HXSB5ItLVD_9LP45E0xHAngS0g4EU,12101
+dlai_grader/templates.py,sha256=gToTofemIAcgz5G343-RPLdfq0dJj66Nv4ERgHf7Ezw,9810
+dlai_grader/types.py,sha256=5uiFaF3aDn-vjxTp9ec-ND-PRqeeV2_NfPHS2ngGsRo,306
+dlai_grader/templates/Makefile,sha256=hQLhl-xLGw5WmACjlSGxlXA0Bc13XOY_4i5RaAunWlU,1904
+dlai_grader/templates/grader.py,sha256=AeazA3RzXTmplAwsFuDR9XKOluRj-EJSkhMLzJFGioo,899
+dlai_grader/templates/submission.ipynb,sha256=xfjI4j1ZJzU2cXwPnvjVKaP0mv5PKuDvrYFbyLI1SOs,749
+dlai_grader/templates/copy_assignment_sh/extrafile_n,sha256=qB9ZViBm69r69nT9WXDaJfrW57sVho03aCZXbTS-lTc,430
+dlai_grader/templates/copy_assignment_sh/extrafile_y,sha256=Zh07IAViyN-rELp4_-ZOJJSmTIigh0GxHLexW0ZGnMQ,616
+dlai_grader/templates/dockerfile/data_n_solution_n,sha256=mD_fHhkzrGCCG3EPwXmafYVn1AoIcgBmSZLX8eCeH_g,447
+dlai_grader/templates/dockerfile/data_n_solution_y,sha256=9iSyDj3-Jwm6RyAHNtVUDeD-XrYODB61i-HB3HfA70g,480
+dlai_grader/templates/dockerfile/data_y_solution_n,sha256=i9nWcTAUCQzyhx3kM1aH64j0dkEMlYlEb6FFiE5k5oc,472
+dlai_grader/templates/dockerfile/data_y_solution_y,sha256=xs6p-puJ-j5AeIuHiESL7X9kNSFZVCZ3Wb9SAW9KlUU,505
+dlai_grader/templates/entry_py/solution_n_file_n.py,sha256=hZr5pcijXi-LOrJCInjEiiux5afIZXwhamdz_QjWCW0,2354
+dlai_grader/templates/entry_py/solution_n_file_y.py,sha256=maEfF2sjM9J1xPWppAtaR5Qf1sjCyPivvvjxdEzDCjU,3212
+dlai_grader/templates/entry_py/solution_y_file_n.py,sha256=ejRspmifrha0qY3WWUcHmbDQB86jXDpj6hdt-VFmntA,2402
+dlai_grader/templates/entry_py/solution_y_file_y.py,sha256=AXDb3qzLLf1Z-gYqC29xI6ucxj02bLk6GrOBVREeGqA,3280
+dlai_grader-2.1.0.dist-info/licenses/LICENSE,sha256=a_kch_UqdJPtyxk35QJr9O84K_koPixqWPYW9On4-io,1072
+dlai_grader-2.1.0.dist-info/METADATA,sha256=FhNsrExqMRIUvx8lGLq0xzRHpL5G8bUINyLL6lqrCTU,8776
+dlai_grader-2.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlai_grader-2.1.0.dist-info/entry_points.txt,sha256=4OcSAUIluONXa3ymViQ7CBQ2Lk52nb6xZnfph1rlMnk,71
+dlai_grader-2.1.0.dist-info/top_level.txt,sha256=4YKtA3ztisFtx_g4hsGivy3J2NHnXxFziIMqawC8HWg,12
+dlai_grader-2.1.0.dist-info/RECORD,,

dlai_grader-2.0b3.dist-info/RECORD

@@ -1,27 +0,0 @@
-dlai_grader/__init__.py,sha256=kisxRYjpk8bk5dZK5AMHM69PqUB6bwdnig0LWjY9E0o,210
-dlai_grader/cli.py,sha256=NIwboE-AFn1LXOFmF4O70Ow0fkRxgclG_eMwmWiua38,4917
-dlai_grader/compiler.py,sha256=elbHNUCqBCoOOoNmMRXbgeNL0nt0RM57eZi0-6AqycA,3036
-dlai_grader/config.py,sha256=DokK1tVF_r7v0p9tWpBN-7lOAlPmHSpFXDZiI8cGw7s,1821
-dlai_grader/grading.py,sha256=BMIoZ_loQDuNCEk1Dj3on4IWz-FGgIbnhbDyk8HmQ7c,5041
-dlai_grader/io.py,sha256=5hs7Bv5zfyHKZUrFP-2gVH7y9dbIFsyGiKgsqFYbrMs,9250
-dlai_grader/notebook.py,sha256=MgxZFuetTXwwZ-HXSB5ItLVD_9LP45E0xHAngS0g4EU,12101
-dlai_grader/templates.py,sha256=OdmwnmNS2KCCcZ4-9jqfclV43tmbJoSuCk-5QWU6KoE,9291
-dlai_grader/types.py,sha256=5uiFaF3aDn-vjxTp9ec-ND-PRqeeV2_NfPHS2ngGsRo,306
-dlai_grader/templates/Makefile,sha256=PhRJ-87fU3IMqYMt9ChrAAfr2BPlk0uwogygLZItZL8,1795
-dlai_grader/templates/grader.py,sha256=492Dzs3enoCGfDviq_mdnrzeF5e1qNl21i42M5tjv4Y,896
-dlai_grader/templates/copy_assignment_sh/extrafile_n,sha256=qB9ZViBm69r69nT9WXDaJfrW57sVho03aCZXbTS-lTc,430
-dlai_grader/templates/copy_assignment_sh/extrafile_y,sha256=Zh07IAViyN-rELp4_-ZOJJSmTIigh0GxHLexW0ZGnMQ,616
-dlai_grader/templates/dockerfile/data_n_solution_n,sha256=mD_fHhkzrGCCG3EPwXmafYVn1AoIcgBmSZLX8eCeH_g,447
-dlai_grader/templates/dockerfile/data_n_solution_y,sha256=9iSyDj3-Jwm6RyAHNtVUDeD-XrYODB61i-HB3HfA70g,480
-dlai_grader/templates/dockerfile/data_y_solution_n,sha256=i9nWcTAUCQzyhx3kM1aH64j0dkEMlYlEb6FFiE5k5oc,472
-dlai_grader/templates/dockerfile/data_y_solution_y,sha256=xs6p-puJ-j5AeIuHiESL7X9kNSFZVCZ3Wb9SAW9KlUU,505
-dlai_grader/templates/entry_py/solution_n_file_n.py,sha256=Y9cuwGuCrRHWfWmcvNP-Gh8mFcJL_JE0e9Ed09O7x6Q,2349
-dlai_grader/templates/entry_py/solution_n_file_y.py,sha256=yHXK4iRVaxlhAwq3FiOfFEJdSRApfOgs3FMQtIe-A_c,2984
-dlai_grader/templates/entry_py/solution_y_file_n.py,sha256=MKVmgXJVC1UtxtChsah7jUQ6-SL93kafZ02KrSayN0k,2397
-dlai_grader/templates/entry_py/solution_y_file_y.py,sha256=7ioDw33vx0bRDw3yFlMX5DsjA2ZJxOL0g3s7ukQ36so,3054
-dlai_grader-2.0b3.dist-info/licenses/LICENSE,sha256=a_kch_UqdJPtyxk35QJr9O84K_koPixqWPYW9On4-io,1072
-dlai_grader-2.0b3.dist-info/METADATA,sha256=6Q4Ioa45aZ9Pof5bpa-pMm2av7gryZwnzf0Hcp94bdM,8776
-dlai_grader-2.0b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlai_grader-2.0b3.dist-info/entry_points.txt,sha256=4OcSAUIluONXa3ymViQ7CBQ2Lk52nb6xZnfph1rlMnk,71
-dlai_grader-2.0b3.dist-info/top_level.txt,sha256=4YKtA3ztisFtx_g4hsGivy3J2NHnXxFziIMqawC8HWg,12
-dlai_grader-2.0b3.dist-info/RECORD,,