reacton 1.8.3__tar.gz → 1.9.1__tar.gz

{reacton-1.8.3 → reacton-1.9.1}/PKG-INFO

@@ -1,6 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: reacton
-Version: 1.8.3
+Version: 1.9.1
+Dynamic: Summary
 Project-URL: Home, https://www.github.com/widgetti/reacton
 Project-URL: Documentation, https://reacton.solara.dev
 Project-URL: Source code, https://www.github.com/widgetti/reacton
@@ -36,26 +37,28 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: User Interfaces
 Requires-Dist: ipywidgets
 Requires-Dist: typing-extensions>=4.1.1
 Provides-Extra: dev
-Requires-Dist: black; extra == 'dev'
 Requires-Dist: bqplot; extra == 'dev'
 Requires-Dist: bump2version; extra == 'dev'
 Requires-Dist: coverage; extra == 'dev'
-Requires-Dist: flake8; extra == 'dev'
 Requires-Dist: ipykernel; extra == 'dev'
 Requires-Dist: ipyvuetify; extra == 'dev'
 Requires-Dist: jinja2; extra == 'dev'
 Requires-Dist: mypy; extra == 'dev'
-Requires-Dist: numpy; extra == 'dev'
+Requires-Dist: numpy<2; extra == 'dev'
 Requires-Dist: pandas; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
+Requires-Dist: ruff; (python_version > '3.6') and extra == 'dev'
 Provides-Extra: generate
 Requires-Dist: black; extra == 'generate'
 Requires-Dist: bqplot; extra == 'generate'
 Requires-Dist: jinja2; extra == 'generate'
 Requires-Dist: mypy; extra == 'generate'
+Requires-Dist: ruff; (python_version > '3.6') and extra == 'generate'

{reacton-1.8.3 → reacton-1.9.1}/pyproject.toml

@@ -22,6 +22,8 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Framework :: Jupyter",
     "Topic :: Software Development :: User Interfaces",
     "Environment :: Web Environment",
