moops 0.7.1__tar.gz → 0.7.2__tar.gz

{moops-0.7.1 → moops-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moops
-Version: 0.7.1
+Version: 0.7.2
 Summary: Write Marimo notebooks that also work as CLI scripts, with unified UI controls
 Keywords: marimo,notebooks,cli,testing
 Author: Yair Chuchem

{moops-0.7.1 → moops-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "moops"
-version = "0.7.1"
+version = "0.7.2"
 description = "Write Marimo notebooks that also work as CLI scripts, with unified UI controls"
 license = "MIT"
 readme = "README.md"

{moops-0.7.1 → moops-0.7.2}/src/moops/interface.py

@@ -13,6 +13,47 @@ from . import _input_map, _options, _parse, _query_params
 from .presets import Presets
 
 
+def _wrap_usage(prefix: str, parts: list[str], width: int = 88) -> str:
+    indent = " " * len(prefix)
+    lines: list[str] = []
+    current = prefix
+    first_on_line = True
+    for part in parts:
+        attempt = current + part if first_on_line else current + " " + part
+        if first_on_line or len(attempt) <= width:
+            current = attempt
+            first_on_line = False
+        else:
+            lines.append(current)
+            current = indent + part
+    lines.append(current)
+    return "\n".join(lines)
+
+
+def _wrap_help_line(line: str, width: int = 88) -> list[str]:
+    if len(line) <= width:
+        return [line]
+    sep = ": "
+    sep_idx = line.find(sep)
+    if sep_idx == -1:
+        return [line]
+    header = line[: sep_idx + 1]  # e.g. "  --option METAVAR:"
+    indent = "      "
+    result = [header]
+    current = indent
+    first_on_line = True
+    for word in line[sep_idx + len(sep) :].split():
+        attempt = current + word if first_on_line else current + " " + word
+        if first_on_line or len(attempt) <= width:
+            current = attempt
+            first_on_line = False
+        else:
+            result.append(current)
+            current = indent + word
+    result.append(current)
+    return result
+
+
 @dataclasses.dataclass
 class Interface:
     """Controls registered by a subgroup's interface, for passing to the parent."""
@@ -95,13 +136,15 @@ class Interface:
         usage_parts = list(self._format_usage_parts(_usage_placeholders(self)))
         usage_parts.extend(("[--interactive]", "[-h/--help]"))
         name = self.command.rsplit("/", 1)[-1]
-        segments = [f"Usage: {name} {' '.join(usage_parts)}"]
+        prefix = f"Usage: {name} "
+        segments = [_wrap_usage(prefix, usage_parts)]
         help_lines = list(self._format_help_lines())
         if help_lines:
             segments.append("\n".join(help_lines))
         return "\n\n".join(segments)
 
     def _format_help_lines(self) -> typing.Iterator[str]:
+        prev_was_group_with_content = False
         for ctrl in self.controls:
             if (sub_iface := _attached_interface(ctrl)) is not None:
                 lines = list(sub_iface._format_help_lines())
@@ -109,10 +152,15 @@ class Interface:
                     yield ""
                     yield f"{sub_iface.help_heading}:"
                 yield from lines
+                prev_was_group_with_content = bool(lines)
             else:
                 input_control = self.input_map.get(ctrl)
                 if input_control is not None and not self._is_overridden(input_control):
-                    yield from input_control.format_help_lines()
+                    if prev_was_group_with_content:
+                        yield ""
+                    for help_line in input_control.format_help_lines():
+                        yield from _wrap_help_line(help_line)
+                prev_was_group_with_content = False
 
     def _format_usage_parts(
         self, placeholders_by_option: dict[str, str]