PyKubeGrader 0.1.20__py3-none-any.whl → 0.1.21__py3-none-any.whl

{PyKubeGrader-0.1.20.dist-info → PyKubeGrader-0.1.21.dist-info}/METADATA

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

{PyKubeGrader-0.1.20.dist-info → PyKubeGrader-0.1.21.dist-info}/RECORD

@@ -1,10 +1,10 @@
 pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
 pykubegrader/initialize.py,sha256=UQ828VrueLOgrzJsYqWeQe6k0J6OWuX8AnojdU1eqFg,3167
-pykubegrader/telemetry.py,sha256=0nPdqvd70IACz3tz1lZmjwQhJByqLz9IUVmxKhfaWCw,5692
+pykubegrader/telemetry.py,sha256=IVQISKPfJX7IJ4tCG9AOO36UlTtbVZv2rZnrv3-ZSIc,5994
 pykubegrader/utils.py,sha256=dKw6SyRYU3DWRgD3xER7wq-C9e1daWPkqr901LpcwiQ,642
 pykubegrader/validate.py,sha256=vEdNN386yFloDRcjMDrTAqfBmeCXGcDPNH_rLZScIm8,10945
 pykubegrader/build/api_notebook_builder.py,sha256=GVi6hupfQaWeFMv6Bdela3FTRHvOQYXPIcICnkaLhgA,20119
-pykubegrader/build/build_folder.py,sha256=Tf3eryxgDLCkVaSA0s1HKInW7IRQEQd-BfLa66TUTjg,66268
+pykubegrader/build/build_folder.py,sha256=_mVEUiPwOPARBHkucAOw2bP8XzmspfL6B4-Ic_Ey3I0,66493
 pykubegrader/log_parser/parse.ipynb,sha256=F3ZWi5_AOxEnSihY0VBz4jjqo0__GggjRgFvS0QCHTg,10611
 pykubegrader/log_parser/parse.py,sha256=aON6tWj0dFJcYR9GmzXWfmZ4_t8LU1FTq6vbWCePgRs,6987
 pykubegrader/widgets/__init__.py,sha256=s3ky3eJDa1RedFVdpKxmqv6mHBYpOSL9Z6qThSH9cbs,303
@@ -19,9 +19,9 @@ pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-
 pykubegrader/widgets_base/multi_select.py,sha256=jzuK_1eLyhDOzR1jragLRBf_aO8IEaoixfozxBeMBs0,3975
 pykubegrader/widgets_base/reading.py,sha256=4uTLmlPzCwxVzufFhPjM7W19uMGguRb6y4eAV3x-zAc,5314
 pykubegrader/widgets_base/select.py,sha256=b5mmd-Cl1A2T2ePZ20-KLVyvP3bzvzYX36n3lMcrcFM,2456
-PyKubeGrader-0.1.20.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.1.20.dist-info/METADATA,sha256=5O8j0L-1D3dOQl2QNgW9zYyzkYaA7xMRJvnsXuuFUQc,2665
-PyKubeGrader-0.1.20.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-PyKubeGrader-0.1.20.dist-info/entry_points.txt,sha256=Kd4Bh-i3hc4qlnLU1p0nc8yPw9cC5AQGOtkk2eLGnQw,78
-PyKubeGrader-0.1.20.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.1.20.dist-info/RECORD,,
+PyKubeGrader-0.1.21.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.1.21.dist-info/METADATA,sha256=VmZN6QwNzxfV3NOudCKAuP7KwL77Mv8v04Xa7yG4yOo,2665
+PyKubeGrader-0.1.21.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+PyKubeGrader-0.1.21.dist-info/entry_points.txt,sha256=Kd4Bh-i3hc4qlnLU1p0nc8yPw9cC5AQGOtkk2eLGnQw,78
+PyKubeGrader-0.1.21.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.1.21.dist-info/RECORD,,

pykubegrader/build/build_folder.py

@@ -64,7 +64,7 @@ class NotebookProcessor:
             __name__
         )  # Create a logger instance specific to this module
         self.logger = logger  # Assign the logger instance to the class for use in instance methods
