assignment-codeval 0.0.26__py3-none-any.whl → 0.0.28__py3-none-any.whl

assignment_codeval/check_grading.py

@@ -62,7 +62,7 @@ def _has_codeval_comment_after_submission(submission_node, codeval_prefix):
     comments = submission_node.get("commentsConnection", {}).get("nodes", [])
     for comment in comments:
         text = comment.get("comment", "")
-        if not text.startswith(codeval_prefix):
+        if not text.startswith(codeval_prefix.rstrip()):
             continue
         created_at = comment.get("createdAt")
         if created_at and created_at > submitted_at:

assignment_codeval/convertMD2Html.py

@@ -1,5 +1,6 @@
 import os
 import re
+import zipfile
 
 import markdown
 
@@ -41,19 +42,28 @@ def ansi_to_html(text):
     return ''.join(result)
 
 
-def _read_file_content(filename, spec_dir):
-    """Read the content of a file referenced by an OF or IF tag."""
-    if not spec_dir:
-        return None
-    filepath = os.path.join(spec_dir, filename)
-    try:
-        with open(filepath, 'r') as f:
-            return f.read()
-    except (FileNotFoundError, OSError):
-        return None
+def _read_file_content(filename, spec_dir, zip_archives=None):
+    """Read the content of a file referenced by an IF/OF/EF tag.
 
+    Searches local spec_dir first, then zip archives. Returns content as string.
+    """
+    if spec_dir:
+        filepath = os.path.join(spec_dir, filename)
+        try:
+            with open(filepath, 'r') as f:
+                return f.read()
+        except (FileNotFoundError, OSError):
+            pass
+    if zip_archives:
+        for zf in zip_archives:
+            try:
+                return zf.read(filename).decode('utf-8')
+            except KeyError:
+                continue
+    return None
 
-def sampleTestCases(listOfTC, numOfTC, spec_dir=None):
+
+def sampleTestCases(listOfTC, numOfTC, spec_dir=None, zip_archives=None):
     counter = 0
     samples = "<pre><code>"
     for line in listOfTC:
@@ -64,7 +74,7 @@ def sampleTestCases(listOfTC, numOfTC, spec_dir=None):
             samples = samples + "\n" + "Command to RUN: " + line[2:]
         elif line.startswith('IF '):
             filename = line[3:].strip()
-            content = _read_file_content(filename, spec_dir)
+            content = _read_file_content(filename, spec_dir, zip_archives)
             if content is not None:
                 samples = samples + "<span style=\"color:green\">" + ansi_to_html(content) + "</span>"
             else:
@@ -75,7 +85,7 @@ def sampleTestCases(listOfTC, numOfTC, spec_dir=None):
             samples = samples + "<span style=\"color:green\">" + line[2:] + "</span>"
         elif line.startswith('OF '):
             filename = line[3:].strip()
-            content = _read_file_content(filename, spec_dir)
+            content = _read_file_content(filename, spec_dir, zip_archives)
             if content is not None:
                 samples = samples + "<span style=\"color:blue\">" + ansi_to_html(content) + "</span>"
             else:
@@ -86,6 +96,13 @@ def sampleTestCases(listOfTC, numOfTC, spec_dir=None):
             samples = samples + "<span style=\"color:blue\">" + line[2:] + "</span>"
         elif line.startswith('X '):
             samples = samples + "Expected Exit Code: " + line[2:]
+        elif line.startswith('EF '):
+            filename = line[3:].strip()
+            content = _read_file_content(filename, spec_dir, zip_archives)
+            if content is not None:
+                samples = samples + "<span style=\"color:Tomato\">" + ansi_to_html(content) + "</span>"
+            else:
+                samples = samples + "<span style=\"color:Tomato\">Expected error from file: " + filename + "\n</span>"
         elif line.startswith('EB '):
             samples = samples + "<span style=\"color:Tomato\">" + line[3:] + "</span>"
         elif line.startswith('E '):
@@ -104,24 +121,41 @@ def mdToHtml(file_name, files_resolver=None):
         compile_command = ""
         past_crt_hw = False
         numOfSampleTC = 1
