wandb 0.19.0__py3-none-macosx_11_0_arm64.whl → 0.19.1__py3-none-macosx_11_0_arm64.whl

wandb/sdk/lib/ipython.py

@@ -71,36 +71,14 @@ def in_notebook() -> bool:
     return _get_python_type() != "python"
 
 
-def display_html(html: str):  # type: ignore
-    """Display HTML in notebooks, is a noop outside a jupyter context."""
-    if wandb.run and wandb.run._settings.silent:
-        return
-    try:
-        from IPython.core.display import HTML, display  # type: ignore
-    except ImportError:
-        wandb.termwarn("Unable to render HTML, can't import display from ipython.core")
-        return False
-    return display(HTML(html))
-
-
-def display_widget(widget):
-    """Display ipywidgets in notebooks, is a noop outside of a jupyter context."""
-    if wandb.run and wandb.run._settings.silent:
-        return
-    try:
-        from IPython.core.display import display
-    except ImportError:
-        wandb.termwarn(
-            "Unable to render Widget, can't import display from ipython.core"
-        )
-        return False
-    return display(widget)
-
-
 class ProgressWidget:
     """A simple wrapper to render a nice progress bar with a label."""
 
     def __init__(self, widgets, min, max):
+        from IPython import display
+
+        self._ipython_display = display
+
         self.widgets = widgets
         self._progress = widgets.FloatProgress(min=min, max=max)
         self._label = widgets.Label()
@@ -116,7 +94,7 @@ class ProgressWidget:
             self._label.value = label
             if not self._displayed:
                 self._displayed = True
-                display_widget(self._widget)
+                self._ipython_display.display(self._widget)
         except Exception as e:
             self._disabled = True
             logger.exception(e)

wandb/sdk/lib/printer.py

@@ -426,11 +426,24 @@ class _PrinterJupyter(Printer):
         super().__init__()
         self._progress = ipython.jupyter_progress_bar()
 
+        from IPython import display
+
+        self._ipython_display = display
+
     @override
     @contextlib.contextmanager
     def dynamic_text(self) -> Iterator[DynamicText | None]:
-        # TODO: Support dynamic text in Jupyter notebooks.
-        yield None
+        handle = self._ipython_display.display(
+            self._ipython_display.HTML(""),
+            display_id=True,
+        )
+
+        if handle:
+            yield _DynamicJupyterText(handle)
+        else:
+            yield None
+
+        handle.update(self._ipython_display.HTML(""))
 
     @override
     def display(
@@ -439,25 +452,12 @@ class _PrinterJupyter(Printer):
         *,
         level: str | int | None = None,
     ) -> None:
-        text = "<br/>".join(text) if isinstance(text, (list, tuple)) else text
-        self._display_fn_mapping(level)(text)
+        if wandb.run and wandb.run._settings.silent:
+            return
 
-    @staticmethod
-    def _display_fn_mapping(level: str | int | None) -> Callable[[str], None]:
-        level = Printer._sanitize_level(level)
-
-        if level >= CRITICAL:
-            return ipython.display_html
-        elif ERROR <= level < CRITICAL:
-            return ipython.display_html
-        elif WARNING <= level < ERROR:
-            return ipython.display_html
-        elif INFO <= level < WARNING:
-            return ipython.display_html
-        elif DEBUG <= level < INFO:
-            return ipython.display_html
-        else:
-            return ipython.display_html
+        text = "<br>".join(text) if isinstance(text, (list, tuple)) else text
+        text = "<br>".join(text.splitlines())
+        self._ipython_display.display(self._ipython_display.HTML(text))
 
     @override
     @property
@@ -533,3 +533,16 @@ class _PrinterJupyter(Printer):
     def panel(self, columns: list[str]) -> str:
         row = "".join([f'<div class="wandb-col">{col}</div>' for col in columns])
         return f'{_JUPYTER_PANEL_STYLES}<div class="wandb-row">{row}</div>'
+
+
+class _DynamicJupyterText(DynamicText):
+    def __init__(self, handle) -> None:
+        from IPython import display
+
+        self._ipython_to_html = display.HTML
+        self._handle: display.DisplayHandle = handle
+
+    @override
+    def set_text(self, text: str) -> None:
+        text = "<br>".join(text.splitlines())
+        self._handle.update(self._ipython_to_html(text))

wandb/sdk/lib/progress.py

@@ -6,6 +6,7 @@ import contextlib
 from typing import Iterable, Iterator
 
 import wandb
+from wandb import env
 from wandb.proto import wandb_internal_pb2 as pb
 
 from . import printer as p
@@ -50,7 +51,12 @@ class ProgressPrinter:
         progress_text_area: p.DynamicText | None,
         settings: wandb.Settings | None,
     ) -> None:
-        self._show_operation_stats = settings and settings.x_show_operation_stats
+        self._show_operation_stats = (
+            settings
+            and settings.x_show_operation_stats
+            # Not implemented by the legacy service.
+            and not env.is_require_legacy_service()
+        )
         self._printer = printer
         self._progress_text_area = progress_text_area
         self._tick = 0

wandb/sdk/lib/sparkline.py

@@ -16,8 +16,7 @@ def sparkify(series: List[Union[float, int]]) -> str:
     """Convert <series> to a sparkline string.
 
     Example:
-    >>> sparkify([ 0.5, 1.2, 3.5, 7.3, 8.0, 12.5, 13.2, 15.0, 14.2, 11.8, 6.1,
-    ... 1.9 ])
+    >>> sparkify([0.5, 1.2, 3.5, 7.3, 8.0, 12.5, 13.2, 15.0, 14.2, 11.8, 6.1, 1.9])
     u'▁▁▂▄▅▇▇██▆▄▂'
 
     >>> sparkify([1, 1, -2, 3, -5, 8, -13])

wandb/sdk/wandb_config.py

@@ -61,8 +61,8 @@ class Config:
 
         Using absl flags
         ```
-        flags.DEFINE_string("model", None, "model to run") # name, default, help
-        wandb.config.update(flags.FLAGS) # adds all absl flags to config
+        flags.DEFINE_string("model", None, "model to run")  # name, default, help
+        wandb.config.update(flags.FLAGS)  # adds all absl flags to config
         ```
 
         Argparse flags