-        
+
         self.total_point_log = {}
 
     def process_notebooks(self):
@@ -120,10 +120,12 @@ class NotebookProcessor:
 
                 # Process the notebook if it meets the criteria
                 self._process_single_notebook(notebook_path)
-                
+
         # Write the dictionary to a JSON file
         with open(f"{self.solutions_folder}/total_points.json", "w") as json_file:
-            json.dump(self.total_point_log, json_file, indent=4)  # `indent=4` for pretty formatting
+            json.dump(
+                self.total_point_log, json_file, indent=4
+            )  # `indent=4` for pretty formatting
 
     def _print_and_log(self, message):
         """
@@ -176,7 +178,7 @@ class NotebookProcessor:
         Returns:
             None
         """
-        
+
         self.select_many_total_points = 0
         self.mcq_total_points = 0
         self.tf_total_points = 0
@@ -288,11 +290,16 @@ class NotebookProcessor:
                 os.path.join(student_path, question_file_name_sanitized),
                 os.path.join(questions_folder_jbook, question_file_name_sanitized),
             )
-            
-        total_points = self.select_many_total_points + self.mcq_total_points + self.tf_total_points + self.otter_total_points
-            
-        self.total_point_log.update({notebook_name: total_points})    
-            
+
+        total_points = (
+            self.select_many_total_points
+            + self.mcq_total_points
+            + self.tf_total_points
+            + self.otter_total_points
+        )
+
+        self.total_point_log.update({notebook_name: total_points})
+
     def free_response_parser(
         self, temp_notebook_path, notebook_subfolder, notebook_name
     ):
@@ -309,7 +316,7 @@ class NotebookProcessor:
 
             shutil.copy("./keys/.client_private_key.bin", client_private_key)
             shutil.copy("./keys/.server_public_key.bin", server_public_key)
