otter-service-stdalone 1.1.7__py3-none-any.whl → 1.1.9__py3-none-any.whl

otter_service_stdalone/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.7"
+__version__ = "1.1.9"

otter_service_stdalone/app.py

@@ -11,6 +11,8 @@ from otter_service_stdalone import grade_notebooks
 from zipfile import ZipFile, ZIP_DEFLATED
 from multiprocessing import Queue
 
+from .util import otter_version_correct
+
 
 __UPLOADS__ = "/tmp/uploads"
 log_debug = f'{os.environ.get("ENVIRONMENT")}-debug'
@@ -35,19 +37,16 @@ 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
 
     def on_close(self):
         """stop the periodic callback on close
         """
-        close_code = self.close_code
-        close_reason = self.close_reason
         if self.get_secure_cookie("user"):
             user_id = self.get_secure_cookie("user").decode('utf-8')
-            if user_id in session_callbacks and session_callbacks[user_id].callback:
-                log.write_logs("ws-close-removing-user!", close_code, f"{close_code}: {close_reason}", "debug", log_debug)
+            if user_id in session_callbacks and session_callbacks[user_id]:
                 session_callbacks[user_id].stop()
                 session_callbacks.pop(user_id)
 
@@ -65,7 +64,7 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
                         if not q.empty():
                             while not q.empty():
                                 user_messages_dict[result_id].append(q.get())
-                            self.write_message({"messages": user_messages_dict})
+                    self.write_message({"messages": user_messages_dict})
         except tornado.websocket.WebSocketClosedError:
             log.write_logs("ws-error", "Web Socket Close Error", "", "", log_error)
         except Exception:
@@ -186,16 +185,16 @@ class Download(BaseHandler):
             m = "Download: Directory for Code Not existing"
             log.write_logs(download_code, m, f"{download_code}", "debug", log_debug)
             msg = "The download code appears to not be correct or expired "
-            msg += f"- results are deleted regularly: {download_code}."
+            msg += f"- results are deleted regularly: {download_code}. "
             msg += "Please check the code or upload your notebooks "
             msg += "and autograder.zip for grading again."
-            self.render("index.html",  download_message=msg)
+            self.render("index.html", download_message=msg)
         elif not os.path.exists(f"{directory}/final_grades.csv"):
             m = "Download: Results Not Ready"
             log.write_logs(download_code, m, f"{download_code}", "debug", log_debug)
             msg = "The results of your download are not ready yet. "
             msg += "Please check back."
-            self.render("index.html",  download_message=msg, dcode=download_code)
+            self.render("index.html", download_message=msg, dcode=download_code)
         else:
             m = "Download Success: Creating results.zip"
             log.write_logs(download_code, m, "", "debug", log_debug)
@@ -252,7 +251,7 @@ 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)
+        log.write_logs(results_path, "Step 1: Upload accepted", "", "debug", log_debug)    
         if autograder is not None and notebooks is not None:
             notebooks_fname = notebooks['filename']
             notebooks_extn = os.path.splitext(notebooks_fname)[1]
@@ -267,25 +266,36 @@ 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)
             fh = open(auto_p, 'wb')
             fh.write(autograder['body'])
-
-            fh = open(notebooks_path, 'wb')
-            fh.write(notebooks['body'])
-            m = "Step 3: Uploaded Files Written to Disk"
+            m = "Step 3A: Uploaded autograder.zip files written to disk - now checking otter version"
             log.write_logs(results_path, m, f"Results Code: {results_path}", "debug", log_debug)
