auto-options-python 0.1.6__tar.gz → 0.1.7__tar.gz

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: auto-options-python
-Version: 0.1.6
-Summary: Mange command options in python and create QWidgets for them.
-Author: Volker Baecker
-Author-email: volker.baecker@mri.cnrs.fr
+Version: 0.1.7
+Summary: Manage command options in Python and create QWidgets for them.
+Author-email: Volker Baecker <volker.baecker@mri.cnrs.fr>, Clément Benedetti <clement.benedetti@mri.cnrs.fr>
 License: MIT License
         
         Copyright (c) 2025 Montpellier Ressources Imagerie
@@ -47,7 +46,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: appdirs
-Requires-Dist: pyqt5
 Requires-Dist: qtpy
 Requires-Dist: napari
 Requires-Dist: pyperclip

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "auto-options-python"
 dynamic = ["version"]
-description = "Mange command options in python and create QWidgets for them."
+description = "Manage command options in Python and create QWidgets for them."
 readme = "README.md"
 license = {file = "LICENSE"}
 authors = [
-  {name = "Volker Baecker"},
-  {email = "volker.baecker@mri.cnrs.fr"},
+  {name = "Volker Baecker", email = "volker.baecker@mri.cnrs.fr"},
+  {name = "Clément Benedetti", email = "clement.benedetti@mri.cnrs.fr"}
 ]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -30,7 +30,6 @@ requires-python = ">=3.10"
 # See best practices: https://napari.org/stable/plugins/building_a_plugin/best_practices.html
 dependencies = [
     "appdirs",
-    "pyqt5",
     "qtpy",
     "napari",
     "pyperclip",

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/src/auto_options_python.egg-info/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: auto-options-python
-Version: 0.1.6
-Summary: Mange command options in python and create QWidgets for them.
-Author: Volker Baecker
-Author-email: volker.baecker@mri.cnrs.fr
+Version: 0.1.7
+Summary: Manage command options in Python and create QWidgets for them.
+Author-email: Volker Baecker <volker.baecker@mri.cnrs.fr>, Clément Benedetti <clement.benedetti@mri.cnrs.fr>
 License: MIT License
         
         Copyright (c) 2025 Montpellier Ressources Imagerie
@@ -47,7 +46,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: appdirs
-Requires-Dist: pyqt5
 Requires-Dist: qtpy
 Requires-Dist: napari
 Requires-Dist: pyperclip

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/src/auto_options_python.egg-info/SOURCES.txt

@@ -32,8 +32,13 @@ src/autooptions/qtutil.py
 src/autooptions/widget.py
 src/autooptions/_tests/__init__.py
 src/autooptions/_tests/test_array_util.py
+src/autooptions/_tests/test_layouts.py
 src/autooptions/_tests/test_napari_util.py
 src/autooptions/_tests/test_options.py
 src/autooptions/_tests/test_qtutil.py
 src/autooptions/_tests/test_widget.py
+src/autooptions/layouts/__init__.py
+src/autooptions/layouts/base_layout.py
+src/autooptions/layouts/grid_layout.py
+src/autooptions/layouts/vertical_layout.py
 src/scratch/options.py

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/src/auto_options_python.egg-info/requires.txt

@@ -1,5 +1,4 @@
 appdirs
-pyqt5
 qtpy
 napari
 pyperclip

auto_options_python-0.1.7/src/autooptions/_tests/test_layouts.py

@@ -0,0 +1,80 @@
+import pytest
+import os
+import numpy as np
+
+from autooptions.widget import OptionsWidget
+from autooptions.options import Options
+from autooptions.layouts import LayoutFactory
+
+
+class TestLayoutUtils:
+
+    @staticmethod
+    def getLayoutsList():
+        return list(LayoutFactory.availableLayouts.keys())
+
+
+class TestLayouts:
+
+    def onSomethingHappened(self, value):
+        self.lastValue = value
+
+    @pytest.fixture()
+    def options(self):
+        options = Options("Autooptions Test", "Layouts Test")
+        options.addImage("image", value=None, transient=True, optional=(True, False))
+        options.addLabels("labels", value="labels_layer", transient=True)
+        options.addPoints("points", value="points_layer", transient=True)
+        options.addFFT("fft", value=None, transient=True)
+        options.addStr("group", value="lps", optional=(True, True))
+        options.addInt("size xy", value=3)
+        options.addInt("size z", value=1)
+        options.addChoice(
+            "footprint",
+            choices=["none", "cube", "ball", "octahedron"],
+            callback=self.onSomethingHappened,
+        )
+        options.addFloat("sigma", value=1.34)
+        options.addBool("do it", value=True)
+        yield options
+
+    @pytest.mark.parametrize("layout_type", TestLayoutUtils.getLayoutsList())
+    def testLayoutInstanciation(self, options, make_napari_viewer_proxy, layout_type):
+        viewer = make_napari_viewer_proxy()
+        widget = OptionsWidget(viewer, options, layout_type=layout_type, client=self)
+        assert widget.options is options
+        assert widget.viewer is viewer
+        assert widget.client is self
+        assert type(widget.layout()) is LayoutFactory.availableLayouts[layout_type]
+
+    @pytest.mark.parametrize("layout_type", TestLayoutUtils.getLayoutsList())
+    @pytest.mark.parametrize("same_row", [None, [], ["labels", "points"], ["size z"]])
+    def testLayoutLength(
+        self, options, make_napari_viewer_proxy, layout_type, same_row
+    ):
+        viewer = make_napari_viewer_proxy()
+        widget = OptionsWidget(
+            viewer, options, layout_type=layout_type, sameRowSet=same_row, client=self
+        )
+        n_widgets = len(options)
+        expected = n_widgets - (len(same_row) if same_row else 0)
+        assert widget.layout().size() == expected
+
+    @pytest.mark.parametrize("field_width", [50, 300])
+    def testLayoutSizingFixed(self, options, make_napari_viewer_proxy, field_width):
+        viewer = make_napari_viewer_proxy()
+        args = {"name": "vertical", "max_width": field_width}
+        widget = OptionsWidget(viewer, options, layout_type=args, client=self)
+        for _, w in widget.widgets.values():
+            assert w.maximumWidth() == field_width
+
+    @pytest.mark.parametrize("layout_type", TestLayoutUtils.getLayoutsList())
+    def testWidgetsHierarchy(self, options, make_napari_viewer_proxy, layout_type):
+        viewer = make_napari_viewer_proxy()
+        widget = OptionsWidget(viewer, options, layout_type=layout_type, client=self)
+        for cb, w in widget.widgets.values():
+            assert w.parent() is widget
+            assert w in widget.children()
+            if cb is not None:
+                assert cb.parent() is widget
+                assert cb in widget.children()

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/src/autooptions/_tests/test_options.py

@@ -157,11 +157,12 @@ class TestOptions:
 
 
     def testGetBaseOption(self, options):
-        option = options.getBaseOption(7, True, None, self.onSomething)
+        option = options._getBaseOption(7, True, None, self.onSomething, [True, False])
         assert option["value"] == 7
         assert option["transient"] == True
         assert option["position"] == 6
         assert option["callback"] == "onSomething"
+        assert option["optional"] == [True, False]
 
 
     def test_GetPosition(self, options):

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/src/autooptions/_tests/test_qtutil.py

@@ -7,21 +7,16 @@ from autooptions.qtutil import WidgetTool
 from autooptions.qtutil import TableView
 from autooptions.qtutil import PlotWidget
 
-
-
 COUNTER_TEXT_CHANGED = 0
 
 
-
 class ParentWidget(QWidget):
 
-
     def __init__(self):
         super().__init__()
         self.setWindowTitle("Test")
 
 
-
 def handleTextChanged(text):
     global COUNTER_TEXT_CHANGED
     COUNTER_TEXT_CHANGED = COUNTER_TEXT_CHANGED + 1
@@ -29,57 +24,38 @@ def handleTextChanged(text):
 
 def testGetLineInput(make_napari_viewer_proxy):
     make_napari_viewer_proxy()
-    parent = ParentWidget()
-    label, inputWidget = WidgetTool.getLineInput(parent,
-                                            "your guess",
-                                            10,
-                                            50,
-                                            handleTextChanged)
-    assert label in parent.children()
-    assert inputWidget in parent.children()
-    assert label.parent() == parent
-    assert inputWidget.parent() == parent
+    label, inputWidget, cbActive = WidgetTool.getLineInput(
+        "your guess", 10, callback=handleTextChanged
+    )
     assert label.text() == "your guess"
     counter = COUNTER_TEXT_CHANGED
     assert inputWidget.text() == str(10)
     inputWidget.setText("20")
-    assert COUNTER_TEXT_CHANGED == counter  # Only editing in the interface sends the signal,
-                                            # not programmatically changing the value
-    assert inputWidget.maximumWidth() == 50
+    # Editing in the interface -> sends the signal
+    # Programmatically changing the value -> does not send the signal
+    assert COUNTER_TEXT_CHANGED == counter
+    assert cbActive is None
 
 
 def testGetLineInputNoCallback(make_napari_viewer_proxy):
     make_napari_viewer_proxy()
-    parent = ParentWidget()
-    label, inputWidget = WidgetTool.getLineInput(parent,
-                                            "your guess",
-                                            10,
-                                            50,
-                                            None)
-    assert label in parent.children()
-    assert inputWidget in parent.children()
-    assert label.parent() == parent
-    assert inputWidget.parent() == parent
+    label, inputWidget, cbActive = WidgetTool.getLineInput("your guess", 10)
     assert label.text() == "your guess"
     counter = COUNTER_TEXT_CHANGED
     assert inputWidget.text() == str(10)
     inputWidget.setText("20")
-    assert inputWidget.maximumWidth() == 50
     assert COUNTER_TEXT_CHANGED == counter
+    assert cbActive is None  # by default, options are not optional
 
 
 def testGetComboBox(make_napari_viewer_proxy, mocker):
     make_napari_viewer_proxy()
-    parent = ParentWidget()
-    callback = mocker.stub(name='onSelectedFruitChanged')
-    label, comboWidget = WidgetTool.getComboInput(parent,
-                                                  "fruits",
-                                                  ["apple", "orange", "banana"],
-                                                  callback=callback)
-    assert label in parent.children()
-    assert comboWidget in parent.children()
-    assert label.parent() == parent
-    assert comboWidget.parent() == parent
+    callback = mocker.stub(name="onSelectedFruitChanged")
+    label, comboWidget, _ = WidgetTool.getComboInput(
+        "fruits", 
+        ["apple", "orange", "banana"], 
+        callback=callback
+    )
     assert label.text() == "fruits"
     allItems = [comboWidget.itemText(i) for i in range(comboWidget.count())]
     assert allItems == ["apple", "orange", "banana"]
@@ -89,12 +65,12 @@ def testGetComboBox(make_napari_viewer_proxy, mocker):
     callback.assert_called_once_with("banana")
 
 
-def testReplaceItemsInComboBox(make_napari_viewer_proxy, mocker):
+def testReplaceItemsInComboBox(make_napari_viewer_proxy):
     make_napari_viewer_proxy()
-    parent = ParentWidget()
-    label, comboWidget = WidgetTool.getComboInput(parent,
-                                                  "fruits",
-                                                  ["apple", "orange", "banana"])
+    _, comboWidget, _ = WidgetTool.getComboInput(
+        "fruits", 
+        ["apple", "orange", "banana"]
+    )
     WidgetTool.replaceItemsInComboBox(comboWidget, ["lemon", "ananas"])
     allItems = [comboWidget.itemText(i) for i in range(comboWidget.count())]
     assert allItems == ["lemon", "ananas"]
@@ -108,34 +84,22 @@ def testReplaceItemsInComboBox(make_napari_viewer_proxy, mocker):
 
 def testGetCheckBox(make_napari_viewer_proxy, mocker):
     make_napari_viewer_proxy()
-    parent = ParentWidget()
-    callback = mocker.stub(name='onRemoveBackgroundChanged')
-    label, checkbox = WidgetTool.getCheckbox(parent,
-                                             "remove background",
-                                             True,
-                                             50,
-                                             callback)
-    assert label in parent.children()
-    assert checkbox in parent.children()
-    assert checkbox.parent() == parent
-    assert label.parent() == parent
+    callback = mocker.stub(name="onRemoveBackgroundChanged")
+    label, checkbox, _ = WidgetTool.getCheckbox(
+        "remove background", 
+        True, 
+        callback=callback
+    )
     assert label.text() == "remove background"
     assert checkbox.isChecked()
-    assert checkbox.maximumWidth() == 50
     checkbox.setChecked(False)
     callback.assert_called_once_with(False)
-    label2, checkbox2 = WidgetTool.getCheckbox(parent,
-                                             "smooth",
-                                             False,
-                                             50,
-                                             None)
+    _, checkbox2, _ = WidgetTool.getCheckbox("smooth", False, callback=None)
     assert not checkbox2.isChecked()
 
 
-
 class TestTableView:
 
-
     def testConstructor(self, make_napari_viewer_proxy):
         make_napari_viewer_proxy()
         table = {"area": [23.87, 65.28, 12.98], "mean": [19992, 2233, 24553]}
@@ -144,7 +108,6 @@ class TestTableView:
         tableView2 = TableView(None)
         assert not tableView2.data
 
-
     def testSetData(self, make_napari_viewer_proxy):
         make_napari_viewer_proxy()
         table = {"area": [23.87, 65.28, 12.98], "mean": [19992, 2233, 24553]}
@@ -153,7 +116,6 @@ class TestTableView:
         tableView.setData(table2)
         assert tableView.data == table2
 
-
     def testResetView(self, make_napari_viewer_proxy):
         make_napari_viewer_proxy()
         table = {"area": [23.87, 65.28, 12.98], "mean": [19992, 2233, 24553]}
@@ -161,32 +123,39 @@ class TestTableView:
         tableView.resetView()
         assert tableView.data == table
 
-
     def testKeyPressEvent(self, make_napari_viewer_proxy):
         pyperclip.copy("")
         make_napari_viewer_proxy()
         table = {"area": [23.87, 65.28, 12.98], "mean": [19992, 2233, 24553]}
         tableView = TableView(table)
         tableView.selectAll()
-        event = QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_C, Qt.KeyboardModifier.ControlModifier, "copy")
+        event = QKeyEvent(
+            QEvent.Type.KeyPress,
+            Qt.Key.Key_C,
+            Qt.KeyboardModifier.ControlModifier,
+            "copy",
+        )
         tableView.keyPressEvent(event)
         text = pyperclip.paste()
         assert "23.87" in text
         assert "24553" in text
 
