otter-service-stdalone 0.0.51__py3-none-any.whl → 0.0.55__py3-none-any.whl

otter_service_stdalone/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.51"
+__version__ = "0.0.55"

otter_service_stdalone/app.py

@@ -11,13 +11,32 @@ import async_timeout
 __UPLOADS__ = "/tmp/uploads"
 
 class GradeNotebooks():
+    def get_otter_version(self, auto_path):
+        zip_folder = auto_path.split(".")[0]
+        with ZipFile(auto_path, 'r') as zObject:
+            zObject.extractall(path=zip_folder)
+        with open(f"{zip_folder}/requirements.txt") as file:
+            for line in file:
+                if "otter-grader" in line:
+                    version = line.split("==")[1].split(".")[0]
+                    log.write_logs("Preparation: Grading", f"Otter Version: {version}", "info", f'{os.environ.get("ENVIRONMENT")}-logs')
+                    if int(version) < 3:
+                        log.write_logs("Preparation: Grading", f"Otter Version less than 3: {version} - changed to version 3", "info", f'{os.environ.get("ENVIRONMENT")}-logs')
+                        version = "3"
+                    
+                    return version
+        return Exception("Otter-Grader version not found in requirements")
+    
     async def grade(self, p, notebooks_zip):
         try:
             zip_folder = notebooks_zip.split(".")[0]
             with ZipFile(notebooks_zip, 'r') as zObject:
                 zObject.extractall(path=zip_folder)
             
+            otter_version = self.get_otter_version(p)
+            path = f"/etc/venv-otter{otter_version}/bin/python3"
             command = [
+                path, "-m"
                 'otter', 'grade',
                 '-a', p,
                 '-p', zip_folder,
@@ -100,7 +119,6 @@ class Upload(tornado.web.RequestHandler):
         autograder = self.request.files['autograder'][0] if "autograder" in files else None
         notebooks = self.request.files['notebooks'][0] if "notebooks" in files else None
         if autograder is not None and notebooks is not None:
-            print("fileinfo is: ", autograder)
             notebooks_fname = notebooks['filename']
             notebooks_extn = os.path.splitext(notebooks_fname)[1]
             results_path = str(uuid.uuid4())

{otter_service_stdalone-0.0.51.dist-info → otter_service_stdalone-0.0.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter-service-stdalone
-Version: 0.0.51
+Version: 0.0.55
 Summary: Grading Service for Instructors using Otter Grader
 Home-page: https://github.com/sean-morris/otter-service-stdalone
 Author: Sean Morris

otter_service_stdalone-0.0.55.dist-info/RECORD

@@ -0,0 +1,9 @@
+otter_service_stdalone/__init__.py,sha256=jXOOiiBG8YrcSzw2nujXNZ67Lc4_BDh5cva6CjfFnJo,23
+otter_service_stdalone/app.py,sha256=31AeZ6ozyxm70rRJABj2SJMj5sWjBHi7DfyYpX83qmU,7467
+otter_service_stdalone/fs_logging.py,sha256=BaigFMwt277bW-MXnQKvmiBiyYBNxNRQz_ilPoxcO-w,1734
+otter_service_stdalone/index.html,sha256=Kxg-itiwyIRvnqjOYBB8Sa73WczkE601jptOfXlIM3w,6024
+otter_service_stdalone-0.0.55.dist-info/METADATA,sha256=dCzQxCRT0vf2wD5pCFz16hzp0GXeXKcrEqG32FMDW7I,1345
+otter_service_stdalone-0.0.55.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+otter_service_stdalone-0.0.55.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
+otter_service_stdalone-0.0.55.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
+otter_service_stdalone-0.0.55.dist-info/RECORD,,

{otter_service_stdalone-0.0.51.dist-info → otter_service_stdalone-0.0.55.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

otter_service_stdalone-0.0.51.dist-info/RECORD

@@ -1,9 +0,0 @@
-otter_service_stdalone/__init__.py,sha256=a8pM17WeWYYAxbOZmoVZmj8DiMfrW4RCZSq3ceZABpM,23
-otter_service_stdalone/app.py,sha256=lZiWeILzK0W_GytBERMxxcdu6na5xisN6gZJVDRYkLg,6456
-otter_service_stdalone/fs_logging.py,sha256=BaigFMwt277bW-MXnQKvmiBiyYBNxNRQz_ilPoxcO-w,1734
-otter_service_stdalone/index.html,sha256=Kxg-itiwyIRvnqjOYBB8Sa73WczkE601jptOfXlIM3w,6024
-otter_service_stdalone-0.0.51.dist-info/METADATA,sha256=ECq4wPScSKTEYAliqyIe4GGPBTSm91W-XmrWSc5RdJM,1345
-otter_service_stdalone-0.0.51.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-otter_service_stdalone-0.0.51.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-0.0.51.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-0.0.51.dist-info/RECORD,,