-            
+
             client_private_key = os.path.join(
                 notebook_subfolder,
                 ".client_private_key.bin",
@@ -322,7 +329,9 @@ class NotebookProcessor:
             shutil.copy("./keys/.client_private_key.bin", client_private_key)
             shutil.copy("./keys/.server_public_key.bin", server_public_key)
 
-            out = FastAPINotebookBuilder(notebook_path=temp_notebook_path, assignment_tag=self.assignment_tag)
+            out = FastAPINotebookBuilder(
+                notebook_path=temp_notebook_path, assignment_tag=self.assignment_tag
+            )
 
             debug_notebook = os.path.join(
                 notebook_subfolder,
@@ -400,7 +409,6 @@ class NotebookProcessor:
         replace_cell_source(notebook_path, index, cell)
 
     def multiple_choice_parser(self, temp_notebook_path, new_notebook_path):
-        
         ### Parse the notebook for multiple choice questions
         if self.has_assignment(temp_notebook_path, "# BEGIN MULTIPLE CHOICE"):
             self._print_and_log(
@@ -420,7 +428,9 @@ class NotebookProcessor:
 
             for data_ in data:
                 # Generate the solution file
-                self.mcq_total_points = self.generate_solution_MCQ(data, output_file=solution_path)
+                self.mcq_total_points = self.generate_solution_MCQ(
+                    data, output_file=solution_path
+                )
 
                 question_path = (
                     f"{new_notebook_path.replace(".ipynb", "")}_questions.py"
@@ -460,7 +470,9 @@ class NotebookProcessor:
 
             # for data_ in data:
             # Generate the solution file
-            self.tf_total_points = self.generate_solution_MCQ(data, output_file=solution_path)
+            self.tf_total_points = self.generate_solution_MCQ(
+                data, output_file=solution_path
+            )
 
             question_path = f"{new_notebook_path.replace(".ipynb", "")}_questions.py"
 
@@ -496,7 +508,9 @@ class NotebookProcessor:
 
             # for data_ in data:
             # Generate the solution file
-            self.select_many_total_points = self.generate_solution_MCQ(data, output_file=solution_path)
+            self.select_many_total_points = self.generate_solution_MCQ(
+                data, output_file=solution_path
+            )
 
             question_path = f"{new_notebook_path.replace(".ipynb", "")}_questions.py"
 
@@ -702,7 +716,7 @@ class NotebookProcessor:
                 solutions.update(existing_module.solutions)
             if hasattr(existing_module, "total_points"):
                 total_points.extend(existing_module.total_points)
-        
+
         question_points = 0
         # Process new question data and update solutions and total_points
         for question_set in data_list:
@@ -722,7 +736,7 @@ class NotebookProcessor:
                 # For safety, we assume solutions are strings, but if not, repr would be safer
                 f.write(f'    "{key}": {repr(solution)},\n')
             f.write("}\n")
-            
+
         return question_points
 
     def extract_MCQ(ipynb_file):
@@ -1439,7 +1453,9 @@ def generate_mcq_file(data_dict, output_file="mc_questions.py"):
             keys = []
             for i, (q_key, q_value) in enumerate(question_dict.items()):
                 # Write keys
-                keys.append(f"q{q_value['question number']}-{q_value['subquestion_number']}-{q_value['name']}")
+                keys.append(
+                    f"q{q_value['question number']}-{q_value['subquestion_number']}-{q_value['name']}"
+                )
 
             f.write(f"            keys={keys},\n")
 
@@ -1508,7 +1524,9 @@ def generate_select_many_file(data_dict, output_file="select_many_questions.py")
             keys = []
             for i, (q_key, q_value) in enumerate(question_dict.items()):
                 # Write keys
-                keys.append(f"q{q_value['question number']}-{q_value['subquestion_number']}-{q_value['name']}")
+                keys.append(
+                    f"q{q_value['question number']}-{q_value['subquestion_number']}-{q_value['name']}"
+                )
 
             f.write(f"            keys={keys},\n")
 
@@ -1583,7 +1601,9 @@ def generate_tf_file(data_dict, output_file="tf_questions.py"):
             keys = []
             for i, (q_key, q_value) in enumerate(question_dict.items()):
                 # Write keys
-                keys.append(f"q{q_value['question number']}-{q_value['subquestion_number']}-{q_value['name']}")
+                keys.append(
+                    f"q{q_value['question number']}-{q_value['subquestion_number']}-{q_value['name']}"
+                )
 
             f.write(f"            keys={keys},\n")
 
@@ -1671,16 +1691,18 @@ def main():
     parser.add_argument(
         "root_folder", type=str, help="Path to the root folder to process"
     )
-    
+
     parser.add_argument(
         "--assignment-tag",
         type=str,
         help="assignment-tag used for calculating grades",
         default="Reading-Week-X",
     )
-    
+
     args = parser.parse_args()
-    processor = NotebookProcessor(root_folder=args.root_folder, assignment_tag=args.assignment_tag)
+    processor = NotebookProcessor(
+        root_folder=args.root_folder, assignment_tag=args.assignment_tag
+    )
     processor.process_notebooks()
 
 

pykubegrader/telemetry.py

@@ -209,9 +209,17 @@ def score_question_improved(
     res = requests.post(url, json=payload, auth=HTTPBasicAuth("student", "capture"))
 
     res_data = res.json()
-    max_points, points_earned = res_data["max_points"], res_data["points_earned"]
-    log_variable(
-        assignment_name=responses["assignment"],
-        value=f"{points_earned}, {max_points}",
-        info_type="score",
-    )
+    # max_points, points_earned = res_data["max_points"], res_data["points_earned"]
+    # log_variable(
+    #     assignment_name=responses["assignment"],
+    #     value=f"{points_earned}, {max_points}",
+    #     info_type="score",
+    # )
+
+    # res_data is now dict[str, tuple[float, float]]
+    for question, (points_earned, max_points) in res_data.items():
+        log_variable(
+            assignment_name=responses["assignment"],
+            value=f"{points_earned}, {max_points}",
+            info_type=question,
+        )