-            m = "Please save this code; it appears in the \"Notebook Grading Progress\" section below. You can "
-            m += f"retrieve your files by submitting this code in the \"Results\" section to the right: {results_path}"
-            self.render("index.html", message=m)
-            try:
-                session_queues[user_id][results_path] = Queue()
-                session_messages[user_id][results_path] = []
-                await g.grade(auto_p, notebooks_path, 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)
+            if not otter_version_correct(auto_p):
+                m = "Step 3A-1: autograder.zip is wrong version of otter-grader; must be > 5.5.0"
+                log.write_logs(results_path, m, f"Results Code: {results_path}", "debug", log_debug)
+                m = "You need to make sure the autograder.zip uses otter-grader version >5.5.0. BUT you do not need "
+                m += "to re-generate your autograder.zip; un-archive autograder.zip and change the version in either "
+                m += "requirements.txt or environmental.yaml depending on the version of otter-grader the autograder.zip "
+                m += "is created with."
+                self.render("index.html", message=m)
+            else:
+                fh = open(notebooks_path, 'wb')
+                fh.write(notebooks['body'])
+                m = "Step 3B: Uploaded Notebook File Written to Disk"
+                log.write_logs(results_path, m, f"Results Code: {results_path}", "debug", log_debug)
+                m = "Please save this code; it appears in the \"Notebook Grading Progress\" section below. You can "
+                m += f"retrieve your files by submitting this code in the \"Results\" section to the right: {results_path}"
+                self.render("index.html", message=m)
+                try:
+                    session_queues[user_id][results_path] = Queue()
+                    session_messages[user_id][results_path] = []
+                    await g.grade(auto_p, notebooks_path, 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)
         else:
             m = "Step 2b: Uploaded Files not given"
             log.write_logs(results_path, m, "", "debug", log_debug)
@@ -297,19 +307,8 @@ class RemoveProgressHandler(BaseHandler):
     """This handles requests to remove progress on a specific submission
 
     Args:
-        tornado (tornado.web.RequestHandler): The request handler
+        tornado (BaseHandler): The request handler
     """
-    def set_default_headers(self):
-        """Set CORS headers to allow cross-origin requests."""
-        self.set_header("Access-Control-Allow-Origin", "*")  # Allow requests from any domain
-        self.set_header("Access-Control-Allow-Headers", "x-requested-with")
-        self.set_header("Access-Control-Allow-Methods", "DELETE, GET, POST, OPTIONS")
-
-    def options(self, *args):
-        """Respond to OPTIONS requests for preflight in CORS."""
-        self.set_status(204)
-        self.finish()
-
     @tornado.web.authenticated
     def get(self):
         # this just redirects to login and displays main page

otter_service_stdalone/scripts/web_socket.js