-
     def testKeyPressEventNoCopy(self, make_napari_viewer_proxy):
         pyperclip.copy("")
         make_napari_viewer_proxy()
         table = {"area": [23.87, 65.28, 12.98], "mean": [19992, 2233, 24553]}
         tableView = TableView(table)
         tableView.selectAll()
-        event = QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_C, Qt.KeyboardModifier.ShiftModifier, "copy")
+        event = QKeyEvent(
+            QEvent.Type.KeyPress,
+            Qt.Key.Key_C,
+            Qt.KeyboardModifier.ShiftModifier,
+            "copy",
+        )
         tableView.keyPressEvent(event)
         text = pyperclip.paste()
         assert text == ""
 
-
     def testCopyDataToClipboard(self, make_napari_viewer_proxy):
         pyperclip.copy("")
         make_napari_viewer_proxy()
@@ -204,7 +173,6 @@ class TestTableView:
 
 class TestPlotWidget:
 
-
     def testConstructor(self, make_napari_viewer_proxy):
         viewer = make_napari_viewer_proxy()
         plot = PlotWidget(viewer)
@@ -212,7 +180,6 @@ class TestPlotWidget:
         assert plot.X == []
         assert plot.Y == []
 
-
     def testAddData(self, make_napari_viewer_proxy):
         viewer = make_napari_viewer_proxy()
         plot = PlotWidget(viewer)
