otter-service-stdalone 1.1.30__py3-none-any.whl → 1.1.31__py3-none-any.whl

otter_service_stdalone/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.30"
+__version__ = "1.1.31"

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/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.dist-info → otter_service_stdalone-1.1.31.dist-info}/METADATA

@@ -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.dist-info → otter_service_stdalone-1.1.31.dist-info}/RECORD

@@ -1,8 +1,8 @@
-otter_service_stdalone/__init__.py,sha256=Mxexe530sI-N2BfQmI2sCtggHwNxuNwO94_QilBEmqM,23
+otter_service_stdalone/__init__.py,sha256=Y9b5TRHjXX4JCba9wG0eWODKTtGpLMDuVuylmN7aP8M,23
 otter_service_stdalone/access_sops_keys.py,sha256=nboU5aZ84Elrm5vO0dMgpIF5LLcnecpNAwpxKvj6DvU,2129
-otter_service_stdalone/app.py,sha256=9_UvXXp93hXXxTMs8AXh0wpoiKiRmObmJM4XtpznHG4,16334
+otter_service_stdalone/app.py,sha256=sNHhy9PMOSXlzsx6DuJ6T69xixSvvDq9llh3_59KkC0,16176
 otter_service_stdalone/fs_logging.py,sha256=IKFZkc5TmpI6G3vTYFAU9jDjQ-GT5aRxk8kdZ0h0kJE,2390
-otter_service_stdalone/grade_notebooks.py,sha256=x19MK_ResW-xM3mdwEUALsdsCiX4I1OHmODUHodcIow,3817
+otter_service_stdalone/grade_notebooks.py,sha256=kHlil5pGcJWC6kSEqwCIUL-RUz7ODS6p6vbUoU0QKFM,3979
 otter_service_stdalone/index.html,sha256=eEbFGxbV-plE5bAggGYHTv1q7yqoTN4kJbzL729uMmk,7276
 otter_service_stdalone/upload_handle.py,sha256=PbpQEyUIPKercJ9hegKwvxHBvSc9uylhIfwjvHybjs0,5061
 otter_service_stdalone/user_auth.py,sha256=L9Kfj1BsQttAteHhRn71IUY8WX9nvBy3MXVGq1yjTtE,4253
@@ -15,8 +15,8 @@ otter_service_stdalone/secrets/gh_key.staging.yaml,sha256=cKVqj4dcwuz2LhXwMNQy_1
 otter_service_stdalone/static_files/README_DO_NOT_DISTRIBUTE.txt,sha256=eMqBa1du1u0c07fuG3Eu9DDHuixRTFEbiQwrlvAnL1Y,353
 otter_service_stdalone/static_templates/403.html,sha256=7eO3XQsEkl4nF8PEeFkLwCzGBfdZ3kkkeu_Kgpgbh0k,1440
 otter_service_stdalone/static_templates/500.html,sha256=t6DeEMp8piSWyBToHb_JpTrw3GStAHFrozlmeuXyamg,1421
-otter_service_stdalone-1.1.30.dist-info/METADATA,sha256=kYu_oFnur_Gon_JXhalNkCVghk21RX0G3guohq-C2nk,1322
-otter_service_stdalone-1.1.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-otter_service_stdalone-1.1.30.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-1.1.30.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-1.1.30.dist-info/RECORD,,
+otter_service_stdalone-1.1.31.dist-info/METADATA,sha256=NGDJ1XUgQ0Hdea_CciTv-jSgN_4f-khyXht3tO_6r58,1322
+otter_service_stdalone-1.1.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+otter_service_stdalone-1.1.31.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
+otter_service_stdalone-1.1.31.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
+otter_service_stdalone-1.1.31.dist-info/RECORD,,