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

otter_service_stdalone/__init__.py

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

otter_service_stdalone/app.py

@@ -9,7 +9,7 @@ from otter_service_stdalone import fs_logging as log
 from otter_service_stdalone import user_auth as u_auth
 from otter_service_stdalone import grade_notebooks
 from zipfile import ZipFile, ZIP_DEFLATED
-import queue
+from multiprocessing import Queue
 
 
 __UPLOADS__ = "/tmp/uploads"
@@ -40,14 +40,14 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
         pass  # No action needed on incoming message
 
     def on_close(self):
-        """stop the periodic classback on close
+        """stop the periodic callback on close
         """
         close_code = self.close_code
         close_reason = self.close_reason
-        log.write_logs("socket", close_code, f"{close_code}: {close_reason}", "debug", log_debug)
         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)
                 session_callbacks[user_id].stop()
                 session_callbacks.pop(user_id)
 
@@ -67,7 +67,9 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
                                 user_messages_dict[result_id].append(q.get())
                             self.write_message({"messages": user_messages_dict})
         except tornado.websocket.WebSocketClosedError:
-            log.write_logs("ws-error", "Web Socket Problem", "", "", log_error)
+            log.write_logs("ws-error", "Web Socket Close Error", "", "", log_error)
+        except Exception:
+            log.write_logs("ws-error", "Web Socket Error", "", "", log_error)
 
 
 class HealthHandler(tornado.web.RequestHandler):
@@ -230,7 +232,7 @@ class Upload(BaseHandler):
 
     Args:
         tornado (tornado.web.RequestHandler): The upload request handler
-    """        
+    """
     @tornado.web.authenticated
     def get(self):
         # this just redirects to login and displays main page
@@ -279,7 +281,7 @@ class Upload(BaseHandler):
             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.Queue()
+                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:
@@ -291,6 +293,44 @@ class Upload(BaseHandler):
             self.render("index.html", message=m)
 
 
+class RemoveProgressHandler(BaseHandler):
+    """This handles requests to remove progress on a specific submission
+
+    Args:
+        tornado (tornado.web.RequestHandler): 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
+        self.render("index.html", message=None)
+
+    @tornado.web.authenticated
+    def delete(self, result_id):
+        """this handles the post request and asynchronously launches the grader
+        """
+        user = self.get_current_user()
+        user_id = user.decode('utf-8')
+        log.write_logs(result_id, f"Deleting Result: {result_id}", "", "debug", log_debug)
+        if user_id in session_queues and result_id in session_queues[user_id]:
+            del session_queues[user_id][result_id]
+        if user_id in session_messages and result_id in session_messages[user_id]:
+            del session_messages[user_id][result_id]
+
+        self.write({'message': f'Item {result_id} removed successfully'})
+        self.set_status(200)
+
+
 settings = {
     "cookie_secret": str(uuid.uuid4()),
     "xsrf_cookies": True,
@@ -303,6 +343,7 @@ application = tornado.web.Application([
         (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")}),

otter_service_stdalone/grade_notebooks.py

@@ -2,6 +2,8 @@ import asyncio
 from otter_service_stdalone import fs_logging as log, upload_handle as uh
 import os
 from otter.grade import main as grade
+from multiprocessing import Process
+from tornado.ioloop import PeriodicCallback
 
 log_debug = f'{os.environ.get("ENVIRONMENT")}-debug'
 log_count = f'{os.environ.get("ENVIRONMENT")}-count'
@@ -12,7 +14,7 @@ class GradeNotebooks():
     """The class contains the async grade method for executing
         otter grader as well as a function for logging the number of 
         notebooks to be graded
-    """    
+    """
     def count_ipynb_files(self, directory, extension):
         """this count the files for logging purposes"""
         count = 0
@@ -47,28 +49,38 @@ class GradeNotebooks():
                            f"Notebook Folder: {notebook_folder}",
                            "debug",
                            log_debug)
+            p = Process(target=grade,
+                        kwargs = {
+                            "name": "grader",
+                            "autograder": p,
+                            "paths": (notebook_folder,),
+                            "containers": 10,
+                            "timeout": 300,
+                            "ext": "ipynb",
+                            "output_dir": notebook_folder,
+                            "result_queue": user_queue,
+                            "summaries": True,
+                        }
+                        )
+            p.start()
 
-            await grade(
-                name='grader',
-                autograder=p,
-                paths=(notebook_folder,),
-                containers=10,
-                timeout=300,
-                ext="ipynb",
-                output_dir=notebook_folder,
-                result_queue=user_queue
-            )
-            user_queue.put("Results available for download")
+            # Periodically check if the process is alive
+            def check_if_finished():
+                if not p.is_alive():
+                    log.write_logs(results_id, "Step 6: Grading: Finished",
+                                   f"{notebook_folder}",
+                                   "debug",
+                                   log_debug)
+                    log.write_logs(results_id, f"Grading: Finished: {notebook_folder}",
+                                   "",
+                                   "info",
+                                   log_error)
+                    periodic_callback.stop()
+                    return True
+
+            periodic_callback = PeriodicCallback(check_if_finished, 500)
+            periodic_callback.start()
 
-            log.write_logs(results_id, "Step 6: Grading: Finished",
-                           f"{notebook_folder}",
-                           "debug",
-                           log_debug)
-            log.write_logs(results_id, f"Grading: Finished: {notebook_folder}",
-                           "",
-                           "info",
-                           log_error)
-            return True
         except asyncio.TimeoutError:
             raise Exception(f'Grading timed out for {notebook_folder}')
         except Exception as e:

otter_service_stdalone/index.html

@@ -1,6 +1,6 @@
 <html>
 <head> 
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <title>Upload Form</title>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
 <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
@@ -18,12 +18,18 @@
       width: auto; 
       margin-bottom: 10px; 
   }
-
+  .fa-minus-circle, .fa-plus-circle {
+    position: relative;
+    top: 5px;
+    right: 4px
+  }
   /* Styles for the header */
   .header {
       background-color: #f1f1f1;
       padding: 10px;
       cursor: pointer;
+      display: flex;
+      justify-content: space-between
   }
 
   /* Styles for the content */
@@ -33,6 +39,17 @@
       padding: 10px;
       display: none;
   }
+  .close-btn {
+    background-color: transparent;
+    border: none;
+    font-size: 24px;
+    cursor: pointer;
+    margin-left: auto;
+  }
+
+  .close-btn:hover {
+    color: red;
+  }
 
 
 </style>

otter_service_stdalone/scripts/web_socket.js

@@ -61,14 +61,18 @@ function _setUpNewSubmission(submission_key, index, messages){
     newMessageHeader.id = "header-" + submission_key
     var toggleSign =  document.createElement("span");
     var submissionHeader =  document.createElement("span");
+    var closeBtn = document.createElement("button")
     submissionHeader.innerHTML = " Submission Progress: Submission #" + (index+1)
     submissionHeader.id = "sub-header-" + submission_key
+    closeBtn.className = "close-btn"
+    closeBtn.innerHTML = "×"
     newMessage.className = "collapsible"
     newMessageHeader.className = "header"
     toggleSign.innerHTML = '<i class="fas fa-minus-circle"></i>';
   
     newMessageHeader.appendChild(toggleSign)
     newMessageHeader.appendChild(submissionHeader)
+    newMessageHeader.appendChild(closeBtn)
     newMessageContent.className = "content"
     newMessageContent.style.display = "block"
     newMessage.appendChild(newMessageHeader)
@@ -83,7 +87,7 @@ function _setUpNewSubmission(submission_key, index, messages){
       newMessageContent.appendChild(li);
     }
     // Toggle the visibility of the scrollable content
-    newMessageHeader.addEventListener('click', () => {
+    newMessageHeader.addEventListener('click', (event) => {
       if (newMessageContent.style.display == 'none') {
         newMessageContent.style.display = 'block';
         toggleSign.innerHTML = '<i class="fas fa-minus-circle"></i>';
@@ -92,6 +96,35 @@ function _setUpNewSubmission(submission_key, index, messages){
         toggleSign.innerHTML = '<i class="fas fa-plus-circle"></i>';
       }
     });
+
+
+    function getXsrfToken() {
+        return document.querySelector('input[name="_xsrf"]').value
+    }
+
+    closeBtn.addEventListener('click', (event) => {
+        const removeUri = `/remove/${submission_key}`;
+        fetch(removeUri, {
+            method: 'DELETE',
+            credentials: 'include', 
+            headers: {
+                'Content-Type': 'application/json',
+                'X-XSRFToken': getXsrfToken()
+            },
+        })
+        .then(response => {
+            if (response.ok) {
+                newMessage.remove();
+            } else {
+                console.error(`Failed to remove item ${submission_key}`);
+            }
+        })
+        .catch(error => {
+            console.error('Failed to remove item:', error);
+        });
+        
+    });
+
     return newMessage;
 }
 
@@ -124,6 +157,7 @@ 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-1.1.5.dist-info → otter_service_stdalone-1.1.7.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
-otter_service_stdalone/__init__.py,sha256=KlgaVSJ1AQxCDJZgh4wFk-gpem-k9PfebW8U3hiKJD4,22
+otter_service_stdalone/__init__.py,sha256=p2qAfdU7zHOShJi2f1FW-_7Tbm0-KCPE7CI7284QiHg,22
 otter_service_stdalone/access_sops_keys.py,sha256=nboU5aZ84Elrm5vO0dMgpIF5LLcnecpNAwpxKvj6DvU,2129
-otter_service_stdalone/app.py,sha256=xawbz74KR6CVHhh-kz0rgZcRCRcYKg6gwN2QQXXzkZQ,13522
+otter_service_stdalone/app.py,sha256=D0Trfw0wwwZaJo9MKPqQptUXhFosn2bq0V_m7dLOsXg,15283
 otter_service_stdalone/fs_logging.py,sha256=IKFZkc5TmpI6G3vTYFAU9jDjQ-GT5aRxk8kdZ0h0kJE,2390
-otter_service_stdalone/grade_notebooks.py,sha256=9pi4F4y5GCXf3kEQf8hCIJyFGOHx1zb8WZd2s8TqCuU,2945
-otter_service_stdalone/index.html,sha256=egDgltPDGIgxqDiR4vXNd7xwG58poM1X98DoItKJqAA,6946
+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=qDQEIo0V8LIu1EzF9EVb3MxintVXbbR0DXO9YR7p5TY,5034
+otter_service_stdalone/scripts/web_socket.js,sha256=xoG7kt5xU9jS1vqw7_NuPLShzEqHXtQyaCnmvhCOrUk,6081
 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 +14,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.5.dist-info/METADATA,sha256=YzOu5SoRAHWjhiDbNqQzQclzIS9PcBgUDdncDU8l6u4,1467
-otter_service_stdalone-1.1.5.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-otter_service_stdalone-1.1.5.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-1.1.5.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-1.1.5.dist-info/RECORD,,
+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.5.dist-info → otter_service_stdalone-1.1.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any