otter-service-stdalone 1.1.24__tar.gz → 1.1.26__tar.gz

{otter_service_stdalone-1.1.24 → otter_service_stdalone-1.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: otter_service_stdalone
-Version: 1.1.24
+Version: 1.1.26
 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.26/src/otter_service_stdalone/__init__.py

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

{otter_service_stdalone-1.1.24 → otter_service_stdalone-1.1.26}/src/otter_service_stdalone/app.py

@@ -3,6 +3,7 @@ import tornado.ioloop
 import tornado.web
 import tornado.auth
 import os
+import re
 import uuid
 import tornado.websocket
 from otter_service_stdalone import fs_logging as log
@@ -37,7 +38,7 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
             if user_id not in session_callbacks:
                 session_callbacks[user_id] = tornado.ioloop.PeriodicCallback(lambda: self.send_results(user_id), 1000)
                 session_callbacks[user_id].start()
-    
+
     def on_message(self, message):
         pass  # No action needed on incoming message
 
@@ -209,8 +210,8 @@ class Download(BaseHandler):
                         zipF.write(f"{file_path}", f_path, compress_type=ZIP_DEFLATED)
                 read_me = os.path.join(os.path.dirname(__file__), "static_files", "README_DO_NOT_DISTRIBUTE.txt")
                 zipF.write(read_me, "README_DO_NOT_DISTRIBUTE.txt", compress_type=ZIP_DEFLATED)
-
-            download_label = f"{download_code.split('-')[0]}-results.zip"
+            
+            download_label = f"{'-'.join(download_code.split('-')[:-5])}-results.zip"
             self.set_header('Content-Type', 'application/octet-stream')
             self.set_header("Content-Description", "File Transfer")
             m = f"attachment; filename={download_label}"
@@ -255,7 +256,8 @@ class Upload(BaseHandler):
         if autograder is not None and notebooks is not None:
             log.write_logs(results_path, "Step 1: Upload accepted", "", "debug", log_debug)
             notebooks_fname = notebooks['filename']
-            results_path = f"{os.path.splitext(notebooks_fname)[0]}-{results_path}"
+            sanitized_filename = re.sub(r"[ ,./\\\[\]{}()]]", "", os.path.splitext(notebooks_fname)[0])
+            results_path = f"{sanitized_filename}-{results_path}"
             notebooks_extn = os.path.splitext(notebooks_fname)[1]
             if notebooks_extn == ".zip":
                 notebooks_name = results_path + notebooks_extn

{otter_service_stdalone-1.1.24 → otter_service_stdalone-1.1.26}/src/otter_service_stdalone.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: otter_service_stdalone
-Version: 1.1.24
+Version: 1.1.26
 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.24 → otter_service_stdalone-1.1.26}/src/otter_service_stdalone.egg-info/SOURCES.txt

@@ -23,4 +23,5 @@ src/otter_service_stdalone/secrets/gh_key.staging.yaml
 src/otter_service_stdalone/static_files/README_DO_NOT_DISTRIBUTE.txt
 src/otter_service_stdalone/static_templates/403.html
 src/otter_service_stdalone/static_templates/500.html
-tests/test_upload_handle.py
+tests/test_upload_handle.py
+tests/test_util.py

{otter_service_stdalone-1.1.24 → otter_service_stdalone-1.1.26}/tests/test_upload_handle.py

@@ -51,6 +51,10 @@ def test_handle_one_notebook(resources):
     assert "tests/files" in uh.handle_one_notebook("tests/files/hw3.ipynb")
 
 
+def test_period_in_notebook_name(resources):
+    assert "tests/files" in uh.handle_upload("tests/files/hw3.3.ipynb", "test-up-123")
+
+
 def test_handle_upload(resources):
     zip = "tests/files/hw3-submissions-only-notebooks.zip"
     mixed_zip = "tests/files/hw3-submissions-notebooks-zips-mixed.zip"

otter_service_stdalone-1.1.26/tests/test_util.py

@@ -0,0 +1,10 @@
+import otter_service_stdalone.util as util
+
+
+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
+    assert util.otter_version_correct(a3) is False

otter_service_stdalone-1.1.24/src/otter_service_stdalone/__init__.py

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