Update app.py

app.py

@@ -306,4 +306,156 @@ def main():
     # MIDI I/O
     st.subheader("MIDI Ports")
     in_ports = mido.get_input_names()
-    out_
+    out_ports = mido.get_output_names()
+    input_choice = st.selectbox("MIDI Input", ["None"] + in_ports)
+    output_choice = st.selectbox("MIDI Output", ["None"] + out_ports)
+
+    # Manage opening/closing
+    if 'midi_in' not in st.session_state:
+        st.session_state.midi_in = None
+    if 'midi_out' not in st.session_state:
+        st.session_state.midi_out = None
+
+    # Callback for incoming hardware MIDI
+    def midi_in_callback(msg):
+        if msg.type in ['note_on', 'note_off']:
+            # Convert to dictionary
+            event = {
+                'type': 'noteOn' if msg.type == 'note_on' else 'noteOff',
+                'note': msg.note,
+                'velocity': msg.velocity
+            }
+            st.session_state.incoming_events.put(event)
+
+    def open_input(port):
+        if port == "None":
+            return None
+        return mido.open_input(port, callback=midi_in_callback)
+
+    def open_output(port):
+        if port == "None":
+            return None
+        return mido.open_output(port)
+
+    # Re-open if changed
+    if st.session_state.midi_in and st.session_state.midi_in.name != input_choice:
+        st.session_state.midi_in.close()
+        st.session_state.midi_in = open_input(input_choice)
+    elif not st.session_state.midi_in and input_choice != "None":
+        st.session_state.midi_in = open_input(input_choice)
+
+    if st.session_state.midi_out and st.session_state.midi_out.name != output_choice:
+        st.session_state.midi_out.close()
+        st.session_state.midi_out = open_output(output_choice)
+    elif not st.session_state.midi_out and output_choice != "None":
+        st.session_state.midi_out = open_output(output_choice)
+
+    st.write("Press keys on hardware (if connected) or use the on-screen UI below:")
+
+    # On-screen 5-octave keyboard
+    st.subheader("5-Octave Keyboard")
+    components.html(get_keyboard_html(), height=220)
+
+    # Drum pads
+    st.subheader("Drum Pads (16)")
+    components.html(get_drum_pads_html(), height=220)
+
+    # Hidden script to route postMessage -> Streamlit
+    components.html("""
+    <script>
+    window.addEventListener('message', function(e) {
+        if (e.data.type === 'midiEvent') {
+            // forward to parent's postMessage
+            window.parent.postMessage({
+                type: 'streamlit:message',
+                data: {
+                    type: 'midi_event',
+                    event: e.data.data
+                }
+            }, '*');
+        } else if (e.data.type === 'drumTrigger') {
+            window.parent.postMessage({
+                type: 'streamlit:message',
+                data: {
+                    type: 'drum_event',
+                    event: e.data.data
+                }
+            }, '*');
+        }
+    });
+    </script>
+    """, height=0)
+
+    # We'll store inbound events in a queue
+    if 'incoming_events' not in st.session_state:
+        st.session_state.incoming_events = Queue()
+
+    # A small debug output
+    debug_area = st.empty()
+
+    # We define a function to dispatch events to pyo and optionally to MIDI out
+    def dispatch_event(event):
+        etype = event['type']
+        if etype in ('noteOn', 'noteOff'):
+            note = event['note']
+            vel = event.get('velocity', 100)
+            # Arp logic or direct
+            if use_arp:
+                # Send to arpeggiator
+                if etype == 'noteOn':
+                    st.session_state.arpeggiator.note_on(note)
+                else:
+                    st.session_state.arpeggiator.note_off(note)
+            else:
+                # Trigger directly
+                if etype == 'noteOn':
+                    note_on(note, vel)
+                else:
+                    note_off(note)
+
+            # Also echo to output port
+            if st.session_state.midi_out:
+                if etype == 'noteOn':
+                    out_msg = Message('note_on', note=note, velocity=vel)
+                    st.session_state.midi_out.send(out_msg)
+                else:
+                    out_msg = Message('note_off', note=note, velocity=0)
+                    st.session_state.midi_out.send(out_msg)
+
+            debug_area.write(f"MIDI Note Event -> {event}")
+
+        elif etype == 'drum':
+            # for drum, we have event['padIndex']
+            idx = event['padIndex']
+            vel = event.get('velocity', 100)
+            drum_trigger(idx, vel)
+            debug_area.write(f"Drum Trigger -> Pad {idx}")
+        else:
+            pass
+
+    # We'll do a short poll in the Streamlit loop
+    # (In actual usage, you'd use a Streamlit custom component to pass these more elegantly.)
+    def poll_events():
+        while not st.session_state.incoming_events.empty():
+            e = st.session_state.incoming_events.get_nowait()
+            dispatch_event(e)
+
+    poll_events()
+
+    st.write("Try pressing the on-screen keys/pads or your hardware keyboard/pads. Enjoy!")
+
+    # Cleanup
+    def cleanup():
+        st.session_state.arpeggiator.stop()
+        for note in list(active_oscillators.keys()):
+            note_off(note)
+        if st.session_state.midi_in:
+            st.session_state.midi_in.close()
+        if st.session_state.midi_out:
+            st.session_state.midi_out.close()
+        s.stop()
+
+    st.on_session_end(cleanup)
+
+if __name__ == "__main__":
+    main()