otter-service-stdalone 0.1.5__py3-none-any.whl → 0.1.8__py3-none-any.whl

otter_service_stdalone/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.8"

otter_service_stdalone/app.py

@@ -8,10 +8,21 @@ from otter_service_stdalone import fs_logging as log
 from zipfile import ZipFile, ZIP_DEFLATED
 import asyncio
 import async_timeout
+import shutil
 
 __UPLOADS__ = "/tmp/uploads"
 
 
+def copySubDirNotebooksToParentDir(parent_dir):
+    for root, dirs, files in os.walk(parent_dir):
+        for directory in dirs:
+            print(f"Subdirectory: {os.path.join(root, directory)}")
+            dir_path = os.path.join(root, directory)
+            for f in os.listdir(dir_path):
+                if os.path.isfile(f):
+                    shutil.move(f, parent_dir)
+
+
 class GradeNotebooks():
     async def grade(self, p, notebooks_zip):
         try:
@@ -19,6 +30,8 @@ class GradeNotebooks():
             with ZipFile(notebooks_zip, 'r') as zObject:
                 zObject.extractall(path=zip_folder)
 
+            copySubDirNotebooksToParentDir(zip_folder)
+
             command = [
                 'otter', 'grade',
                 '-a', p,

{otter_service_stdalone-0.1.5.dist-info → otter_service_stdalone-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter-service-stdalone
-Version: 0.1.5
+Version: 0.1.8
 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.1.8.dist-info/RECORD

@@ -0,0 +1,9 @@
+otter_service_stdalone/__init__.py,sha256=C69ADlbQREQlR15trneyA2sk8x0-oH4rDAX5fsv19_U,22
+otter_service_stdalone/app.py,sha256=9kWJvEJc4xRmqm2gz3JK5Nnzpm3KzRxiGUmg7bSkHKw,6799
+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.1.8.dist-info/METADATA,sha256=50KrjD0N9P_rzxMpst97SIRYfg6L6VCq0rxVnhu5k1Q,1344
+otter_service_stdalone-0.1.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+otter_service_stdalone-0.1.8.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
+otter_service_stdalone-0.1.8.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
+otter_service_stdalone-0.1.8.dist-info/RECORD,,

otter_service_stdalone-0.1.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-otter_service_stdalone/__init__.py,sha256=rPSfWgIeq2YWVPyESOAwCBt8vftsTpIkuLAGDEzyRQc,22
-otter_service_stdalone/app.py,sha256=wAsJ6sNcxX7Yqbl6Q0x44H7BgRp7QSmOIPwDu_uN_1k,6349
-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.1.5.dist-info/METADATA,sha256=WFhfb0dZjQhhde2yZM_SE_0xuL3_U9z9WlkcOraBT2I,1344
-otter_service_stdalone-0.1.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-otter_service_stdalone-0.1.5.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-0.1.5.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-0.1.5.dist-info/RECORD,,