WIP: lib & db restructure

.gitignore

@@ -27,7 +27,6 @@ MANIFEST
 *.env
 !example.env
 !docker.env
-data/
 *.bin
 
 # custom shortcut files

pyproject.toml

@@ -29,8 +29,24 @@ repository = "https://github.com/zerospeech/vocolab"
 voco = "vocolab.admin.main:run_cli"
 
 [project.optional-dependencies]
+
+extras = [
+    # todo migrate towards normal install when package is published
+    "vocolab-ext @ https://github.com/zerospeech/vocolab-ext/archive/master.zip"
+]
+
+eval = [
+    "vocolab[extras]",
+    "celery",
+]
+
+zerospeech = [
+    "vocolab[extras]",
+    # todo migrate this to pip version
+    "zerospeech-benchmarks @ https://github.com/zerospeech/vocolab-ext/archive/develop.zip"
+]
+
 dev = [
-   "zerospeech-benchmarks[all]",
     "ipython",
     "jupyterlab",
     "pytest",
@@ -40,7 +56,6 @@ dev = [
 ]
 
 
-
 [build-system]
 requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"

requirements.txt

@@ -7,7 +7,7 @@ requests==2.28.2
 Jinja2==3.1.2
 gunicorn==20.1.0
 # todo: breaking update to 4.0.0
-filesplit==3.0.2
+filesplit>=4.0.1
 toml;python_version<'3.11'
 python-dateutil
 numpy

samples/benchmark.json

@@ -0,0 +1,11 @@
+[
+  {
+    "label": "test-challenge",
+    "start_date": "2022-06-30",
+    "end_date": null,
+    "url": "https://vocolab.com/challenge/test",
+    "active": false,
+    "evaluator": null,
+    "auto_eval": false
+  }
+]

samples/benchmark_list.json

@@ -0,0 +1,82 @@
+[
+  {
+    "label": "test-challenge",
+    "start_date": "2022-02-21",
+    "end_date": null,
+    "url": "https://zerospeech.com/track/test",
+    "active": true,
+    "evaluator": null,
+    "auto_eval": false
+  },
+  {
+    "label": "abx15",
+    "start_date": "2015-01-20",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_1/benchmarks_datasets/#zr2015-and-abx15",
+    "active": false,
+    "evaluator": null
+  },
+  {
+    "label": "abx17",
+    "start_date": "2017-01-20",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_1/benchmarks_datasets/#zrc2017-and-abx17",
+    "active": false,
+    "evaluator": null,
+    "auto_eval": false
+  },
+  {
+    "label": "abxLS",
+    "start_date": "2021-12-12",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_1/benchmarks_datasets/#abxls-dataset-and-benchmark",
+    "active": false,
+    "evaluator": null,
+    "auto_eval": false
+  },
+  {
+    "label": "tde15",
+    "start_date": "2015-01-20",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_2/tasks_goals/",
+    "active": false,
+    "evaluator": null,
+    "auto_eval": false
+  },
+  {
+    "label": "tde17",
+    "start_date": "2017-01-20",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_2/tasks_goals/",
+    "active": false,
+    "evaluator": null,
+    "auto_eval": false
+  },
+  {
+    "label": "sLM21",
+    "start_date": "2021-12-12",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_4/tasks_goals/",
+    "active": false,
+    "evaluator": null,
+    "auto_eval": false
+  },
+  {
+    "label": "prosAudit",
+    "start_date": "2023-02-01",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_4/tasks_goals/",
+    "active": true,
+    "evaluator": null,
+    "auto_eval": false
+  },
+  {
+    "label": "ttso19",
+    "start_date": "2019-01-20",
+    "end_date": null,
+    "url": "https://zerospeech.com/tasks/task_3/tasks_goals/",
+    "active": false,
+    "evaluator": null,
+    "auto_eval": false
+  }
+]

samples/leaderboards_list.json

@@ -0,0 +1,58 @@
+[
+  {
+    "label": "test-leaderboard",
+    "benchmark_id": 1,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  },
+  {
+    "label": "abx-15-leaderboard",
+    "benchmark_id": 2,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  },
+  {
+    "label": "abx-17-leaderboard",
+    "benchmark_id": 3,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  },
+  {
+    "label": "abx-LS-leaderboard",
+    "benchmark_id": 4,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  },
+  {
+    "label": "sLM21-leaderboard",
+    "benchmark_id": 7,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  },
+  {
+    "label": "tde-15-leaderboard",
+    "benchmark_id": 5,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  },
+  {
+    "label": "tde-17-leaderboard",
+    "benchmark_id": 6,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  },
+  {
+    "label": "tts0-leaderboard",
+    "benchmark_id": 8,
+    "archived": false,
+    "static_files": false,
+    "sorting_key": null
+  }
+]

tests/fixtures/db.py

@@ -1,11 +1,11 @@
 import pytest
 
-from vocolab.db import zrDB, create_db
+from vocolab.data.db import zrDB, build_database_from_schema
 
 
 @pytest.fixture(scope="session")
 async def db():
-    create_db()
+    build_database_from_schema()
     # connect to Database
     await zrDB.connect()