From 4dde78c9ccc2f73d92d39fb5a4ddbcbac8101c7e Mon Sep 17 00:00:00 2001 From: prem Date: Thu, 6 Jul 2023 18:40:38 +0000 Subject: [PATCH 1/4] Adding option to save without package. --- audiotools/ml/layers/base.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/audiotools/ml/layers/base.py b/audiotools/ml/layers/base.py index 586dbe2e..b82c96cd 100644 --- a/audiotools/ml/layers/base.py +++ b/audiotools/ml/layers/base.py @@ -238,6 +238,7 @@ def save_to_folder( self, folder: typing.Union[str, Path], extra_data: dict = None, + package: bool = True, ): """Dumps a model into a folder, as both a package and as weights, as well as anything specified in @@ -271,10 +272,11 @@ def save_to_folder( target_base = Path(f"{folder}/{model_name}/") target_base.mkdir(exist_ok=True, parents=True) - package_path = target_base / f"package.pth" - weights_path = target_base / f"weights.pth" + if package: + package_path = target_base / f"package.pth" + self.save(package_path) - self.save(package_path) + weights_path = target_base / f"weights.pth" self.save(weights_path, package=False) for path, obj in extra_data.items(): From 417383f4472ec5a59d51362cb9ade070dc2848c4 Mon Sep 17 00:00:00 2001 From: Alejandro Luebs Date: Fri, 7 Jul 2023 22:56:13 +0000 Subject: [PATCH 2/4] Update from deprecated importlib_resources.read_text to importlib_resources.files --- audiotools/__init__.py | 2 +- audiotools/core/playback.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audiotools/__init__.py b/audiotools/__init__.py index 157971f1..66ae138e 100644 --- a/audiotools/__init__.py +++ b/audiotools/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.7.1" +__version__ = "0.7.2" from .core import AudioSignal from .core import STFTParams from .core import Meter diff --git a/audiotools/core/playback.py b/audiotools/core/playback.py index 61262b93..e44dd6c2 100644 --- a/audiotools/core/playback.py +++ b/audiotools/core/playback.py @@ -16,8 +16,8 @@ from .util import _close_temp_files from .util import format_figure -headers = pkg_resources.read_text(templates, "headers.html") -widget = pkg_resources.read_text(templates, "widget.html") +headers = pkg_resources.files(templates).joinpath("headers.html").read_text() +widget = pkg_resources.files(templates).joinpath("widget.html").read_text() DEFAULT_EXTENSION = ".wav" diff --git a/setup.py b/setup.py index 75a2de27..4a845d88 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name="descript-audiotools", - version="0.7.1", + version="0.7.2", classifiers=[ "Intended Audience :: Developers", "Intended Audience :: Education", From cd92fead5d1155d964badfe2ac7db90429b810d6 Mon Sep 17 00:00:00 2001 From: Alejandro Luebs Date: Mon, 10 Jul 2023 19:39:16 +0000 Subject: [PATCH 3/4] Add tests for python version 3.9 --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c682ad5d..9ea4b497 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 From 1fc25dc007380e8b2ad5d16025c6d9eaee13fc37 Mon Sep 17 00:00:00 2001 From: Alejandro Luebs Date: Tue, 11 Jul 2023 23:28:37 +0000 Subject: [PATCH 4/4] Remove temporary file when resampling --- audiotools/core/ffmpeg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/audiotools/core/ffmpeg.py b/audiotools/core/ffmpeg.py index dba47e97..bbd350b8 100644 --- a/audiotools/core/ffmpeg.py +++ b/audiotools/core/ffmpeg.py @@ -136,6 +136,7 @@ def ffmpeg_resample(self, sample_rate: int, quiet: bool = True): command += " -hide_banner -loglevel error" subprocess.check_call(shlex.split(command)) resampled = AudioSignal(f_out) + Path.unlink(Path(f_out)) return resampled @classmethod