@@ -221,7 +188,6 @@ class TestPlotWidget:
         assert [1, 4, 9] in plot.Y
         assert "r+" in plot.formatStrings
 
-
     def testClearData(self, make_napari_viewer_proxy):
         viewer = make_napari_viewer_proxy()
         plot = PlotWidget(viewer)
@@ -229,7 +195,6 @@ class TestPlotWidget:
         plot.clear()
         assert True
 
-
     def testDisplay(self, make_napari_viewer_proxy):
         viewer = make_napari_viewer_proxy()
         plot = PlotWidget(viewer)
@@ -242,4 +207,3 @@ class TestPlotWidget:
         plot2.display()
         assert plot2.ax.get_xlabel() == plot2.xLabel
         assert plot2.ax.get_ylabel() == plot2.yLabel
-

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/src/autooptions/_tests/test_widget.py

@@ -4,129 +4,147 @@ import numpy as np
 from autooptions.widget import OptionsWidget
 from autooptions.options import Options
 
+
 class FakeEvent:
     modifiers = {}
 
 
 class TestOptionsWidget:
 
-
-
     def onSomethingHappened(self, value):
         self.lastValue = value
 
-
     @pytest.fixture()
     def options(self):
         options = Options("Autooptions Test", "Widget Test")
-        options.addImage('image', value=None, transient=True)
-        options.addLabels('labels', value='labels_layer', transient=True)
-        options.addPoints('points', value='points_layer', transient=True)
-        options.addFFT('fft', value=None, transient=True)
+        options.addImage("image", value=None, transient=True, optional=(True, False))
+        options.addLabels(
+            "labels", 
+            value="labels_layer", 
+            transient=True, 
+            optional=(True, True)
+        )
+        options.addPoints(
+            "points", 
+            value="points_layer", 
+            transient=True, 
+            optional=(False, False)
+        )
+        options.addFFT(
+            "fft", 
+            value=None, 
+            transient=True, 
+            optional=(False, True)
+        )
         options.addStr("group", value="lps")
