PyKubeGrader 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

{PyKubeGrader-0.3.6.dist-info → PyKubeGrader-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyKubeGrader
-Version: 0.3.6
+Version: 0.3.8
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2

{PyKubeGrader-0.3.6.dist-info → PyKubeGrader-0.3.8.dist-info}/RECORD

@@ -1,22 +1,23 @@
 pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
 pykubegrader/grading_tester.ipynb,sha256=wwT9jyhpR6GGM8r4todaGfrsUxS6JxM0qIqMcDYKM7w,18839
 pykubegrader/initialize.py,sha256=Bwu1q18l18FB9lGppvt-L41D5gzr3S8t6zC0_UbrASw,3994
-pykubegrader/telemetry.py,sha256=vZK9p3XqnqacwtiVyZgjI2mcIr5ZcxRRwW5sAZsrJkE,16631
+pykubegrader/telemetry.py,sha256=oFw27YfTLYZvn7iZKh4jzYXjD726MuUoIQ-9twbXxXk,16632
 pykubegrader/utils.py,sha256=jlJklKvRhY3O7Hz2aaU1m0y3p_n9eMAXNnAF7LUEaPY,1275
 pykubegrader/validate.py,sha256=OKnItGyd-L8QPKcsE0KRuwBI_IxKiJzMLJKZiA2j3II,11184
 pykubegrader/build/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/build/api_notebook_builder.py,sha256=EZG4Ow4YATzOWPPNLkdQEdWt7hkpbaI5ZD1Bf2KEWeY,25622
-pykubegrader/build/build_folder.py,sha256=9aewc4dcYKS5kNaDS3gTwCnzRTmHT6Ooio5TF258q_8,86963
+pykubegrader/build/build_folder.py,sha256=HDccW597shBhAd-jxvMUPpsiNj2S4DlKRGMDH_6U9nQ,87590
 pykubegrader/build/clean_folder.py,sha256=8N0KyL4eXRs0DCw-V_2jR9igtFs_mOFMQufdL6tD-38,1323
 pykubegrader/build/collate.py,sha256=cVvF7tf2U3iiH4R_dbghTcieedIx5w3Fyw9L_llInM8,6754
 pykubegrader/build/markdown_questions.py,sha256=cSh8mkHK3hh-etJdgrZu9UQi1WPrKQtofkzLCUp1Z-w,4676
+pykubegrader/grade_reports/get_my_grades_testing.py,sha256=JNgaHK1eMDPxJASrPpIcXxwMYE0kB0r4p5EgD6GICl4,2359
 pykubegrader/grade_reports/grade_reports.py,sha256=n8H_n9jdZRSPn2zlIf-GQt_Y8w91p6M8ZbdVH76Sg5k,2303
 pykubegrader/graders/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/graders/late_assignments.py,sha256=_2-rA5RqO0BWY9WAQA_mbCxxPKTOiJOl-byD2CYWaE0,1393
 pykubegrader/log_parser/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/log_parser/parse.ipynb,sha256=5e-9dzUbJk2M8kPP55lVeksm86lSY5ocKfWOP2RSWH0,11921
 pykubegrader/log_parser/parse.py,sha256=dXzTEOTI6VTRNoHFDAjg6hZUhvB3kHtMb10_KW3NPrw,7641
-pykubegrader/submit/submit_assignment.py,sha256=cqVu7US8GVaCdJdaU2yjawlVBtAKP5XJc4oAvX5FeRU,2575
+pykubegrader/submit/submit_assignment.py,sha256=EJkdADfihojJxAPZEmEiEEg1Vo-FBFHHEjAGzSmK5UA,2660
 pykubegrader/tokens/token_panel.py,sha256=NNA5ZV3Q9jB_lz2aSwMyViXV0ESu6V_7T92Qji7UpSQ,1377
 pykubegrader/tokens/tokens.py,sha256=qcYMFgNPimbfeS7lXOtbgquGgeJCgOGx5hvXewIs0oQ,1474
 pykubegrader/tokens/validate_token.py,sha256=kvHX0NJBm21xzb2p67j7vq1La6J1XbmobEJQ3fTMdZA,3289
@@ -33,9 +34,9 @@ pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-
 pykubegrader/widgets_base/multi_select.py,sha256=KtfAP0PyEbcjWlKNpI5_5-PLMtcUbbNX0Es_-w-H34Q,4226
 pykubegrader/widgets_base/reading.py,sha256=ChUS3NOTa_HLtNpxR8hGX80LPKMvYMypnR6dFknfxus,5430
 pykubegrader/widgets_base/select.py,sha256=uMncmVIqjvJkffMQY1L_PokrFCidK1PeVITX0i70fho,2750
-PyKubeGrader-0.3.6.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.3.6.dist-info/METADATA,sha256=RVMHbbz9895jEBhpogU7TM5keqyf-kUKhKJhJ1Hk168,2729
-PyKubeGrader-0.3.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyKubeGrader-0.3.6.dist-info/entry_points.txt,sha256=RR57KvzDRJrP4omy5heS5cZ3E7g56YxcxJhDnp57ZU0,253
-PyKubeGrader-0.3.6.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.3.6.dist-info/RECORD,,
+PyKubeGrader-0.3.8.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.3.8.dist-info/METADATA,sha256=qrucw04y1mZfpYfKihEEtqTjQ9SLh5YKDgBA_GNQJ2s,2729
+PyKubeGrader-0.3.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.3.8.dist-info/entry_points.txt,sha256=RR57KvzDRJrP4omy5heS5cZ3E7g56YxcxJhDnp57ZU0,253
+PyKubeGrader-0.3.8.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.3.8.dist-info/RECORD,,

pykubegrader/build/build_folder.py

@@ -578,7 +578,7 @@ class NotebookProcessor:
 
         if self.require_key:
             # Add an additional line for validate_token()
-            validate_token_line = "from pykubegrader.tokens.validate_token import validate_token\nvalidate_token()\n"
+            validate_token_line =f"from pykubegrader.tokens.validate_token import validate_token\nvalidate_token(assignment = '{self.assignment_tag}')\n"
 
             # Define the Code cell
             code_cell = nbformat.v4.new_code_cell(
@@ -681,6 +681,7 @@ class NotebookProcessor:
                 self.week,
                 self.assignment_type,
                 require_key=self.require_key,
+                assignment_tag = self.assignment_tag,
             )
 
             NotebookProcessor.replace_temp_in_notebook(
@@ -711,6 +712,7 @@ class NotebookProcessor:
                 self.week,
                 self.assignment_type,
                 require_key=self.require_key,
+                assignment_tag = self.assignment_tag
             )
             NotebookProcessor.replace_temp_no_otter(
                 temp_notebook_path, temp_notebook_path
@@ -742,7 +744,7 @@ class NotebookProcessor:
             nbformat.write(notebook, f)
 
     @staticmethod
-    def add_validate_token_cell(notebook_path: str, require_key: bool) -> None:
+    def add_validate_token_cell(notebook_path: str, require_key: bool, **kwargs) -> None:
         """
         Adds a new code cell at the top of a Jupyter notebook if require_key is True.
 
@@ -756,18 +758,24 @@ class NotebookProcessor:
         if not require_key:
             print("require_key is False. No changes made to the notebook.")
             return
-
-        NotebookProcessor.add_validate_block(notebook_path, require_key)
+        
+        NotebookProcessor.add_validate_block(notebook_path, require_key, assignment_tag = kwargs.get("assignment_tag", None))
 
         # Load the notebook
         with open(notebook_path, "r", encoding="utf-8") as f:
             notebook = nbformat.read(f, as_version=4)
 
         # Create the new code cell
-        new_cell = nbformat.v4.new_code_cell(
+        if kwargs.get("assignment_tag", None):
+            new_cell = nbformat.v4.new_code_cell(
+            "from pykubegrader.tokens.validate_token import validate_token\n"
+            f"validate_token('type the key provided by your instructor here', assignment = '{kwargs.get('assignment_tag')}')\n"
+            )
+        else:
+            new_cell = nbformat.v4.new_code_cell(
             "from pykubegrader.tokens.validate_token import validate_token\n"
             "validate_token('type the key provided by your instructor here')\n"
-        )
+            )
 
         # Add the new cell to the top of the notebook
         notebook.cells.insert(0, new_cell)
@@ -777,7 +785,7 @@ class NotebookProcessor:
             nbformat.write(notebook, f)
 
     @staticmethod
-    def add_validate_block(notebook_path: str, require_key: bool) -> None:
+    def add_validate_block(notebook_path: str, require_key: bool, **kwargs) -> None:
         """
         Modifies the first code cell of a Jupyter notebook to add the validate_token call if require_key is True.
 
@@ -811,7 +819,7 @@ class NotebookProcessor:
 
     @staticmethod
     def add_initialization_code(
-        notebook_path, week, assignment_type, require_key=False
+        notebook_path, week, assignment_type, require_key=False, **kwargs,
     ):
         # finds the first code cell
         index, cell = find_first_code_cell(notebook_path)
@@ -823,7 +831,7 @@ class NotebookProcessor:
         replace_cell_source(notebook_path, index, cell)
 
         if require_key:
-            NotebookProcessor.add_validate_token_cell(notebook_path, require_key)
+            NotebookProcessor.add_validate_token_cell(notebook_path, require_key, assignment_tag = kwargs.get("assignment_tag", None))
 
     def multiple_choice_parser(self, temp_notebook_path, new_notebook_path):
         ### Parse the notebook for multiple choice questions

pykubegrader/grade_reports/get_my_grades_testing.py

@@ -0,0 +1,79 @@
+
+
+# ##### CONFIGURATION #####
+
+# weights = {
+#     "homework": 0.15,
+#     "lab": 0.15,
+#     "lecture": 0.15,
+#     "quiz": 0.15,
+#     "readings": 0.15,
+#     "labattendance": 0.05,
+#     "practicequiz": 0.015,
+#     "practicemidterm": 0.015,
+#     "midterm": 0.15,
+#     "practicefinal": 0.02,
+#     "final": 0.2,
+# }
+
+# ##### END CONFIGURATION #####
+
+
+# class GradeReport:
+    
+#     def __init__(self, start_date="2025-01-06", verbose=True):
+#         self.start_date = start_date
+#         self.verbose = verbose
+#         self.weights = weights
+       
+#         self.assignments, self.student_subs = get_assignments_submissions()
+#         self.new_grades_df = setup_grades_df(self.assignments)
+#         self.new_weekly_grades = fill_grades_df(
+#             self.new_grades_df, self.assignments, self.student_subs
+#         )
+#         self.current_week = get_current_week(self.start_date)
+#         self.avg_grades_dict = get_average_weighted_grade(
+#             self.assignments, self.current_week, self.new_weekly_grades, self.weights
+#         )
+    
+#     @property
+#     def weights(self):
+#         return self.weights
+
+
+# def get_my_grades_testing(start_date="2025-01-06", verbose=True):
+#     """takes in json.
+#     reshapes columns into reading, lecture, practicequiz, quiz, lab, attendance, homework, exam, final.
+#     fills in 0 for missing assignments
+#     calculate running average of each category"""
+
+#     # set up new df format
+#     weights = {
+#         "homework": 0.15,
+#         "lab": 0.15,
+#         "lecture": 0.15,
+#         "quiz": 0.15,
+#         "readings": 0.15,
+#         # 'midterm':0.15, 'final':0.2
+#         "labattendance": 0.05,
+#         "practicequiz": 0.05,
+#     }
+
+#     assignments, student_subs = get_assignments_submissions()
+
+#     new_grades_df = setup_grades_df(assignments)
+
+#     new_weekly_grades = fill_grades_df(new_grades_df, assignments, student_subs)
+
+#     current_week = get_current_week(start_date)
+
+#     avg_grades_dict = get_average_weighted_grade(
+#         assignments, current_week, new_weekly_grades, weights
+#     )
+
+#     if verbose:
+#         max_key_length = max(len(k) for k in weights.keys())
+#         for k, v in avg_grades_dict.items():
+#             print(f"{k:<{max_key_length}}:\t {v:.2f}")
+
+#     return new_weekly_grades  # get rid of test and running avg columns

pykubegrader/submit/submit_assignment.py

@@ -42,6 +42,10 @@ def call_score_assignment(
         "assignment_title": assignment_title,
         "notebook_title": notebook_title,
     }
+    
+    token = os.getenv("TOKEN")
+    if token:
+        params["key_used"] = token
 
     username, password = get_credentials().values()
 

pykubegrader/telemetry.py

@@ -454,6 +454,7 @@ def get_my_grades_testing(start_date="2025-01-06", verbose=True):
             print(f'{k:<{max_key_length}}:\t {v:.2f}')
 
     return new_weekly_grades  # get rid of test and running avg columns
+
 def get_all_students(admin_user, admin_pw):
     res = requests.get(
         url=api_base_url.rstrip("/") + "/students",