e2xauthoring 0.3.0.dev0__py3-none-any.whl → 0.3.0.dev1__py3-none-any.whl

e2xauthoring/__version__.py

@@ -1 +1 @@
-__version__ = "0.3.0-dev0"
+__version__ = "0.3.0-dev1"

e2xauthoring/managers/taskmanager.py

@@ -128,12 +128,23 @@ class TaskManager(BaseManager):
         tasks = []
         path = os.path.join(self.base_path, pool)
         assert os.path.exists(path), f"No pool with the name {pool} exists."
-        for task_dir in self.listdir(os.path.join(self.base_path, pool)):
-            points, n_questions = await self.__get_task_info(task_dir, pool)
-            git_status = await asyncio.to_thread(self.git_status, pool, task_dir)
+
+        coroutines = []
+        task_dirs = self.listdir(os.path.join(self.base_path, pool))
+
+        for task_dir in task_dirs:
+            coroutines.append(self.__get_task_info(task_dir, pool))
+            coroutines.append(asyncio.to_thread(self.git_status, pool, task_dir))
+
+        results = await asyncio.gather(*coroutines)
+
+        for i, task_dir in enumerate(task_dirs):
+            points, n_questions = results[i * 2]
+            git_status = results[i * 2 + 1]
 
             if "repo" in git_status:
                 del git_status["repo"]
+
             tasks.append(
                 Task(
                     name=task_dir,
@@ -143,15 +154,24 @@ class TaskManager(BaseManager):
                     git_status=git_status,
                 )
             )
+
         return tasks
 
     async def list_all(self):
         pool_manager = TaskPoolManager(self.coursedir)
         tasks = []
         pool_list = await pool_manager.list()
-        for pool in pool_list:
-            pool_tasks = await self.list(pool.name)
+
+        # Collect all coroutines
+        coroutines = [self.list(pool.name) for pool in pool_list]
+
+        # Run them concurrently
+        results = await asyncio.gather(*coroutines)
+
+        # Flatten the list of results
+        for pool_tasks in results:
             tasks.extend(pool_tasks)
+
         return tasks
 
     def copy(self, old_name: str, new_name: str, pool: str = ""):

e2xauthoring/managers/taskpoolmanager.py

@@ -61,13 +61,25 @@ class TaskPoolManager(BaseManager):
         if not os.path.exists(self.base_path):
             self.log.warning("The pool directory does not exist.")
             os.makedirs(self.base_path, exist_ok=True)
+
         pool_dirs = await asyncio.to_thread(self.listdir, self.base_path)
         tasks = []
+        coroutines = []
+
         for pool_dir in pool_dirs:
-            n_tasks = await self.__get_n_tasks(pool_dir)
-            is_repo = await asyncio.to_thread(
-                is_version_controlled, os.path.join(self.base_path, pool_dir)
+            coroutines.append(self.__get_n_tasks(pool_dir))
+            coroutines.append(
+                asyncio.to_thread(
+                    is_version_controlled, os.path.join(self.base_path, pool_dir)
+                )
             )
+
+        results = await asyncio.gather(*coroutines)
+
+        for i, pool_dir in enumerate(pool_dirs):
+            n_tasks = results[i * 2]
+            is_repo = results[i * 2 + 1]
+
             tasks.append(
                 TaskPool(
                     name=pool_dir,
@@ -75,4 +87,5 @@ class TaskPoolManager(BaseManager):
                     is_repo=is_repo,
                 )
             )
+
         return tasks

{e2xauthoring-0.3.0.dev0.dist-info → e2xauthoring-0.3.0.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: e2xauthoring
-Version: 0.3.0.dev0
+Version: 0.3.0.dev1
 Summary: Authoring app for e2xgrader
 Project-URL: Source, https://github.com/Digiklausur/e2xauthoring
 Project-URL: Documentation, https://e2xauthoring.readthedocs.io/en/latest/

{e2xauthoring-0.3.0.dev0.dist-info → e2xauthoring-0.3.0.dev1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 e2xauthoring/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-e2xauthoring/__version__.py,sha256=AxGm3rA12a_EMYIbjJVflPoPHS80Eh_UsvtfGZawwhI,27
+e2xauthoring/__version__.py,sha256=tgUijMYyAGuaPfiCpkMqY-poIEf3SOv-hE8By80rRUs,27
 e2xauthoring/app/__init__.py,sha256=dAcKvUKQEUD4RGfiabBdpmFe0wadDaVF5V1V4856cL4,64
 e2xauthoring/app/authoring.py,sha256=5y5gDU2qdn02pEcgmUDpE-eAr3Yw9QdnwC_desqEEqA,1000
 e2xauthoring/app/handlers/apihandlers.py,sha256=-bFgPK3W1-EEa5jc3-XP6M1qiKgyqIoR3AuzRNNI_44,3794
@@ -18,8 +18,8 @@ e2xauthoring/managers/__init__.py,sha256=eiaIwWVsM7vt_zALnPaBImK1nsrys9JUB2Bm97r
 e2xauthoring/managers/assignmentmanager.py,sha256=rtnq89ZoiQESgSo9z0vv1v2g3kPOByqhHep3A5ZoxKw,1067
 e2xauthoring/managers/base.py,sha256=V0S-Aqk-ZBlJo5Q33-cIGfr0ErW4EQIspTMvUYlb1pI,1654
 e2xauthoring/managers/presetmanager.py,sha256=4xn3Ct_jxQt2FI2hbMlNnZoqTcGMEqUCGXxkgmsY_28,2714
-e2xauthoring/managers/taskmanager.py,sha256=FWLRWVumXBcxywM3ZgUsfgaWkLJdNA0fKBfAZG0ZIbA,6646
-e2xauthoring/managers/taskpoolmanager.py,sha256=GJkaIKIaxYF6W_54Zr4OYry12nMPRn8QAk17qTLCFbw,2751
+e2xauthoring/managers/taskmanager.py,sha256=QRc8JQm9f4OW7IKsRGJH5munRQTObUUwkiqBWcA2uEU,7068
+e2xauthoring/managers/taskpoolmanager.py,sha256=Qpsg5aMPvBltkrf5sC2Ht-D8bsfIUA5GiQRtE6hZ0Go,3004
 e2xauthoring/managers/templatemanager.py,sha256=0cW4PHt_BJ0Fsvvmg-iCuvYvEEfiVwcLCIFM60N082w,2692
 e2xauthoring/managers/worksheetmanager.py,sha256=tAEZGH1C3KzGIF69TBzKjUtZX9MiFfkSYuDyhppqvJk,1687
 e2xauthoring/managers/dataclasses/__init__.py,sha256=6TKalTEjmtK0ZSeQ1JUKLtaojKxdFsACpLOvcY3OEUA,751
@@ -46,7 +46,7 @@ e2xauthoring/preprocessors/removeexercise.py,sha256=ZVCy_92BjiSNfkWC0Z72dSUd1o7E
 e2xauthoring/utils/__init__.py,sha256=ORm5Z51bACVUChgBBzJtjPF4elHUveoyFmE0cuctTK4,106
 e2xauthoring/utils/gitutils.py,sha256=AJedjYwtlHBpbhgQfS-_fs_wgU4O0WqPAEfuwovP9g8,5941
 e2xauthoring/utils/notebookvariableextractor.py,sha256=E9oxz6TA3rTq2Ye1uDj0QJe1sZsTZgANfEagwv1WKH0,397
-e2xauthoring-0.3.0.dev0.dist-info/METADATA,sha256=KoDEtSiT6h6de164lPidP_ufxxFEr06jVOzs6Q3BCTk,2155
-e2xauthoring-0.3.0.dev0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-e2xauthoring-0.3.0.dev0.dist-info/licenses/LICENSE,sha256=lbgSaWqrEqIf7B9gj3dpxM7PvrKgpEND3REakth-zGU,1068
-e2xauthoring-0.3.0.dev0.dist-info/RECORD,,
+e2xauthoring-0.3.0.dev1.dist-info/METADATA,sha256=-TpqmDl8K2oIGOUbqJ161OSGpnkTGZC2PWRvmX3slgk,2155
+e2xauthoring-0.3.0.dev1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+e2xauthoring-0.3.0.dev1.dist-info/licenses/LICENSE,sha256=lbgSaWqrEqIf7B9gj3dpxM7PvrKgpEND3REakth-zGU,1068
+e2xauthoring-0.3.0.dev1.dist-info/RECORD,,