-        options.addInt('size xy', value=3)
-        options.addInt('size z', value=1)
-        options.addChoice('footprint', choices=["none", "cube", "ball", "octahedron"], callback=self.onSomethingHappened)
-        options.addFloat('sigma', value=1.34)
-        options.addBool('do it', value=True)
+        options.addInt("size xy", value=3)
+        options.addInt("size z", value=1)
+        options.addChoice(
+            "footprint",
+            choices=["none", "cube", "ball", "octahedron"],
+            callback=self.onSomethingHappened,
+        )
+        options.addFloat("sigma", value=1.34)
+        options.addBool("do it", value=True)
         yield options
 
+    def testOptionsCheckboxes(self, options, make_napari_viewer_proxy):
+        viewer = make_napari_viewer_proxy()
+        widget = OptionsWidget(viewer, options, client=self)
+        viewer.window.add_dock_widget(widget, name=options.optionsName)
+        for name, (cb, _) in widget.widgets.items():
+            if options.isOptional(name):
+                assert cb is not None
+            else:
+                assert cb is None
 
     def testConstructor(self, options, make_napari_viewer_proxy):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
+        widget = OptionsWidget(viewer, options, client=self)
         assert widget.options is options
         assert widget.viewer is viewer
         assert widget.client is self
 
-
     def testAddApplyButton(self, options, make_napari_viewer_proxy, mocker):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