@@ -39,15 +41,14 @@ packages = ["react_ipywidgets", "reacton"]
 
 [project.optional-dependencies]
 dev = [
-    "flake8",
-    "black",
+    "ruff; python_version > '3.6'",
     "mypy",
     "pre-commit",
     "coverage",
     "pytest",
     "pytest-cov",
     "bqplot",
-    "numpy",
+    "numpy<2",
     "ipyvuetify",
     "bump2version",
     "jinja2",
@@ -56,6 +57,7 @@ dev = [
 ]
 
 generate = [
+    "ruff; python_version > '3.6'",
     "black",
     "bqplot",
     "jinja2",
@@ -67,11 +69,6 @@ Home = "https://www.github.com/widgetti/reacton"
 Documentation = "https://reacton.solara.dev"
 "Source code" = "https://www.github.com/widgetti/reacton"
 
-[tool.black]
-line-length = 160
-
 [tool.ruff]
 line-length = 160
-
-[tool.isort]
-profile = "black"
+target-version = "py37"

{reacton-1.8.3 → reacton-1.9.1}/reacton/__init__.py

@@ -11,6 +11,7 @@ from . import _version
 
 __version__ = _version.__version__
 from .core import (
+    Fragment,
     component,
     component_interactive,
     create_context,
@@ -34,6 +35,7 @@ from .core import (
 )
 
 __all__ = [
+    "Fragment",
     "__version__",
     "component",
     "value_component",

reacton-1.9.1/reacton/_version.py

@@ -0,0 +1 @@
+__version__ = "1.9.1"

{reacton-1.8.3 → reacton-1.9.1}/reacton/bqplot.py

@@ -24,7 +24,6 @@ class FigureElement(Element[bqplot.Figure]):
 
 
 if __name__ == "__main__":
-
     from . import generate
 
     class CodeGen(generate.CodeGen):
@@ -90,7 +89,6 @@ def _Albers(
 
 @implements(_Albers)
 def Albers(**kwargs):
-
     widget_cls = bqplot.scales.Albers
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -130,7 +128,6 @@ def _AlbersUSA(
 
 @implements(_AlbersUSA)
 def AlbersUSA(**kwargs):
-
     widget_cls = bqplot.scales.AlbersUSA
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -235,7 +232,6 @@ def _Axis(
 
 @implements(_Axis)
 def Axis(**kwargs):
-
     widget_cls = bqplot.axes.Axis
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -402,7 +398,6 @@ def _Bars(
 
 @implements(_Bars)
 def Bars(**kwargs):
-
     widget_cls = bqplot.marks.Bars
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -418,7 +413,6 @@ def _BaseAxis() -> Element[bqplot.axes.BaseAxis]:
 
 @implements(_BaseAxis)
 def BaseAxis(**kwargs):
-
     widget_cls = bqplot.axes.BaseAxis
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -569,7 +563,6 @@ def _Bins(
 
 @implements(_Bins)
 def Bins(**kwargs):
-
     widget_cls = bqplot.marks.Bins
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -659,7 +652,6 @@ def _Boxplot(
 
 @implements(_Boxplot)
 def Boxplot(**kwargs):
-
     widget_cls = bqplot.marks.Boxplot
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -720,7 +712,6 @@ def _ColorAxis(
 
 @implements(_ColorAxis)
 def ColorAxis(**kwargs):
-
     widget_cls = bqplot.axes.ColorAxis
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -781,7 +772,6 @@ def _ColorScale(
 
 @implements(_ColorScale)
 def ColorScale(**kwargs):
-
     widget_cls = bqplot.scales.ColorScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -855,7 +845,6 @@ def _DateColorScale(
 
 @implements(_DateColorScale)
 def DateColorScale(**kwargs):
-
     widget_cls = bqplot.scales.DateColorScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -899,7 +888,6 @@ def _DateScale(
 
 @implements(_DateScale)
 def DateScale(**kwargs):
-
     widget_cls = bqplot.scales.DateScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -936,7 +924,6 @@ def _EquiRectangular(
 
 @implements(_EquiRectangular)
 def EquiRectangular(**kwargs):
-
     widget_cls = bqplot.scales.EquiRectangular
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1168,7 +1155,6 @@ def _FlexLine(
 
 @implements(_FlexLine)
 def FlexLine(**kwargs):
-
     widget_cls = bqplot.marks.FlexLine
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1195,7 +1181,6 @@ def _GeoScale(
 
 @implements(_GeoScale)
 def GeoScale(**kwargs):
-
     widget_cls = bqplot.scales.GeoScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1241,7 +1226,6 @@ def _Gnomonic(
 
 @implements(_Gnomonic)
 def Gnomonic(**kwargs):
-
     widget_cls = bqplot.scales.Gnomonic
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1366,7 +1350,6 @@ def _Graph(
 
 @implements(_Graph)
 def Graph(**kwargs):
-
     widget_cls = bqplot.marks.Graph
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1500,7 +1483,6 @@ def _GridHeatMap(
 
 @implements(_GridHeatMap)
 def GridHeatMap(**kwargs):
-
     widget_cls = bqplot.marks.GridHeatMap
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1579,7 +1561,6 @@ def _HeatMap(
 
 @implements(_HeatMap)
 def HeatMap(**kwargs):
-
     widget_cls = bqplot.marks.HeatMap
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1687,7 +1668,6 @@ def _Hist(
 
 @implements(_Hist)
 def Hist(**kwargs):
-
     widget_cls = bqplot.marks.Hist
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1761,7 +1741,6 @@ def _Image(
 
 @implements(_Image)
 def Image(**kwargs):
-
     widget_cls = bqplot.marks.Image
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1794,7 +1773,6 @@ def _Interaction() -> Element[bqplot.interacts.Interaction]:
 
 @implements(_Interaction)
 def Interaction(**kwargs):
-
     widget_cls = bqplot.interacts.Interaction
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -1948,7 +1926,6 @@ def _Label(
 
 @implements(_Label)
 def Label(**kwargs):
-
     widget_cls = bqplot.marks.Label
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2014,7 +1991,6 @@ def _LinearScale(
 
 @implements(_LinearScale)
 def LinearScale(**kwargs):
-
     widget_cls = bqplot.scales.LinearScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2166,7 +2142,6 @@ def _Lines(
 
 @implements(_Lines)
 def Lines(**kwargs):
-
     widget_cls = bqplot.marks.Lines
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2208,7 +2183,6 @@ def _LogScale(
 
 @implements(_LogScale)
 def LogScale(**kwargs):
-
     widget_cls = bqplot.scales.LogScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2298,7 +2272,6 @@ def _Map(
 
 @implements(_Map)
 def Map(**kwargs):
-
     widget_cls = bqplot.marks.Map
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2423,7 +2396,6 @@ def _Mark(
 
 @implements(_Mark)
 def Mark(**kwargs):
-
     widget_cls = bqplot.marks.Mark
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2470,7 +2442,6 @@ def _Mercator(
 
 @implements(_Mercator)
 def Mercator(**kwargs):
-
     widget_cls = bqplot.scales.Mercator
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2574,7 +2545,6 @@ def _OHLC(
 
 @implements(_OHLC)
 def OHLC(**kwargs):
-
     widget_cls = bqplot.marks.OHLC
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2626,7 +2596,6 @@ def _OrdinalColorScale(
 
 @implements(_OrdinalColorScale)
 def OrdinalColorScale(**kwargs):
-
     widget_cls = bqplot.scales.OrdinalColorScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2664,7 +2633,6 @@ def _OrdinalScale(
 
 @implements(_OrdinalScale)
 def OrdinalScale(**kwargs):
-
     widget_cls = bqplot.scales.OrdinalScale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2715,7 +2683,6 @@ def _Orthographic(
 
 @implements(_Orthographic)
 def Orthographic(**kwargs):
-
     widget_cls = bqplot.scales.Orthographic
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2752,7 +2719,6 @@ def _PanZoom(
 
 @implements(_PanZoom)
 def PanZoom(**kwargs):
-
     widget_cls = bqplot.interacts.PanZoom
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2893,7 +2859,6 @@ def _Pie(
 
 @implements(_Pie)
 def Pie(**kwargs):
-
     widget_cls = bqplot.marks.Pie
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2935,7 +2900,6 @@ def _Scale(
 
 @implements(_Scale)
 def Scale(**kwargs):
-
     widget_cls = bqplot.scales.Scale
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -3149,7 +3113,6 @@ def _Scatter(
 
 @implements(_Scatter)
 def Scatter(**kwargs):
-
     widget_cls = bqplot.marks.Scatter
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -3264,7 +3227,6 @@ def _ScatterGL(
 
 @implements(_ScatterGL)
 def ScatterGL(**kwargs):
-
     widget_cls = bqplot.marks.ScatterGL
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -3315,7 +3277,6 @@ def _Stereographic(
 
 @implements(_Stereographic)
 def Stereographic(**kwargs):
-
     widget_cls = bqplot.scales.Stereographic
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)

{reacton-1.8.3 → reacton-1.9.1}/reacton/core.py

@@ -6,6 +6,7 @@ ReactJS - ipywidgets relation:
  * Component -- function
 
 """
+
 import contextlib
 import copy
 import functools
@@ -230,6 +231,7 @@ class Element(Generic[W]):
         self._meta = {}
         # for debugging/testing only
         self._render_count = 0
+        self._key_frozen: bool = False
 
         rc = _get_render_context(required=False)
         if rc is not None and rc.container_adders:
@@ -269,6 +271,8 @@ class Element(Generic[W]):
 
         This can help render performance. See documentation for details.
         """
+        if self._key_frozen:
+            raise RuntimeError("Element keys should not be mutated after rendering")
         self._key = value
         return self
 
@@ -333,7 +337,7 @@ class Element(Generic[W]):
 
     def __enter__(self):
         rc = _get_render_context()
-        ca = ContainerAdder[T](self, "children")
+        ca = ContainerAdder[W](self, "children")
         assert rc.context is not None
         rc.container_adders.append(ca)
         return self
@@ -475,11 +479,9 @@ class Element(Generic[W]):
 
 
 class Value(Generic[V], Protocol):
-    def get(self) -> V:
-        ...
+    def get(self) -> V: ...
 
-    def set(self, value: V):
-        ...
+    def set(self, value: V): ...
 
 
 class ValueElement(Generic[W, V], Element[W]):
@@ -677,18 +679,15 @@ class ComponentFunction(Component):
 
 
 @overload
-def component(obj: None = None, mime_bundle=...) -> Callable[[FuncT], FuncT]:
-    ...
+def component(obj: None = None, mime_bundle=...) -> Callable[[FuncT], FuncT]: ...
 
 
 @overload
-def component(obj: FuncT, mime_bundle=...) -> FuncT:
-    ...
+def component(obj: FuncT, mime_bundle=...) -> FuncT: ...
 
 
 @overload
-def component(obj: Callable[P, None], mime_bundle=...) -> Callable[P, Element]:
-    ...
+def component(obj: Callable[P, None], mime_bundle=...) -> Callable[P, Element]: ...
 
 
 # it is actually this...
@@ -712,15 +711,13 @@ def component(obj: Union[Callable[P, None], FuncT] = None, mime_bundle: Dict[str
 @overload
 def value_component(
     value_type: None, value_name="value", mime_bundle: Dict[str, Any] = mime_bundle_default
-) -> Callable[[Callable[P, ValueElement[W, V]]], Callable[P, ValueElement[W, V]]]:
-    ...
+) -> Callable[[Callable[P, ValueElement[W, V]]], Callable[P, ValueElement[W, V]]]: ...
 
 
 @overload
 def value_component(
     value_type: Type[V], value_name="value", mime_bundle: Dict[str, Any] = mime_bundle_default
-) -> Callable[[Callable[P, Element[W]]], Callable[P, ValueElement[W, V]]]:
-    ...
+) -> Callable[[Callable[P, Element[W]]], Callable[P, ValueElement[W, V]]]: ...
 
 
 def value_component(value_type: Union[Type[V], None], value_name="value", mime_bundle: Dict[str, Any] = mime_bundle_default):
@@ -835,13 +832,11 @@ def use_state_widget(widget: widgets.Widget, prop_name, key=None):
 
 
 @overload
-def get_render_context(required: Literal[True] = ...) -> "_RenderContext":
-    ...
+def get_render_context(required: Literal[True] = ...) -> "_RenderContext": ...
 
 
 @overload
-def get_render_context(required: Literal[False] = ...) -> Optional["_RenderContext"]:
-    ...
+def get_render_context(required: Literal[False] = ...) -> Optional["_RenderContext"]: ...
 
 
 def get_render_context(required=True):
@@ -1588,6 +1583,7 @@ class _RenderContext:
         key = el._key
         if key is None:
             key = default_key
+        el._key_frozen = True
 
         logger.debug("Render: (%s,%s)  - %r", parent_key, key, element)
 
@@ -1697,7 +1693,6 @@ class _RenderContext:
                     # back the root element
                     root_element: Optional[Element] = None
                     try:
-                        stack = contextlib.ExitStack()
                         with contextlib.ExitStack() as stack:
                             for cm in context.context_managers:
                                 stack.enter_context(cm)
@@ -1795,8 +1790,6 @@ class _RenderContext:
         kwargs = el.kwargs.copy()
         key = el._key
         if key is None:
-            if default_key == "/":
-                default_key = "/"
             key = default_key
         assert key is not None
         logger.debug("Reconsolidate: (%s,%s) %r", parent_key, key, el)
@@ -1807,7 +1800,6 @@ class _RenderContext:
 
         already_reconsolidated = el in self._shared_elements
         if already_reconsolidated and el is not self.element and el.is_shared:
-
             logger.debug("Reconsolidate: Using existing widget (prev = %r)", el_prev)
             # keeping this for debugging
             # logger.debug("Current:")
@@ -1891,6 +1883,9 @@ class _RenderContext:
                                         context.needs_render = True
                                 effect = child_context.effects[effect_index] = effect.next
                                 try:
+                                    if child_context.exceptions_self or child_context.exceptions_children:
+                                        # we had an exception, so we skip the effect (not the cleanup)
+                                        continue
                                     effect()
                                 except BaseException as e:
                                     context.exceptions_self.append(e)
@@ -1899,6 +1894,9 @@ class _RenderContext:
                                     context.needs_render = True
                         else:
                             try:
+                                if child_context.exceptions_self or child_context.exceptions_children:
+                                    # we had an exception, so we skip the effect (not the cleanup)
+                                    continue
                                 effect()
                             except BaseException as e:
                                 context.exceptions_self.append(e)
@@ -2044,12 +2042,12 @@ class _RenderContext:
             raise
         finally:
             # this marks the work as 'done'
+            # move from _elemens_next to _elements
             context.elements[key] = context.elements_next.pop(key)
 
             if el_prev in self._shared_elements:
                 self._shared_elements.remove(el_prev)
 
-            # move from _elemens_next to _elements
             if el.is_shared:
                 assert el not in self._shared_elements
                 self._shared_elements.add(el)
@@ -2082,8 +2080,6 @@ class _RenderContext:
     def _remove_element(self, el: Element, default_key: str, parent_key):
         key = el._key
         if key is None:
-            if default_key == "/":
-                default_key = "/"
             key = default_key
         assert key is not None
         assert self.context is not None
@@ -2123,6 +2119,17 @@ class _RenderContext:
                 new_parent_key = join_key(parent_key, key)
                 self._remove_element(self.context.root_element, "/", parent_key=new_parent_key)
             finally:
+                try:
+                    assert not child_context.elements, f"left over elements {child_context.elements}"
+                    assert not child_context.element_to_widget, f"left over element_to_widget {child_context.element_to_widget}"
+                    assert not child_context.widgets, f"left over widgets {child_context.widgets}"
+                    assert not child_context.children, f"left over children {child_context.children}"
+                    assert not child_context.owns, f"left over owns {child_context.owns}"
+                    # TODO: this is not the case when an exception occurs
+                    # assert not child_context.children_next, f"left over children {child_context.children_next}"
+                except Exception as e:
+                    child_context.exceptions_self.append(e)
+
                 # restore context
                 self.context = context
             if child_context.exceptions_self or child_context.exceptions_children and not child_context.exception_handler:
@@ -2157,14 +2164,6 @@ class _RenderContext:
         if el in context.element_to_widget:
             del context.element_to_widget[el]
         del context.elements[key]
-        if isinstance(el.component, ComponentFunction):
-            assert not child_context.elements, f"left over elements {child_context.elements}"
-            assert not child_context.element_to_widget, f"left over element_to_widget {child_context.element_to_widget}"
-            assert not child_context.widgets, f"left over widgets {child_context.widgets}"
-            assert not child_context.children, f"left over children {child_context.children}"
-            assert not child_context.owns, f"left over owns {child_context.owns}"
-            # TODO: this is not the case when an exception occurs
-            # assert not child_context.children_next, f"left over children {child_context.children_next}"
 
     def _visit_children(self, el: Element, default_key: str, parent_key: str, f: Callable):
         assert self.context is not None
@@ -2180,7 +2179,13 @@ class _RenderContext:
             return f(value, key, parent_key)
         elif isinstance(value, (list, tuple)):
             was_tuple = isinstance(value, tuple)
-            values = [self._visit_children_values(v, f"{key}{index}/", parent_key, f) for index, v in enumerate(value)]
+            values = []
+            for index, v in enumerate(value):
+                new_value = self._visit_children_values(v, f"{key}{index}/", parent_key, f)
+                if isinstance(new_value, FragmentWidget):
+                    values.extend(new_value.children)
+                else:
+                    values.append(new_value)
             if was_tuple:
                 return tuple(values)
             return values
@@ -2193,15 +2198,13 @@ class _RenderContext:
 @overload
 def render(
     element: Element[T], container: None = None, children_trait="children", handle_error: bool = True, initial_state=None
-) -> Tuple[widgets.HBox, _RenderContext]:
-    ...
+) -> Tuple[widgets.HBox, _RenderContext]: ...
 
 
 @overload
 def render(
     element: Element[T], container: None = None, children_trait="children", handle_error: bool = True, initial_state=None
-) -> Tuple[widgets.Widget, _RenderContext]:
-    ...
+) -> Tuple[widgets.Widget, _RenderContext]: ...
 
 
 def render(element: Element[T], container: widgets.Widget = None, children_trait="children", handle_error: bool = True, initial_state=None):
@@ -2320,8 +2323,18 @@ def __getattr__(name):
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 
 
+class FragmentWidget(widgets.VBox):
+    def __init__(self, children, **kwargs):
+        super().__init__(children=children, **kwargs)
+
+
+@component
+def Fragment(children: List[Element]):
+    return FragmentWidget.element(children=children)
+
+
 _last_interactive_vbox = None
-_default_container: Optional[Callable[..., Element]] = None
+_default_container: Optional[Callable[..., Element]] = Fragment
 # not a public api yet, used in solara for now only.
 # lifecycle of context objects are linked to the lifecycle of the component
 _component_context_manager_classes: List[Any] = []

{reacton-1.8.3 → reacton-1.9.1}/reacton/core_test.py

@@ -378,7 +378,6 @@ def test_render_replace():
 
 
 def test_render_conditional_child():
-
     set_value = lambda x: None  # noqa
 
     @react.component
@@ -404,7 +403,6 @@ def test_render_conditional_child():
 
 
 def test_render_conditional_replace_component_with_element():
-
     set_value = lambda x: None  # noqa
 
     def Container():
@@ -1383,7 +1381,6 @@ def test_container_context_bqplot():
 
 
 def test_get_widget(Container):
-
     button1 = None
     button2 = None
 
@@ -1998,6 +1995,28 @@ def test_recover_exception_in_widget_update(Container1, Container2):
     rc.close()
 
 
+def test_exception_in_child_no_run_effect():
+    set_fail = None
+
+    mock = unittest.mock.Mock()
+
+    @react.component
+    def Test():
+        nonlocal set_fail
+        children = v.Btn(children=[1])
+        # we do not want to run this effect
+        use_effect(mock, [])
+        return children
+
+    box, rc = react.render(Test(), handle_error=True)
+    assert not mock.called
+
+    assert not rc.find(ipyvuetify.Btn)
+    assert "Traceback" in rc.find(ipywidgets.HTML).widget.value
+
+    rc.close()
+
+
 def test_state_get():
     set_value = None
 
@@ -2945,7 +2964,6 @@ def test_close_when_overridden():
 
 
 def test_render_perf_child_only():
-
     render_child = unittest.mock.Mock()
     render_main = unittest.mock.Mock()
     set_text = lambda x: None  # noqa
@@ -3142,3 +3160,47 @@ def test_memory_leak(component):
     del rc
     gc.collect()
     assert weak_rc() is None
+
+
+def test_fragment():
+    @reacton.component
+    def Children():
+        with reacton.Fragment():
+            w.Button(description="1")
+            w.Button(description="2")
+
+    @reacton.component
+    def Test():
+        with w.VBox():
+            Children()
+
+    box, rc = react.render(Test(), handle_error=False)
+    vbox = rc.find(widgets.VBox).widget
+    assert len(vbox.children) == 2
+    assert isinstance(vbox.children[0], widgets.Button)
+    assert isinstance(vbox.children[1], widgets.Button)
+    assert vbox.children[0].description == "1"
+    assert vbox.children[1].description == "2"
+    rc.close()
+
+
+def test_key_mutate_protection(Container):
+    button = ButtonComponentFunction(description="Hi")
+    set_state = lambda value: None  # noqa
+
+    @react.component
+    def Test():
+        nonlocal set_state
+        state, set_state = react.use_state(0)
+        if state == 0:
+            return Container(children=[button])
+        else:
+            return Container(children=[button.key("i_should_not_be_mutated")]).key("bla")
+
+    box, rc = react.render(Test(), handle_error=False)
+    assert rc.find(widgets.Button).widget.description == "Hi"
+    assert button._key is None
+    with pytest.raises(RuntimeError, match="Element keys should not be mutated after rendering"):
+        set_state(1)
+    rc.render(w.HTML(value="recover").key("HTML"))
+    rc.close()

{reacton-1.8.3 → reacton-1.9.1}/reacton/deprecated/ipyvuetify.py

@@ -3300,7 +3300,7 @@ def _Flex(
     py_1: bool = None,
     py_2: bool = None,
     py_3: bool = None,
-    **kwargs
+    **kwargs,
 ) -> ValueElement[ipyvuetify.generated.Flex, Any]:
     """ """
     ...

{reacton-1.8.3 → reacton-1.9.1}/reacton/generate.py

@@ -5,7 +5,6 @@ from inspect import isclass
 from textwrap import indent
 from typing import Any, Dict, Generic, Type, TypeVar
 
-import black
 import bqplot
 import ipywidgets
 import ipywidgets as widgets  # type: ignore
@@ -106,9 +105,28 @@ class CodeGen(Generic[W]):
     def get_ignore_props(self, cls):
         return self.ignore_props
 
+    # Replicated from https://gist.github.com/shner-elmo/b2639a4d1e04ceafaad120acfb31213c
+    def ruff_format(self, code: str) -> str:
+        import subprocess
+        from ruff.__main__ import find_ruff_bin
+
+        ruff_args = [
+            find_ruff_bin(),
+            "format",
+            "--stdin-filename",
+            "foo.py",  # you can pass any random string, it wont use it...
+            # these two lines are optional, but this is how you can pass the config for ruff
+            "--line-length",
+            f"{MAX_LINE_LENGTH}",
+        ]
+        proc = subprocess.run(ruff_args, input=code, text=True, capture_output=True)
+        proc.check_returncode()  # raise an Exception if return code is not 0
+        return proc.stdout
+
     def generate_component(self, cls: Type[widgets.Widget], blacken=True):
         element_class_name = self.get_element_class(cls).__name__
         ignore = self.get_ignore_props(cls)
+
         traits = {key: value for key, value in cls.class_traits().items() if "output" not in value.metadata and not key.startswith("_") and key not in ignore}
 
         def has_default(trait):
@@ -293,9 +311,8 @@ del _{{ method_name }}
         )
 
         if blacken:
-            mode = black.Mode(line_length=MAX_LINE_LENGTH)
             try:
-                code = black.format_file_contents(code, fast=False, mode=mode)
+                code = self.ruff_format(code)
             except Exception:
                 print("code:\n", code)
                 raise
@@ -325,10 +342,7 @@ del _{{ method_name }}
             raise ValueError(f"Could not find new line after marker: {marker!r}")
         code_total = current_code[: start + 1] + "\n" + code
         if blacken:
-            import black
-
-            mode = black.Mode(line_length=MAX_LINE_LENGTH)
-            code_total = black.format_file_contents(code_total, fast=False, mode=mode)
+            code_total = self.ruff_format(code_total)
         only_valid = True
         if only_valid:
             try:

{reacton-1.8.3 → reacton-1.9.1}/reacton/generate_test.py

@@ -1,9 +1,12 @@
+import sys
 import ipywidgets as widgets
 import traitlets
+import pytest
 
 from .generate import CodeGen
 
 
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="Ruff does not support Python < 3.7")
 def test_basic():
     class MyTest(traitlets.HasTraits):
         a = traitlets.traitlets.Int(1)
@@ -22,7 +25,6 @@ def _MyTest(
 
 @implements(_MyTest)
 def MyTest(**kwargs):
-
     widget_cls = reacton.generate_test.MyTest
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -33,6 +35,7 @@ del _MyTest
     assert code.strip() == code_expected.strip()
 
 
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="Ruff does not support Python < 3.7")
 def test_value():
     class MyTest(traitlets.HasTraits):
         a = traitlets.traitlets.Int(1)
@@ -51,7 +54,6 @@ def _MyTest(
 
 @implements(_MyTest)
 def MyTest(**kwargs):
-
     widget_cls = reacton.generate_test.MyTest
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return ValueElement("value", comp, kwargs=kwargs)
@@ -62,6 +64,7 @@ del _MyTest
     assert code.strip() == code_expected.strip()
 
 
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="Ruff does not support Python < 3.7")
 def test_instance_non_widget():
     class NonWidget:
         def __init__(self, *args) -> None:
@@ -85,7 +88,6 @@ def _MyTest(
 
 @implements(_MyTest)
 def MyTest(**kwargs):
-
     widget_cls = reacton.generate_test.MyTest
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -95,6 +97,7 @@ del _MyTest'''
     assert code.strip() == code_expected.strip()
 
 
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="Ruff does not support Python < 3.7")
 def test_instance_widget():
     class SomeWidget(widgets.Widget):
         def __init__(self, *args) -> None:
@@ -116,7 +119,6 @@ def _MyTest(
 
 @implements(_MyTest)
 def MyTest(**kwargs):
-
     widget_cls = reacton.generate_test.MyTest
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)

{reacton-1.8.3 → reacton-1.9.1}/reacton/ipycanvas.py

@@ -11,7 +11,6 @@ from . import ipywidgets as w
 from .utils import implements
 
 if __name__ == "__main__":
-
     from .generate import generate
 
     generate(__file__, [ipycanvas])
@@ -176,7 +175,6 @@ def _Path2D(value: str = "", on_value: typing.Callable[[str], Any] = None) -> El
 
 @implements(_Path2D)
 def Path2D(**kwargs):
-
     widget_cls = ipycanvas.canvas.Path2D
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)

reacton-1.9.1/reacton/ipyvuetify.py

@@ -0,0 +1,7 @@
+# for backward compatibility
+from .ipyvue import use_event  # noqa: F401
+
+try:
+    from ipyvuetify.components import *  # type: ignore  # noqa: F401, F403
+except ModuleNotFoundError:
+    from reacton.deprecated.ipyvuetify import *  # type: ignore  # noqa: F401, F403

{reacton-1.8.3 → reacton-1.9.1}/reacton/ipywidgets.py

@@ -545,7 +545,6 @@ def _ButtonStyle(
 
 @implements(_ButtonStyle)
 def ButtonStyle(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_button.ButtonStyle
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -746,7 +745,6 @@ def _CoreWidget() -> Element[ipywidgets.widgets.widget_core.CoreWidget]:
 
 @implements(_CoreWidget)
 def CoreWidget(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_core.CoreWidget
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2016,7 +2014,6 @@ def _Layout(
 
 @implements(_Layout)
 def Layout(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_layout.Layout
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2670,7 +2667,6 @@ def _SliderStyle(
 
 @implements(_SliderStyle)
 def SliderStyle(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_int.SliderStyle
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -2686,7 +2682,6 @@ def _Style() -> Element[ipywidgets.widgets.widget_style.Style]:
 
 @implements(_Style)
 def Style(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_style.Style
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -3011,7 +3006,6 @@ def _ToggleButtonsStyle(
 
 @implements(_ToggleButtonsStyle)
 def ToggleButtonsStyle(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_selection.ToggleButtonsStyle
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -3210,7 +3204,6 @@ def _ValueWidget(value: Any = None, on_value: typing.Callable[[Any], Any] = None
 
 @implements(_ValueWidget)
 def ValueWidget(**kwargs):
-
     widget_cls = ipywidgets.widgets.valuewidget.ValueWidget
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return ValueElement("value", comp, kwargs=kwargs)
@@ -3327,7 +3320,6 @@ def _DescriptionStyle(
 
 @implements(_DescriptionStyle)
 def DescriptionStyle(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_description.DescriptionStyle
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)
@@ -3383,7 +3375,6 @@ def _ProgressStyle(
 
 @implements(_ProgressStyle)
 def ProgressStyle(**kwargs):
-
     widget_cls = ipywidgets.widgets.widget_int.ProgressStyle
     comp = reacton.core.ComponentWidget(widget=widget_cls)
     return Element(comp, kwargs=kwargs)

{reacton-1.8.3 → reacton-1.9.1}/reacton/logging.py

@@ -3,6 +3,7 @@
 See `configuration of logging <conf.html#logging>`_ how to configure logging.
 
 """
+
 import logging
 import os
 from typing import Optional

{reacton-1.8.3 → reacton-1.9.1}/reacton/utils_test.py

@@ -145,7 +145,6 @@ def test_isinstance_lazy():
     assert isinstance_lazy(1, int)
     assert isinstance_lazy(1, (int, "does.not.exist"))
     assert not isinstance_lazy(1, "does.not.exist")
-    import pandas
 
     sys.modules.pop("pandas", None)
     assert not isinstance_lazy(1, "pandas.DataFrame")

reacton-1.8.3/reacton/_version.py

@@ -1 +0,0 @@
-__version__ = "1.8.3"

reacton-1.8.3/reacton/ipyvuetify.py

@@ -1,7 +0,0 @@
-# for backward compatibility
-from .ipyvue import use_event  # noqa: F401
-
-try:
-    from ipyvuetify.components import *  # noqa: F401, F403
-except ModuleNotFoundError:
-    from reacton.deprecated.ipyvuetify import *  # noqa: F401, F403