From bed7a31aefa49eef38e064c32d329e922d678f37 Mon Sep 17 00:00:00 2001 From: mbsantiago Date: Wed, 9 Oct 2024 19:17:54 +0100 Subject: [PATCH] Update docs --- back/pyproject.toml | 1 + back/src/whombat/api/features.py | 2 +- back/src/whombat/api/notes.py | 1 + back/src/whombat/api/tags.py | 2 +- back/src/whombat/api/users.py | 1 + back/src/whombat/routes/dependencies/users.py | 2 +- back/tests/conftest.py | 3 ++- back/tests/test_api/test_datasets.py | 2 +- back/uv.lock | 11 +++++++++++ 9 files changed, 20 insertions(+), 5 deletions(-) diff --git a/back/pyproject.toml b/back/pyproject.toml index fc88ecb3..d424d5c9 100644 --- a/back/pyproject.toml +++ b/back/pyproject.toml @@ -17,6 +17,7 @@ dependencies = [ "alembic>=1.13.2", "bcrypt==4.0.1", "colorama>=0.4.6", + "setuptools>=75.1.0", ] requires-python = ">=3.11" readme = "README.md" diff --git a/back/src/whombat/api/features.py b/back/src/whombat/api/features.py index 60d497d0..00040f3a 100644 --- a/back/src/whombat/api/features.py +++ b/back/src/whombat/api/features.py @@ -163,7 +163,7 @@ def to_soundevent( The soundevent feature object. """ return data.Feature( - name=feature.name, + term=data.term_from_key(feature.name), value=feature.value, ) diff --git a/back/src/whombat/api/notes.py b/back/src/whombat/api/notes.py index 5eedb390..968f5a25 100644 --- a/back/src/whombat/api/notes.py +++ b/back/src/whombat/api/notes.py @@ -134,6 +134,7 @@ def to_soundevent( email=user.email, username=user.username, name=user.name, + institution=None, ) return data.Note( diff --git a/back/src/whombat/api/tags.py b/back/src/whombat/api/tags.py index 5db2c847..5a2c2292 100644 --- a/back/src/whombat/api/tags.py +++ b/back/src/whombat/api/tags.py @@ -133,7 +133,7 @@ def to_soundevent( The soundevent tag object. """ return data.Tag( - key=tag.key, + term=data.term_from_key(tag.key), value=tag.value, ) diff --git a/back/src/whombat/api/users.py b/back/src/whombat/api/users.py index 68973fbe..eb4dedb0 100644 --- a/back/src/whombat/api/users.py +++ b/back/src/whombat/api/users.py @@ -257,6 +257,7 @@ def to_soundevent( username=obj.username, email=obj.email, name=obj.name, + institution=None, ) def _get_pk_condition(self, pk: UUID): diff --git a/back/src/whombat/routes/dependencies/users.py b/back/src/whombat/routes/dependencies/users.py index 77eec887..10f39812 100644 --- a/back/src/whombat/routes/dependencies/users.py +++ b/back/src/whombat/routes/dependencies/users.py @@ -15,7 +15,7 @@ async def get_user_db(session: Session) -> AsyncGenerator[UserDatabase, None]: - """Get the user database.""" "" + """Get the user database.""" yield UserDatabase(session, models.User) diff --git a/back/tests/conftest.py b/back/tests/conftest.py index d0850ea4..3e2a5174 100644 --- a/back/tests/conftest.py +++ b/back/tests/conftest.py @@ -1,4 +1,5 @@ -"""Common fixtures for Whombat tests.""" "" +"""Common fixtures for Whombat tests.""" + import logging import os import random diff --git a/back/tests/test_api/test_datasets.py b/back/tests/test_api/test_datasets.py index d3d839ff..1644bef8 100644 --- a/back/tests/test_api/test_datasets.py +++ b/back/tests/test_api/test_datasets.py @@ -29,7 +29,7 @@ async def test_dataset_is_stored_with_relative_audio_dir( session: AsyncSession, audio_dir: Path, ): - """Test that a dataset is stored with a relative audio dir.""" "" + """Test that a dataset is stored with a relative audio dir.""" dataset_audio_dir = audio_dir / "dataset_audio_dir" dataset_audio_dir.mkdir() dataset = await api.datasets.create( diff --git a/back/uv.lock b/back/uv.lock index bad189e4..9629fc8f 100644 --- a/back/uv.lock +++ b/back/uv.lock @@ -2042,6 +2042,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f5/1b/6ee032251bf4cdb0cc50059374e86a9f076308c1512b61c4e003e241efb7/scipy-1.14.1-cp313-cp313-win_amd64.whl", hash = "sha256:baff393942b550823bfce952bb62270ee17504d02a1801d7fd0719534dfb9c84", size = 44469524 }, ] +[[package]] +name = "setuptools" +version = "75.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/27/b8/f21073fde99492b33ca357876430822e4800cdf522011f18041351dfa74b/setuptools-75.1.0.tar.gz", hash = "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538", size = 1348057 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ff/ae/f19306b5a221f6a436d8f2238d5b80925004093fa3edea59835b514d9057/setuptools-75.1.0-py3-none-any.whl", hash = "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2", size = 1248506 }, +] + [[package]] name = "shapely" version = "2.0.6" @@ -2487,6 +2496,7 @@ dependencies = [ { name = "fastapi-users", extra = ["sqlalchemy"] }, { name = "passlib" }, { name = "pydantic-settings" }, + { name = "setuptools" }, { name = "soundevent", extra = ["all"] }, { name = "uvicorn", extra = ["standard"] }, ] @@ -2531,6 +2541,7 @@ requires-dist = [ { name = "passlib", specifier = ">=1.7.4" }, { name = "psycopg2-binary", marker = "extra == 'postgre'", specifier = ">=2.9.9" }, { name = "pydantic-settings", specifier = ">=2.4.0" }, + { name = "setuptools", specifier = ">=75.1.0" }, { name = "soundevent", extras = ["all"], specifier = ">=2.1.1" }, { name = "uvicorn", extras = ["standard"], specifier = ">=0.30.6" }, ]