+        widget = OptionsWidget(viewer, options, client=self)
         assert widget.getApplyButton() is None
-        callback = mocker.stub(name='onApplyButtonPressed')
+        callback = mocker.stub(name="onApplyButtonPressed")
         widget.addApplyButton(callback)
         assert not widget.getApplyButton() is None
         assert callback.call_count == 0
 
-
     def testAddOKButton(self, options, make_napari_viewer_proxy, mocker):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
+        widget = OptionsWidget(viewer, options, client=self)
         assert widget.getOKButton() is None
-        callback = mocker.stub(name='onOKButtonPressed')
+        callback = mocker.stub(name="onOKButtonPressed")
         widget.addOKButton(callback)
         assert not widget.getOKButton() is None
         assert callback.call_count == 0
 
-
     def testAddCancelButton(self, options, make_napari_viewer_proxy, mocker):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
+        widget = OptionsWidget(viewer, options, client=self)
         assert widget.getCancelButton() is None
-        callback = mocker.stub(name='onCancelButtonPressed')
+        callback = mocker.stub(name="onCancelButtonPressed")
         widget.addCancelButton(callback)
         assert not widget.getCancelButton() is None
         assert callback.call_count == 0
 
-
     def test_OnApplyButtonClicked(self, options, make_napari_viewer_proxy, mocker):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
-        callback = mocker.stub(name='self.apply')
+        widget = OptionsWidget(viewer, options, client=self)
+        callback = mocker.stub(name="self.apply")
         widget.addApplyButton(callback)
