e2xauthoring 0.3.0.dev0__tar.gz → 0.3.0.dev1__tar.gz

{e2xauthoring-0.3.0.dev0 → e2xauthoring-0.3.0.dev1}/PKG-INFO

@@ -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 → e2xauthoring-0.3.0.dev1}/docs/source/conf.py

@@ -9,7 +9,7 @@
 project = "e2xauthoring"
 copyright = "2023, Tim Metzler"
 author = "Tim Metzler"
-release = "0.3.0-dev0"
+release = "0.3.0-dev1"
 github_project_url = "https://github.com/Digiklausur/e2xauthoring"
 
 # -- General configuration ---------------------------------------------------

e2xauthoring-0.3.0.dev1/e2xauthoring/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.3.0-dev1"

{e2xauthoring-0.3.0.dev0 → e2xauthoring-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-0.3.0.dev0 → e2xauthoring-0.3.0.dev1}/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 → e2xauthoring-0.3.0.dev1}/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "e2xauthoring",
-  "version": "0.3.0-dev0",
+  "version": "0.3.0-dev1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "e2xauthoring",
-      "version": "0.3.0-dev0",
+      "version": "0.3.0-dev1",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
@@ -24431,7 +24431,7 @@
     },
     "packages/api": {
       "name": "@e2xauthoring/api",
-      "version": "0.3.0-dev0",
+      "version": "0.3.0-dev1",
       "license": "MIT",
       "devDependencies": {
         "webpack": "^5.73.0",
@@ -24440,9 +24440,9 @@
     },
     "packages/app": {
       "name": "@e2xauthoring/app",
-      "version": "0.3.0-dev0",
+      "version": "0.3.0-dev1",
       "dependencies": {
-        "@e2xauthoring/api": "0.3.0-dev0",
+        "@e2xauthoring/api": "0.3.0-dev1",
         "@emotion/react": "^11.10.0",
         "@emotion/styled": "^11.10.0",
         "@fontsource/roboto": "^4.5.8",
@@ -25836,7 +25836,7 @@
     "@e2xauthoring/app": {
       "version": "file:packages/app",
       "requires": {
-        "@e2xauthoring/api": "0.3.0-dev0",
+        "@e2xauthoring/api": "0.3.0-dev1",
         "@emotion/react": "^11.10.0",
         "@emotion/styled": "^11.10.0",
         "@fontsource/roboto": "^4.5.8",

{e2xauthoring-0.3.0.dev0 → e2xauthoring-0.3.0.dev1}/package.json

@@ -4,7 +4,7 @@
   "workspaces": [
     "packages/*"
   ],
-  "version": "0.3.0-dev0",
+  "version": "0.3.0-dev1",
   "description": "An app for e2xgrader",
   "scripts": {
     "install": "lerna run bootstrap",

{e2xauthoring-0.3.0.dev0 → e2xauthoring-0.3.0.dev1}/pyproject.toml

@@ -58,7 +58,7 @@ artifacts = [
 github_url = "https://github.com/Digiklausur/e2xauthoring/"
 
 [tool.tbump.version]
-current = "0.3.0-dev0"
+current = "0.3.0-dev1"
 
 regex = '''
   (?P<major>\d+)

e2xauthoring-0.3.0.dev0/e2xauthoring/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.3.0-dev0"