convert notepredictor example to iipyper

Author: victor-shepardson

examples/notepredictor/midi-duet.scd

@@ -26,7 +26,7 @@ OSCdef(\return, {
     (Process.elapsedTime - t).postln;
 }, '/prediction', nil);
 t = Process.elapsedTime;
-b.sendMsg("/predictor/predict", 60+12.rand, 0);
+b.sendMsg("/predictor/predict", \pitch, 60+12.rand, \time, 0);
 )
 
 // set the delay for more precise timing
@@ -51,7 +51,7 @@ MIDIdef.noteOn(\input, {
     SystemClock.clear;
 
     //get a new prediction in light of current note
-    b.sendMsg("/predictor/predict", num, dt);
+    b.sendMsg("/predictor/predict", \pitch, num, \time, dt);
 
     // release the previous note
     y.release(1.0);
@@ -99,7 +99,7 @@ OSCdef(\return, {
                 // be if there was a lot of fast MIDI input)
                 SystemClock.clear;
                 // feed model its own prediction as input
-                b.sendMsg("/predictor/predict", num, dt);
+                b.sendMsg("/predictor/predict", \pitch, num, \time, dt);
                 // release the previous note
                 (dt<3e-2).if{
                     // if the time delay is very small, slowly release to play a chord
@@ -122,10 +122,11 @@ OSCdef(\return, {
             }
     })};
 
-}, '/prediction', nil);
+}, "/prediction", nil);
 )
 
-// b.sendMsg("/predictor/predict", 70, 0.1);
+// send a note manually if you don't have a MIDI controller:
+b.sendMsg("/predictor/predict", \pitch, 70, \time, 0);
 
 // load another model
 // b.sendMsg("/predictor/load", "/path/to/checkpoint");

examples/notepredictor/server.py

@@ -4,100 +4,51 @@
   Jack Armitage
   Intelligent Instruments Lab 2022
 """
-# TODO: convert to iipyper
 
-# import asyncio
-# import fire
 from notepredictor import NotePredictor
-# from osc import OSC
 
 from iipyper import OSC, run
 
-# def predictor_handler(address, *args):
-#     """
-#     Handle OSC messages to Predictor
-#     """
-#     address = address.split("/")
-
-#     if(address[2] == "load"):
-#         print(f"/load {args}")
-#         global predictor
-#         predictor = NotePredictor.from_checkpoint(*args)
-#         predictor.eval()
-
-#     elif(address[2] == "predict"):
-#         print(f"/predict {args}")
-#         r = predictor.predict(*args)
-#         msg = (r['pitch'], r['time'])
-#         # print(msg)
-#         osc.send_message('/prediction', msg)
-
-#     elif(address[2] == "reset"):
-#         print(f"/reset {args}")
-#         predictor.reset(*args)
-        
-#     else:
-#         print(f"PitchPredictor: Unrecognised OSC {address} with {args}")
-
-# async def loop():
-#     """
-#     Separate async loop.
-#     """
-#     i = 0
-#     while True:
-#         i += 1
-#         # osc.send_message("/hello", i)
-#         await asyncio.sleep(1)
-
-# async def init_main():
-#     await osc.create_server(asyncio.get_event_loop())
-#     osc.add_handler("/predictor/*", predictor_handler)
-#     osc.create_client()
-    
-#     await loop()
-    
-#     osc.close_server()
-
-# def main(ip="127.0.0.1", send=57120, receive=9999, checkpoint=None):
 def main(host="127.0.0.1", port=9999, checkpoint=None):
-    # global osc, predictor
-
-    # osc = OSC(ip, send, receive)
     osc = OSC(host, port)
 
-    predictor = None
+    global predictor
     if checkpoint is not None:
         predictor = NotePredictor.from_checkpoint(checkpoint)
         predictor.eval()
-
-    # asyncio.run(init_main())
-
-    @osc.args('/predictor/*')
-    def predictor_handler(address, *args):
+    else:
+        predictor = None
+ 
+    @osc.kwargs('/predictor/*')
+    def _(address, **kw):
         """
         Handle OSC messages to Predictor
         """
+        global predictor
+        print(f"{address} {kw}")
+
         address = address.split("/")
         cmd = address[2]
 
         if cmd=="load":
-            print(f"/load {args}")
-            # global predictor
-            predictor = NotePredictor.from_checkpoint(*args)
+            predictor = NotePredictor.from_checkpoint(**kw)
             predictor.eval()
 
         elif cmd=="predict":
-            print(f"/predict {args}")
-            r = predictor.predict(*args)
-            return '/prediction', r['pitch'], r['time']
+            if predictor is None:
+                print('no model loaded')
+            else:
+                r = predictor.predict(**kw)
+                return '/prediction', r['pitch'], r['time']
 
         elif cmd=="reset":
-            print(f"/reset {args}")
-            predictor.reset(*args)
+            if predictor is None:
+                print('no model loaded')
+            else:
+                predictor.reset(**kw)
 
         else:
-            print(f"PitchPredictor: Unrecognised OSC {address} with {args}")
+            print(f"PitchPredictor: Unrecognised OSC {address} with {kw}")
 
 if __name__=='__main__':
-    # fire.Fire(main)
     run(main)