moops 0.3.2__tar.gz → 0.4.0__tar.gz

{moops-0.3.2 → moops-0.4.0}/PKG-INFO

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

{moops-0.3.2 → moops-0.4.0}/pyproject.toml

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

{moops-0.3.2 → moops-0.4.0}/src/moops/__init__.py

@@ -1,5 +1,6 @@
 from importlib.metadata import version
 
+from ._embed import Passthrough, embed
 from ._run import run
 from ._run_button import run_button
 from .group import Group
@@ -8,4 +9,13 @@ from .presets import Presets
 
 __version__ = version("moops")
 
-__all__ = ["Group", "Interface", "Presets", "__version__", "run", "run_button"]
+__all__ = [
+    "Group",
+    "Interface",
+    "Passthrough",
+    "Presets",
+    "__version__",
+    "embed",
+    "run",
+    "run_button",
+]

moops-0.3.2/src/moops/embed.py → moops-0.4.0/src/moops/_embed.py

@@ -3,6 +3,8 @@ import typing
 
 import marimo as mo
 
+from . import interface
+
 
 class _Embed(typing.Protocol):
     defs: typing.Mapping[str, typing.Any]
@@ -18,9 +20,9 @@ class _App(typing.Protocol):
     ) -> tuple[typing.Iterable[typing.Any], typing.Mapping[str, object]]: ...
 
 
-class App:
+async def embed(app: _App, defs: dict[str, typing.Any] | None = None) -> typing.Any:
     """
-    Wrap a marimo app with lean script-mode embeds.
+    Embed a marimo app, with lean script-mode embeds.
 
     In script mode, only the embedded notebook's ``result`` definition is
     retained, so intermediate definitions and rendered outputs can be released
@@ -29,17 +31,9 @@ class App:
     This also works around marimo nested embed failures in script mode,
     see https://github.com/marimo-team/marimo/issues/9572
     """
-
-    def __init__(self, app: _App) -> None:
-        self._app = app
-
-    def clone(self) -> "App":
-        return App(self._app.clone())
-
-    async def embed(self, defs: dict[str, typing.Any] | None = None) -> typing.Any:
-        if mo.running_in_notebook():
-            return await self._app.embed(defs=defs)
-        return await asyncio.to_thread(_embed_in_script, self._app, defs or {})
+    if mo.running_in_notebook():
+        return await app.embed(defs=defs)
+    return await asyncio.to_thread(_embed_in_script, app, defs or {})
 
 
 class Passthrough:
@@ -50,7 +44,9 @@ class Passthrough:
     def __init__(self, source: _Embed | dict[str, typing.Any]) -> None:
         self.defs = {
             "result": (source if isinstance(source, dict) else source.defs)["result"],
-            "interface": None,
+            "interface": interface.Interface(
+                controls=typing.cast(tuple[typing.Any], ())
+            ),
         }
         self.output = None
 
@@ -58,7 +54,7 @@ class Passthrough:
         unexpected = defs.keys() - {"args"}
         if unexpected:
             raise ValueError(
-                f"moops.embed.Passthrough received unexpected defs keys: {unexpected}"
+                f"moops.Passthrough received unexpected defs keys: {unexpected}"
             )
         return self
 

{moops-0.3.2 → moops-0.4.0}/src/moops/group.py

@@ -79,11 +79,7 @@ class Group:
             raise ValueError("markdown_heading_offset must be non-negative")
         _frame = inspect.currentframe()
         _caller = _frame.f_back if _frame else None
-        if (
-            _caller is not None
-            and mo.running_in_notebook()
-            and bool(_caller.f_code.co_flags & inspect.CO_COROUTINE)
-        ):
+        if _caller is not None and bool(_caller.f_code.co_flags & inspect.CO_COROUTINE):
             warnings.warn(
                 f"args.subgroup('{prefix}') called inside an async cell, "
                 "likely the cell making the embed it is used for. "