dlai-grader 2.0b2__py3-none-any.whl → 2.0b3__py3-none-any.whl

dlai_grader/__init__.py

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

dlai_grader/templates/entry_py/solution_y_file_y.py

@@ -1,14 +1,16 @@
 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 (
+    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):
@@ -60,7 +62,7 @@ def main() -> None:
         case "123":
             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/templates.py

@@ -159,30 +159,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 +191,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"
+        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"
 
-        if cpus not in ["0.25", "0.5", "0.75", "1"]:
-            print("invalid option selected")
-            sys.exit(1)
+            if cpus not in ["0.25", "0.5", "0.75", "1"]:
+                print(f"Options are: {['0.25', '0.5', '0.75', '1']}")
 
-        soft_memory = input("Memory Reservation (leave empty for 512m): ")
-        soft_memory = soft_memory if soft_memory else "512m"
-
-        if soft_memory not in [
+        soft_memory = ""
+        soft_memory_options = [
             "512m",
             "768m",
             "1024m",
@@ -211,14 +212,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 +233,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,18 +266,18 @@ 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()
 

{dlai_grader-2.0b2.dist-info → dlai_grader-2.0b3.dist-info}/METADATA

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

{dlai_grader-2.0b2.dist-info → dlai_grader-2.0b3.dist-info}/RECORD

@@ -1,11 +1,11 @@
-dlai_grader/__init__.py,sha256=p-V3tVdD4pOdvAnNIMgMndm9u8oM-swvPyX7xrgkb0M,210
+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=vtOic70NtJael8d5l9cX1KsNCwXKZrchhQgjHiSFhow,8898
+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
@@ -18,10 +18,10 @@ dlai_grader/templates/dockerfile/data_y_solution_y,sha256=xs6p-puJ-j5AeIuHiESL7X
 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=gLauAYo-bieHR4ad20M-Zh1jYzoaYOyXHVKCXZReJ_A,3032
-dlai_grader-2.0b2.dist-info/licenses/LICENSE,sha256=a_kch_UqdJPtyxk35QJr9O84K_koPixqWPYW9On4-io,1072
-dlai_grader-2.0b2.dist-info/METADATA,sha256=V5bDW25vUyH7zf7mhe5hZKu-zTqxSxwIYYEBrYiaXU0,8776
-dlai_grader-2.0b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlai_grader-2.0b2.dist-info/entry_points.txt,sha256=4OcSAUIluONXa3ymViQ7CBQ2Lk52nb6xZnfph1rlMnk,71
-dlai_grader-2.0b2.dist-info/top_level.txt,sha256=4YKtA3ztisFtx_g4hsGivy3J2NHnXxFziIMqawC8HWg,12
-dlai_grader-2.0b2.dist-info/RECORD,,
+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,,