Fix type hints for stereo downmixing

corrscope/channel.py

@@ -15,7 +15,7 @@ from corrscope.config import (
 )
 from corrscope.triggers import MainTriggerConfig
 from corrscope.util import coalesce
-from corrscope.wave import Wave, Flatten
+from corrscope.wave import Wave, FlattenOrStr
 
 if TYPE_CHECKING:
     from corrscope.corrscope import Config
@@ -37,8 +37,8 @@ class ChannelConfig(DumpableAttrs):
     amplification: Optional[float] = None
 
     # Stereo config
-    trigger_stereo: Optional[Flatten] = None
-    render_stereo: Optional[Flatten] = None
+    trigger_stereo: Optional[FlattenOrStr] = None
+    render_stereo: Optional[FlattenOrStr] = None
 
     line_color: Optional[str] = None
 

corrscope/corrscope.py

@@ -16,8 +16,7 @@ from corrscope.outputs import FFmpegOutputConfig, IOutputConfig
 from corrscope.renderer import Renderer, RendererConfig, RendererFrontend
 from corrscope.triggers import CorrelationTriggerConfig, PerFrameCache, SpectrumConfig
 from corrscope.util import pushd, coalesce
-from corrscope.wave import Wave, Flatten
-
+from corrscope.wave import Wave, Flatten, FlattenOrStr
 
 PRINT_TIMESTAMP = True
 
@@ -78,8 +77,8 @@ class Config(
     amplification: float
 
     # Stereo config
-    trigger_stereo: Flatten = Flatten.SumAvg
-    render_stereo: Flatten = Flatten.SumAvg
+    trigger_stereo: FlattenOrStr = Flatten.SumAvg
+    render_stereo: FlattenOrStr = Flatten.SumAvg
 
     trigger: CorrelationTriggerConfig  # Can be overriden per Wave
 

corrscope/wave.py

@@ -143,7 +143,7 @@ class Wave:
         self,
         wave_path: str,
         amplification: float = 1.0,
-        flatten: Flatten = Flatten.SumAvg,
+        flatten: FlattenOrStr = Flatten.SumAvg,
     ):
         self.wave_path = wave_path
         self.amplification = amplification
@@ -191,7 +191,7 @@ class Wave:
         else:
             raise CorrError(f"unexpected wavfile dtype {dtype}")
 
-    def with_flatten(self, flatten: Flatten, return_channels: bool) -> "Wave":
+    def with_flatten(self, flatten: FlattenOrStr, return_channels: bool) -> "Wave":
         new = copy.copy(self)
         new.flatten = flatten
         new.return_channels = return_channels