cr-proc 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

code_recorder_processor/cli.py

@@ -229,6 +229,7 @@ def find_submitted_file(
 
 def process_single_file(
     jsonl_path: Path,
+    json_data: tuple[dict[str, Any], ...],
     template_data: str,
     target_document: str | None,
     time_limit: int | None,
@@ -241,7 +242,9 @@ def process_single_file(
     Parameters
     ----------
     jsonl_path : Path
-        Path to the JSONL file
+        Path to the JSONL file (used for error reporting and file matching)
+    json_data : tuple[dict[str, Any], ...]
+        Pre-loaded JSON events from the recording file
     template_data : str
         Template file content
     target_document : str | None
@@ -258,11 +261,6 @@ def process_single_file(
     tuple
         (verified, reconstructed_code, suspicious_events, time_info, template_diff_text, doc_events, submitted_comparison)
     """
-    try:
-        json_data = load_jsonl(jsonl_path)
-    except (FileNotFoundError, ValueError, IOError) as e:
-        print(f"Error loading {jsonl_path}: {e}", file=sys.stderr)
-        return False, "", [], None, "", (), None
 
     # Filter events for target document
     doc_events = filter_events_by_document(json_data, target_document)
@@ -380,7 +378,8 @@ def write_reconstructed_file(
 
 def handle_playback_mode(
     jsonl_file: Path,
-    template_file: Path,
+    json_data: tuple[dict[str, Any], ...],
+    template_base: Path | None,
     template_data: str,
     document_override: str | None,
     speed: float,
@@ -391,9 +390,11 @@ def handle_playback_mode(
     Parameters
     ----------
     jsonl_file : Path
-        Path to the recording file
-    template_file : Path
-        Path to the template file
+        Path to the recording file (for error reporting)
+    json_data : tuple[dict[str, Any], ...]
+        Pre-loaded JSON events from the recording file
+    template_base : Path | None
+        Path to the template file or directory
     template_data : str
         Template file content
     document_override : str | None
@@ -407,9 +408,8 @@ def handle_playback_mode(
         Exit code (0 for success, 1 for error)
     """
     try:
-        json_data = load_jsonl(jsonl_file)
         recorded_docs = get_recorded_documents(json_data)
-        target_document = resolve_document(recorded_docs, template_file, document_override)
+        target_document = resolve_document(recorded_docs, template_base, document_override)
 
         if target_document:
             playback_recording(json_data, target_document, template_data, speed)
@@ -418,12 +418,13 @@ def handle_playback_mode(
             print("Error: No documents found in recording", file=sys.stderr)
             return 1
     except Exception as e:
-        print(f"Error loading file for playback: {e}", file=sys.stderr)
+        print(f"Error in playback: {e}", file=sys.stderr)
         return 1
 
 
 def process_batch(
     jsonl_files: list[Path],
+    json_data_map: dict[Path, tuple[dict[str, Any], ...]],
     template_base: Path | None,
     template_data: str,
     args: argparse.Namespace,
@@ -435,6 +436,8 @@ def process_batch(
     ----------
     jsonl_files : list[Path]
         List of JSONL files to process
+    json_data_map : dict[Path, tuple[dict[str, Any], ...]]
+        Pre-loaded JSON data for each file
     template_base : Path
         Path to template file or directory
     template_data : str
@@ -456,9 +459,16 @@ def process_batch(
     for i, jsonl_file in enumerate(jsonl_files, 1):
         print_batch_header(i, len(jsonl_files), jsonl_file.name)
 
+        # Get pre-loaded data for this file
+        if jsonl_file not in json_data_map:
+            print(f"Error: No pre-loaded data for {jsonl_file}", file=sys.stderr)
+            all_verified = False
+            continue
+
+        file_data = json_data_map[jsonl_file]
+
         # Determine target document for this file
         try:
-            file_data = load_jsonl(jsonl_file)
             recorded_docs = get_recorded_documents(file_data)
             target_document = resolve_document(recorded_docs, template_base, args.document)
         except (FileNotFoundError, ValueError, IOError) as e:
@@ -482,9 +492,9 @@ def process_batch(
         else:
             file_template_data = template_data
 
-        # Process the file
+        # Process the file with pre-loaded data
         verified, reconstructed, suspicious_events, time_info, diff_text, doc_events, submitted_comparison = process_single_file(
-            jsonl_file, file_template_data, target_document, args.time_limit, args.submitted_file, args.submitted_dir
+            jsonl_file, file_data, file_template_data, target_document, args.time_limit, args.submitted_file, args.submitted_dir
         )
 
         if not verified:
@@ -520,6 +530,7 @@ def process_batch(
 
 def process_single(
     jsonl_file: Path,
+    json_data: tuple[dict[str, Any], ...],
     template_base: Path | None,
     template_data: str,
     args: argparse.Namespace,
@@ -531,6 +542,8 @@ def process_single(
     ----------
     jsonl_file : Path
         Path to JSONL file
+    json_data : tuple[dict[str, Any], ...]
+        Pre-loaded JSON data for the file
     template_base : Path
         Path to template file or directory
     template_data : str
@@ -544,8 +557,7 @@ def process_single(
         (results, verified)
     """
     try:
-        file_data = load_jsonl(jsonl_file)
-        recorded_docs = get_recorded_documents(file_data)
+        recorded_docs = get_recorded_documents(json_data)
         target_document = resolve_document(recorded_docs, template_base, args.document)
     except (FileNotFoundError, ValueError, IOError) as e:
         print(f"Error determining document: {e}", file=sys.stderr)
@@ -570,7 +582,7 @@ def process_single(
     print(f"Processing: {target_document or template_base}", file=sys.stderr)
 
     verified, reconstructed, suspicious_events, time_info, diff_text, doc_events, submitted_comparison = process_single_file(
-        jsonl_file, file_template_data, target_document, args.time_limit, args.submitted_file, args.submitted_dir
+        jsonl_file, json_data, file_template_data, target_document, args.time_limit, args.submitted_file, args.submitted_dir
     )
 
     # Display results
@@ -647,10 +659,23 @@ def main() -> int:
     # Determine template source (use template_dir if provided, otherwise template_file)
     template_path = args.template_dir if args.template_dir else template_file
 
+    # Load all files once - fail fast if any fail
+    json_data_map: dict[Path, tuple[dict[str, Any], ...]] = {}
+    for jsonl_file in jsonl_files:
+        try:
+            json_data_map[jsonl_file] = load_jsonl(jsonl_file)
+        except ValueError as e:
+            print(f"Error parsing {jsonl_file}: {e}", file=sys.stderr)
+            print("Tampering is likey - aborting processing.", file=sys.stderr)
+            return 1
+        except (FileNotFoundError, ValueError, IOError) as e:
+            print(f"Error loading {jsonl_file}: {e}", file=sys.stderr)
+            return 1
+
     # Handle playback mode (single file only)
     if not batch_mode and args.playback:
         try:
-            json_data = load_jsonl(jsonl_files[0])
+            json_data = json_data_map[jsonl_files[0]]
             recorded_docs = get_recorded_documents(json_data)
             target_document = resolve_document(recorded_docs, template_path, args.document)
 
@@ -661,14 +686,11 @@ def main() -> int:
                 target_document
             )
 
-            if target_document:
-                playback_recording(json_data, target_document, template_data, args.playback_speed)
-                return 0
-            else:
-                print("Error: No documents found in recording", file=sys.stderr)
-                return 1
+            return handle_playback_mode(
+                jsonl_files[0], json_data, template_path, template_data, args.document, args.playback_speed
+            )
         except Exception as e:
-            print(f"Error loading file for playback: {e}", file=sys.stderr)
+            print(f"Error in playback: {e}", file=sys.stderr)
             return 1
 
     # Get template data
@@ -687,14 +709,14 @@ def main() -> int:
         print(f"Error: {e}", file=sys.stderr)
         return 1
 
-    # Process files
+    # Process files with pre-loaded data
     if batch_mode:
         results, all_verified = process_batch(
-            jsonl_files, template_path, template_data, args
+            jsonl_files, json_data_map, template_path, template_data, args
         )
     else:
         results, all_verified = process_single(
-            jsonl_files[0], template_path, template_data, args
+            jsonl_files[0], json_data_map[jsonl_files[0]], template_path, template_data, args
         )
 
     if not results:

{cr_proc-0.1.12.dist-info → cr_proc-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cr_proc
-Version: 0.1.12
+Version: 0.1.13
 Summary: A tool for processing BYU CS code recording files.
 Author: Ethan Dye
 Author-email: mrtops03@gmail.com

{cr_proc-0.1.12.dist-info → cr_proc-0.1.13.dist-info}/RECORD

@@ -4,10 +4,10 @@ code_recorder_processor/api/document.py,sha256=eIsGBCPq234cPiPN_ktBOoVrt0G1hHqbg
 code_recorder_processor/api/load.py,sha256=Br-USpFQJ6W8c5hjmCnunM3V0_MURKZp5Yyl1IJdahc,5514
 code_recorder_processor/api/output.py,sha256=HLa6DtN4i-wW0-vyE7SzqLeq35nhSoj2yHc9RjTPcBc,2441
 code_recorder_processor/api/verify.py,sha256=6D8Zs8NBziG1kNc6HgH59yQp4u1wa4zyCuNE0qLTlpk,36040
-code_recorder_processor/cli.py,sha256=t3pIJnoEh9bMmLTQ3xDcehl63aFtCZ218GQBSnPLwzI,25200
+code_recorder_processor/cli.py,sha256=giFUu9KiB40k5Z2CwZK9CDL7dQOicBLCGBx0Uzki39o,26329
 code_recorder_processor/display.py,sha256=He5loCMrm1S1186N2BgDy6bl0v__kiosJ_qDxpa4hbM,8657
 code_recorder_processor/playback.py,sha256=6-OJtQOHKgfutxUNBMunWl-VVSIB0zUDENSl0EsPCh4,4008
-cr_proc-0.1.12.dist-info/METADATA,sha256=HcLLyKL-nl08T_1S7-OSIBdCNqh05MIaOr7ja__oIWM,9812
-cr_proc-0.1.12.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-cr_proc-0.1.12.dist-info/entry_points.txt,sha256=xb5dPAAWN1Z9NUHpvZgNakaslR1MVOERf_IfpG_M04M,77
-cr_proc-0.1.12.dist-info/RECORD,,
+cr_proc-0.1.13.dist-info/METADATA,sha256=-3ylZb1eSoxy2GY2egju_6WobzjoyLnGfEQikM7wMzA,9812
+cr_proc-0.1.13.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+cr_proc-0.1.13.dist-info/entry_points.txt,sha256=xb5dPAAWN1Z9NUHpvZgNakaslR1MVOERf_IfpG_M04M,77
+cr_proc-0.1.13.dist-info/RECORD,,

{cr_proc-0.1.12.dist-info → cr_proc-0.1.13.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.3.0
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any