analyzeAudio 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

analyzeAudio/analyzersUseFilename.py

@@ -40,7 +40,7 @@ def getSI_SDRmean(pathFilenameAlpha: str | PathLike[Any], pathFilenameBeta: str
 	return SI_SDRmean
 
 @cachetools.cached(cache=cacheAudioAnalyzers)
-def ffprobeShotgunAndCache(pathFilename: str | PathLike[Any]) -> dict[str, float | numpy.ndarray]:
+def ffprobeShotgunAndCache(pathFilename: str | PathLike[Any]) -> dict[str, float]:
 	# for lavfi amovie/movie, the colons after driveLetter letters need to be escaped twice.
 	pFn = pathlib.PureWindowsPath(pathFilename)
 	lavfiPathFilename = pFn.drive.replace(":", "\\\\:")+pathlib.PureWindowsPath(pFn.root,pFn.relative_to(pFn.anchor)).as_posix()
@@ -63,14 +63,14 @@ def ffprobeShotgunAndCache(pathFilename: str | PathLike[Any]) -> dict[str, float
 	stdoutFFprobe, _DISCARDstderr = systemProcessFFprobe.communicate()
 	FFprobeStructured = pythonizeFFprobe(stdoutFFprobe.decode('utf-8'))[-1]
 
-	dictionaryAspectsAnalyzed: dict[str, float | numpy.ndarray] = {}
+	dictionaryAspectsAnalyzed: dict[str, float] = {}
 	if 'aspectralstats' in FFprobeStructured:
 		for keyName in FFprobeStructured['aspectralstats']:
 			# No matter how many channels, each keyName is `numpy.ndarray[tuple[int, int], numpy.dtype[numpy.float64]]`
 			# where `tuple[int, int]` is (channel, frame)
 			# NOTE (as of this writing) `registrar` can only understand the generic class `numpy.ndarray` and not more specific typing
-			dictionaryAspectsAnalyzed[keyName] = FFprobeStructured['aspectralstats'][keyName]
-			# dictionaryAspectsAnalyzed[keyName] = numpy.mean(FFprobeStructured['aspectralstats'][keyName]).astype(float)
+			# dictionaryAspectsAnalyzed[keyName] = FFprobeStructured['aspectralstats'][keyName]
+			dictionaryAspectsAnalyzed[keyName] = numpy.mean(FFprobeStructured['aspectralstats'][keyName]).astype(float)
 	if 'r128' in FFprobeStructured:
 		for keyName in FFprobeStructured['r128']:
 			dictionaryAspectsAnalyzed[keyName] = FFprobeStructured['r128'][keyName][-1]
@@ -133,55 +133,55 @@ def analyzeLUFShigh(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('LRA.high')
 
 @registrationAudioAspect('Power spectral density')
-def analyzeMean(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeMean(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('mean')
 
 @registrationAudioAspect('Spectral variance')
-def analyzeVariance(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeVariance(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('variance')
 
 @registrationAudioAspect('Spectral centroid')
-def analyzeCentroid(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeCentroid(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('centroid')
 
 @registrationAudioAspect('Spectral spread')
-def analyzeSpread(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeSpread(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('spread')
 
 @registrationAudioAspect('Spectral skewness')
-def analyzeSkewness(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeSkewness(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('skewness')
 
 @registrationAudioAspect('Spectral kurtosis')
-def analyzeKurtosis(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeKurtosis(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('kurtosis')
 
 @registrationAudioAspect('Spectral entropy')
-def analyzeSpectralEntropy(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeSpectralEntropy(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('entropy')
 
 @registrationAudioAspect('Spectral flatness')
-def analyzeFlatness(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeFlatness(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('flatness')
 
 @registrationAudioAspect('Spectral crest')
-def analyzeCrest(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeCrest(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('crest')
 
 @registrationAudioAspect('Spectral flux')
-def analyzeFlux(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeFlux(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('flux')
 
 @registrationAudioAspect('Spectral slope')
-def analyzeSlope(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeSlope(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('slope')
 
 @registrationAudioAspect('Spectral decrease')
-def analyzeDecrease(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeDecrease(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('decrease')
 
 @registrationAudioAspect('Spectral rolloff')
-def analyzeRolloff(pathFilename: str | PathLike[Any]) -> numpy.ndarray:
+def analyzeRolloff(pathFilename: str | PathLike[Any]) -> float | None:
 	return ffprobeShotgunAndCache(pathFilename).get('rolloff')
 
 @registrationAudioAspect('Abs_Peak_count')

analyzeAudio/audioAspectsRegistry.py

@@ -1,14 +1,12 @@
 from collections.abc import Callable, Sequence
 from concurrent.futures import ProcessPoolExecutor, as_completed
 from numpy.typing import NDArray
+from os import PathLike
 from typing import Any, cast, ParamSpec, TypeAlias, TYPE_CHECKING, TypeVar
 from Z0Z_tools import defineConcurrencyLimit, oopsieKwargsie, stft
 import cachetools
 import inspect
-import librosa
-import multiprocessing
 import numpy
-from os import PathLike
 import pathlib
 import soundfile
 import torch
@@ -19,8 +17,11 @@ if TYPE_CHECKING:
 else:
 	TypedDict = dict
 
-if __name__ == '__main__':
-	multiprocessing.set_start_method('spawn')
+from multiprocessing import set_start_method as multiprocessing_set_start_method
+try:
+	multiprocessing_set_start_method('spawn')
+except RuntimeError:
+	pass
 
 warnings.filterwarnings('ignore', category=UserWarning, module='torchmetrics', message='.*fast=True.*')
 
@@ -112,9 +113,9 @@ def analyzeAudioFile(pathFilename: str | PathLike[Any], listAspectNames: list[st
 			else:
 				raise ERRORmessage
 
-	spectrogram = stft(waveform, sampleRate=sampleRate)
-	spectrogramMagnitude = numpy.absolute(spectrogram)
-	spectrogramPower = spectrogramMagnitude ** 2
+	# spectrogram = stft(waveform, sampleRate=sampleRate)
+	# spectrogramMagnitude = numpy.absolute(spectrogram)
+	# spectrogramPower = spectrogramMagnitude ** 2
 
 	pytorchOnCPU = not torch.cuda.is_available()  # False if GPU available, True if not
 

{analyzeaudio-0.0.14.dist-info → analyzeaudio-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: analyzeAudio
-Version: 0.0.14
+Version: 0.0.15
 Summary: Measure one or more aspects of one or more audio files.
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0
@@ -15,7 +15,6 @@ Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Other Audience
-Classifier: License :: Free for non-commercial use
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -44,10 +43,11 @@ Requires-Dist: torchmetrics[audio]
 Requires-Dist: tqdm
 Requires-Dist: Z0Z_tools
 Provides-Extra: testing
+Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: pytest-xdist; extra == "testing"
-Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pyupgrade; extra == "testing"
+Dynamic: license-file
 
 # analyzeAudio
 
@@ -139,12 +139,45 @@ print(audioAspects['Chromagram']['analyzerParameters'])
 'Signal entropy': float
 'Spectral Bandwidth': NDArray[float64] # shape(..., 1, frames)
 'Spectral Bandwidth mean': float
-'Spectral centroid': NDArray[float64] # shape(channels, frames)
-'Spectral centroid mean': float
 'Spectral Centroid': NDArray[float64] # shape(..., 1, frames)
 'Spectral Centroid mean': float
 'Spectral Contrast': NDArray[float64] # shape(..., 7, frames)
 'Spectral Contrast mean': float
+'Spectral Flatness': NDArray[float64] # shape(..., 1, frames)
+'Spectral Flatness mean': float
+'SRMR': NDArray[float64] # shape(...)
+'SRMR mean': float
+'Tempo': NDArray[float64] # shape(...)
+'Tempo mean': float
+'Tempogram': NDArray[float64] # shape(..., 384, samples)
+'Tempogram mean': float
+'Zero-crossing rate': NDArray[float64] # shape(..., 1, frames)
+'Zero-crossing rate mean': float
+'Zero-crossings rate': float
+```
+
+### I had to revert back to these
+
+```python
+'Spectral centroid': float
+'Spectral crest': float
+'Spectral decrease': float
+'Spectral entropy': float
+'Spectral flatness': float
+'Spectral flux': float
+'Spectral kurtosis': float
+'Spectral rolloff': float
+'Spectral skewness': float
+'Spectral slope': float
+'Spectral spread': float
+'Spectral variance': float
+```
+
+### Removed (temporarily, I hope)
+
+```python
+'Spectral centroid': NDArray[float64] # shape(channels, frames)
+'Spectral centroid mean': float
 'Spectral crest': NDArray[float64] # shape(channels, frames)
 'Spectral crest mean': float
 'Spectral decrease': NDArray[float64] # shape(channels, frames)
@@ -153,8 +186,6 @@ print(audioAspects['Chromagram']['analyzerParameters'])
 'Spectral entropy mean': float
 'Spectral flatness': NDArray[float64] # shape(channels, frames)
 'Spectral flatness mean': float
-'Spectral Flatness': NDArray[float64] # shape(..., 1, frames)
-'Spectral Flatness mean': float
 'Spectral flux': NDArray[float64] # shape(channels, frames)
 'Spectral flux mean': float
 'Spectral kurtosis': NDArray[float64] # shape(channels, frames)
@@ -169,15 +200,6 @@ print(audioAspects['Chromagram']['analyzerParameters'])
 'Spectral spread mean': float
 'Spectral variance': NDArray[float64] # shape(channels, frames)
 'Spectral variance mean': float
-'SRMR': NDArray[float64] # shape(...)
-'SRMR mean': float
-'Tempo': NDArray[float64] # shape(...)
-'Tempo mean': float
-'Tempogram': NDArray[float64] # shape(..., 384, samples)
-'Tempogram mean': float
-'Zero-crossing rate': NDArray[float64] # shape(..., 1, frames)
-'Zero-crossing rate mean': float
-'Zero-crossings rate': float
 ```
 
 ## Installation
@@ -191,4 +213,4 @@ pip install analyzeAudio
 [![Static Badge](https://img.shields.io/badge/2011_August-Homeless_since-blue?style=flat)](https://HunterThinks.com/support)
 [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UC3Gx7kz61009NbhpRtPP7tw)](https://www.youtube.com/@HunterHogan)
 
-[![CC-BY-NC-4.0](https://github.com/hunterhogan/analyzeAudio/blob/main/CC-BY-NC-4.0.png)](https://creativecommons.org/licenses/by-nc/4.0/)
+[![CC-BY-NC-4.0](https://github.com/hunterhogan/analyzeAudio/blob/main/CC-BY-NC-4.0.svg)](https://creativecommons.org/licenses/by-nc/4.0/)

{analyzeaudio-0.0.14.dist-info → analyzeaudio-0.0.15.dist-info}/RECORD

@@ -1,16 +1,17 @@
 analyzeAudio/__init__.py,sha256=2D5JMeZfLGnwyQvt4Q2-HCsShHulcNXBM_Wu9vZPCiI,437
-analyzeAudio/analyzersUseFilename.py,sha256=iXF3Ut_Ldd6hKtNC54vpwRLGaQQA0UdE83aCMcFfVGI,10972
+analyzeAudio/analyzersUseFilename.py,sha256=XMRmbARX7UzbTdPXOmQOQDDPennF2Vd1UaIIV8k6NrQ,10927
 analyzeAudio/analyzersUseSpectrogram.py,sha256=j-e69ICVHOC_W3ev8HOTem4KGGpE9QyKnYZEvFseMkE,1835
 analyzeAudio/analyzersUseTensor.py,sha256=-wD_QAd41lB65ceT5UedEoxWL078tZ0E-kC9ssDSghc,553
 analyzeAudio/analyzersUseWaveform.py,sha256=AwDyagz9bLLAq8ji4by51x7d2YWRdUQaY3iaw1k0yD4,1472
-analyzeAudio/audioAspectsRegistry.py,sha256=EvFKNncWKDv4KDyI0UcfBplkgVK_fGOFOdjolDy8hE0,8517
+analyzeAudio/audioAspectsRegistry.py,sha256=p8GoVbmfGwZvj0YtSC3qbENaf-gKfAfUbNwpvC2R9V8,8571
+analyzeAudio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyzeAudio/pythonator.py,sha256=St6KmIxvHwoW6IuHcEJjjvUUrEkG0sPv2S3Th9rjJtE,5603
+analyzeaudio-0.0.15.dist-info/licenses/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
 tests/conftest.py,sha256=BhZswOjkl_u-qiS4Zy38d2fETdWAtZiigeuXYBK8l0k,397
 tests/test_audioAspectsRegistry.py,sha256=-TWTLMdAn6IFv7ZdFWrBm1KxpLBa3Mz1sCygAwxV6gE,27
 tests/test_other.py,sha256=sd20ms4StQ13_3-gmwZwtAuoIAwfxWC5IXM_Cp5GQXM,428
-analyzeaudio-0.0.14.dist-info/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
-analyzeaudio-0.0.14.dist-info/METADATA,sha256=Q_oiZl_dpECEzAv33Zla9SuVugUKr0sw9IZuUxPGaZs,8659
-analyzeaudio-0.0.14.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-analyzeaudio-0.0.14.dist-info/entry_points.txt,sha256=FHgSx7fndtZ6SnQ-nWVXf0NB59exaHQ2DtatTK9KrLg,100
-analyzeaudio-0.0.14.dist-info/top_level.txt,sha256=QV8LQ0r_1LIQuewxDcEzODpykv5qRYG3I70piOUSVRg,19
-analyzeaudio-0.0.14.dist-info/RECORD,,
+analyzeaudio-0.0.15.dist-info/METADATA,sha256=EGGk2mw9BlVFMauAW9cjwo2uSUpxnNBw8CLcb9iA0sQ,9040
+analyzeaudio-0.0.15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+analyzeaudio-0.0.15.dist-info/entry_points.txt,sha256=FHgSx7fndtZ6SnQ-nWVXf0NB59exaHQ2DtatTK9KrLg,100
+analyzeaudio-0.0.15.dist-info/top_level.txt,sha256=QV8LQ0r_1LIQuewxDcEzODpykv5qRYG3I70piOUSVRg,19
+analyzeaudio-0.0.15.dist-info/RECORD,,

{analyzeaudio-0.0.14.dist-info → analyzeaudio-0.0.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any