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

analyzeAudio/analyzersUseFilename.py

@@ -1,4 +1,5 @@
-from .pythonator import pythonizeFFprobe
+"""Analyzers that use the filename of an audio file to analyze its audio data."""
+from analyzeAudio.pythonator import pythonizeFFprobe
 from analyzeAudio import registrationAudioAspect, cacheAudioAnalyzers
 from os import PathLike
 from statistics import mean

analyzeAudio/analyzersUseSpectrogram.py

@@ -1,30 +1,30 @@
+"""Analyzers that use the spectrogram to analyze audio data."""
 from analyzeAudio import registrationAudioAspect, audioAspects, cacheAudioAnalyzers
 from typing import Any
 import cachetools
 import librosa
 import numpy
-from optype.numpy import AnyFloatingDType, ToArray3D, ToFloat3D
 from numpy import dtype, floating
 
 @registrationAudioAspect('Chromagram')
-def analyzeChromagram(spectrogramPower: numpy.ndarray[Any, dtype[floating[Any]]], sampleRate: int, **keywordArguments: Any) -> numpy.ndarray:
-	return librosa.feature.chroma_stft(S=spectrogramPower, sr=sampleRate, **keywordArguments)
+def analyzeChromagram(spectrogramPower: numpy.ndarray[Any, dtype[floating[Any]]], sampleRate: int, **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
+	return librosa.feature.chroma_stft(S=spectrogramPower, sr=sampleRate, **keywordArguments) # type: ignore
 
 @registrationAudioAspect('Spectral Contrast')
-def analyzeSpectralContrast(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray:
-	return librosa.feature.spectral_contrast(S=spectrogramMagnitude, **keywordArguments)
+def analyzeSpectralContrast(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
+	return librosa.feature.spectral_contrast(S=spectrogramMagnitude, **keywordArguments) # type: ignore
 
 @registrationAudioAspect('Spectral Bandwidth')
-def analyzeSpectralBandwidth(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray:
+def analyzeSpectralBandwidth(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
 	centroid = audioAspects['Spectral Centroid']['analyzer'](spectrogramMagnitude)
-	return librosa.feature.spectral_bandwidth(S=spectrogramMagnitude, centroid=centroid, **keywordArguments)
+	return librosa.feature.spectral_bandwidth(S=spectrogramMagnitude, centroid=centroid, **keywordArguments) # type: ignore
 
 @cachetools.cached(cache=cacheAudioAnalyzers)
 @registrationAudioAspect('Spectral Centroid')
-def analyzeSpectralCentroid(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray:
-	return librosa.feature.spectral_centroid(S=spectrogramMagnitude, **keywordArguments)
+def analyzeSpectralCentroid(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
+	return librosa.feature.spectral_centroid(S=spectrogramMagnitude, **keywordArguments) # type: ignore
 
 @registrationAudioAspect('Spectral Flatness')
-def analyzeSpectralFlatness(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray:
-	spectralFlatness = librosa.feature.spectral_flatness(S=spectrogramMagnitude, **keywordArguments)
+def analyzeSpectralFlatness(spectrogramMagnitude: numpy.ndarray[Any, dtype[floating[Any]]], **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
+	spectralFlatness: numpy.ndarray[tuple[int, ...], numpy.dtype[numpy.floating[Any]]] = librosa.feature.spectral_flatness(S=spectrogramMagnitude, **keywordArguments) # type: ignore
 	return 20 * numpy.log10(spectralFlatness, where=(spectralFlatness != 0)) # dB

analyzeAudio/analyzersUseTensor.py

@@ -1,3 +1,4 @@
+"""Analyzers that use the tensor to analyze audio data."""
 from analyzeAudio import registrationAudioAspect
 from torchmetrics.functional.audio.srmr import speech_reverberation_modulation_energy_ratio
 from typing import Any
@@ -5,6 +6,6 @@ import numpy
 import torch
 
 @registrationAudioAspect('SRMR')
-def analyzeSRMR(tensorAudio: torch.Tensor, sampleRate: int, pytorchOnCPU: bool | None, **keywordArguments: Any) -> numpy.ndarray:
+def analyzeSRMR(tensorAudio: torch.Tensor, sampleRate: int, pytorchOnCPU: bool | None, **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
 	keywordArguments['fast'] = keywordArguments.get('fast') or pytorchOnCPU or None
-	return torch.Tensor.numpy(speech_reverberation_modulation_energy_ratio(tensorAudio, sampleRate, **keywordArguments))
+	return torch.Tensor.numpy(speech_reverberation_modulation_energy_ratio(tensorAudio, sampleRate, **keywordArguments)) # type: ignore

analyzeAudio/analyzersUseWaveform.py

@@ -1,26 +1,26 @@
+"""Analyzers that use the waveform of audio data."""
 from analyzeAudio import registrationAudioAspect, audioAspects, cacheAudioAnalyzers
 from typing import Any
 import librosa
 import numpy
-from optype.numpy import ToArray2D, AnyFloatingDType
 import cachetools
 
 @cachetools.cached(cache=cacheAudioAnalyzers)
 @registrationAudioAspect('Tempogram')
-def analyzeTempogram(waveform: ToArray2D[AnyFloatingDType], sampleRate: int, **keywordArguments: Any) -> numpy.ndarray:
-	return librosa.feature.tempogram(y=waveform, sr=sampleRate, **keywordArguments)
+def analyzeTempogram(waveform: numpy.ndarray[tuple[int, ...], numpy.dtype[numpy.floating[Any]]], sampleRate: int, **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
+	return librosa.feature.tempogram(y=waveform, sr=sampleRate, **keywordArguments) # type: ignore
 
 # "RMS value from audio samples is faster ... However, ... spectrogram ... more accurate ... because ... windowed"
 @registrationAudioAspect('RMS from waveform')
-def analyzeRMS(waveform: ToArray2D[AnyFloatingDType], **keywordArguments: Any) -> numpy.ndarray:
-	arrayRMS = librosa.feature.rms(y=waveform, **keywordArguments)
+def analyzeRMS(waveform: numpy.ndarray[tuple[int, ...], numpy.dtype[numpy.floating[Any]]], **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
+	arrayRMS: numpy.ndarray[tuple[int, ...], numpy.dtype[numpy.floating[Any]]] = librosa.feature.rms(y=waveform, **keywordArguments) # type: ignore
 	return 20 * numpy.log10(arrayRMS, where=(arrayRMS != 0)) # dB
 
 @registrationAudioAspect('Tempo')
-def analyzeTempo(waveform: ToArray2D[AnyFloatingDType], sampleRate: int, **keywordArguments: Any) -> numpy.ndarray:
+def analyzeTempo(waveform: numpy.ndarray[tuple[int, ...], numpy.dtype[numpy.floating[Any]]], sampleRate: int, **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
 	tempogram = audioAspects['Tempogram']['analyzer'](waveform, sampleRate)
-	return librosa.feature.tempo(y=waveform, sr=sampleRate, tg=tempogram, **keywordArguments)
+	return librosa.feature.tempo(y=waveform, sr=sampleRate, tg=tempogram, **keywordArguments) # type: ignore
 
 @registrationAudioAspect('Zero-crossing rate') # This is distinct from 'Zero-crossings rate'
-def analyzeZeroCrossingRate(waveform: ToArray2D[AnyFloatingDType], **keywordArguments: Any) -> numpy.ndarray:
-	return librosa.feature.zero_crossing_rate(y=waveform, **keywordArguments)
+def analyzeZeroCrossingRate(waveform: numpy.ndarray[tuple[int, ...], numpy.dtype[numpy.floating[Any]]], **keywordArguments: Any) -> numpy.ndarray: # pyright: ignore [reportMissingTypeArgument, reportUnknownParameterType]
+	return librosa.feature.zero_crossing_rate(y=waveform, **keywordArguments) # type: ignore

analyzeAudio/audioAspectsRegistry.py

@@ -3,7 +3,7 @@ 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
+from Z0Z_tools import defineConcurrencyLimit, oopsieKwargsie, stft, Spectrogram
 import cachetools
 import inspect
 import numpy
@@ -102,7 +102,7 @@ def analyzeAudioFile(pathFilename: str | PathLike[Any], listAspectNames: list[st
 
 	# I need "lazy" loading
 	tryAgain = True
-	while tryAgain: # `tenacity`?
+	while tryAgain:
 		try:
 			tensorAudio = torch.from_numpy(waveform)  # memory-sharing
 			tryAgain = False
@@ -113,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/pythonator.py

@@ -1,3 +1,4 @@
+"""Convert FFprobe output to a standardized Python object."""
 from collections import defaultdict
 from typing import Any, cast, NamedTuple
 import json
@@ -89,7 +90,7 @@ def pythonizeFFprobe(FFprobeJSON_utf8: str):
 											Z0Z_dictionaries[registrant] = {}
 										elif statistic not in Z0Z_dictionaries[registrant]:
 												# NOTE (as of this writing) `registrar` can only understand the generic class `numpy.ndarray` and not more specific typing
-												valueSherpa = cast(numpy.ndarray, numpy.zeros((channel, len(FFroot['frames']))))
+												valueSherpa = cast(numpy.ndarray, numpy.zeros((channel, len(FFroot['frames'])))) # type: ignore
 												Z0Z_dictionaries[registrant][statistic] = valueSherpa
 										else:
 											raise  # Re-raise the exception

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: analyzeAudio
-Version: 0.0.15
+Version: 0.0.16
 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
@@ -35,7 +35,6 @@ License-File: LICENSE
 Requires-Dist: cachetools
 Requires-Dist: librosa
 Requires-Dist: numpy
-Requires-Dist: optype[numpy]
 Requires-Dist: standard-aifc; python_version >= "3.13"
 Requires-Dist: standard-sunau; python_version >= "3.13"
 Requires-Dist: torch
@@ -213,4 +212,13 @@ 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)
 
+## How to code
+
+Coding One Step at a Time:
+
+0. WRITE CODE.
+1. Don't write stupid code that's hard to revise.
+2. Write good code.
+3. When revising, write better code.
+
 [![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.16.dist-info/RECORD

@@ -0,0 +1,17 @@
+analyzeAudio/__init__.py,sha256=2D5JMeZfLGnwyQvt4Q2-HCsShHulcNXBM_Wu9vZPCiI,437
+analyzeAudio/analyzersUseFilename.py,sha256=AOA_Ab6-QU4q4i7AOy9Z68yPiGBi-Zjpo4zYmqvOwuM,11021
+analyzeAudio/analyzersUseSpectrogram.py,sha256=RjKW9it_9EDgKwkx9sB99z7qbLrVq5xM7ALTcwo4xE8,2346
+analyzeAudio/analyzersUseTensor.py,sha256=oRxKw42Q4bdBhuSlwdyVo2MNgI0AbnjEjpnRLQVaqco,701
+analyzeAudio/analyzersUseWaveform.py,sha256=2nGhwdpDpamAAgeZ4XAbtX1aGAn5R-VIwHO1qnyxz0U,2042
+analyzeAudio/audioAspectsRegistry.py,sha256=NoRUflTxls4palGtc7iQsfMLc9nMGITCVRPhDehNFJ4,8564
+analyzeAudio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+analyzeAudio/pythonator.py,sha256=hL2KzeO7cgboSCL9uOl1uyuWMrnR0xhDt9o78GkM2_0,5680
+analyzeaudio-0.0.16.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.16.dist-info/METADATA,sha256=Nn-a1bKLTdVvwmayCHEA8SdelzcSDhmbCJyMrdIv5XU,9178
+analyzeaudio-0.0.16.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+analyzeaudio-0.0.16.dist-info/entry_points.txt,sha256=FHgSx7fndtZ6SnQ-nWVXf0NB59exaHQ2DtatTK9KrLg,100
+analyzeaudio-0.0.16.dist-info/top_level.txt,sha256=QV8LQ0r_1LIQuewxDcEzODpykv5qRYG3I70piOUSVRg,19
+analyzeaudio-0.0.16.dist-info/RECORD,,

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

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

analyzeaudio-0.0.15.dist-info/RECORD

@@ -1,17 +0,0 @@
-analyzeAudio/__init__.py,sha256=2D5JMeZfLGnwyQvt4Q2-HCsShHulcNXBM_Wu9vZPCiI,437
-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=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.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,,