Update app.py

app.py

@@ -13,7 +13,8 @@ if 'history' not in st.session_state:
 if 'downloadable' not in st.session_state:
     st.session_state['downloadable'] = False
 notes = [['C'], ['Db', 'C#'], ['D'], ['Eb', 'D#'], ['E'], ['F'], ['Gb', 'F#'], ['G'], ['Ab', 'G#'], ['A'], ['Bb', 'A#'], ['B']]
-monster = r'(?<![A-Za-z\d])([A-G](?:#|b)?\d(?:-\d+(?:\/\d+)?(?:-\d+(?:\.\d+)?)?)+)(?![A-Za-z\d])'
+monsters = [r'(?<![A-Za-z\d])([A-G](?:#|b)?\d-(?:\d+\/\d+|\d+))(?![A-Za-z\d])', r'(?<![A-Za-z\d])([A-G](?:#|b)?\d(?:-\d+(?:\/\d+)?(?:-\d+(?:\.\d+)?)?)+)(?![A-Za-z\d])']
+examples = ['\n\nNotation looks like this:\n(Note-duration)\nC4-1/4, Eb4-1/4, D4-1/8, Eb4-1/8, C4-1/4', '\n\nNotation looks like this:\n(Note-duration-time in beats)\nC4-1/4-0, Eb4-1/8-2.5, D4-1/4-3, F4-1/4-3 etc.']
 
 def noteToInt(n):
     oct = int(n[-1])
@@ -25,7 +26,7 @@ def noteToInt(n):
                 id = ix
     return id+oct*12+12
 
-def midiToStr(mPath):
+def midiToStr(mPath, nIndex):
     midIn = mido.MidiFile(os.path.expanduser(mPath))
     ticks = midIn.ticks_per_beat
     midOut = []
@@ -40,19 +41,23 @@ def midiToStr(mPath):
                     noteTime = int(noteTime) if noteTime.is_integer() else noteTime
                     noteDur = str(Fraction((globalT-noteTime)/4))
                     noteDur = str(round((globalT-noteTime),3)) if len(noteDur)>=6 else noteDur