+        zip_paths = []
         for line in f:
             if 'CRT_HW START' in line:
                 assignment_name = line[13:].strip()
             elif 'CRT_HW END' in line:
                 assignment = text
                 past_crt_hw = True
-            elif line.startswith(('T ', 'I ', 'IB ', 'IF ', 'O ', 'OB ', 'OF ', 'X ', 'E ', 'EB ')):
+            elif line.startswith(('T ', 'I ', 'IB ', 'IF ', 'O ', 'OB ', 'OF ',
+                                  'EF ', 'X ', 'E ', 'EB ')):
                 examples.append(line)
             elif line.startswith('HT '):
                 break
             else:
                 if past_crt_hw and line.startswith('C '):
                     compile_command = line[2:].strip()
+                if past_crt_hw and line.startswith('Z '):
+                    zip_paths.append(line[2:].strip())
                 if 'EXMPLS ' in line:
                     numOfSampleTC = int(line[7:])
                 text = text + line
         spec_dir = os.path.dirname(os.path.abspath(file_name))
-        samples = sampleTestCases(examples, numOfSampleTC, spec_dir)
+
+        # Open zip archives for IF/OF/EF file resolution
+        zip_archives = []
+        try:
+            for zp in zip_paths:
+                full_path = os.path.join(spec_dir, zp)
+                if os.path.exists(full_path):
+                    zip_archives.append(zipfile.ZipFile(full_path, 'r'))
+            samples = sampleTestCases(examples, numOfSampleTC, spec_dir,
+                                      zip_archives)
+        finally:
+            for zf in zip_archives:
+                zf.close()
+
         assignment = re.sub('EXMPLS [0-9]+', samples, assignment)
         if compile_command:
             assignment = assignment.replace('COMPILE', compile_command)

assignment_codeval/create_assignment.py

@@ -25,6 +25,28 @@ def get_codeval_folder(course):
     exit(2)
 
 
+def get_assignment_subfolder(course, codeval_folder, assignment_name):
+    """Get or create a subfolder under CodEval named after the assignment."""
+    subfolder_path = f"{codeval_folder.full_name}/{assignment_name}"
+    canvas_folders = course.get_folders()
+    for folder in canvas_folders:
+        if folder.full_name == subfolder_path:
+            return folder
+    # Create the subfolder if it doesn't exist
+    debug(f'Creating subfolder: {subfolder_path}')
+    return course.create_folder(assignment_name, parent_folder_id=codeval_folder.id)
+
+
+def extract_assignment_name(specname):
+    """Extract the assignment name from the CRT_HW START line of a codeval spec file."""
+    with open(specname, 'r') as f:
+        for line in f:
+            if 'CRT_HW START' in line:
+                return line[13:].strip()
+    error(f"could not find CRT_HW START in {specname}")
+    exit(2)
+
+
 def extract_file_macros(specname):
     """Extract all FILE[filename] macros from the markdown portion of a codeval spec file."""
     file_macros = []
@@ -119,7 +141,13 @@ def create_assignment(dryrun, verbose, course_name, group_name, specname, extra)
     if has_github:
         debug(f'Found GITHUB entry for course, will use online_text_entry submission type')
 
-    canvas_folder = get_codeval_folder(course)
+    codeval_folder = get_codeval_folder(course)
+    assign_name_early = extract_assignment_name(specname)
+    if get_config().dry_run:
+        canvas_folder = codeval_folder
+        debug(f'Would use subfolder: CodEval/{assign_name_early}')
+    else:
+        canvas_folder = get_assignment_subfolder(course, codeval_folder, assign_name_early)
     if extra:
         upload_assignment_files(canvas_folder, extra)
     # find zipfiles in spec

