Fix up is_figurish typechecks.

Author: ayjayt

src/py/kaleido/_fig_tools.py

@@ -59,7 +59,7 @@ class Spec(TypedDict):
 
 
 # validation function
-def _is_figurish(o: Any) -> TypeGuard[Figurish]:
+def is_figurish(o: Any) -> TypeGuard[Figurish]:
     valid = hasattr(o, "to_dict") or (isinstance(o, dict) and "data" in o)
     if not valid:
         _logger.debug(
@@ -92,7 +92,7 @@ def coerce_for_js(
     path: Path | str | None,
     opts: LayoutOpts | None,
 ) -> Spec:
-    if not _is_figurish(fig):  # VALIDATE FIG
+    if not is_figurish(fig):  # VALIDATE FIG
         raise TypeError("Figure supplied doesn't seem to be a valid plotly figure.")
     if hasattr(fig, "to_dict"):  # COERCE FIG
         fig = fig.to_dict()

src/py/kaleido/kaleido.py

@@ -327,15 +327,15 @@ async def write_fig_from_object(
         tasks: set[asyncio.Task] = set()
 
         try:
-            async for args in _utils.ensure_async_iter(generator):
+            async for fig_arg in _utils.ensure_async_iter(generator):
                 spec = _fig_tools.coerce_for_js(
-                    args.get("fig"),
-                    args.get("path", None),
-                    args.get("opts", None),
+                    fig_arg.get("fig"),
+                    fig_arg.get("path", None),
+                    fig_arg.get("opts", None),
                 )
 
                 full_path = _path_tools.determine_path(
-                    args.get("path", None),
+                    fig_arg.get("path", None),
                     spec["data"],
                     spec["format"],  # should just take spec
                 )
@@ -344,7 +344,7 @@ async def write_fig_from_object(
                     self._render_task(
                         spec=spec,
                         write_path=full_path if _write else None,  # bwrds - compat!
-                        topojson=args.get("topojson"),
+                        topojson=fig_arg.get("topojson"),
                     ),
                 )
                 tasks.add(t)
@@ -369,7 +369,10 @@ async def write_fig(
         cancel_on_error=False,
     ) -> tuple[None | Exception]:  # TODO this should be filtered
         """Temp."""
-        if not isinstance(fig, (Iterable, AsyncIterable)):
+        if _fig_tools.is_figurish(fig) or not isinstance(
+            fig,
+            (Iterable, AsyncIterable),
+        ):
             fig = [fig]
 
         async def _temp_generator():