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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otter_service_stdalone
-Version: 1.1.30
+Version: 1.1.31
 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.31/src/otter_service_stdalone/__init__.py

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

{otter_service_stdalone-1.1.30 → otter_service_stdalone-1.1.31}/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.31}/src/otter_service_stdalone/grade_notebooks.py

@@ -6,6 +6,7 @@ from otter.grade import main as grade
 from otter import logging as loggers
 from multiprocessing import Process
 from tornado.ioloop import PeriodicCallback
+from .util import clean_directory
 
 log_debug = f'{os.environ.get("ENVIRONMENT")}-debug'
 log_count = f'{os.environ.get("ENVIRONMENT")}-count'
@@ -43,6 +44,10 @@ class GradeNotebooks():
         """
         try:
             notebook_folder = uh.handle_upload(notebooks_path, results_id)
+
+            # remove special characters from notebooks and remove hidden folders
+            clean_directory(notebook_folder)
+
             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.31}/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.31
 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.31}/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"