-                    midOut.append('-'.join([notes[msg.note%12][0]+str(msg.note//12-1), noteDur, str(round(noteTime,3))]))
+                    if nIndex:
+                        midOut.append('-'.join([notes[msg.note%12][0]+str(msg.note//12-1), noteDur, str(round(noteTime,3))]))
+                    else:
+                        midOut.append('-'.join([notes[msg.note%12][0]+str(msg.note//12-1), noteDur]))
                     del opens[msg.note]
                 if msg.type == 'note_on':
                     opens[msg.note] = globalT
     return ', '.join(midOut)
 
 st.markdown('# GPT-4 2 Midi\n#### AI Generated Polyphonic Music\n##### plus conversion tools for use with Chat-GPT\napp by [d3nt](https://github.com/d3n7/)')
+notation = st.selectbox('Notation', ('Polyphonic', 'Monophonic'))
 main, m2t, t2m = st.tabs(['GPT4-To-Midi', 'Midi-2-Text', 'Text-2-Midi'])
 
 with main:
     userPrompt = st.text_input('Prompt', 'Full piece of sad music with multiple parts. Plan out the structure beforehand, including chords, parts (soprano, alto, tenor, bass), meter, etc.')
     with st.expander('System Prompt'):
-        sysPrompt = st.text_input('', 'You are MusicGPT, a music creation and completion chat bot that. When a user gives you a prompt, you return them a song showing the notes, durations, and times that they occur. Respond with just the music.\n\nNotation looks like this:\n(Note-duration-time in beats)\nC4-1/4-0, Eb4-1/8-2.5, D4-1/4-3, F4-1/4-3 etc.')
+        sysPrompt = st.text_input('', 'You are MusicGPT, a music creation and completion chat bot that. When a user gives you a prompt, you return them a song showing the notes, durations, and times that they occur. Respond with just the music.')
     openaikey = st.text_input('OpenAI API Key', type='password')
     modelV = st.selectbox('Model', ('GPT-4', 'GPT-3.5-Turbo'))
     col1, col2 = st.columns(2)
@@ -65,8 +70,10 @@ with main:
     with col3:
         if st.button('Ask GPT'):
             if userPrompt != '' and sysPrompt != '' and  openaikey != '':
+                notationIndex = int(notation=='Polyphonic')
+
                 if newSession:
-                    st.session_state['history'] = [{'role': 'system', 'content': sysPrompt}]
+                    st.session_state['history'] = [{'role': 'system', 'content': sysPrompt+examples[notationIndex]}]
 
                 prompt = userPrompt
                 if uploadMidi:
@@ -74,7 +81,7 @@ with main:
                     midiPath = os.path.join(st.session_state['path'], filename)
                     with open(midiPath, 'wb') as f:
                         f.write(uploadMidi.getbuffer())
-                    prompt += '\n'+midiToStr(midiPath)
+                    prompt += '\n'+midiToStr(midiPath, notationIndex)
                     os.remove(midiPath)
                 st.session_state['history'].append({'role': 'user', 'content': prompt})
 
@@ -88,14 +95,23 @@ with main:
                 st.session_state['history'].append({'role': 'assistant', 'content': response})
 
                 noteInfo = []
-                for i in re.findall(monster, response):
+                for i in re.findall(monsters[notationIndex], response):
                     n = i.split('-')
-                    noteInfo.append([noteToInt(n[0]), float(Fraction(n[1])) * 4, float(n[2])])  #note, duration, time
+                    if notationIndex:
+                        noteInfo.append([noteToInt(n[0]), float(Fraction(n[1]))*4, float(n[2])])  #note, duration, time
+                    else:
+                        noteInfo.append([noteToInt(n[0]), float(Fraction(n[1]))*4])  # note, duration
 
                 song = MIDIFile(1, deinterleave=False)
+                time = 0
                 for i in noteInfo:
-                    pitch, dur, time = i
+                    if notationIndex:
+                        pitch, dur, time = i
+                    else:
+                        pitch, dur = i
                     song.addNote(0, 0, pitch, time, dur, 100)
+                    if not notationIndex:
+                        time += dur
                 with open(os.path.join(st.session_state['path'], 'output.mid'), 'wb') as f:
                     song.writeFile(f)
                 if not st.session_state['downloadable']:
@@ -119,20 +135,30 @@ with m2t:
             midiPath = os.path.join(st.session_state['path'], filename)
             with open(midiPath, 'wb') as f:
                 f.write(inMidi.getbuffer())
-            st.text_area('Output', midiToStr(midiPath))
+            st.text_area('Output', midiToStr(midiPath, notation=='Polyphonic'))
             os.remove(midiPath)
 
 with t2m:
     inText = st.text_input('Input')
     if st.button('Convert', key='2'):
+        notationIndex = int(notation=='Polyphonic')
         noteInfo = []
-        for i in re.findall(monster, inText):
+        for i in re.findall(monsters[notationIndex], inText):
             n = i.split('-')
-            noteInfo.append([noteToInt(n[0]), float(Fraction(n[1])) * 4, float(n[2])])
+            if notationIndex:
+                noteInfo.append([noteToInt(n[0]), float(Fraction(n[1])) * 4, float(n[2])])  # note, duration, time
+            else:
+                noteInfo.append([noteToInt(n[0]), float(Fraction(n[1])) * 4])  # note, duration
         song = MIDIFile(1, deinterleave=False)
+        time = 0
         for i in noteInfo:
-            pitch, dur, time = i
+            if notationIndex:
+                pitch, dur, time = i
+            else:
+                pitch, dur = i
             song.addNote(0, 0, pitch, time, dur, 100)
+            if not notationIndex:
+                time += dur
         with open(os.path.join(st.session_state['path'], 't2m.mid'), 'wb') as f:
             song.writeFile(f)
         with open(os.path.join(st.session_state['path'], 't2m.mid'), 'rb') as f: