refactor: fix incorrect usage of Optional type hint

Author: Bentroen

nbswave/audio.py

@@ -11,9 +11,9 @@ def load_sound(path: str) -> AudioSegment:
 
 def sync(
     sound: AudioSegment,
-    channels: Optional[int] = 2,
-    frame_rate: Optional[int] = 44100,
-    sample_width: Optional[int] = 2,
+    channels: int = 2,
+    frame_rate: int = 44100,
+    sample_width: int = 2,
 ) -> AudioSegment:
     return (
         sound.set_channels(channels)
@@ -43,10 +43,10 @@ def vol_to_gain(vol: float) -> float:
 class Mixer:
     def __init__(
         self,
-        sample_width: Optional[int] = 2,
-        frame_rate: Optional[int] = 44100,
-        channels: Optional[int] = 2,
-        length: Optional[float] = 0,
+        sample_width: int = 2,
+        frame_rate: int = 44100,
+        channels: int = 2,
+        length: float = 0,
     ):
         self.sample_width = sample_width
         self.frame_rate = frame_rate
@@ -102,7 +102,7 @@ def append(self, sound):
 
     def to_audio_segment(self):
         peak = np.abs(self.output).max()
-        clipping_factor = peak / (2 ** 15 - 1)
+        clipping_factor = peak / (2**15 - 1)
 
         if clipping_factor > 1:
             print(
@@ -141,11 +141,11 @@ def from_audio_segment(cls, segment: AudioSegment):
     def save(
         self,
         filename: str,
-        format: Optional[str] = "wav",
-        sample_width: Optional[int] = 2,
-        frame_rate: Optional[int] = 44100,
-        channels: Optional[int] = 2,
-        target_bitrate: Optional[int] = 320,
+        format: str = "wav",
+        sample_width: int = 2,
+        frame_rate: int = 44100,
+        channels: int = 2,
+        target_bitrate: int = 320,
         target_size: Optional[int] = None,
         tags: Optional[Dict[str, str]] = None,
     ):

nbswave/main.py

@@ -1,7 +1,7 @@
 import io
 import os
 import zipfile
-from typing import BinaryIO, Dict, Optional, Sequence, Union
+from typing import BinaryIO, Dict, Sequence, Union
 
 import pydub
 import pynbs
@@ -92,7 +92,7 @@ class SongRenderer:
     def __init__(
         self,
         song: Union[pynbs.File, nbs.Song],
-        default_sound_path: Optional[PathLike] = SOUNDS_PATH,
+        default_sound_path: PathLike = SOUNDS_PATH,
     ):
         if isinstance(song, pynbs.File):
             song = nbs.Song(song)
@@ -135,9 +135,9 @@ def _mix(
         self,
         notes: Sequence[nbs.Note],
         ignore_missing_instruments: bool = False,
-        sample_rate: Optional[int] = 44100,
-        channels: Optional[int] = 2,
-        bit_depth: Optional[int] = 16,
+        sample_rate: int = 44100,
+        channels: int = 2,
+        bit_depth: int = 16,
     ) -> audio.Track:
 
         tempo_segments = self._song.tempo_segments

nbswave/nbs.py

@@ -191,9 +191,7 @@ def layer_groups(self) -> Dict[str, pynbs.Layer]:
                 groups[name].append(layer.id)
         return groups
 
-    def notes_by_layer(
-        self, group_by_name: Optional[bool] = False
-    ) -> Dict[str, List[Note]]:
+    def notes_by_layer(self, group_by_name: bool = False) -> Dict[str, List[Note]]:
         """Return a dict of lists containing the weighted notes in each non-empty layer of the
         song. If `group_by_name` is true, notes in layers with identical names will be grouped."""
         groups = {}