otter-service-stdalone 1.1.30__tar.gz → 1.1.32__tar.gz

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otter_service_stdalone
-Version: 1.1.30
+Version: 1.1.32
 Summary: Grading Service for Instructors using Otter Grader
 Home-page: https://github.com/sean-morris/otter-service-stdalone
 Author: Sean Morris

otter_service_stdalone-1.1.32/src/otter_service_stdalone/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.1.32"

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/src/otter_service_stdalone/app.py

@@ -12,7 +12,7 @@ from otter_service_stdalone import grade_notebooks
 from zipfile import ZipFile, ZIP_DEFLATED
 from multiprocessing import Queue
 
-from .util import otter_version_correct, clean_directory
+from .util import otter_version_correct
 
 
 __UPLOADS__ = "/tmp/uploads"
@@ -303,8 +303,6 @@ class Upload(BaseHandler):
                     session_queues[user_id][results_path] = Queue()
                     session_messages[user_id][results_path] = []
 
-                    # remove special characters from notebooks and remove hidden folders
-                    clean_directory(notebooks_path)
                     await g.grade(auto_p, notebooks_path, autograder_orig_name, results_path, session_queues[user_id].get(results_path))
                 except Exception as e:
                     log.write_logs(results_path, "Grading Problem", str(e), "error", log_error)

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/src/otter_service_stdalone/grade_notebooks.py

@@ -43,6 +43,7 @@ class GradeNotebooks():
         """
         try:
             notebook_folder = uh.handle_upload(notebooks_path, results_id)
+
             notebook_count = self.count_ipynb_files(notebook_folder, ".ipynb")
             log.write_logs(results_id, f"{notebook_count}",
                            "",

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/src/otter_service_stdalone/upload_handle.py

@@ -2,6 +2,7 @@ import os
 import shutil
 from zipfile import ZipFile
 from otter_service_stdalone import fs_logging as log
+from .util import clean_directory
 
 
 def handle_one_notebook(path):
@@ -119,7 +120,8 @@ def handle_upload(path, results_id):
                 zip_folder = path.split(".")[0]
                 with ZipFile(path, 'r') as zObject:
                     zObject.extractall(path=zip_folder)
-
+                # remove special characters from notebooks and remove hidden folders
+                clean_directory(zip_folder)
                 log.write_logs(results_id, "Step 4a: Configure Notebooks Folder for Otter Grader",
                                "Zipped file of notebooks Uploaded",
                                "debug",

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/src/otter_service_stdalone/util.py

@@ -49,7 +49,7 @@ def sanitize_filename(filename: str) -> str:
     # Split name and extension
     name, ext = os.path.splitext(filename)
     # Remove periods and commas from the name part
-    clean_name = name.replace('.', '').replace(',', '')
+    clean_name = name.replace('.', '').replace(',', '').replace(' ', '')
     return f"{clean_name}{ext}"
 
 
@@ -62,7 +62,6 @@ def clean_directory(path: str):
         for dir_name in list(dirs):
             if dir_name.startswith('.') or dir_name == '__MACOSX':
                 dir_path = os.path.join(root, dir_name)
-                print(f"Deleting folder: {dir_path}")
                 shutil.rmtree(dir_path)
                 dirs.remove(dir_name)  # remove from list to avoid walking it
 
@@ -72,5 +71,4 @@ def clean_directory(path: str):
             new_name = sanitize_filename(file_name)
             new_path = os.path.join(root, new_name)
             if old_path != new_path:
-                print(f"Renaming {old_path} -> {new_path}")
                 os.rename(old_path, new_path)

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/src/otter_service_stdalone.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otter_service_stdalone
-Version: 1.1.30
+Version: 1.1.32
 Summary: Grading Service for Instructors using Otter Grader
 Home-page: https://github.com/sean-morris/otter-service-stdalone
 Author: Sean Morris

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/tests/test_upload_handle.py

@@ -11,6 +11,7 @@ def resources():
     l4 = "tests/files/lab04/lab04.ipynb"
     n1 = "tests/files/hw3-submissions-only-notebooks"
     n2 = "tests/files/hw3-submissions-notebooks-zips-mixed"
+    n3 = "tests/files/clean_up"
     shutil.copy("tests/files/student_1.zip", "/".join(s1.split("/")[:-1]))
     shutil.copy("tests/files/student_4.zip", "/".join(s4.split("/")[:-1]))
     yield "resources"
@@ -25,6 +26,8 @@ def resources():
         shutil.rmtree(n1)
     if os.path.exists(n2):
         shutil.rmtree(n2)
+    if os.path.exists(n3):
+        shutil.rmtree(n3)
 
 
 def test_one_notebook(resources):
@@ -58,7 +61,9 @@ def test_period_in_notebook_name(resources):
 def test_handle_upload(resources):
     zip = "tests/files/hw3-submissions-only-notebooks.zip"
     mixed_zip = "tests/files/hw3-submissions-notebooks-zips-mixed.zip"
+    clean = "tests/files/clean_up.zip"
     assert "tests/files" in uh.handle_upload("tests/files/hw3.ipynb", "test-up-123")
     assert "files/hw3-submissions-only-notebooks" in uh.handle_upload(zip, "test-up-123")
     assert "files/hw3-submissions-only-notebooks" in uh.handle_upload(zip, "test-up-123")
     assert "files/hw3-submissions-notebooks-zips-mixed" in uh.handle_upload(mixed_zip, "test-up-123")
+    assert "files/clean_up" in uh.handle_upload(clean, "test-up-123")

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.32}/tests/test_util.py

@@ -8,9 +8,11 @@ def test_autograder_zip_version():
     a1 = "tests/files/hw01-autograder_6_0_4.zip"
     a2 = "tests/files/hw02-autograder_6_1_0.zip"
     a3 = "tests/files/hw02-autograder_5_5_0.zip"
-    assert util.otter_version_correct(a1) is True
-    assert util.otter_version_correct(a2) is True
+    a4 = "tests/files/hw03-autograder_6_1_3.zip"
+    assert util.otter_version_correct(a1) is False
+    assert util.otter_version_correct(a2) is False
     assert util.otter_version_correct(a3) is False
+    assert util.otter_version_correct(a4) is False
 
 
 def test_clean_directory():

otter_service_stdalone-1.1.30/src/otter_service_stdalone/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.1.30"