modusa 0.4.14__tar.gz → 0.4.16__tar.gz

{modusa-0.4.14 → modusa-0.4.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modusa
-Version: 0.4.14
+Version: 0.4.16
 Summary: A modular signal analysis python library.
 Author-Email: Ankit Anand <ankit0.anand0@gmail.com>
 License: MIT

{modusa-0.4.14 → modusa-0.4.16}/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "0.4.14"
+version = "0.4.16"
 
 [project.license]
 text = "MIT"

{modusa-0.4.14 → modusa-0.4.16}/src/modusa/__init__.py

@@ -1,11 +1,11 @@
 from modusa.utils import excp, config
 
 #=====Giving access to plot functions to plot multiple signals.=====
-from modusa.tools import dist_plot, hill_plot, fig
+from modusa.tools import dist_plot, hill_plot, plot, fig
 #=====
 
 from modusa.tools import play, convert, record, save
 from modusa.tools import download
 from modusa.tools import load, load_ann
 
-__version__ = "0.4.14"
+__version__ = "0.4.16"

{modusa-0.4.14 → modusa-0.4.16}/src/modusa/tools/__init__.py

@@ -9,4 +9,4 @@ from .ann_loader import load_ann
 from .audio_recorder import record
 
 from .plotter import Fig as fig
-from .plotter import dist_plot, hill_plot
+from .plotter import dist_plot, hill_plot, plot

modusa-0.4.16/src/modusa/tools/audio_player.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+
+from IPython.display import Audio, HTML, display
+import numpy as np
+
+def play(y: np.ndarray, sr: float, clip: tuple[float, float] | None = None, label: str | None = None) -> None:
+		"""
+		Simple audio player with optional clip selection and label, 
+		displayed neatly in a small table.
+
+		Parameters
+		----------
+		y : np.ndarray
+				Mono audio data (1D numpy array).
+		sr : float
+				Sampling rate.
+		clip : tuple[float, float] | None
+				(start_time, end_time) in seconds. Plays whole audio if None.
+		label : str | None
+				Optional label to describe the clip (e.g. "Chorus", "Intro").
+
+		Returns
+		-------
+		None
+		"""
+		start_time, end_time = 0.0, len(y) / sr
+	
+		if clip is not None:
+				if not isinstance(clip, tuple) or len(clip) != 2:
+						raise ValueError("`clip` must be a tuple of (start_time, end_time)")
+				start_sample = int(clip[0] * sr)
+				end_sample = int(clip[1] * sr)
+				y = y[start_sample:end_sample]
+				start_time, end_time = clip
+			
+		# Build the HTML table
+		audio_html = Audio(data=y, rate=sr)._repr_html_()
+		label_html = label if label is not None else "-"
+	
+		table_html = f"""
+		<div style="display:inline-block; border:1px solid #ccc; border-radius:6px; overflow:hidden;">
+			<table style="border-collapse:collapse; font-family:sans-serif; font-size:14px;">
+				<tr style="background-color:#f8f8f8;">
+					<th style="padding:6px 12px; text-align:left;">Timing</th>
+					<th style="padding:6px 12px; text-align:left;">Label</th>
+					<th style="padding:6px 12px; text-align:left;">Audio</th>
+				</tr>
+				<tr>
+					<td style="padding:6px 12px; border-top:1px solid #ddd;">{start_time:.2f}s → {end_time:.2f}s</td>
+					<td style="padding:6px 12px; border-top:1px solid #ddd;">{label_html}</td>
+					<td style="padding:6px 12px; border-top:1px solid #ddd;">{audio_html}</td>
+				</tr>
+			</table>
+		</div>
+		"""
+	
+		display(HTML(table_html))
+
+		
+		
+		

{modusa-0.4.14 → modusa-0.4.16}/src/modusa/tools/plotter.py

@@ -1013,6 +1013,43 @@ def dist_plot(*args, ann=None, xlim=None, ylim=None, ylabel=None, xlabel=None, t
 		return fig
 	
 
+# ======== Single Plot ===========
+def plot(*args):
+	"""
+	To create 1D/2D plot for immediate
+	inspection.
+
+	Parameters
+	----------
+	*args: ndarray
+		- Arrays to be plotted.
+	"""
+	n = len(args)
+	
+	if n < 1:
+		raise ValueError("Need atleast 1 positional argument")
+	
+	## 1D Array
+	if args[0].ndim == 1:
+		if n > 1: # User also passed the xs
+			fig = Fig("s").add_signal(args[0], args[1])
+		else:
+			fig = Fig("s").add_signal(args[0])
+	
+	## 2D Array
+	if args[0].ndim == 2:
+		if n == 1:
+			fig = Fig("m").add_matrix(args[0])
+		elif n == 2: # User also passed the xs
+			fig = Fig("m").add_matrix(args[0], args[1])
+		elif n == 3:
+			fig = Fig("m").add_matrix(args[0], args[1], args[2])
+	
+	return fig
+	
+	
+		
+	
 	
 		
 	

modusa-0.4.14/src/modusa/tools/audio_player.py

@@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-
-import numpy as np
-from IPython.display import display, HTML, Audio
-
-def play(y: np.ndarray, sr: float, title = None, t0: float = 0.0, regions = None) -> None:
-		"""
-		Plays audio clips for given regions in Jupyter Notebooks.
-
-		Parameters
-		----------
-		y : np.ndarray
-			- Audio data.
-			- Mono (1D) numpy array.
-		sr: float
-			- Sampling rate of the audio.
-		title : str | None
-			- Title to display above audio players.
-		t0: float
-			- Starting timestamp, incase the audio is cropped
-			- Default: 0.0 → Starts from 0.0 sec
-		regions : list[tuple[float, float, str]] | tuple[float, float, str] | None
-			- Regions to extract and play (in sec), e.g. [(0, 10.2, "tag")]
-			- If there is only one region, a tuple should also work. e.g. (0, 10.2, "tag")
-			- Default: None → The entire song is selected.
-
-		Returns
-		-------
-		None
-		"""
-		if title:
-			display(HTML(f"<p style='font-size:15px; font-weight:600; text-decoration: underline; margin-left:10px'>{title}</p>"))
-			
-		clip_tags = []
-		timings = []
-		players = []
-	
-		if isinstance(regions, tuple): regions = [regions] # (10, 20, "Region 1") -> [(10, 20, "Region 1")]
-	
-		if regions is not None:
-			for region in regions:
-				assert len(region) == 3
-				
-				start_sec = region[0] - t0
-				end_sec = region[1] - t0
-				tag = region[2]
-				
-				start_sample, end_sample = int(start_sec * sr), int(end_sec * sr)
-				clip = y[start_sample: end_sample]
-				audio_player = Audio(data=clip, rate=sr)._repr_html_()
-				
-				clip_tags.append(f"<td style='text-align:center; border-right:1px solid #ccc; padding:6px;'>{tag}</td>")
-				timings.append(f"<td style='text-align:center; border-right:1px solid #ccc; padding:6px;'>{start_sec:.2f}s → {end_sec:.2f}s</td>")
-				players.append(f"<td style='padding:6px;'>{audio_player}</td>")
-		else:
-			audio_player = Audio(data=y, rate=sr)._repr_html_()
-			
-			start_sec = t0
-			end_sec = t0 + y.shape[0] / sr
-			
-			clip_tags.append(f"<td style='text-align:center; border-right:1px solid #ccc; padding:6px;'>1</td>")
-			timings.append(f"<td style='text-align:center; border-right:1px solid #ccc; padding:6px;'>{start_sec:.2f}s → {end_sec:.2f}s</td>")
-			players.append(f"<td style='padding:6px;'>{audio_player}</td>")
-			
-		# Wrap rows in a table with border
-		table_html = f"""
-		<div style="display:inline-block; border:1px solid #ccc; border-radius:6px; overflow:hidden;">
-			<table style="border-collapse:collapse;">
-				<tr style="background-color:#f2f2f2;">
-					<th style="text-align:left; padding:6px 12px;">Clip</th>
-					{''.join(clip_tags)}
-				</tr>
-				<tr style="background-color:#fcfcfc;">
-					<th style="text-align:left; padding:6px 12px;">Timing</th>
-					{''.join(timings)}
-				</tr>
-				<tr>
-					<th style="text-align:left; padding:6px 12px;">Player</th>
-					{''.join(players)}
-				</tr>
-			</table>
-		</div>
-		"""
-	
-		return HTML(table_html)
-
-		
-		
-