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

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

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

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

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

@@ -210,9 +210,10 @@ class Download(BaseHandler):
                 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"
             self.set_header('Content-Type', 'application/octet-stream')
             self.set_header("Content-Description", "File Transfer")
-            m = f"attachment; filename=results-{download_code}.zip"
+            m = f"attachment; filename={download_label}"
             self.set_header('Content-Disposition', m)
             with open(f"{directory}/results.zip", 'rb') as f:
                 try:
@@ -251,9 +252,10 @@ class Upload(BaseHandler):
         results_path = str(uuid.uuid4())
         autograder = self.request.files['autograder'][0] if "autograder" in files else None
         notebooks = self.request.files['notebooks'][0] if "notebooks" in files else None
-        log.write_logs(results_path, "Step 1: Upload accepted", "", "debug", log_debug)    
         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}"
             notebooks_extn = os.path.splitext(notebooks_fname)[1]
             if notebooks_extn == ".zip":
                 notebooks_name = results_path + notebooks_extn
@@ -300,7 +302,7 @@ class Upload(BaseHandler):
                 except Exception as e:
                     log.write_logs(results_path, "Grading Problem", str(e), "error", log_error)
         else:
-            m = "Step 2b: Uploaded Files not given"
+            m = "Step 1: Uploaded Files not given"
             log.write_logs(results_path, m, "", "debug", log_debug)
             m = "It looks like you did not set the notebooks or autograder.zip or both!"
             self.render("index.html", message=m)

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: otter_service_stdalone
-Version: 1.1.23
+Version: 1.1.24
 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.23 → otter_service_stdalone-1.1.24}/tests/test_upload_handle.py

@@ -48,13 +48,13 @@ def test_zip_with_zips_process_dir(resources):
 
 
 def test_handle_one_notebook(resources):
-    assert "files/lab04" in uh.handle_one_notebook("tests/files/lab04.ipynb")
+    assert "tests/files" in uh.handle_one_notebook("tests/files/hw3.ipynb")
 
 
 def test_handle_upload(resources):
     zip = "tests/files/hw3-submissions-only-notebooks.zip"
     mixed_zip = "tests/files/hw3-submissions-notebooks-zips-mixed.zip"
-    assert "files/lab04" in uh.handle_upload("tests/files/lab04.ipynb")
-    assert "files/hw3-submissions-only-notebooks" in uh.handle_upload(zip)
-    assert "files/hw3-submissions-only-notebooks" in uh.handle_upload(zip)
-    assert "files/hw3-submissions-notebooks-zips-mixed" in uh.handle_upload(mixed_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")

otter_service_stdalone-1.1.23/src/otter_service_stdalone/__init__.py

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