-        options.setValue('group', 'xps')
+        options.setValue("group", "xps")
         if os.path.exists(options.optionsPath):
             os.remove(options.optionsPath)
         widget._onApplyButtonClicked()
         assert os.path.exists(options.optionsPath)
         assert options.value("group") == "lps"
 
-
     def test_OnOKButtonClicked(self, options, make_napari_viewer_proxy, mocker):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
-        callback = mocker.stub(name='self.ok')
+        widget = OptionsWidget(viewer, options, client=self)
+        callback = mocker.stub(name="self.ok")
         widget.addOKButton(callback)
         viewer.window.add_dock_widget(widget, name=options.optionsName)
-        options.setValue('group', 'xps')
+        options.setValue("group", "xps")
         if os.path.exists(options.optionsPath):
             os.remove(options.optionsPath)
         widget._onOKButtonClicked()
         assert os.path.exists(options.optionsPath)
         assert options.value("group") == "lps"
 
-
     def test_OnCancelButtonClicked(self, options, make_napari_viewer_proxy, mocker):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
-        callback = mocker.stub(name='self.cancel')
+        widget = OptionsWidget(viewer, options, client=self)
+        callback = mocker.stub(name="self.cancel")
         widget.addCancelButton(callback)
         viewer.window.add_dock_widget(widget, name=options.optionsName)
-        options.setValue('group', 'xps')
+        options.setValue("group", "xps")
         if os.path.exists(options.optionsPath):
             os.remove(options.optionsPath)
         widget._onCancelButtonClicked()
         assert not os.path.exists(options.optionsPath)
         assert options.value("group") == "xps"
 
-
     def test_OnLayerAddedOrRemoved(self, options, make_napari_viewer_proxy):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
+        widget = OptionsWidget(viewer, options, client=self)
         viewer.window.add_dock_widget(widget, name=options.optionsName)
         data = np.random.rand(12, 12)
-        viewer.add_image(data=data, name='data')
+        viewer.add_image(data=data, name="data")
         assert True
 
-
     def testGetImageLayer(self, options, make_napari_viewer_proxy):
         viewer = make_napari_viewer_proxy()
-        widget = OptionsWidget(viewer, options, self)
+        widget = OptionsWidget(viewer, options, client=self)
         viewer.window.add_dock_widget(widget, name=options.optionsName)
         data = np.random.rand(12, 12)
-        viewer.add_image(data=data, name='labels_layer')
+        viewer.add_image(data=data, name="labels_layer")
         layer = widget.getImageLayer("labels")
         assert layer is not None
         assert layer.name == "labels_layer"
-        assert layer.data.shape == (12, 12)
+        assert layer.data.shape == (12, 12)

{auto_options_python-0.1.6 → auto_options_python-0.1.7}/src/autooptions/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.6'
-__version_tuple__ = version_tuple = (0, 1, 6)
+__version__ = version = '0.1.7'
+__version_tuple__ = version_tuple = (0, 1, 7)
 
-__commit_id__ = commit_id = 'g52deebf6d'
+__commit_id__ = commit_id = 'g0de8a65d0'

auto_options_python-0.1.7/src/autooptions/layouts/__init__.py

@@ -0,0 +1,29 @@
+from autooptions.layouts.grid_layout import GridLayout
+from autooptions.layouts.vertical_layout import VerticalLayout
+
+
+class LayoutFactory(object):
+
+    availableLayouts = {"grid": GridLayout, "vertical": VerticalLayout}
+
+    defaultLayout = GridLayout
+
+    def get(self, layout_type):
+        return self.availableLayouts.get(layout_type, self.defaultLayout)
+
+    @staticmethod
+    def createLayout(layout_type, same_row_set=None, parent=None):
+        if type(layout_type) is str:
+            layout_name = layout_type.lower()
+            layout_args = {}
+        elif type(layout_type) is dict:
+            layout_name = layout_type.get("name", "vertical").lower()
+            layout_args = {k: v for k, v in layout_type.items() if k != "name"}
+        else:
+            raise ValueError(f"Invalid layout_type: {layout_type}")
+        layoutConstructor = LayoutFactory.availableLayouts.get(
+            layout_name, LayoutFactory.defaultLayout
+        )
+        return layoutConstructor(
+            same_row_set=same_row_set, parent=parent, **layout_args
+        )