assignment-codeval 0.0.4__tar.gz → 0.0.5__tar.gz

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/PKG-INFO

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

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/pyproject.toml

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

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/src/assignment_codeval/canvas_utils.py

@@ -8,7 +8,7 @@ import click
 from canvasapi import Canvas
 from canvasapi.current_user import CurrentUser
 
-from assignment_codeval.commons import error, info, errorWithException
+from assignment_codeval.commons import error, info, errorWithException, despace
 
 CanvasConnection = NamedTuple('CanvasConnection', [('canvas', Canvas), ('user', CurrentUser)])
 
@@ -69,6 +69,7 @@ def is_teacher(course):
 
 def get_courses(canvas, name: str, is_active=True, is_finished=False):
     ''' find the courses based on partial match '''
+    name = despace(name)
     courses = [c for c in canvas.get_courses() if is_teacher(c)]
     now = datetime.datetime.now(datetime.timezone.utc)
     course_list = []
@@ -79,7 +80,7 @@ def get_courses(canvas, name: str, is_active=True, is_finished=False):
             continue
         if is_finished and end < now:
             continue
-        if name in c.name:
+        if name in despace(c.name):
             c.start = start
             c.end = end
             course_list.append(c)
@@ -88,7 +89,8 @@ def get_courses(canvas, name: str, is_active=True, is_finished=False):
 
 @cache
 def get_assignment(course, assignment_name):
-    assignments = [a for a in course.get_assignments() if assignment_name.lower() in a.name.lower()]
+    assignment_name = despace(assignment_name)
+    assignments = [a for a in course.get_assignments() if assignment_name.lower() in despace(a.name).lower()]
     if len(assignments) == 0:
         error(f'no assignments found that contain {assignment_name}. options are:')
         for a in course.get_assignments():

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/src/assignment_codeval/commons.py

@@ -5,6 +5,10 @@ import time
 import dataclasses
 
 
+def despace(name):
+    return name.replace(" ", "_")
+
+
 @dataclasses.dataclass(init=True, repr=True, frozen=True)
 class _Config():
     """Global configuration object for the CLI"""

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/src/assignment_codeval/evaluate.py

@@ -532,7 +532,7 @@ def check_test():
     try:
         test_exec.communicate(timeout=timeout_val)
 
-    except TimeoutError:
+    except subprocess.TimeoutExpired:
         print(f"Took more than {timeout_val} seconds to run. FAIL")
         passed = False
 
@@ -650,6 +650,10 @@ def run_evaluation(codeval_file):
     """
     start_time_seconds = time.time()
 
+    # turn off line buffering so that outputs don't get intermixed
+    sys.stdout.reconfigure(line_buffering=True)
+    sys.stderr.reconfigure(line_buffering=True)
+
     setup()
 
     # Count test case total

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/src/assignment_codeval/github_connect.py

@@ -2,21 +2,27 @@ import os.path
 import re
 import subprocess
 from configparser import ConfigParser
+from time import sleep
 
 import click
 
 from assignment_codeval.canvas_utils import get_course, connect_to_canvas, get_assignment
-from assignment_codeval.commons import error, debug, info
+from assignment_codeval.commons import error, info, despace
 
 HEX_DIGITS = "0123456789abcdefABCDEF"
 
+
 @click.command()
 @click.argument("course_name", metavar="COURSE")
 @click.argument("assignment_name", metavar="ASSIGNMENT")
-@click.option("--all-repos", is_flag=True, help="download all repositories, even if they don't have a valid commit hash")
+@click.option("--all-repos", is_flag=True,
+              help="download all repositories, even if they don't have a valid commit hash")
 @click.option("--target-dir", help="directory to download submissions to", default='./submissions', show_default=True)
 @click.option("--github-field", help="GitHub field name in canvas profile", default="github", show_default=True)
-def github_setup_repo(course_name, assignment_name, target_dir, github_field, all_repos):
+@click.option("--clone-delay",
+              help="seconds to wait between cloning repos. github will sometimes return an error if you clone to fast.e",
+              default=1, show_default=True)
+def github_setup_repo(course_name, assignment_name, target_dir, github_field, all_repos, clone_delay):
     """
     Connect to a GitHub repository for a given course and assignment.
 
