PyKubeGrader 0.2.41__py3-none-any.whl → 0.3.1__py3-none-any.whl

{PyKubeGrader-0.2.41.dist-info → PyKubeGrader-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyKubeGrader
-Version: 0.2.41
+Version: 0.3.1
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2
@@ -19,6 +19,7 @@ Requires-Dist: mypy
 Requires-Dist: nbformat
 Requires-Dist: nest_asyncio
 Requires-Dist: numpy
+Requires-Dist: pandas-stubs
 Requires-Dist: panel
 Requires-Dist: pynacl
 Requires-Dist: pytest

{PyKubeGrader-0.2.41.dist-info → PyKubeGrader-0.3.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
 pykubegrader/initialize.py,sha256=Bwu1q18l18FB9lGppvt-L41D5gzr3S8t6zC0_UbrASw,3994
-pykubegrader/telemetry.py,sha256=-XiWKMlwneS4zD8-hPcMVZFY4b6gK4jHKTwhjUBw8gw,6556
-pykubegrader/utils.py,sha256=eqQSf2xOAtqB9pWSf6RI-WwwdEowVe8yr2XIiNpc5Rc,870
+pykubegrader/telemetry.py,sha256=50Qp5WXeF7PD5FxDLFXWFAnQ2Yobj-wL3Dxh0Hz_vh0,6552
+pykubegrader/utils.py,sha256=FrxuZ3gtTBTm5FQeH5c0bF9kFjA_AVtE5AYeFhzwKZ0,827
 pykubegrader/validate.py,sha256=OKnItGyd-L8QPKcsE0KRuwBI_IxKiJzMLJKZiA2j3II,11184
 pykubegrader/build/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/build/api_notebook_builder.py,sha256=dlcVrGgsvxnt6GlAUN3e-FrpsPNJKXSHni1fstRCBik,20311
-pykubegrader/build/build_folder.py,sha256=WTdPFsV1PRJ9U_730ckcWezQfMEL2oCH4ZDoflmr30M,83138
-pykubegrader/build/clean_folder.py,sha256=dfs9NuZ-EP6q_xYQnZKH74aEafEB6hpTAZcSkY14UWI,1328
-pykubegrader/build/markdown_questions.py,sha256=OEEFoM5L4Ptax0dm8Tz-gM01akJEoDvsPNgixE1Vk1s,4675
+pykubegrader/build/build_folder.py,sha256=Ltd2skxEP1OdZA_D3Kb-WyTpDVtv4e35v6_XiMFZ9Vo,85378
+pykubegrader/build/clean_folder.py,sha256=8N0KyL4eXRs0DCw-V_2jR9igtFs_mOFMQufdL6tD-38,1323
+pykubegrader/build/markdown_questions.py,sha256=cSh8mkHK3hh-etJdgrZu9UQi1WPrKQtofkzLCUp1Z-w,4676
 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
@@ -17,21 +17,21 @@ pykubegrader/submit/submit_assignment.py,sha256=UgJXKWw5b8-bRSFnba4iHAyXnujULHcW
 pykubegrader/tokens/tokens.py,sha256=X9f3SzrGCrAJp_BXhr6VJn5f0LxtgQ7HLPBw7zEF2BY,1198
 pykubegrader/tokens/validate_token.py,sha256=MQtgz_USvSZ9JahJ48ybjp74F5aYz64lhtvuwVc4kQw,2712
 pykubegrader/widgets/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pykubegrader/widgets/multiple_choice.py,sha256=oH1NjL2cuQDhn-9Ds8yBNAWDHr2anGS__F8uel7IsiI,2657
-pykubegrader/widgets/question_processor.py,sha256=iWlurO1IRHY94NXI8ToZcBolGkP9lj9C9qZdE8nuH_Q,1233
+pykubegrader/widgets/multiple_choice.py,sha256=CE7y6DPIhm4UuD8I1nwWPF2l9sKtKvYhbyPpeZ1qmQc,2686
+pykubegrader/widgets/question_processor.py,sha256=59R9oBiemuVJP0qzsR1kY8MeqDq4Kh99AYRq9RGujsg,1223
 pykubegrader/widgets/reading_question.py,sha256=y30_swHwzH8LrT8deWTnxctAAmR8BSxTlXAqMgUrAT4,3031
-pykubegrader/widgets/select_many.py,sha256=l7YQ8QT5k71j36KC1f5LmKIAX2bXpvMDGc6nqIJ1PeQ,4116
+pykubegrader/widgets/select_many.py,sha256=wyRPCEdI6GorPX3HzSbDiT_IHr34mFOUHzUN085-d88,4621
 pykubegrader/widgets/student_info.py,sha256=xhQgKehk1r5e6N_hnjAIovLdPvQju6ZqQTOiPG0aevg,3568
 pykubegrader/widgets/style.py,sha256=fVBMYy_a6Yoz21avNpiORWC3f5FD-OrVpaZ3npmunvs,1656
 pykubegrader/widgets/true_false.py,sha256=QllIhHuJstJft_RuShkxI_fFFTaDAlzNZOFNs00HLIM,2842
 pykubegrader/widgets/types_question.py,sha256=kZdRRXyFzOtYTmGdC7XWb_2oaxqg1WSuLcQn_sTj6Qc,2300
 pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pykubegrader/widgets_base/multi_select.py,sha256=_rvpW-oSeNRE9_RtOh1hA9l_-GHDIE3_7K129_k1N4I,4186
+pykubegrader/widgets_base/multi_select.py,sha256=Btr09qjl2g2-wtKEtI3RYwo1Xm1dfFnHnDzw_1Yfqf4,4148
 pykubegrader/widgets_base/reading.py,sha256=xmvN1UIXwk32v9S-JhsXwDc7axPlgpvoxSeM3II8sxY,5393
-pykubegrader/widgets_base/select.py,sha256=mCwCEYz5wlBL8AZniqnSr_P_jnov349qMBUruaIbQ9o,2666
-PyKubeGrader-0.2.41.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.41.dist-info/METADATA,sha256=lQpVYU6uJvtccUNg_T6MaB1mD7WkgCVFNGO-7J3BeIg,2779
-PyKubeGrader-0.2.41.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyKubeGrader-0.2.41.dist-info/entry_points.txt,sha256=BbLXpFZObpOXA8e3p3GcFkL-sHdUnDLUcnYmc6zx3NI,201
-PyKubeGrader-0.2.41.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.41.dist-info/RECORD,,
+pykubegrader/widgets_base/select.py,sha256=RgSieRtBapAwXLd_ByJtT1L1EeUSi-9pFTuIm7zwDVE,2649
+PyKubeGrader-0.3.1.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.3.1.dist-info/METADATA,sha256=fqlGOEpvYY7AyGQV7ngPA01-D00cnsja365LanEQoFE,2806
+PyKubeGrader-0.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.3.1.dist-info/entry_points.txt,sha256=BbLXpFZObpOXA8e3p3GcFkL-sHdUnDLUcnYmc6zx3NI,201
+PyKubeGrader-0.3.1.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.3.1.dist-info/RECORD,,

pykubegrader/build/build_folder.py

@@ -616,6 +616,21 @@ class NotebookProcessor:
             shutil.copy("./keys/.client_private_key.bin", client_private_key)
             shutil.copy("./keys/.server_public_key.bin", server_public_key)
 
+            # Extract the assignment config
+            config = extract_config_from_notebook(temp_notebook_path)
+
+            files = extract_files(config)
+
+            # print(f"Files: {files}, from {temp_notebook_path}")
+
+            if files:
+                for file in files:
+                    print(f"Copying {file} to {os.path.join(notebook_subfolder, file)}")
+                    shutil.copy(
+                        os.path.join(self.root_folder, file),
+                        os.path.join(notebook_subfolder, file),
+                    )
+
             client_private_key = os.path.join(
                 notebook_subfolder,
                 ".client_private_key.bin",
@@ -1352,15 +1367,18 @@ def extract_SELECT_MANY(ipynb_file):
                         1  # Increment subquestion number for each question
                     )
 
-                    # Extract question text (### heading)
-                    question_text_match = re.search(
-                        r"^###\s*\*\*(.+)\*\*", markdown_content, re.MULTILINE
-                    )
-                    question_text = (
-                        question_text_match.group(1).strip()
-                        if question_text_match
-                        else None
-                    )
+                    # # Extract question text (### heading)
+                    # question_text_match = re.search(
+                    #     r"^###\s*\*\*(.+)\*\*", markdown_content, re.MULTILINE
+                    # )
+                    # question_text = (
+                    #     question_text_match.group(1).strip()
+                    #     if question_text_match
+                    #     else None
+                    # )
+                    
+                    # Extract question text enable multiple lines
+                    question_text = extract_question(markdown_content)
 
                     # Extract OPTIONS (lines after #### options)
                     options_match = re.search(
@@ -2126,6 +2144,57 @@ def update_initialize_assignment(
         print(f"No matching lines found in '{notebook_path}'.")
 
 
+def extract_config_from_notebook(notebook_path):
+    """
+    Extract configuration text from a Jupyter Notebook.
+
+    Parameters:
+        notebook_path (str): Path to the Jupyter Notebook file.
+
+    Returns:
+        str: The configuration text if found, otherwise an empty string.
+    """
+    with open(notebook_path, "r", encoding="utf-8") as f:
+        notebook_data = json.load(f)
+
+    # Iterate through cells to find the configuration text
+    config_text = ""
+    for cell in notebook_data.get("cells", []):
+        if cell.get("cell_type") == "raw":  # Check for code cells
+            source = "".join(cell.get("source", []))
+            if "# ASSIGNMENT CONFIG" in source:
+                config_text = source
+                break
+
+    return config_text
+
+
+def extract_files(config_text):
+    """
+    Extract the list of files from the given configuration text, excluding .bin files.
+
+    Parameters:
+        config_text (str): The configuration text to process.
+
+    Returns:
+        list: A list of file names excluding .bin files.
+    """
+    # Regular expression to extract files list
+    file_pattern = re.search(r"files:\s*\[(.*?)\]", config_text, re.DOTALL)
+
+    if file_pattern:
+        files = file_pattern.group(1)
+        # Split the list into individual file names and exclude .bin files
+        file_list = [
+            file.strip()
+            for file in files.split(",")
+            if not file.strip().endswith(".bin")
+        ]
+        return file_list
+    else:
+        return []
+
+
 def main():
     parser = argparse.ArgumentParser(
         description="Recursively process Jupyter notebooks with '# ASSIGNMENT CONFIG', move them to a solutions folder, and run otter assign."

pykubegrader/build/clean_folder.py

@@ -5,7 +5,6 @@ import sys
 
 
 class FolderCleaner:
-    
     def __init__(self, root_folder: str):
         """
         Initializes the FolderCleaner with the root folder to clean.

pykubegrader/build/markdown_questions.py

@@ -1,5 +1,6 @@
 import argparse
 import os
+
 import nbformat as nbf
 
 

pykubegrader/telemetry.py

@@ -5,9 +5,9 @@ import logging
 import os
 import socket
 from typing import Any, Optional
-import pandas as pd
 
 import nacl.public
+import pandas as pd
 import requests
 from IPython.core.interactiveshell import ExecutionInfo
 from requests import Response
@@ -205,7 +205,7 @@ def verify_server(jhub_user: Optional[str] = None) -> str:
     return message
 
 
-def get_my_grades() -> dict[str, float]:
+def get_my_grades() -> pd.DataFrame:
     if not student_user or not student_pw or not api_base_url:
         raise ValueError("Necessary environment variables not set")
 

pykubegrader/utils.py

@@ -15,9 +15,7 @@ def list_of_lists(options: list) -> bool:
 
 def shuffle_options(options: list[Optional[str]], seed: int) -> list[Optional[str]]:
     random.seed(seed)
-    
-    for inner_list in options:
-        random.shuffle(inner_list)
+    random.shuffle(options)
 
     return options
 

pykubegrader/widgets/multiple_choice.py

@@ -16,7 +16,6 @@ def MCQ(
     options: list[str] | list[list[str]],
     initial_vals: list[str],
 ) -> Tuple[list[pn.pane.HTML], list[pn.widgets.RadioButtonGroup]]:
-
     # Process descriptions through `process_questions_and_codes`
     processed_titles, code_blocks = process_questions_and_codes(descriptions)
 
@@ -29,7 +28,9 @@ def MCQ(
         )
         # Add the title and code block in a row
         if code_block:
-            desc_widgets.append(pn.Column(title_pane, code_block, sizing_mode="stretch_width"))
+            desc_widgets.append(
+                pn.Column(title_pane, code_block, sizing_mode="stretch_width")
+            )
         else:
             desc_widgets.append(pn.Column(title_pane, sizing_mode="stretch_width"))
 

pykubegrader/widgets/question_processor.py

@@ -1,4 +1,3 @@
-import re
 import panel as pn
 
 

pykubegrader/widgets/select_many.py

@@ -2,6 +2,7 @@ import panel as pn
 
 from ..widgets.style import drexel_colors, raw_css
 from ..widgets_base.multi_select import MultiSelectQuestion
+from .question_processor import process_questions_and_codes
 
 # Pass the custom CSS to Panel
 pn.extension(design="material", global_css=[drexel_colors], raw_css=[raw_css])
@@ -24,15 +25,25 @@ def MultiSelect(
     separator = pn.pane.HTML("<hr style='border:1px solid lightgray; width:100%;'>")
 
     i = 0
+    desc_width = "500px"
 
     for question, option_set in zip(descriptions, options):
-        desc_width = "500px"
-
-        # Create description widget with separator
-        desc_widget = pn.pane.HTML(
+        # Process descriptions through `process_questions_and_codes`
+        processed_titles, code_blocks = process_questions_and_codes(question)
+        
+        # Create an HTML pane for the title
+        title_pane  = pn.pane.HTML(
             f"<hr style='border:1px solid lightgray; width:100%;'>"
-            f"<div style='text-align: left; width: {desc_width};'><b>{question}</b></div>"
+            f"<div style='text-align: left; width: {desc_width};'><b>{processed_titles[0]}</b></div>"
         )
+        # Add the title and code block in a row
+        if code_blocks[0]:
+            desc_widget = pn.Column(title_pane, code_blocks[0], sizing_mode="stretch_width")
+        else:
+            desc_widget = title_pane
+        
+        # # Create description widget with separator
+        
 
         # Create checkboxes for current question
         checkbox_set = [

pykubegrader/widgets_base/multi_select.py

@@ -4,7 +4,7 @@ from typing import Callable, Tuple
 import panel as pn
 
 from ..telemetry import ensure_responses, score_question, update_responses
-from ..utils import shuffle_questions, shuffle_options
+from ..utils import shuffle_questions
 from ..widgets.style import drexel_colors, raw_css
 
 # Pass the custom CSS to Panel
@@ -58,7 +58,7 @@ class MultiSelectQuestion:
 
         # # add shuffle options to multi_select.py
         # options = shuffle_options(options, seed)
-        
+
         description_widgets, self.widgets = style(
             descriptions, options, self.initial_vals
         )
@@ -72,14 +72,13 @@ class MultiSelectQuestion:
         question_header = pn.pane.HTML(
             f"<h2>Question {self.question_number}: {title}</h2>"
         )
-        
+
         question_body = pn.Column(
             *[
                 pn.Row(desc_widget, checkbox_set)
                 for desc_widget, checkbox_set in widget_pairs
             ]
         )
-    
 
         self.layout = pn.Column(question_header, question_body, self.submit_button)
 

pykubegrader/widgets_base/select.py

@@ -4,7 +4,7 @@ from typing import Callable, Tuple
 import panel as pn
 
 from ..telemetry import ensure_responses, score_question, update_responses
-from ..utils import shuffle_questions, shuffle_options
+from ..utils import shuffle_questions
 from ..widgets.style import drexel_colors
 
 # Pass custom CSS to Panel