Add audio-levels variable, make map work with arrays

Author: WyattBlue

auto_editor/analyze.py

@@ -90,10 +90,6 @@ def link_nodes(*nodes: FilterContext) -> None:
         c.link_to(n)
 
 
-def to_threshold(arr: np.ndarray, t: int | float) -> NDArray[np.bool_]:
-    return np.fromiter((x >= t for x in arr), dtype=np.bool_)
-
-
 def mut_remove_small(
     arr: NDArray[np.bool_], lim: int, replace: int, with_: int
 ) -> None:

auto_editor/lang/palet.py

@@ -18,12 +18,7 @@
 import numpy as np
 from numpy import logical_and, logical_not, logical_or, logical_xor
 
-from auto_editor.analyze import (
-    LevelError,
-    mut_remove_large,
-    mut_remove_small,
-    to_threshold,
-)
+from auto_editor.analyze import LevelError, mut_remove_large, mut_remove_small
 from auto_editor.lib.contracts import *
 from auto_editor.lib.data_structs import *
 from auto_editor.lib.err import MyError
@@ -690,6 +685,9 @@ def palet_map(proc: Proc, seq: Any) -> Any:
         return Quoted(tuple(map(proc, seq.val)))
     if isinstance(seq, list | range):
         return list(map(proc, seq))
+    elif isinstance(seq, np.ndarray):
+        vectorized_proc = np.vectorize(proc)
+        return vectorized_proc(seq)
     return proc(seq)
 
 
@@ -1469,6 +1467,16 @@ def edit_all() -> np.ndarray:
     return env["@levels"].all()
 
 
+def audio_levels(stream: int) -> np.ndarray:
+    if "@levels" not in env:
+        raise MyError("Can't use `audio` if there's no input media")
+
+    try:
+        return env["@levels"].audio(stream)
+    except LevelError as e:
+        raise MyError(e)
+
+
 def edit_audio(
     threshold: float = 0.04,
     stream: object = Sym("all"),
@@ -1491,7 +1499,7 @@ def edit_audio(
 
     try:
         for s in stream_range:
-            audio_list = to_threshold(levels.audio(s), threshold)
+            audio_list = levels.audio(s) >= threshold
             if stream_data is None:
                 stream_data = audio_list
             else:
@@ -1521,7 +1529,7 @@ def edit_motion(
     levels = env["@levels"]
     strict = env["@filesetup"].strict
     try:
-        return to_threshold(levels.motion(stream, blur, width), threshold)
+        return levels.motion(stream, blur, width) >= threshold
     except LevelError as e:
         return raise_(e) if strict else levels.all()
 
@@ -1582,7 +1590,7 @@ def my_eval(env: Env, node: object) -> Any:
                     return ref(oper, my_eval(env, node[1]))
 
             raise MyError(
-                f"Tried to run: {print_str(oper)} with args: {print_str(node[1:])}"
+                f"{print_str(oper)} is not a function. Tried to run with args: {print_str(node[1:])}"
             )
 
         if type(oper) is Syntax:
@@ -1617,6 +1625,7 @@ def my_eval(env: Env, node: object) -> Any:
     # edit procedures
     "none": Proc("none", edit_none, (0, 0)),
     "all/e": Proc("all/e", edit_all, (0, 0)),
+    "audio-levels": Proc("audio-levels", audio_levels, (1, 1), is_nat),
     "audio": Proc("audio", edit_audio, (0, 4),
         is_threshold, orc(is_nat, Sym("all")), is_nat,
         {"threshold": 0, "stream": 1, "minclip": 2, "mincut": 2}

auto_editor/lib/contracts.py

@@ -5,6 +5,8 @@
 from fractions import Fraction
 from typing import Any
 
+from numpy import float64
+
 from .data_structs import Sym, print_str
 from .err import MyError
 
@@ -41,7 +43,7 @@ def check_contract(c: object, val: object) -> bool:
         return val is True
     if c is False:
         return val is False
-    if type(c) in (int, float, Fraction, complex, str, Sym):
+    if type(c) in (int, float, float64, Fraction, complex, str, Sym):
         return val == c
     raise MyError(f"Invalid contract, got: {print_str(c)}")
 
@@ -163,17 +165,21 @@ def is_contract(c: object) -> bool:
 is_nat = Contract("nat?", lambda v: type(v) is int and v > -1)
 is_nat1 = Contract("nat1?", lambda v: type(v) is int and v > 0)
 int_not_zero = Contract("(or/c (not/c 0) int?)", lambda v: v != 0 and is_int(v))
-is_num = Contract("number?", lambda v: type(v) in (int, float, Fraction, complex))
-is_real = Contract("real?", lambda v: type(v) in (int, float, Fraction))
-is_float = Contract("float?", lambda v: type(v) is float)
+is_num = Contract(
+    "number?", lambda v: type(v) in (int, float, float64, Fraction, complex)
+)
+is_real = Contract("real?", lambda v: type(v) in (int, float, float64, Fraction))
+is_float = Contract("float?", lambda v: type(v) in (float, float64))
 is_frac = Contract("frac?", lambda v: type(v) is Fraction)
 is_str = Contract("string?", lambda v: type(v) is str)
 any_p = Contract("any", lambda v: True)
 is_void = Contract("void?", lambda v: v is None)
-is_int_or_float = Contract("(or/c int? float?)", lambda v: type(v) in (int, float))
+is_int_or_float = Contract(
+    "(or/c int? float?)", lambda v: type(v) in (int, float, float64)
+)
 is_threshold = Contract(
     "threshold?",
-    lambda v: type(v) in (int, float) and v >= 0 and v <= 1,  # type: ignore
+    lambda v: type(v) in (int, float, float64) and v >= 0 and v <= 1,  # type: ignore
 )
 is_proc = Contract("procedure?", lambda v: isinstance(v, Proc | Contract))
 

resources/scripts/maxcut.pal

@@ -46,3 +46,9 @@
     (maxcut my-arr 3)
     (bool-array 1 0 1 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
 ))
+
+
+(define (b x) (>= x 0.5))
+(define arr (array 'float64 0.1 0.2 0.3 0.6 0.7))
+
+(assert (bool-array? (map b arr)))