@@ -30,7 +36,7 @@ def github_setup_repo(course_name, assignment_name, target_dir, github_field, al
     parser.config_file = config_file
     course = get_course(canvas, course_name, True)
     assignment = get_assignment(course, assignment_name)
-    submission_dir = os.path.join(target_dir, course.name, assignment.name)
+    submission_dir = os.path.join(target_dir, despace(course.name), despace(assignment.name))
     os.makedirs(submission_dir, exist_ok=True)
 
     gh_key = course.name.replace(":", "").replace("=", "")
@@ -53,9 +59,9 @@ def github_setup_repo(course_name, assignment_name, target_dir, github_field, al
         result_path = f"{ssid_dir}/comments.txt"
         success_path = f"{ssid_dir}/gh_success.txt"
         content_path = f"{ssid_dir}/content.txt"
-        repo_path = os.path.join(ssid_dir, "repo")
-        if os.path.exists(repo_path):
-            info(f"skipping {ssid_dir}, repo already exists at {repo_path}")
+        submission_path = os.path.join(ssid_dir, "submission")
+        if os.path.exists(submission_path):
+            info(f"skipping {ssid_dir}, repo already exists at {submission_path}")
             continue
         with open(result_path, "w") as fd:
             content = None
@@ -82,15 +88,16 @@ def github_setup_repo(course_name, assignment_name, target_dir, github_field, al
             repo_url = f"{gh_repo_prefix}-{gh_id}.git"
             click.echo(f"Cloning repo for {gh_id} to {ssid_dir}")
             print(f"cloning {repo_url}", file=fd)
-            rc = subprocess.run(['git', 'clone', repo_url, repo_path], stdout=fd, stderr=subprocess.STDOUT)
+            rc = subprocess.run(['git', 'clone', repo_url, submission_path], stdout=fd, stderr=subprocess.STDOUT)
             if rc.returncode != 0:
                 error(f"❌ error {rc.returncode} connecting to github repo for {ssid} using {repo_url}")
                 continue
-            subprocess.run(['git', 'config', 'advice.detachedHead', 'false'], cwd=repo_path)
-            rc = subprocess.run(['git', 'checkout', content], cwd=repo_path, stdout=fd, stderr=subprocess.STDOUT)
+            subprocess.run(['git', 'config', 'advice.detachedHead', 'false'], cwd=submission_path)
+            rc = subprocess.run(['git', 'checkout', content], cwd=submission_path, stdout=fd, stderr=subprocess.STDOUT)
             if rc.returncode != 0:
                 print(f"❌ error {rc.returncode} checking out {content}", file=fd)
                 continue
             print(f"✅ successfully connected to {repo_url} and checked out {content}", file=fd)
             with open(success_path, "w") as sfd:
                 print(content, file=sfd)
+        sleep(clone_delay)

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/src/assignment_codeval/submissions.py

@@ -12,7 +12,7 @@ import click
 import requests
 
 from assignment_codeval.canvas_utils import connect_to_canvas, get_course, get_assignment
-from assignment_codeval.commons import debug, error, info, warn
+from assignment_codeval.commons import debug, error, info, warn, despace
 
 
 @click.command()
@@ -82,7 +82,7 @@ def evaluate_submissions(codeval_dir, submissions_dir):
         info(f"processing {dirpath}")
 
         assignment_name = match.group(2)
-        repo_dir = os.path.abspath(os.path.join(dirpath, "repo"))
+        submission_dir = os.path.abspath(os.path.join(dirpath, "submission"))
 
         codeval_file = os.path.join(codeval_dir, f"{assignment_name}.codeval")
         if not os.path.exists(codeval_file):
@@ -104,22 +104,29 @@ def evaluate_submissions(codeval_dir, submissions_dir):
                 if line.startswith("CD"):
                     assignment_working_dir = os.path.normpath(
                         os.path.join(assignment_working_dir, line.split()[1].strip()))
-                    if not os.path.isdir(os.path.join(repo_dir, assignment_working_dir)):
+                    if not os.path.isdir(os.path.join(submission_dir, assignment_working_dir)):
                         out = f"{assignment_working_dir} does not exist or is not a directory\n".encode('utf-8')
                         move_to_next_submission = True
                         break
                 if line.startswith("Z"):
                     zipfile = line.split(None, 1)[1]
-                    # unzip into the repo directory
+                    # unzip into the submission directory
                     with ZipFile(os.path.join(codeval_dir, zipfile)) as zf:
-                        zf.extractall(os.path.join(repo_dir, assignment_working_dir))
+                        for f in zf.infolist():
+                            dest_dir = os.path.join(submission_dir, assignment_working_dir)
+                            zf.extract(f, dest_dir)
+                            if not f.is_dir():
+                                perms = f.external_attr >> 16
+                                if perms:
+                                    os.chmod(os.path.join(dest_dir, f.filename), perms)
+
         if not move_to_next_submission:
             command = raw_command.replace("EVALUATE", "cd /submissions; assignment-codeval run-evaluation codeval.txt")
 
             with TemporaryDirectory("cedir", dir="/var/tmp") as link_dir:
-                repo_link = os.path.join(link_dir, "submissions")
-                os.symlink(repo_dir, repo_link)
-                full_assignment_working_dir = os.path.join(repo_link, assignment_working_dir)
+                submission_link = os.path.join(link_dir, "submissions")
+                os.symlink(submission_dir, submission_link)
+                full_assignment_working_dir = os.path.join(submission_link, assignment_working_dir)
                 shutil.copy(codeval_file, os.path.join(full_assignment_working_dir, "codeval.txt"))
 
                 command = command.replace("SUBMISSIONS", full_assignment_working_dir)
@@ -168,7 +175,7 @@ def download_submissions(course_name, assignment_name, target_dir, include_comme
 
     course = get_course(canvas, course_name)
     assignment = get_assignment(course, assignment_name)
-    submission_dir = os.path.join(target_dir, course.name, assignment.name)
+    submission_dir = os.path.join(target_dir, despace(course.name), despace(assignment.name))
     os.makedirs(submission_dir, exist_ok=True)
 
     for submission in assignment.get_submissions(include=["submission_comments", "user"]):

{assignment_codeval-0.0.4 → assignment_codeval-0.0.5}/src/assignment_codeval.egg-info/PKG-INFO

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