@@ -115,6 +115,9 @@ function _setUpNewSubmission(submission_key, index, messages){
         .then(response => {
             if (response.ok) {
                 newMessage.remove();
+                if(document.querySelector('div[id="messages"]').childElementCount == 1){
+                  document.getElementById("none-msg").style.display = "block";
+                }
             } else {
                 console.error(`Failed to remove item ${submission_key}`);
             }
@@ -122,6 +125,7 @@ function _setUpNewSubmission(submission_key, index, messages){
         .catch(error => {
             console.error('Failed to remove item:', error);
         });
+        event.stopPropagation();
         
     });
 
@@ -157,7 +161,4 @@ function _updateSubmission(submission_key, index, messages){
       newMessageContent.style.display = 'none';
     }
 }
-function getXsrfToken() {
-  return xsrfToken;  // Use the token variable from the script
-}
 connectWebSocket()

otter_service_stdalone/util.py

@@ -0,0 +1,36 @@
+import re
+import zipfile
+
+
+def is_version_5(zip_ref, target_file, reg):
+    if target_file:
+        with zip_ref.open(target_file) as file:
+            content = file.read().decode('utf-8')
+            match = reg.search(content)
+            if match:
+                version = match.group(1)
+                version_nums = version.split(".")
+                if len(version_nums) > 0 and int(version_nums[0]) >= 5:
+                    return True
+    return False
+
+
+def otter_version_correct(autograder_path):
+    requirements_regex = re.compile(r"otter-grader==([\d\.]+)")
+    environment_regex = re.compile(r"otter-grader: ([\d\.]+)")
+    # Open the zip file
+    with zipfile.ZipFile(autograder_path, 'r') as zip_ref:
+        # Get a list of files in the zip
+        file_list = zip_ref.namelist()
+
+        # Check if 'requirements.txt' or 'environment.yaml' exists
+        req_target_file = None
+        env_target_file = None
+        if 'requirements.txt' in file_list:
+            req_target_file = 'requirements.txt'
+        if 'environment.yaml' in file_list:
+            env_target_file = 'environment.yaml'
+
+        otter_in_req = is_version_5(zip_ref, req_target_file, requirements_regex)
+        otter_in_env = is_version_5(zip_ref, env_target_file, environment_regex)
+        return otter_in_req or otter_in_env

{otter_service_stdalone-1.1.7.dist-info → otter_service_stdalone-1.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter_service_stdalone
-Version: 1.1.7
+Version: 1.1.9
 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.7.dist-info → otter_service_stdalone-1.1.9.dist-info}/RECORD

@@ -1,12 +1,13 @@
-otter_service_stdalone/__init__.py,sha256=p2qAfdU7zHOShJi2f1FW-_7Tbm0-KCPE7CI7284QiHg,22
+otter_service_stdalone/__init__.py,sha256=lnHAM_YSOt5TvtAm4ZVs32T0TpsCQ5kOOznnQlur1YE,22
 otter_service_stdalone/access_sops_keys.py,sha256=nboU5aZ84Elrm5vO0dMgpIF5LLcnecpNAwpxKvj6DvU,2129
-otter_service_stdalone/app.py,sha256=D0Trfw0wwwZaJo9MKPqQptUXhFosn2bq0V_m7dLOsXg,15283
+otter_service_stdalone/app.py,sha256=X_u4V02uOiFBTwM9FR0bQjXK6YcsO3Jieuji-UBwgSw,15588
 otter_service_stdalone/fs_logging.py,sha256=IKFZkc5TmpI6G3vTYFAU9jDjQ-GT5aRxk8kdZ0h0kJE,2390
 otter_service_stdalone/grade_notebooks.py,sha256=s-nequcOnpsZD4aQeUx_EFbnfKurVj7J8oCTK6Dix1E,3596
 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/scripts/web_socket.js,sha256=xoG7kt5xU9jS1vqw7_NuPLShzEqHXtQyaCnmvhCOrUk,6081
+otter_service_stdalone/util.py,sha256=ptsV1_W-IwpBVVk9oPJWNjaqdh8DJKWVpVqXHaQrUO0,1324
+otter_service_stdalone/scripts/web_socket.js,sha256=VYbwPE6is1BINQ9ToY1HS3I6VWWIVcpCi1sVmxaxdwg,6209
 otter_service_stdalone/secrets/gh_key.dev.yaml,sha256=ORUVDu8SDcv0OE2ThwROppeg7y8oLkJJbPTCMn0s5l0,1138
 otter_service_stdalone/secrets/gh_key.local.yaml,sha256=NtPXXyGf1iSgJ9Oa2ahvIEf_fcmflB3dwd3LWyCgxis,1138
 otter_service_stdalone/secrets/gh_key.prod.yaml,sha256=6vgLqHzDp8cVAOJlpSXGDTUjSI6EyCb6f1-SSVG2rqw,1138
@@ -14,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.7.dist-info/METADATA,sha256=Lc6rrx3zJDV1Ops-iRN04Q6NLfATZfYHlnHLeuM880g,1467
-otter_service_stdalone-1.1.7.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-otter_service_stdalone-1.1.7.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-1.1.7.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-1.1.7.dist-info/RECORD,,
+otter_service_stdalone-1.1.9.dist-info/METADATA,sha256=wKJrBRrfS6-09EtWyq6P4m1Ba7o5ltbat8UUhnyiOH8,1467
+otter_service_stdalone-1.1.9.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+otter_service_stdalone-1.1.9.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
+otter_service_stdalone-1.1.9.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
+otter_service_stdalone-1.1.9.dist-info/RECORD,,