Replace Number with float

Author: rec

tuney/audio/__init__.py

@@ -1,10 +1,8 @@
 import numpy as np
 
-from ..types import Number
-
 EPSILON = 1e-8
 
 
-def apply_gain(data: np.ndarray, number: Number) -> None:
+def apply_gain(data: np.ndarray, number: float) -> None:
     if abs(number - 1.0) > EPSILON:
         data *= number

tuney/audio/oscillator.py

@@ -5,11 +5,9 @@
 
 import numpy as np
 
-from ..types import Number
-
 
 class Oscillator:
-    period: Number = 2 * np.pi
+    period: float = 2 * np.pi
     # TODO: add intensity to compensate for different energies
 
     @abstractmethod
@@ -23,7 +21,7 @@ def function(self, x: np.ndarray, out: np.ndarray) -> np.ndarray:
 
 
 class Triangle(Oscillator):
-    width: Number = 0.5
+    width: float = 0.5
 
     @override
     def function(self, x: np.ndarray, out: np.ndarray) -> np.ndarray:
@@ -40,7 +38,7 @@ def function(self, x: np.ndarray, out: np.ndarray) -> np.ndarray:
 
 
 class Sawtooth(Triangle):
-    width: Number = 0
+    width: float = 0
 
 
 sawtooth, sine, triangle = Sawtooth(), Sine(), Triangle()

tuney/audio/oscillator_player.py

@@ -7,7 +7,6 @@
 import numpy as np
 from pydantic import BaseModel
 
-from ..types import Number
 from . import apply_gain
 from . import oscillator as osc
 from .player import Player
@@ -16,10 +15,10 @@
 
 
 class Sound(BaseModel, frozen=True):
-    period: Number = 0x100
-    gain: Number = 1.0
-    fade_in_samples: Number = 0x1000
-    fade_out_samples: Number = 0x1000
+    period: float = 0x100
+    gain: float = 1.0
+    fade_in_samples: float = 0x1000
+    fade_out_samples: float = 0x1000
 
 
 @dc.dataclass
@@ -28,7 +27,7 @@ class OscillatorPlayer(Player):
     oscillator_name: str = 'sawtooth'
 
     #: Records the the frame we started to fade out.
-    _fade_frame: dc.InitVar[Number | None] = None
+    _fade_frame: dc.InitVar[float | None] = None
     _stopping: dc.InitVar[bool] = False
 
     @cached_property
@@ -42,10 +41,10 @@ def stop(self) -> None:
             super().stop()
 
     def _fill(self, out: np.ndarray) -> bool | None:
-        period = cast(float, self.sound.period)
+        period = self.sound.period
         start = self.frame_count % period
         end = start + len(out)
-        ratio = cast(float, self.oscillator.period) / period
+        ratio = self.oscillator.period / period
         wave = np.linspace(start * ratio, end * ratio, len(out))
         wave = self.oscillator.function(wave, out=wave)
 
@@ -58,7 +57,7 @@ def _fill(self, out: np.ndarray) -> bool | None:
         else:
             gain *= ii.max
         apply_gain(wave, gain)
-        fade_in = cast(float, self.sound.fade_in_samples)
+        fade_in = self.sound.fade_in_samples
         if self.frame_count < fade_in and not self._stopping:
             _fade(wave, cast(float, self.frame_count) / fade_in, len(out) / fade_in)
 
@@ -68,8 +67,8 @@ def _fill(self, out: np.ndarray) -> bool | None:
                 offset = max(0.0, fade_in - self.frame_count)
                 self._fade_frame = self.frame_count - offset
 
-            fade_out = cast(float, self.sound.fade_out_samples)
-            elapsed = cast(float, self.frame_count - self._fade_frame)
+            fade_out = self.sound.fade_out_samples
+            elapsed = self.frame_count - self._fade_frame
             if (start := 1 - elapsed / fade_out) <= 0:
                 super().stop()
                 return False

tuney/scale/note.py

@@ -4,7 +4,7 @@
 
 from pydantic import BaseModel
 
-from ..types import NoteNumber, Number
+from ..types import NoteNumber
 from .scale import Scale
 
 
@@ -14,7 +14,7 @@ class Note(BaseModel, frozen=True):
     number: NoteNumber
 
     @cached_property
-    def frequency(self) -> Number:
+    def frequency(self) -> float:
         return self.scale.tuning(self.number)
 
     @staticmethod

tuney/scale/tuning.py

@@ -2,11 +2,12 @@
 
 import dataclasses as dc
 from contextlib import nullcontext, suppress
+from fractions import Fraction
 from typing import Protocol, cast, runtime_checkable
 
 from pydantic import BaseModel
 
-from ..types import Fraction, Frequency, NoteNumber, Number
+from ..types import Frequency, NoteNumber
 
 # TODO: make sure we can serialize and deserialize Fraction (as str)
 
@@ -19,16 +20,15 @@ def __call__(self, note_number: NoteNumber) -> Frequency: ...
 @runtime_checkable
 class ToFrequency(Protocol):
     def __call__(
-        self, root_frequency: Number, octave_change: Number, octaves: Number
+        self, root_frequency: float, octave_change: float, octaves: float
     ) -> Frequency: ...
 
 
 class PitchToFrequency(BaseModel, frozen=True):
     #: The base rule for converting a pitch to a frequency
     function: str = 'power'
 
-    def __call__(self, root: Frequency, change: Number, octaves: Number) -> Number:
-        change, octaves = cast(float, change), cast(float, octaves)
+    def __call__(self, root: Frequency, change: float, octaves: float) -> float:
         if self.function == 'power':
             return root * change**octaves
         elif self.function == 'linear':
@@ -45,7 +45,7 @@ class TuningImpl(BaseModel, frozen=True, arbitrary_types_allowed=True):
     """
 
     #: Detune everything, in cents of an octave division
-    detune: Number = 0
+    detune: float = 0
 
     #: If limit_denominator is greater than zero, use rounded N-limit just intonation
     limit_denominator: int = 0
@@ -57,7 +57,7 @@ class TuningImpl(BaseModel, frozen=True, arbitrary_types_allowed=True):
     #: the change is a ratio, so if it's 2, each octave is twice the frequency of the
     #: last; for "linear", it's a difference, so if it's 100, each octave would be
     #: 100Hz greater in frequency than the previous.
-    octave_change: Number = 2
+    octave_change: float = 2
 
     #: The rule for converting a pitch to a frequency
     pitch_to_frequency: PitchToFrequency = PitchToFrequency()

tuney/types.py

@@ -1,14 +1,10 @@
 from collections.abc import Callable
-from fractions import Fraction
-from typing import Any, TypeAlias
-
-import numpy as np
+from typing import Any
 
 type Milliseconds = float
 type Seconds = float
 
-Number: TypeAlias = int | float | np.floating | np.integer | Fraction
-type Frequency = Number  # Must be non-negative
+type Frequency = float  # Must be non-negative
 type NoteNumber = int  # May be negative
 
 type Callback = Callable[[], Any]