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

otter_service_stdalone/__init__.py

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

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
+from .util import otter_version_correct, clean_directory
 
 
 __UPLOADS__ = "/tmp/uploads"
@@ -181,7 +181,7 @@ class Download(BaseHandler):
             m = "Download: Code Not Given!"
             log.write_logs(download_code, m, f"{download_code}", "debug", log_debug)
             msg = "Please enter the download code to see your result."
-            self.render("index.html",  download_message=msg)
+            self.render("index.html", download_message=msg)
         elif not os.path.exists(f"{directory}"):
             m = "Download: Directory for Code Not existing"
             log.write_logs(download_code, m, f"{download_code}", "debug", log_debug)
@@ -210,7 +210,7 @@ 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"{'-'.join(download_code.split('-')[:-5])}-results.zip"
             self.set_header('Content-Type', 'application/octet-stream')
             self.set_header("Content-Description", "File Transfer")
@@ -272,7 +272,7 @@ class Upload(BaseHandler):
             if not os.path.exists(__UPLOADS__):
                 os.mkdir(__UPLOADS__)
             auto_p = f"{__UPLOADS__}/{autograder_name}"
-            
+
             notebooks_path = f"{__UPLOADS__}/{notebooks_name}"
             m = "Step 2a: Uploaded File Names Determined"
             log.write_logs(results_path, m, f"notebooks path: {notebooks_path}", "debug", log_debug)
@@ -302,6 +302,9 @@ class Upload(BaseHandler):
                 try:
                     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)
@@ -346,16 +349,16 @@ settings = {
 }
 
 application = tornado.web.Application([
-        (r"/", MainHandler),
-        (r"/login", LoginHandler),
-        (r"/upload", Upload),
-        (r"/download", Download),
-        (r"/update", WebSocketHandler),
-        (r"/remove/([a-zA-Z0-9\-]+)", RemoveProgressHandler),
-        (r"/oauth_callback", GitHubOAuthHandler),
-        (r"/otterhealth", HealthHandler),
-        (r"/scripts/(.*)", tornado.web.StaticFileHandler, {"path": os.path.join(os.path.dirname(__file__), "scripts")}),
-        ], **settings, debug=False)
+    (r"/", MainHandler),
+    (r"/login", LoginHandler),
+    (r"/upload", Upload),
+    (r"/download", Download),
+    (r"/update", WebSocketHandler),
+    (r"/remove/([a-zA-Z0-9\-]+)", RemoveProgressHandler),
+    (r"/oauth_callback", GitHubOAuthHandler),
+    (r"/otterhealth", HealthHandler),
+    (r"/scripts/(.*)", tornado.web.StaticFileHandler, {"path": os.path.join(os.path.dirname(__file__), "scripts")}),
+], **settings, debug=False)
 
 
 def main():

otter_service_stdalone/util.py

@@ -2,6 +2,7 @@ import re
 import zipfile
 from packaging import version
 import os
+import shutil
 
 
 def is_version_6_or_greater(zip_ref, target_file, reg):
@@ -39,3 +40,37 @@ def otter_version_correct(autograder_path):
         otter_in_req = is_version_6_or_greater(zip_ref, req_target_file, requirements_regex)
         otter_in_env = is_version_6_or_greater(zip_ref, env_target_file, environment_regex)
         return otter_in_req or otter_in_env
+
+
+def sanitize_filename(filename: str) -> str:
+    """
+    Remove periods and commas from filename except the extension dot.
+    """
+    # Split name and extension
+    name, ext = os.path.splitext(filename)
+    # Remove periods and commas from the name part
+    clean_name = name.replace('.', '').replace(',', '')
+    return f"{clean_name}{ext}"
+
+
+def clean_directory(path: str):
+    """
+    Delete hidden folders like __MACOSX and sanitize all file names in the directory tree.
+    """
+    for root, dirs, files in os.walk(path, topdown=True):
+        # Remove hidden/system folders
+        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
+
+        # Sanitize file names
+        for file_name in files:
+            old_path = os.path.join(root, file_name)
+            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.29.dist-info → otter_service_stdalone-1.1.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otter_service_stdalone
-Version: 1.1.29
+Version: 1.1.30
 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.29.dist-info → otter_service_stdalone-1.1.30.dist-info}/RECORD

@@ -1,12 +1,12 @@
-otter_service_stdalone/__init__.py,sha256=DOpsZaN1AAXZKyhDQEexHmPoqsRUDlJ3UgTYvWIk8_M,23
+otter_service_stdalone/__init__.py,sha256=Mxexe530sI-N2BfQmI2sCtggHwNxuNwO94_QilBEmqM,23
 otter_service_stdalone/access_sops_keys.py,sha256=nboU5aZ84Elrm5vO0dMgpIF5LLcnecpNAwpxKvj6DvU,2129
-otter_service_stdalone/app.py,sha256=p9IAWakM1ol7kY1P9_clD76h-EQ0kQfheBxcCVebfYw,16244
+otter_service_stdalone/app.py,sha256=9_UvXXp93hXXxTMs8AXh0wpoiKiRmObmJM4XtpznHG4,16334
 otter_service_stdalone/fs_logging.py,sha256=IKFZkc5TmpI6G3vTYFAU9jDjQ-GT5aRxk8kdZ0h0kJE,2390
 otter_service_stdalone/grade_notebooks.py,sha256=x19MK_ResW-xM3mdwEUALsdsCiX4I1OHmODUHodcIow,3817
 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
-otter_service_stdalone/util.py,sha256=HtPmi0vEi2v7CZft3GYfpppbkd8UOb_IMubUplpTWi8,1544
+otter_service_stdalone/util.py,sha256=gyaHCPPUootX2i_wsxOo6cotkiNYKOQgoPpUlvjw8SA,2836
 otter_service_stdalone/scripts/web_socket.js,sha256=0h71SNvaD7WNQ735KvuqAPsLYvqHyxzUbLWMu-8qYds,6348
 otter_service_stdalone/secrets/gh_key.dev.yaml,sha256=ORUVDu8SDcv0OE2ThwROppeg7y8oLkJJbPTCMn0s5l0,1138
 otter_service_stdalone/secrets/gh_key.local.yaml,sha256=NtPXXyGf1iSgJ9Oa2ahvIEf_fcmflB3dwd3LWyCgxis,1138
@@ -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.29.dist-info/METADATA,sha256=UuecZ55y7YY_Iy5MrcDCR4Ffo_1Tnvimi3ohEsc7-34,1322
-otter_service_stdalone-1.1.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-otter_service_stdalone-1.1.29.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-1.1.29.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-1.1.29.dist-info/RECORD,,
+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,,