assignment-codeval 0.0.27__tar.gz → 0.0.29__tar.gz

{assignment_codeval-0.0.27 → assignment_codeval-0.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assignment-codeval
-Version: 0.0.27
+Version: 0.0.29
 Summary: CodEval for evaluating programming assignments
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -57,6 +57,9 @@ Use a part of the course name that can uniquely identify the course on Canvas.
   - Default: --no-copytmpdir
   - Copy temporary directory content to current directory for debugging
 
+### Codeval File Matching
+When looking up the codeval file for an assignment, CodEval first tries to match by filename (case-insensitive). If no filename match is found, it falls back to checking the `CRT_HW START` title inside each `.codeval` file in the codeval directory. This allows the codeval filename to differ from the assignment name on Canvas as long as the `CRT_HW START` title matches.
+
 ### Specification Tags
 Tags used in a spec file (\<course name>.codeval)
 

{assignment_codeval-0.0.27 → assignment_codeval-0.0.29}/README.md

@@ -37,6 +37,9 @@ Use a part of the course name that can uniquely identify the course on Canvas.
   - Default: --no-copytmpdir
   - Copy temporary directory content to current directory for debugging
 
+### Codeval File Matching
+When looking up the codeval file for an assignment, CodEval first tries to match by filename (case-insensitive). If no filename match is found, it falls back to checking the `CRT_HW START` title inside each `.codeval` file in the codeval directory. This allows the codeval filename to differ from the assignment name on Canvas as long as the `CRT_HW START` title matches.
+
 ### Specification Tags
 Tags used in a spec file (\<course name>.codeval)
 

{assignment_codeval-0.0.27 → assignment_codeval-0.0.29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "assignment-codeval"
-version = "0.0.27"
+version = "0.0.29"
 description = "CodEval for evaluating programming assignments"
 readme = "README.md"
 requires-python = ">=3.12"

{assignment_codeval-0.0.27 → assignment_codeval-0.0.29}/src/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-0.0.27 → assignment_codeval-0.0.29}/src/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-0.0.27 → assignment_codeval-0.0.29}/src/assignment_codeval/evaluate.py

@@ -1138,8 +1138,6 @@ def check_test():
                                 if len(lines) > 22:
                                     print(f"    ... ({len(lines) - 22} more lines)")
 
-        cleanup()
-
         # Exit program after failed test case
         sys.exit(2)
 
@@ -1215,8 +1213,5 @@ def run_evaluation(codeval_file):
 
     check_test()
 
-    # cleanup
-    cleanup()
-
     end_time_seconds = time.time()
     print(f"took {end_time_seconds - start_time_seconds} seconds")

{assignment_codeval-0.0.27 → assignment_codeval-0.0.29}/src/assignment_codeval/recent_comments.py

@@ -12,6 +12,7 @@ from assignment_codeval.canvas_utils import (
     get_canvas_credentials, graphql_request, fetch_all_submissions,
 )
 from assignment_codeval.commons import despace
+from assignment_codeval.submissions import find_codeval_file
 
 COURSE_ASSIGNMENTS_QUERY = """
 query CourseAssignmentsQuery($courseId: ID!) {
@@ -164,8 +165,7 @@ def recent_comments(course_name, active, time_period, codeval_prefix, verbose, s
             # Check if this assignment has a codeval file
             has_codeval = True
             if codeval_dir:
-                codeval_file = os.path.join(codeval_dir, f"{despace(assignment_name)}.codeval")
-                has_codeval = os.path.exists(codeval_file)
+                has_codeval = find_codeval_file(codeval_dir, despace(assignment_name)) is not None
                 if not has_codeval:
                     if verbose:
                         click.echo(f"    (no codeval file)", err=True)

{assignment_codeval-0.0.27 → assignment_codeval-0.0.29}/src/assignment_codeval/submissions.py

@@ -17,13 +17,41 @@ from assignment_codeval.canvas_utils import connect_to_canvas, get_course, get_c
 from assignment_codeval.commons import debug, error, info, warn, despace
 
 
+def _extract_codeval_title(filepath):
+    """Extract the assignment title from the CRT_HW START line of a codeval file.
+    Returns None if no CRT_HW START line is found."""
+    try:
+        with open(filepath, 'r') as f:
+            for line in f:
+                if 'CRT_HW START' in line:
+                    idx = line.index('CRT_HW START') + len('CRT_HW START')
+                    title = line[idx:].strip()
+                    return title if title else None
+    except (OSError, UnicodeDecodeError):
+        pass
+    return None
+
+
 def find_codeval_file(codeval_dir, assignment_name):
     """Find a codeval file by assignment name, case-insensitive.
+    First tries matching by filename, then falls back to checking
+    CRT_HW START titles inside each .codeval file.
     Returns the full path if found, or None if not found."""
     target = f"{assignment_name}.codeval".lower()
+    codeval_files = []
     for f in os.listdir(codeval_dir):
         if f.lower() == target:
             return os.path.join(codeval_dir, f)
+        if f.endswith('.codeval'):
+            codeval_files.append(f)
+
+    # Fallback: check CRT_HW START titles
+    target_name = assignment_name.lower()
+    for f in codeval_files:
+        filepath = os.path.join(codeval_dir, f)
+        title = _extract_codeval_title(filepath)
+        if title and despace(title).lower() == target_name:
+            return filepath
     return None
 
 
@@ -596,7 +624,15 @@ def list_codeval_assignments(course_name):
         raise click.UsageError(f"CODEVAL directory does not exist: {codeval_dir}")
 
     # Get all codeval files in the directory (map lowercase name -> original name)
-    codeval_files = {f[:-8].lower(): f[:-8] for f in os.listdir(codeval_dir) if f.endswith('.codeval')}
+    codeval_files = {}
+    codeval_titles = {}  # map despaced-lowercase CRT_HW title -> original filename stem
+    for f in os.listdir(codeval_dir):
+        if f.endswith('.codeval'):
+            stem = f[:-8]
+            codeval_files[stem.lower()] = stem
+            title = _extract_codeval_title(os.path.join(codeval_dir, f))
+            if title:
+                codeval_titles[despace(title).lower()] = stem
     matched_codeval_keys = set()
 
     (canvas, user) = connect_to_canvas()
@@ -611,6 +647,9 @@ def list_codeval_assignments(course_name):
             if assignment_key in codeval_files:
                 matched_codeval_keys.add(assignment_key)
                 info(f"{course.name}: {assignment.name}")
+            elif assignment_key in codeval_titles:
+                matched_codeval_keys.add(codeval_titles[assignment_key].lower())
+                info(f"{course.name}: {assignment.name}")
 
     # Report codeval files that don't match any assignment
     unmatched_keys = set(codeval_files.keys()) - matched_codeval_keys

{assignment_codeval-0.0.27 → assignment_codeval-0.0.29}/src/assignment_codeval.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assignment-codeval
-Version: 0.0.27
+Version: 0.0.29
 Summary: CodEval for evaluating programming assignments
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -57,6 +57,9 @@ Use a part of the course name that can uniquely identify the course on Canvas.
   - Default: --no-copytmpdir
   - Copy temporary directory content to current directory for debugging
 
+### Codeval File Matching
+When looking up the codeval file for an assignment, CodEval first tries to match by filename (case-insensitive). If no filename match is found, it falls back to checking the `CRT_HW START` title inside each `.codeval` file in the codeval directory. This allows the codeval filename to differ from the assignment name on Canvas as long as the `CRT_HW START` title matches.
+
 ### Specification Tags
 Tags used in a spec file (\<course name>.codeval)