ed-api-client 0.1.7__tar.gz → 0.1.9__tar.gz

{ed_api_client-0.1.7 → ed_api_client-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ed-api-client
-Version: 0.1.7
+Version: 0.1.9
 Summary: A client for interacting with the Ed LMS
 License: MIT
 Author: David Milne

{ed_api_client-0.1.7 → ed_api_client-0.1.9}/ed_api_client/challenges.py

@@ -214,9 +214,6 @@ class ChallengeResult:
         The number of attempts that the student submitted for this challenge.
     completed : bool
         True if the student successfully completed this challenge, otherwise false.
-    best_submission_by_calendar_days_late : List[Submission]
-        The best submission received at each number of days late.
-        Index 0 = on time, index 1 = up to 1 day late, etc.
     scores_by_calendar_days_late : List[int]
         The best score received at each number of days late.
         Index 0 = on time, index 1 = up to 1 day late, etc.
@@ -229,16 +226,16 @@ class ChallengeResult:
     max_days_late: int = 7
     attempts: int = 0
     completed: bool = False
-    best_submission_by_calendar_days_late: List[Submission] = None
     scores_by_calendar_days_late: List[int] = None
     first_attempt: datetime.datetime = None
     last_attempt: datetime.datetime = None
+    _submissions_by_days_late: List[List[Submission]] = None
+    _best_submission_by_days_late: List[Submission] = None
 
     def add(self, submission: Submission, days_late: int):
         """
         Record a submission for this challenge.
 
-        Keeps track of the best submission received at each number of days late.
         Call this for every submission before calling ``finalize``.
 
         Parameters
@@ -249,9 +246,10 @@ class ChallengeResult:
             How many calendar days after the deadline this submission was received.
             Pass 0 for on-time submissions.
         """
-        if self.best_submission_by_calendar_days_late is None:
-            self.best_submission_by_calendar_days_late = [None] * (self.max_days_late + 1)
+        if self._submissions_by_days_late is None:
             self.scores_by_calendar_days_late = [0] * (self.max_days_late + 1)
+            self._submissions_by_days_late = [[] for _ in range(self.max_days_late + 1)]
+            self._best_submission_by_days_late = [None] * (self.max_days_late + 1)
 
         self.attempts += 1
         if (
@@ -266,12 +264,7 @@ class ChallengeResult:
             self.last_attempt = submission.marked_at
 
         if days_late <= self.max_days_late:
-            if (
-                self.best_submission_by_calendar_days_late[days_late] is None
-                or self.best_submission_by_calendar_days_late[days_late].test_cases_passed
-                < submission.test_cases_passed
-            ):
-                self.best_submission_by_calendar_days_late[days_late] = submission
+            self._submissions_by_days_late[days_late].append(submission)
 
     def finalize(self, marker: ChallengeMarker, crawler):
         """
@@ -286,25 +279,34 @@ class ChallengeResult:
             ``BY_TESTCASE_SCORE``. May be None for other mark types.
         """
         for days_late in range(0, self.max_days_late + 1):
-            submission = self.best_submission_by_calendar_days_late[days_late]
-            if submission is None:
+            submissions = self._submissions_by_days_late[days_late]
+            if not submissions:
                 continue
 
             if marker.mark_type is MarkType.BY_CHALLENGE:
-                if (
-                    submission.status == "passed"
-                    and submission.test_cases_passed == submission.test_cases_total
-                ):
+                best = max(
+                    submissions,
+                    key=lambda s: (
+                        s.status == "passed" and s.test_cases_passed == s.test_cases_total,
+                        s.test_cases_passed,
+                    ),
+                )
+                self._best_submission_by_days_late[days_late] = best
+                if best.status == "passed" and best.test_cases_passed == best.test_cases_total:
                     self.scores_by_calendar_days_late[days_late] = marker.points_per_challenge
             elif marker.mark_type is MarkType.BY_TESTCASE:
-                self.scores_by_calendar_days_late[days_late] += submission.test_cases_passed
+                best = max(submissions, key=lambda s: s.test_cases_passed)
+                self._best_submission_by_days_late[days_late] = best
+                self.scores_by_calendar_days_late[days_late] = best.test_cases_passed
             elif marker.mark_type is MarkType.BY_TESTCASE_SCORE:
-                s = crawler.get_submission(submission.id)
-                for test in s.testcases:
-                    if test.passed:
-                        self.scores_by_calendar_days_late[days_late] = (
-                            self.scores_by_calendar_days_late[days_late] + test.score
-                        )
+                best_score = 0
+                for candidate in submissions:
+                    s = crawler.get_submission(candidate.id)
+                    score = sum(tc.score for tc in s.testcases if tc.passed)
+                    if score > best_score:
+                        best_score = score
+                        self._best_submission_by_days_late[days_late] = s
+                self.scores_by_calendar_days_late[days_late] = best_score
             else:
                 raise Exception(f"Invalid marker type {marker.mark_type}")
 
@@ -348,7 +350,7 @@ class ChallengeResult:
 
         for day in range(0, len(self.scores_by_calendar_days_late)):
             score = self.scores_by_calendar_days_late[day]
-            submission = self.best_submission_by_calendar_days_late[day]
+            submission = self._best_submission_by_days_late[day]
             if submission is None:
                 continue
 

{ed_api_client-0.1.7 → ed_api_client-0.1.9}/ed_api_client/workspaces.py

@@ -473,6 +473,7 @@ class FileSummary(File):
     _insert_intervals: List[float] = field(default_factory=list)
     _prev_insert_time: datetime.datetime = None
     _pending_deletion: str = ""
+    _insert_frontier: int = 0
 
     def from_file(file: File):
         fs = FileSummary(file.id, file.path, file.content)
@@ -522,9 +523,8 @@ class WorkspaceSummary:
         log: WorkspaceLog,
         acceptable_selections: List[str] = [],
         stop_at_first_successful_submission: bool = True,
-        max_idle_seconds=30,
+        max_idle_seconds=600,
         min_suspicious_paste_chars=50,
-        max_continuous_typing_seconds=2,
     ):
         """
         Build a WorkspaceSummary by replaying a workspace event log.
@@ -569,6 +569,9 @@ class WorkspaceSummary:
         for selection in acceptable_selections:
             selected_content.add(selection)
 
+        session_active_time = datetime.timedelta(0)
+        prev_session_event_time = None
+
         curr_selection = None
         pending_selection = None
         for event in log.events:
@@ -595,6 +598,12 @@ class WorkspaceSummary:
             if event.type != "cursor" and event.type != "edit" and event.type != "init":
                 continue
 
+            if prev_session_event_time is not None:
+                elapsed = event.at - prev_session_event_time
+                if elapsed.total_seconds() < max_idle_seconds:
+                    session_active_time += elapsed
+            prev_session_event_time = event.at
+
             file = file_summaries.get(event.file_id)
             if file is None:
                 continue
@@ -627,12 +636,8 @@ class WorkspaceSummary:
 
             pos = 0
 
-            is_uninterrupted = False
             if file.prev_typing_time is not None:
                 elapsed = event.at - file.prev_typing_time
-                if elapsed.total_seconds() < max_continuous_typing_seconds:
-                    is_uninterrupted = True
-
                 if elapsed.total_seconds() < max_idle_seconds:
                     file.typing_time += elapsed
 
@@ -654,6 +659,12 @@ class WorkspaceSummary:
                         )
                     )
 
+                    delete_end = pos + edit.value
+                    if delete_end <= file._insert_frontier:
+                        file._insert_frontier -= edit.value
+                    elif pos < file._insert_frontier:
+                        file._insert_frontier = pos  # deletion overlaps the frontier
+
                     file.content = file.content[:pos] + file.content[pos + edit.value :]
                     file.transcribed_mask = (
                         file.transcribed_mask[:pos]
@@ -673,10 +684,9 @@ class WorkspaceSummary:
                             )
                         )
 
-                    if (
-                        is_uninterrupted
-                        and get_code_character_count(file.content[pos:]) < 5
-                    ):
+                    frontier_tolerance = max(10, len(file.content) // 10)
+                    at_frontier = pos >= file._insert_frontier - frontier_tolerance
+                    if at_frontier:
                         file.transcribed_mask = (
                             file.transcribed_mask[:pos]
                             + get_masked_section(edit.value)
@@ -688,6 +698,11 @@ class WorkspaceSummary:
                             + edit.value
                             + file.transcribed_mask[pos:]
                         )
+                    n = len(edit.value)
+                    if pos < file._insert_frontier:
+                        file._insert_frontier += n      # inserted before frontier — shift it right
+                    else:
+                        file._insert_frontier = pos + n  # advance frontier to end of this insert
 
                     if len(edit.value) > min_suspicious_paste_chars:
                         if not selected_content.contains(edit.value):
@@ -719,10 +734,9 @@ class WorkspaceSummary:
                 if '\n' in sel_text:
                     sel_file.multiline_selection_count += 1
 
-        total_active_time = datetime.timedelta(0)
+        total_active_time = session_active_time
         total_typing_time = datetime.timedelta(0)
         for file in file_summaries.values():
-            total_active_time += file.active_time
             total_typing_time += file.typing_time
 
             pasted_sections = get_pasted_sections(

{ed_api_client-0.1.7 → ed_api_client-0.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ed-api-client"
-version = "0.1.7"
+version = "0.1.9"
 description = "A client for interacting with the Ed LMS"
 authors = ["David Milne <d.n.milne@gmail.com>"]
 license = "MIT"