enhanced logs

app.py

@@ -17,6 +17,8 @@ import os
 import re
 import time
 import json
+import logging
+from collections import deque
 
 import gradio as gr
 
@@ -44,11 +46,58 @@ INSTRUMENTS = _STYLES['instruments']
 _GEN = None
 
 
+# ---- system log capture ----------------------------------------------------
+# A ring buffer that mirrors Python logging (lifecycle messages, warnings, and
+# errors) into the Logs panel, alongside the streamed generation text.
+
+LOG = logging.getLogger('lilyscript')
+
+
+class _RingBufferHandler (logging.Handler):
+	'''Keep the most recent N log records as formatted strings.'''
+	def __init__ (self, capacity=400):
+		super().__init__()
+		self.records = deque(maxlen=capacity)
+
+	def emit (self, record):
+		try:
+			self.records.append(self.format(record))
+		except Exception:
+			pass
+
+	def text (self):
+		return '\n'.join(self.records)
+
+
+_LOG_BUFFER = _RingBufferHandler()
+_LOG_BUFFER.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(name)s: %(message)s', datefmt='%H:%M:%S'))
+
+
+def _init_logging ():
+	'''Route app + library logs and Python warnings into the ring buffer (once),
+	and also echo to stderr so the terminal keeps a copy.'''
+	logging.captureWarnings(True)
+	root = logging.getLogger()
+	if _LOG_BUFFER not in root.handlers:
+		root.addHandler(_LOG_BUFFER)
+		stderr_h = logging.StreamHandler()
+		stderr_h.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(name)s: %(message)s', datefmt='%H:%M:%S'))
+		root.addHandler(stderr_h)
+	root.setLevel(logging.INFO)
+	LOG.setLevel(logging.INFO)
+
+
+_init_logging()
+
+
 def get_generator ():
 	'''Lazily build the (heavy) ONNX generator on first use.'''
 	global _GEN
 	if _GEN is None:
+		LOG.info('loading ONNX generator from %s ...', MODEL_DIR)
+		t0 = time.perf_counter()
 		_GEN = StreamingLilyletGenerator(MODEL_DIR, ASSET_DIR)
+		LOG.info('generator ready (%.1fs)', time.perf_counter() - t0)
 	return _GEN
 
 
@@ -103,6 +152,26 @@ def sync_prompt (composer, genre, instrument, current):
 	return '\n'.join(lines)
 
 
+# Marker line written to the log buffer at the moment generation output begins.
+# `_log_panel` replaces this marker with the live generation text, so the streamed
+# output appears in true chronological position — after the "requested"/"ready"
+# lines and before the later "timing"/"done" lines.
+_GEN_MARKER = '⁣__GENERATION_OUTPUT__⁣'
+
+
+def _log_panel (raw=''):
+	'''Render the Logs panel in chronological order: the captured system log,
+	with the generation-output marker (if present) expanded to the live text.'''
+	sys_log = _LOG_BUFFER.text()
+	if _GEN_MARKER in sys_log:
+		block = '--- generation output ---\n' + raw if raw else '--- generation output ---'
+		return sys_log.replace(_GEN_MARKER, block)
+	# no marker yet (e.g. before generation): fall back to appending raw
+	if raw:
+		return (sys_log + '\n' if sys_log else '') + '--- generation output ---\n' + raw
+	return sys_log
+
+
 def run_generation (prompt, measures, temperature, max_patches, seed, store, top_k=0, top_p=0.9):
 	'''Streaming generate callback. Yields updates for (log, editor, file_list, store).
 
@@ -111,24 +180,48 @@ def run_generation (prompt, measures, temperature, max_patches, seed, store, top
 
 	top_k / top_p have fixed defaults (no UI controls); pass them explicitly to override.
 	'''
-	gen = get_generator()
 	meas = int(measures) if measures and int(measures) > 0 else None
 	store = dict(store or {})
+	LOG.info('generation requested: measures=%s temperature=%s max_patches=%s seed=%s',
+		meas, temperature, max_patches, seed)
 
 	raw = pretty = ''
-	for raw, pretty, done in gen.generate_stream(
-		prompt_text=prompt or '', max_patches=int(max_patches), temperature=float(temperature),
-		top_k=int(top_k), top_p=float(top_p), measures=meas, seed=int(seed)):
-		# stream: update log + editor, keep file list / store unchanged
-		yield raw, pretty, gr.update(), store
+	n_yields = 0
+	t0 = time.perf_counter()
+	try:
+		gen = get_generator()
+		# drop a marker in the log timeline; _log_panel expands it to the live output,
+		# so subsequent log lines (timing/done) land *after* the generation text.
+		LOG.info(_GEN_MARKER)
+		for raw, pretty, done in gen.generate_stream(
+			prompt_text=prompt or '', max_patches=int(max_patches), temperature=float(temperature),
+			top_k=int(top_k), top_p=float(top_p), measures=meas, seed=int(seed)):
+			if not done:
+				n_yields += 1
+			# stream: update log (chronological system log + inline output) + editor
+			yield _log_panel(raw), pretty, gr.update(), store
+	except Exception as e:
+		LOG.exception('generation failed: %s', e)
+		yield _log_panel(raw), pretty, gr.update(), store
+		return
+
+	# timing: the stream yields once for prefill + once per generated patch, so the
+	# patch count is the non-done yields minus that initial prefill yield.
+	elapsed = time.perf_counter() - t0
+	n_patches = max(0, n_yields - 1)
+	per_patch = (elapsed / n_patches) if n_patches else 0.0
+	LOG.info('timing: %.2fs total, %d patches, %.3fs/patch (%.1f patches/s)',
+		elapsed, n_patches, per_patch, (n_patches / elapsed if elapsed else 0.0))
 
 	# finished: persist the document, refresh the file list, select the new entry
 	label = OUTPUT_PREFIX + time.strftime('%H%M%S') + ('_m%d' % meas if meas else '') + '_s%d' % int(seed)
 	store[label] = pretty
 	os.makedirs(OUTPUT_DIR, exist_ok=True)
-	with open(os.path.join(OUTPUT_DIR, label.replace(OUTPUT_PREFIX, '') + '.lyl'), 'w', encoding='utf-8') as f:
+	out_path = os.path.join(OUTPUT_DIR, label.replace(OUTPUT_PREFIX, '') + '.lyl')
+	with open(out_path, 'w', encoding='utf-8') as f:
 		f.write(pretty)
-	yield raw, pretty, gr.update(choices=list(store.keys()), value=label), store
+	LOG.info('generation done: %d chars -> %s', len(pretty), os.path.basename(out_path))
+	yield _log_panel(raw), pretty, gr.update(choices=list(store.keys()), value=label), store
 
 
 def load_file (label, store):
@@ -164,6 +257,12 @@ CUSTOM_CSS = '''
 	white-space: nowrap;
 	vertical-align: middle;
 }
+/* Score List: fixed height with an auto scrollbar, matching the editor's
+   18-line viewport (gr.Code lines=18 ≈ 266px). */
+.score-list {
+	max-height: 324px;
+	overflow-y: auto;
+}
 '''