PyKubeGrader 0.2.41__tar.gz → 0.3.1__tar.gz

{pykubegrader-0.2.41/src/PyKubeGrader.egg-info → pykubegrader-0.3.1}/PKG-INFO

@@ -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 → pykubegrader-0.3.1}/setup.cfg

@@ -29,6 +29,7 @@ install_requires =
 	nbformat
 	nest_asyncio
 	numpy
+	pandas-stubs
 	panel
 	pynacl
 	pytest

{pykubegrader-0.2.41 → pykubegrader-0.3.1/src/PyKubeGrader.egg-info}/PKG-INFO

@@ -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 → pykubegrader-0.3.1}/src/PyKubeGrader.egg-info/requires.txt

@@ -4,6 +4,7 @@ mypy
 nbformat
 nest_asyncio
 numpy
+pandas-stubs
 panel
 pynacl
 pytest

{pykubegrader-0.2.41 → pykubegrader-0.3.1}/src/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-0.2.41 → pykubegrader-0.3.1}/src/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-0.2.41 → pykubegrader-0.3.1}/src/pykubegrader/build/markdown_questions.py

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

{pykubegrader-0.2.41 → pykubegrader-0.3.1}/src/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-0.2.41 → pykubegrader-0.3.1}/src/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-0.2.41 → pykubegrader-0.3.1}/src/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-0.2.41 → pykubegrader-0.3.1}/src/pykubegrader/widgets/question_processor.py

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

{pykubegrader-0.2.41 → pykubegrader-0.3.1}/src/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-0.2.41 → pykubegrader-0.3.1}/src/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-0.2.41 → pykubegrader-0.3.1}/src/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