fixed issue with gradio df

app.py

@@ -9,6 +9,7 @@ import itertools
 import tempfile
 import librosa
 import random
+import mdpd
 import os
 
 from utils import getaudiodata, getBeats, plotBeattimes, find_s1s2
@@ -216,9 +217,11 @@ def getBeatsv2(audio:gr.Audio):
     
 
 
-    return fig, featuredf, (sr, audiodata)
+    return fig, featuredf.to_markdown(), (sr, audiodata)
 
-def updateBeatsv2(beattimes_table:gr.Dataframe, audio:gr.Audio, uploadeddf:gr.File=None)-> go.Figure:
+def updateBeatsv2(beattimes_table:gr.Markdown, audio:gr.Audio, uploadeddf:gr.File=None)-> go.Figure:
+
+    df = mdpd.from_md(df)
 
     sr, audiodata = getaudiodata(audio)
 
@@ -231,9 +234,13 @@ def updateBeatsv2(beattimes_table:gr.Dataframe, audio:gr.Audio, uploadeddf:gr.Fi
 
     fig = plotBeattimes(s1_times, audiodata, sr, s2_times)
 
-    return fig, beattimes_table
+    return fig, beattimes_table.to_markdown()
+
+def download_df (df: str):
+
+    df = mdpd.from_md(df)
 
-def download_df (df: pd.DataFrame):
+    print(df)
 
     temp_dir = tempfile.gettempdir()
     temp_path = os.path.join(temp_dir, "feature_data.csv")
@@ -262,26 +269,29 @@ with gr.Blocks() as app:
 
         beats_wave_plot = gr.Plot()
 
-        beattimes_df = gr.Dataframe(
-            value = pd.DataFrame({"Beattimes":[], "S1 to S2":[], "S2 to S1":[], "Label (S1=0/S2=1)":[]}),
-            label="Beattimes")
+        
         
         with gr.Row():
 
-            csv_download = gr.DownloadButton()
-        
-            updateBeatsbtn = gr.Button("update Beats")
-        
-        uploadDF = gr.File(
-            file_count="single",
-            file_types=[".csv"],
-            label="upload a csv",
-            height=25
-        )
+            with gr.Column():
+
+                beattimes_table = gr.Markdown()
 
-        csv_download.click(download_df, inputs=[beattimes_df], outputs=[csv_download])
-        getBeatsbtn.click(getBeatsv2, inputs=audiofile, outputs=[beats_wave_plot, beattimes_df, cleanedaudio])
-        updateBeatsbtn.click(updateBeatsv2, inputs=[beattimes_df, audiofile, uploadDF], outputs=[beats_wave_plot, beattimes_df])
+            with gr.Column():
+
+                csv_download = gr.DownloadButton()
+                updateBeatsbtn = gr.Button("update Beats")
+        
+                uploadDF = gr.File(
+                    file_count="single",
+                    file_types=[".csv"],
+                    label="upload a csv",
+                    height=25
+                )
+
+        csv_download.click(download_df, inputs=[beattimes_table], outputs=[csv_download])
+        getBeatsbtn.click(getBeatsv2, inputs=audiofile, outputs=[beats_wave_plot, beattimes_table, cleanedaudio])
+        updateBeatsbtn.click(updateBeatsv2, inputs=[beattimes_table, audiofile, uploadDF], outputs=[beats_wave_plot, beattimes_table])
 
         gr.Examples(
             examples=example_files,

requirements.txt

@@ -1,80 +1,98 @@
-aiofiles==23.2.1
-annotated-types==0.7.0
-anyio==4.4.0
-audioread==3.0.1
-certifi==2024.8.30
-cffi==1.17.1
-charset-normalizer==3.3.2
-click==8.1.7
-contourpy==1.3.0
-cycler==0.12.1
-decorator==5.1.1
-fastapi==0.114.2
-ffmpy==0.4.0
-filelock==3.16.0
-fonttools==4.53.1
-fsspec==2024.9.0
-gradio==4.44.0
-gradio_client==1.3.0
-h11==0.14.0
-httpcore==1.0.5
-httpx==0.27.2
-huggingface-hub==0.24.7
-idna==3.10
-importlib_resources==6.4.5
-Jinja2==3.1.4
-joblib==1.4.2
-kiwisolver==1.4.7
-lazy_loader==0.4
-librosa==0.10.2.post1
-llvmlite==0.43.0
-markdown-it-py==3.0.0
-MarkupSafe==2.1.5
-matplotlib==3.9.2
-mdurl==0.1.2
-msgpack==1.1.0
-numba==0.60.0
-numpy==2.0.2
-orjson==3.10.7
-packaging==24.1
-pandas==2.2.2
-pillow==10.4.0
-pip==24.2
-platformdirs==4.3.3
-plotly==5.24.1
-pooch==1.8.2
-pycparser==2.22
-pydantic==2.9.1
-pydantic_core==2.23.3
-pydub==0.25.1
-Pygments==2.18.0
-pyparsing==3.1.4
-python-dateutil==2.9.0.post0
-python-multipart==0.0.9
-pytz==2024.2
-PyWavelets==1.7.0
-PyYAML==6.0.2
-requests==2.32.3
-rich==13.8.1
-ruff==0.6.5
-scikit-learn==1.5.2
-scipy==1.14.1
-semantic-version==2.10.0
-setuptools==72.1.0
-shellingham==1.5.4
-six==1.16.0
-sniffio==1.3.1
-soundfile==0.12.1
-soxr==0.5.0.post1
-starlette==0.38.5
-tenacity==9.0.0
-threadpoolctl==3.5.0
-tomlkit==0.12.0
-tqdm==4.66.5
-typer==0.12.5
-typing_extensions==4.12.2
-tzdata==2024.1
-urllib3==2.2.3
-uvicorn==0.30.6
-websockets==12.0
-wheel==0.44.0
+# This file may be used to create an environment using:
+# $ conda create --name <env> --file <this file>
+# platform: osx-arm64
+aiofiles=23.2.1=pypi_0
+annotated-types=0.7.0=pypi_0
+anyio=4.4.0=pypi_0
+audioread=3.0.1=pypi_0
+bzip2=1.0.8=h80987f9_6
+ca-certificates=2024.7.2=hca03da5_0
+certifi=2024.8.30=pypi_0
+cffi=1.17.1=pypi_0
+charset-normalizer=3.3.2=pypi_0
+click=8.1.7=pypi_0
+contourpy=1.3.0=pypi_0
+cycler=0.12.1=pypi_0
+decorator=5.1.1=pypi_0
+expat=2.6.3=h313beb8_0
+fastapi=0.114.2=pypi_0
+ffmpy=0.4.0=pypi_0
+filelock=3.16.0=pypi_0
+fonttools=4.53.1=pypi_0
+fsspec=2024.9.0=pypi_0
+gradio=4.44.0=pypi_0
+gradio-client=1.3.0=pypi_0
+h11=0.14.0=pypi_0
+httpcore=1.0.5=pypi_0
+httpx=0.27.2=pypi_0
+huggingface-hub=0.24.7=pypi_0
+idna=3.10=pypi_0
+importlib-resources=6.4.5=pypi_0
+jinja2=3.1.4=pypi_0
+joblib=1.4.2=pypi_0
+kiwisolver=1.4.7=pypi_0
+lazy-loader=0.4=pypi_0
+libcxx=14.0.6=h848a8c0_0
+libffi=3.4.4=hca03da5_1
+librosa=0.10.2.post1=pypi_0
+llvmlite=0.43.0=pypi_0
+markdown-it-py=3.0.0=pypi_0
+markupsafe=2.1.5=pypi_0
+matplotlib=3.9.2=pypi_0
+mdpd=0.2.1=pypi_0
+mdurl=0.1.2=pypi_0
+msgpack=1.1.0=pypi_0
+ncurses=6.4=h313beb8_0
+numba=0.60.0=pypi_0
+numpy=2.0.2=pypi_0
+openssl=3.0.15=h80987f9_0
+orjson=3.10.7=pypi_0
+packaging=24.1=pypi_0
+pandas=2.2.2=pypi_0
+pillow=10.4.0=pypi_0
+pip=24.2=py312hca03da5_0
+platformdirs=4.3.3=pypi_0
+plotly=5.24.1=pypi_0
+pooch=1.8.2=pypi_0
+pycparser=2.22=pypi_0
+pydantic=2.9.1=pypi_0
+pydantic-core=2.23.3=pypi_0
+pydub=0.25.1=pypi_0
+pygments=2.18.0=pypi_0
+pyparsing=3.1.4=pypi_0
+python=3.12.3=h99e199e_1
+python-dateutil=2.9.0.post0=pypi_0
+python-multipart=0.0.9=pypi_0
+pytz=2024.2=pypi_0
+pywavelets=1.7.0=pypi_0
+pyyaml=6.0.2=pypi_0
+readline=8.2=h1a28f6b_0
+requests=2.32.3=pypi_0
+rich=13.8.1=pypi_0
+ruff=0.6.5=pypi_0
+scikit-learn=1.5.2=pypi_0
+scipy=1.14.1=pypi_0
+semantic-version=2.10.0=pypi_0
+setuptools=72.1.0=py312hca03da5_0
+shellingham=1.5.4=pypi_0
+six=1.16.0=pypi_0
+sniffio=1.3.1=pypi_0
+soundfile=0.12.1=pypi_0
+soxr=0.5.0.post1=pypi_0
+sqlite=3.45.3=h80987f9_0
+starlette=0.38.5=pypi_0
+tabulate=0.9.0=pypi_0
+tenacity=9.0.0=pypi_0
+threadpoolctl=3.5.0=pypi_0
+tk=8.6.14=h6ba3021_0
+tomlkit=0.12.0=pypi_0
+tqdm=4.66.5=pypi_0
+typer=0.12.5=pypi_0
+typing-extensions=4.12.2=pypi_0
+tzdata=2024.1=pypi_0
+urllib3=2.2.3=pypi_0
+uvicorn=0.30.6=pypi_0
+websockets=12.0=pypi_0
+wheel=0.44.0=py312hca03da5_0
+xz=5.4.6=h80987f9_1
+zlib=1.2.13=h18a0788_1

utils.py

@@ -2,12 +2,9 @@ import librosa
 import numpy as np
 import plotly.graph_objects as go
 from scipy.signal import savgol_filter, find_peaks
-from scipy.signal import butter, filtfilt, medfilt, find_peaks, hilbert
-from scipy.ndimage import gaussian_filter1d
+from scipy.signal import butter, filtfilt, find_peaks
 from sklearn.cluster import KMeans
 from sklearn.preprocessing import StandardScaler
-from io import StringIO
-import soundfile as sf
 import pywt
 import pandas as pd
 
@@ -323,92 +320,6 @@ def getBeats(audiodata: np.ndarray, sr: int, method='envelope') -> tuple[float,
 
     return tempo, peak_times, cleaned_audio
 
-# def plotBeattimes(beattimes: np.ndarray, audiodata: np.ndarray, sr: int) -> go.Figure:
-#     """
-#     Plot audio waveform with beat markers.
-    
-#     Parameters:
-#     -----------
-#     beattimes : np.ndarray
-#         Array of beat times in seconds
-#     audiodata : np.ndarray
-#         Audio time series data
-#     sr : int
-#         Sampling rate
-        
-#     Returns:
-#     --------
-#     go.Figure
-#         Plotly figure with waveform and beat markers
-#     """
-#     # Calculate correct time array for the full audio
-#     time = np.arange(len(audiodata)) / sr
-    
-#     # Convert beat times to sample indices
-#     beat_indices = np.round(beattimes * sr).astype(int)
-    
-#     # Ensure indices are within bounds
-#     beat_indices = beat_indices[beat_indices < len(audiodata)]
-    
-#     # Get actual amplitudes at beat positions
-#     beat_amplitudes = audiodata[beat_indices]
-    
-#     # Create the figure
-#     fig = go.Figure()
-    
-#     # Add waveform
-#     fig.add_trace(
-#         go.Scatter(
-#             x=time,
-#             y=audiodata,
-#             mode='lines',
-#             name='Waveform',
-#             line=dict(color='blue', width=1)
-#         )
-#     )
-    
-#     # Add beat markers
-#     fig.add_trace(
-#         go.Scatter(
-#             x=beattimes[beat_indices < len(audiodata)],  # Use filtered beat times
-#             y=beat_amplitudes,
-#             mode='markers',
-#             name='Beats',
-#             marker=dict(
-#                 color='red',
-#                 size=8,
-#                 symbol='circle',
-#                 line=dict(color='darkred', width=1)
-#             )
-#         )
-#     )
-    
-#     # Update layout
-#     fig.update_layout(
-#         title="Audio Waveform with Beat Detection",
-#         xaxis_title="Time (seconds)",
-#         yaxis_title="Amplitude",
-#         showlegend=False,
-#         hovermode='closest',
-#         plot_bgcolor='white',
-#         legend=dict(
-#             yanchor="top",
-#             y=0.99,
-#             xanchor="left",
-#             x=0.01
-#         )
-#     )
-    
-#     # Add vertical lines at beat positions (optional)
-#     for beat_time in beattimes[beat_indices < len(audiodata)]:
-#         fig.add_vline(
-#             x=beat_time,
-#             line=dict(color="rgba(255, 0, 0, 0.2)", width=1),
-#             layer="below"
-#         )
-    
-#     return fig
-
 def plotBeattimes(beattimes: np.ndarray, 
                 audiodata: np.ndarray, 
                 sr: int,