assignment-codeval 0.0.23__tar.gz → 0.0.24__tar.gz

{assignment_codeval-0.0.23 → assignment_codeval-0.0.24}/PKG-INFO

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

{assignment_codeval-0.0.23 → assignment_codeval-0.0.24}/pyproject.toml

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

{assignment_codeval-0.0.23 → assignment_codeval-0.0.24}/src/assignment_codeval/canvas_utils.py

@@ -5,6 +5,7 @@ from functools import cache
 from typing import NamedTuple
 
 import click
+import requests
 from canvasapi import Canvas
 from canvasapi.current_user import CurrentUser
 
@@ -107,3 +108,77 @@ def get_assignment(course, assignment_name):
             sys.exit(2)
     assignment = assignments[0]
     return assignment
+
+
+SUBMISSIONS_QUERY = """
+query SubmissionsQuery($assignmentId: ID!, $cursor: String) {
+  assignment(id: $assignmentId) {
+    submissionsConnection(after: $cursor) {
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+      nodes {
+        _id
+        submittedAt
+        user {
+          name
+        }
+        commentsConnection(filter: {allComments: true}, sortOrder: desc) {
+          nodes {
+            comment
+            createdAt
+          }
+        }
+      }
+    }
+  }
+}
+"""
+
+
+def get_canvas_credentials():
+    """Read raw url and token from codeval.ini config file."""
+    parser = ConfigParser()
+    config_file = click.get_app_dir("codeval.ini")
+    parser.read(config_file)
+    if 'SERVER' not in parser:
+        error(f"did not find [SERVER] section in {config_file}.")
+        sys.exit(1)
+    for key in ['url', 'token']:
+        if key not in parser['SERVER']:
+            error(f"did not find {key} in [SERVER] in {config_file}.")
+            sys.exit(1)
+    return parser['SERVER']['url'], parser['SERVER']['token']
+
+
+def graphql_request(base_url, token, query, variables):
+    """POST a GraphQL query to Canvas and return the data."""
+    url = f"{base_url}/api/graphql"
+    headers = {"Authorization": f"Bearer {token}"}
+    payload = {"query": query, "variables": variables}
+    resp = requests.post(url, json=payload, headers=headers)
+    resp.raise_for_status()
+    result = resp.json()
+    if "errors" in result:
+        error(f"GraphQL errors: {result['errors']}")
+        sys.exit(1)
+    return result["data"]
+
+
+def fetch_all_submissions(base_url, token, assignment_id):
+    """Fetch all submissions for an assignment using relay pagination."""
+    all_nodes = []
+    cursor = None
+    while True:
+        variables = {"assignmentId": str(assignment_id)}
+        if cursor:
+            variables["cursor"] = cursor
+        data = graphql_request(base_url, token, SUBMISSIONS_QUERY, variables)
+        conn = data["assignment"]["submissionsConnection"]
+        all_nodes.extend(conn["nodes"])
+        if conn["pageInfo"]["hasNextPage"]:
+            cursor = conn["pageInfo"]["endCursor"]
+        else:
+            break
+    return all_nodes

{assignment_codeval-0.0.23 → assignment_codeval-0.0.24}/src/assignment_codeval/check_grading.py

@@ -1,14 +1,15 @@
 """Check which submissions are missing a codeval comment newer than the submission."""
 
 import sys
-from configparser import ConfigParser
 from datetime import datetime, timedelta, timezone
 from math import floor
 
 import click
-import requests
 
-from assignment_codeval.canvas_utils import connect_to_canvas, get_course
+from assignment_codeval.canvas_utils import (
+    connect_to_canvas, get_course,
+    get_canvas_credentials, graphql_request, fetch_all_submissions,
+)
 from assignment_codeval.commons import debug, error
 
 ASSIGNMENTS_QUERY = """
@@ -29,79 +30,6 @@ query AssignmentsQuery($courseId: ID!) {
 }
 """
 
-SUBMISSIONS_QUERY = """
-query SubmissionsQuery($assignmentId: ID!, $cursor: String) {
-  assignment(id: $assignmentId) {
-    submissionsConnection(after: $cursor) {
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-      nodes {
-        _id
-        submittedAt
-        user {
-          name
-        }
-        commentsConnection(filter: {allComments: true}) {
-          nodes {
-            comment
-            createdAt
-          }
-        }
-      }
-    }
-  }
-}
-"""
-
-
-def _get_canvas_credentials():
-    """Read raw url and token from codeval.ini config file."""
-    parser = ConfigParser()
-    config_file = click.get_app_dir("codeval.ini")
-    parser.read(config_file)
-    if 'SERVER' not in parser:
-        error(f"did not find [SERVER] section in {config_file}.")
-        sys.exit(1)
-    for key in ['url', 'token']:
-        if key not in parser['SERVER']:
-            error(f"did not find {key} in [SERVER] in {config_file}.")
-            sys.exit(1)
-    return parser['SERVER']['url'], parser['SERVER']['token']
-
-
-def _graphql_request(base_url, token, query, variables):
-    """POST a GraphQL query to Canvas and return the data."""
-    url = f"{base_url}/api/graphql"
-    headers = {"Authorization": f"Bearer {token}"}
-    payload = {"query": query, "variables": variables}
-    resp = requests.post(url, json=payload, headers=headers)
-    resp.raise_for_status()
-    result = resp.json()
-    if "errors" in result:
-        error(f"GraphQL errors: {result['errors']}")
-        sys.exit(1)
-    return result["data"]
-
-
-def _fetch_all_submissions(base_url, token, assignment_id):
-    """Fetch all submissions for an assignment using relay pagination."""
-    all_nodes = []
-    cursor = None
-    while True:
-        variables = {"assignmentId": str(assignment_id)}
-        if cursor:
-            variables["cursor"] = cursor
-        data = _graphql_request(base_url, token, SUBMISSIONS_QUERY, variables)
-        conn = data["assignment"]["submissionsConnection"]
-        all_nodes.extend(conn["nodes"])
-        if conn["pageInfo"]["hasNextPage"]:
-            cursor = conn["pageInfo"]["endCursor"]
-        else:
-            break
-    return all_nodes
-
 
 def _format_elapsed(submitted_at_str):
     """Format elapsed time since submission as a human-readable string."""
@@ -160,10 +88,10 @@ def check_grading(course_name, assignment_group, codeval_prefix, verbose, warn,
     """
     (canvas, user) = connect_to_canvas()
     course = get_course(canvas, course_name)
-    base_url, token = _get_canvas_credentials()
+    base_url, token = get_canvas_credentials()
 
     debug(f"fetching assignment groups for course {course.name} (id={course.id})")
-    data = _graphql_request(base_url, token, ASSIGNMENTS_QUERY, {"courseId": str(course.id)})
+    data = graphql_request(base_url, token, ASSIGNMENTS_QUERY, {"courseId": str(course.id)})
 
     groups = data["course"]["assignmentGroupsConnection"]["nodes"]
     target_group = None
@@ -192,7 +120,7 @@ def check_grading(course_name, assignment_group, codeval_prefix, verbose, warn,
         assignment_name = assignment["name"]
         debug(f"checking assignment: {assignment_name}")
 
-        submissions = _fetch_all_submissions(base_url, token, assignment_id)
+        submissions = fetch_all_submissions(base_url, token, assignment_id)
 
         missing = []
         warned = []

{assignment_codeval-0.0.23 → assignment_codeval-0.0.24}/src/assignment_codeval/recent_comments.py

@@ -7,9 +7,25 @@ from datetime import datetime, timedelta, timezone
 
 import click
 
-from assignment_codeval.canvas_utils import connect_to_canvas, get_course, get_courses
+from assignment_codeval.canvas_utils import (
+    connect_to_canvas, get_course, get_courses,
+    get_canvas_credentials, graphql_request, fetch_all_submissions,
+)
 from assignment_codeval.commons import despace
 
+COURSE_ASSIGNMENTS_QUERY = """
+query CourseAssignmentsQuery($courseId: ID!) {
+  course(id: $courseId) {
+    assignmentsConnection {
+      nodes {
+        _id
+        name
+      }
+    }
+  }
+}
+"""
+
 
 def format_comment_preview(comment: str, prefix: str) -> str:
     """Format a comment showing first 3 and last 3 lines.
@@ -127,67 +143,70 @@ def recent_comments(course_name, active, time_period, codeval_prefix, verbose, s
     else:
         courses = [get_course(canvas, course_name)]
 
+    base_url, token = get_canvas_credentials()
     total_comments = 0
     total_uncommented = 0
 
     for course in courses:
         if verbose:
             click.echo(f"Checking course: {course.name}", err=True)
-        for assignment in course.get_assignments():
+
+        data = graphql_request(base_url, token, COURSE_ASSIGNMENTS_QUERY,
+                               {"courseId": str(course.id)})
+        assignments = data["course"]["assignmentsConnection"]["nodes"]
+
+        for assignment in assignments:
+            assignment_name = assignment["name"]
+            assignment_id = assignment["_id"]
             if verbose:
-                click.echo(f"  Checking assignment: {assignment.name}", err=True)
+                click.echo(f"  Checking assignment: {assignment_name}", err=True)
 
             # 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")
+                codeval_file = os.path.join(codeval_dir, f"{despace(assignment_name)}.codeval")
                 has_codeval = os.path.exists(codeval_file)
                 if not has_codeval:
                     if verbose:
                         click.echo(f"    (no codeval file)", err=True)
                     continue
 
+            submissions = fetch_all_submissions(base_url, token, assignment_id)
             assignment_comments = []
             uncommented_submissions = []
 
-            for submission in assignment.get_submissions(include=["submission_comments", "user"]):
-                student_name = submission.user.get('name', 'Unknown') if submission.user else 'Unknown'
+            for sub in submissions:
+                student_name = sub.get("user", {}).get("name", "Unknown")
+                comments = sub.get("commentsConnection", {}).get("nodes", [])
 
                 # Find codeval comments
                 codeval_comments = []
-                if submission.submission_comments:
-                    for comment in submission.submission_comments:
-                        comment_text = comment.get('comment', '')
-                        if not comment_text.startswith(codeval_prefix):
-                            continue
-
-                        created_at_str = comment.get('created_at', '')
-                        if not created_at_str:
-                            continue
-
-                        try:
-                            created_at = datetime.strptime(created_at_str, '%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=timezone.utc)
-                        except ValueError:
-                            continue
-
-                        codeval_comments.append({
+                for comment in comments:
+                    comment_text = comment.get("comment", "")
+                    if not comment_text.startswith(codeval_prefix):
+                        continue
+
+                    created_at_str = comment.get("createdAt", "")
+                    if not created_at_str:
+                        continue
+
+                    created_at = datetime.fromisoformat(created_at_str)
+                    codeval_comments.append({
+                        'time': created_at,
+                        'comment': comment_text
+                    })
+
+                    if created_at >= cutoff_time:
+                        assignment_comments.append({
+                            'student': student_name,
                             'time': created_at,
                             'comment': comment_text
                         })
 
-                        if created_at >= cutoff_time:
-                            assignment_comments.append({
-                                'student': student_name,
-                                'time': created_at,
-                                'comment': comment_text
-                            })
-
                 # Check for uncommented submissions
-                if show_uncommented and has_codeval and submission.submitted_at:
-                    try:
-                        submitted_at = datetime.strptime(submission.submitted_at, '%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=timezone.utc)
-                    except ValueError:
-                        continue
+                submitted_at_str = sub.get("submittedAt")
+                if show_uncommented and has_codeval and submitted_at_str:
+                    submitted_at = datetime.fromisoformat(submitted_at_str)
 
                     # Find the most recent codeval comment
                     last_codeval_time = None
@@ -203,7 +222,7 @@ def recent_comments(course_name, active, time_period, codeval_prefix, verbose, s
                         })
 
             if assignment_comments:
-                click.echo(f"\n{course.name}: {assignment.name}")
+                click.echo(f"\n{course.name}: {assignment_name}")
                 click.echo("-" * 60)
                 for c in sorted(assignment_comments, key=lambda x: x['time']):
                     time_str = format_local_time(c['time'])
@@ -214,7 +233,7 @@ def recent_comments(course_name, active, time_period, codeval_prefix, verbose, s
 
             if uncommented_submissions:
                 if not assignment_comments:
-                    click.echo(f"\n{course.name}: {assignment.name}")
+                    click.echo(f"\n{course.name}: {assignment_name}")
                     click.echo("-" * 60)
                 click.echo("  Uncommented submissions:")
                 for s in sorted(uncommented_submissions, key=lambda x: x['submitted']):

{assignment_codeval-0.0.23 → assignment_codeval-0.0.24}/src/assignment_codeval.egg-info/PKG-INFO

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