{assignment_codeval-0.0.26.dist-info → assignment_codeval-0.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assignment-codeval
-Version: 0.0.26
+Version: 0.0.28
 Summary: CodEval for evaluating programming assignments
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{assignment_codeval-0.0.26.dist-info → assignment_codeval-0.0.28.dist-info}/RECORD

@@ -1,11 +1,11 @@
 assignment_codeval/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assignment_codeval/ai_benchmark.py,sha256=ZGWWrBeUcaArkuQqS9wY42gxP8g7J2nivJMedYq9RFs,18045
 assignment_codeval/canvas_utils.py,sha256=MNtGXc93tHlqudEZsb_6r-5QzV9tSqf3AVxIVGEmk-U,5989
-assignment_codeval/check_grading.py,sha256=VFbkAG_PrBi6iFeyqHs7mLKPi0Xjccg6WtLwY9xrRIk,5880
+assignment_codeval/check_grading.py,sha256=rnNdp8T_XWckDfF1zUi3r70BMe9CPNTD-RfjfarI-CM,5889
 assignment_codeval/cli.py,sha256=Vl27zNI7kI0QEZoXTIE2aTrraEJWj9vgJiyVWou3vgU,1357
 assignment_codeval/commons.py,sha256=rr09qHacHoLmmU8S9sBss4_utb0DH8-IyL9Dsj0ycE0,1412
-assignment_codeval/convertMD2Html.py,sha256=4yu41U4Up1oGI5vDZGelmuogwFmEZrRS55M4ZHbRfaE,6243
-assignment_codeval/create_assignment.py,sha256=oZ-0LadVb6R-rXVg0Lz5itziaalIvFoxd71cIxgMfow,10815
+assignment_codeval/convertMD2Html.py,sha256=cCfTWwxH-0SKZ7Br-Qn54OabPuEAhHpx3q4Aeqp_NAo,7682
+assignment_codeval/create_assignment.py,sha256=duGI8wZRpeEnmYPAAth_QXcFHWd185zkjkSJsaeH-GY,11999
 assignment_codeval/evaluate.py,sha256=er21lA-eohP1BfHPYPWRw9m0a_IOeljMNtcidOYacJY,36253
 assignment_codeval/export_tests.py,sha256=IDAlGAp3zk-K5AFwLr85v4w9_WcYr6HXVF0joi4eYTg,5467
 assignment_codeval/file_utils.py,sha256=RDgAgmyIOLKvRlxbAr-zILz2A24zSr-r3--p-dxl4G8,2132
@@ -14,8 +14,8 @@ assignment_codeval/install_assignment.py,sha256=HsXzTex4G-U3t4tb-HyQ2AobBDBPcKeR
 assignment_codeval/recent_comments.py,sha256=e8UQL2_9dsPlf-NYFrGSaM6h6XYnTf_MW2jWhtEsb38,9097
 assignment_codeval/submissions.py,sha256=YbwKynZwWsmcyytwRi3Kuxq3WN-V-vvshO9JrNJoxAs,28333
 assignment_codeval/test_template.html,sha256=lgWsin5sYE_Pwjp3xqa7_UT-yZ4dWrVqAvNlSBBiNMI,2584
-assignment_codeval-0.0.26.dist-info/METADATA,sha256=CvKtHeb1kR3x4Sz0ojGIKui1v_Q1ejiColTIShfMOfg,15589
-assignment_codeval-0.0.26.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-assignment_codeval-0.0.26.dist-info/entry_points.txt,sha256=Pk0eAhsXBpCsgkv6HYLSHTRf5x_zUf-Lg8KK9KsK2B8,66
-assignment_codeval-0.0.26.dist-info/top_level.txt,sha256=a_P8W2IWjAELxKlTV2t4rLwWVoTxElxUMvWgWjR_1n4,19
-assignment_codeval-0.0.26.dist-info/RECORD,,
+assignment_codeval-0.0.28.dist-info/METADATA,sha256=eqDDrmcpY-ibWCD5fI7fgEG44-IfPp-PxpQoTHnYKeg,15589
+assignment_codeval-0.0.28.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+assignment_codeval-0.0.28.dist-info/entry_points.txt,sha256=Pk0eAhsXBpCsgkv6HYLSHTRf5x_zUf-Lg8KK9KsK2B8,66
+assignment_codeval-0.0.28.dist-info/top_level.txt,sha256=a_P8W2IWjAELxKlTV2t4rLwWVoTxElxUMvWgWjR_1n4,19
+assignment_codeval-0.0.28.dist-info/RECORD,,