pyobs-gui 2.3.0__tar.gz → 2.3.1__tar.gz

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyobs-gui
-Version: 2.3.0
+Version: 2.3.1
 Summary: A remote GUI for pyobs
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT
@@ -11,7 +11,7 @@ Requires-Dist: astropy<8,>=7.0.1
 Requires-Dist: colour<0.2,>=0.1.5
 Requires-Dist: keyring<26,>=25.7.0
 Requires-Dist: matplotlib<4,>=3.10.1
-Requires-Dist: pyobs-core<3,>=2.2.0
+Requires-Dist: pyobs-core<3,>=2.7.1
 Requires-Dist: pyside6>=6.10.1
 Requires-Dist: qasync<0.29,>=0.27.1
 Requires-Dist: qfitswidget>=0.13.1

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/pyobs_gui/structuredconfigwidget.py

@@ -1,11 +1,12 @@
 import dataclasses
 import logging
-from typing import Any, Callable, Dict, Optional, cast
+from typing import Any, Callable, Dict, List, Optional, cast
 
 from PySide6 import QtCore, QtWidgets  # type: ignore
 
 from pyobs.interfaces import ConfigAppliedState, ConfigFieldSchema, ConfigSchema, IStructuredConfig
 from pyobs.interfaces.IStructuredConfig import ConfigValue
+from pyobs.utils.enums import AccessLevel
 from .base import BaseWidget
 
 log = logging.getLogger(__name__)
@@ -27,6 +28,16 @@ class _FieldEditor:
     get_value: Callable[[], ConfigValue]
     set_value: Callable[[ConfigValue], None]
     children: Optional[Dict[str, "_FieldEditor"]] = None
+    level: AccessLevel = AccessLevel.BASIC
+
+
+def _collect_by_level(editor: "_FieldEditor", level: AccessLevel) -> List[QtWidgets.QWidget]:
+    """Recursively gather every editor widget (including nested-object children) tagged at
+    exactly the given level, for the basic/expert toggle to enable/disable as a group."""
+    widgets = [editor.widget] if editor.level == level else []
+    for child in (editor.children or {}).values():
+        widgets.extend(_collect_by_level(child, level))
+    return widgets
 
 
 def _nested_get(children: Dict[str, _FieldEditor]) -> Dict[str, ConfigValue]:
@@ -49,7 +60,9 @@ def _build_editor(name: str, schema: ConfigFieldSchema, on_change: Callable[[],
         if schema.default is not None:
             line_edit.setText(str(schema.default))
         line_edit.textChanged.connect(lambda _: on_change())
-        return _FieldEditor(line_edit, line_edit.text, lambda value: line_edit.setText(str(value)))
+        if schema.level == AccessLevel.EXPERT:
+            line_edit.setEnabled(False)
+        return _FieldEditor(line_edit, line_edit.text, lambda value: line_edit.setText(str(value)), level=schema.level)
 
     if schema.type == "int":
         spin_box = QtWidgets.QSpinBox()
@@ -57,7 +70,11 @@ def _build_editor(name: str, schema: ConfigFieldSchema, on_change: Callable[[],
         if schema.default is not None:
             spin_box.setValue(int(schema.default))
         spin_box.valueChanged.connect(lambda _: on_change())
-        return _FieldEditor(spin_box, spin_box.value, lambda value: spin_box.setValue(int(cast("int", value))))
+        if schema.level == AccessLevel.EXPERT:
+            spin_box.setEnabled(False)
+        return _FieldEditor(
+            spin_box, spin_box.value, lambda value: spin_box.setValue(int(cast("int", value))), level=schema.level
+        )
 
     if schema.type == "float":
         double_spin_box = QtWidgets.QDoubleSpinBox()
@@ -68,8 +85,13 @@ def _build_editor(name: str, schema: ConfigFieldSchema, on_change: Callable[[],
         if schema.default is not None:
             double_spin_box.setValue(float(schema.default))
         double_spin_box.valueChanged.connect(lambda _: on_change())
+        if schema.level == AccessLevel.EXPERT:
+            double_spin_box.setEnabled(False)
         return _FieldEditor(
-            double_spin_box, double_spin_box.value, lambda value: double_spin_box.setValue(float(cast("float", value)))
+            double_spin_box,
+            double_spin_box.value,
+            lambda value: double_spin_box.setValue(float(cast("float", value))),
+            level=schema.level,
         )
 
     if schema.type == "bool":
@@ -77,7 +99,11 @@ def _build_editor(name: str, schema: ConfigFieldSchema, on_change: Callable[[],
         if schema.default is not None:
             check_box.setChecked(bool(schema.default))
         check_box.toggled.connect(lambda _: on_change())
-        return _FieldEditor(check_box, check_box.isChecked, lambda value: check_box.setChecked(bool(value)))
+        if schema.level == AccessLevel.EXPERT:
+            check_box.setEnabled(False)
+        return _FieldEditor(
+            check_box, check_box.isChecked, lambda value: check_box.setChecked(bool(value)), level=schema.level
+        )
 
     if schema.type == "enum":
         combo_box = QtWidgets.QComboBox()
@@ -86,7 +112,14 @@ def _build_editor(name: str, schema: ConfigFieldSchema, on_change: Callable[[],
         if schema.default is not None and str(schema.default) in options:
             combo_box.setCurrentText(str(schema.default))
         combo_box.currentTextChanged.connect(lambda _: on_change())
-        return _FieldEditor(combo_box, combo_box.currentText, lambda value: combo_box.setCurrentText(str(value)))
+        if schema.level == AccessLevel.EXPERT:
+            combo_box.setEnabled(False)
+        return _FieldEditor(
+            combo_box,
+            combo_box.currentText,
+            lambda value: combo_box.setCurrentText(str(value)),
+            level=schema.level,
+        )
 
     if schema.type == "object" and schema.nested is not None:
         group_box = QtWidgets.QGroupBox(name)
@@ -94,14 +127,19 @@ def _build_editor(name: str, schema: ConfigFieldSchema, on_change: Callable[[],
         group_box.setLayout(form_layout)
         children: Dict[str, _FieldEditor] = {}
         for child_name, child_schema in schema.nested.items():
+            if child_schema.level == AccessLevel.HIDDEN:
+                continue
             child_editor = _build_editor(child_name, child_schema, on_change)
             form_layout.addRow(child_name, child_editor.widget)
             children[child_name] = child_editor
+        if schema.level == AccessLevel.EXPERT:
+            group_box.setEnabled(False)
         return _FieldEditor(
             group_box,
             lambda: _nested_get(children),
             lambda value: _nested_set(children, value),
             children=children,
+            level=schema.level,
         )
 
     # object without a nested schema (pydantic freeform dict), or any other schema type this
@@ -120,6 +158,8 @@ def _build_editor(name: str, schema: ConfigFieldSchema, on_change: Callable[[],
     placeholder.setReadOnly(True)
     placeholder.setEnabled(False)
     placeholder.setToolTip(f"Field type {schema.type!r} has no schema-driven editor for this widget.")
+    # always BASIC regardless of schema.level: this widget is permanently disabled (nothing to
+    # edit), so it must never be swept into the expert-toggle's re-enable group
     return _FieldEditor(placeholder, _get_raw, _set_raw)
 
 
@@ -142,10 +182,19 @@ class StructuredConfigWidget(BaseWidget):
         # itself register as a user edit (which would otherwise re-enable Apply/Reset for a
         # change that came from the module, not from the operator)
         self._applying_state = False
+        # every EXPERT-level editor widget across the whole (possibly nested) form, collected
+        # once in _build_form; toggled together by checkBoxAdvanced. No password gate, unlike
+        # pyftscontrol's Expert Mode button -- operators here are already authenticated via the
+        # comm layer, so it's just a basic/expert visibility toggle, not an access control.
+        self._expert_widgets: List[QtWidgets.QWidget] = []
 
         outer_layout = QtWidgets.QVBoxLayout()
         self.setLayout(outer_layout)
 
+        self.checkBoxAdvanced = QtWidgets.QCheckBox("Show advanced fields")
+        self.checkBoxAdvanced.toggled.connect(self._on_advanced_toggled)
+        outer_layout.addWidget(self.checkBoxAdvanced)
+
         scroll_area = QtWidgets.QScrollArea()
         scroll_area.setWidgetResizable(True)
         self._form_container = QtWidgets.QWidget()
@@ -186,6 +235,8 @@ class StructuredConfigWidget(BaseWidget):
     def _build_form(self, schema: ConfigSchema) -> None:
         children: Dict[str, _FieldEditor] = {}
         for name, field_schema in schema.fields.items():
+            if field_schema.level == AccessLevel.HIDDEN:
+                continue
             editor = _build_editor(name, field_schema, self._on_editor_changed)
             self._form_layout.addRow(name, editor.widget)
             children[name] = editor
@@ -195,11 +246,17 @@ class StructuredConfigWidget(BaseWidget):
             lambda value: _nested_set(children, value),
             children=children,
         )
+        self._expert_widgets = _collect_by_level(self._root, AccessLevel.EXPERT)
+        self._on_advanced_toggled(self.checkBoxAdvanced.isChecked())
         # a state may already have arrived (and been cached) before the form existed to receive
         # it -- apply it now instead of waiting for the next update
         if self._last_applied is not None:
             self.signal_update_gui.emit()
 
+    def _on_advanced_toggled(self, checked: bool) -> None:
+        for widget in self._expert_widgets:
+            widget.setEnabled(checked)
+
     def _on_state(self, state: ConfigAppliedState) -> None:
         self._last_applied = dict(state.config)
         self.signal_update_gui.emit()

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-gui"
-version = "2.3.0"
+version = "2.3.1"
 description = "A remote GUI for pyobs"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ dependencies = [
     "sunpy[all]>=7.0.1",
     "QtAwesome>=1.4.0,<2",
     "qfitswidget>=0.13.1",
-    "pyobs-core>=2.2.0,<3",
+    "pyobs-core>=2.7.1,<3",
     "pyside6>=6.10.1",
     "astroplan>=0.10.1",
     "astropy>=7.0.1,<8",

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/specs/2026-08-28-gui-main-vs-sidebar-widgets.md

@@ -1,7 +1,6 @@
 # Plan: pyobs-gui — main widgets vs. sidebar widgets, automatic tab pages for multi-widget modules
 
-Status: implemented, merged to develop (PR #157, `b7a14a6`) — issue #150 stays open until this
-reaches a release on `main`, per repo convention.
+Status: implemented, closed (PR #157, `b7a14a6`; released `v2.3.0`, `main`). Issue #150 closed.
 Audited: 2026-08-28
 Revised: 2026-09-01 (D1, D2 — see "Revision 2026-09-01" below; adds D6)
 

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/specs/2026-09-01-gui-video-widget-split.md

@@ -1,6 +1,6 @@
 # `VideoWidget` split into two independent main widgets
 
-Status: implemented, closed.
+Status: implemented, closed (`cf42ab4`; released `v2.3.0`).
 
 Dependency landed 2026-09-01: `2026-08-28-gui-main-vs-sidebar-widgets.md` merged to develop as
 PR #157 (`b7a14a6`).

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/specs/index.md

@@ -13,18 +13,22 @@ ADRs that concern `pyobs-gui` live in `pyobs-core`'s `specs/` tree instead (`spe
 - `2026-08-28-structuredconfig-widget.md` — **proposed (issue #154)**. Generic
   `StructuredConfigWidget`: schema-driven, auto-built editable form for `IStructuredConfig`
   modules (from `ConfigSchema` capabilities + `ConfigAppliedState` + `set_config`).
-- `2026-08-28-gui-main-vs-sidebar-widgets.md` — **implemented, merged to develop (PR #157,
-  `b7a14a6`)**. Issue #150 stays open until this reaches a release on `main`. Explicit
-  main-widget/sidebar-widget distinction, automatic tab pages for multi-widget modules (shared
-  sidebar, merge-per-interface custom config, standalone parity), `sidebar_preferred` promotion
-  rule, universal sidebar container, `paired_sidebar_widget` mechanism (D6, no consumer yet).
-  Post-merge follow-ups: sidebar-fill dedup + D5 sidebar-failure isolation + 3 other review
-  findings (`fccf0e0`), FITS-headers sidebar box alignment (`1e89069`), vertical-only scrollable
-  sidebar (`f05bcba`).
-- `2026-09-01-gui-video-widget-split.md` — **implemented, closed**. Split `VideoWidget` into two
-  independent main widgets (`VideoWidget` "Live View" + new `VideoGrabWidget` "FITS Image"), both
-  matched on `IVideo`, rendered as separate tabs — turned out not to need the `paired_sidebar_widget`
-  mechanism (D6) the draft was written for; the two halves never shared state to begin with.
+- `2026-08-28-gui-main-vs-sidebar-widgets.md` — **implemented, closed (PR #157, `b7a14a6`;
+  released `v2.3.0`)**. Issue #150 closed. Explicit main-widget/sidebar-widget distinction,
+  automatic tab pages for multi-widget modules (shared sidebar, merge-per-interface custom
+  config, standalone parity), `sidebar_preferred` promotion rule, universal sidebar container,
+  `paired_sidebar_widget` mechanism (D6, still no consumer — the video-widget split below ended up
+  not needing it). Post-merge follow-ups: sidebar-fill dedup + D5 sidebar-failure isolation + 3
+  other review findings (`fccf0e0`), FITS-headers sidebar box alignment (`1e89069`),
+  vertical-only scrollable sidebar (`f05bcba`).
+- `2026-09-01-gui-video-widget-split.md` — **implemented, closed, released `v2.3.0`**. Split
+  `VideoWidget` into two independent main widgets (`VideoWidget` "Live View" + new
+  `VideoGrabWidget` "FITS Image"), both matched on `IVideo`, rendered as separate tabs — turned out
+  not to need the `paired_sidebar_widget` mechanism (D6) the draft was written for; the two halves
+  never shared state to begin with. Same release also carries two unplanned same-day fixes with no
+  dedicated doc: `CameraWidget`'s control panel clipping its right edge (`scrollArea` sized off a
+  stale `.ui` width hint instead of real content, `c22d7c7`) and `ModeWidget`'s edit button staying
+  permanently disabled for an `IMode` module with no `IMotion` (`1439437`).
 - `2026-08-21-gui-widget-startup-responsiveness.md` — **implemented, closed 2026-08-23 (PR #141,
   `123161b`)**. Make module widgets appear and respond immediately at startup: non-blocking
   `_add_client` with a "Loading…" placeholder page (clicks are never dropped), parallel

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/tests/test_structuredconfigwidget.py

@@ -5,7 +5,7 @@ from PySide6 import QtWidgets  # type: ignore
 
 from pyobs.interfaces import ConfigAppliedState, ConfigFieldSchema, ConfigSchema
 from pyobs.utils import exceptions as exc
-from pyobs.utils.enums import Unit
+from pyobs.utils.enums import AccessLevel, Unit
 from pyobs_gui.structuredconfigwidget import StructuredConfigWidget, _build_editor, _nested_get
 
 # -- shared fixtures -----------------------------------------------------------------------
@@ -152,6 +152,82 @@ def test_unsupported_field_type_is_also_a_disabled_placeholder() -> None:
     assert editor.get_value() == [1, 2]
 
 
+# -- _build_editor / _build_form: basic/expert level ----------------------------------------
+
+
+def test_basic_field_starts_enabled() -> None:
+    editor = _build_editor("count", ConfigFieldSchema(type="int", default=3, level=AccessLevel.BASIC), lambda: None)
+    assert editor.widget.isEnabled() is True
+    assert editor.level == AccessLevel.BASIC
+
+
+def test_expert_field_starts_disabled() -> None:
+    editor = _build_editor("count", ConfigFieldSchema(type="int", default=3, level=AccessLevel.EXPERT), lambda: None)
+    assert editor.widget.isEnabled() is False
+    assert editor.level == AccessLevel.EXPERT
+
+
+def test_unsupported_type_placeholder_ignores_expert_level_for_toggle_grouping() -> None:
+    """A permanently non-editable placeholder must never be swept into the expert-toggle's
+    re-enable group, even if the underlying field is tagged EXPERT -- see the comment in
+    _build_editor's fallback branch."""
+    editor = _build_editor(
+        "items", ConfigFieldSchema(type="list", default=[1, 2], level=AccessLevel.EXPERT), lambda: None
+    )
+    assert editor.level == AccessLevel.BASIC
+    assert editor.widget.isEnabled() is False
+
+
+def test_nested_object_skips_hidden_children_and_disables_whole_group_when_expert() -> None:
+    schema = ConfigFieldSchema(
+        type="object",
+        level=AccessLevel.EXPERT,
+        nested={
+            "az": ConfigFieldSchema(type="float", default=1.0),
+            "secret": ConfigFieldSchema(type="float", default=2.0, level=AccessLevel.HIDDEN),
+        },
+    )
+    editor = _build_editor("pointing", schema, lambda: None)
+    assert editor.children is not None and set(editor.children) == {"az"}
+    assert editor.widget.isEnabled() is False
+
+
+def _sample_schema_with_levels() -> ConfigSchema:
+    return ConfigSchema(
+        fields={
+            "name": ConfigFieldSchema(type="str", default="foo", level=AccessLevel.BASIC),
+            "gain": ConfigFieldSchema(type="int", default=1, level=AccessLevel.EXPERT),
+            "secret": ConfigFieldSchema(type="int", default=0, level=AccessLevel.HIDDEN),
+        }
+    )
+
+
+def test_build_form_skips_hidden_fields_entirely() -> None:
+    widget = StructuredConfigWidget()
+    widget._build_form(_sample_schema_with_levels())
+
+    assert widget._form_layout.rowCount() == 2  # name + gain, not secret
+    assert widget._root is not None and widget._root.children is not None
+    assert set(widget._root.children) == {"name", "gain"}
+    widget.close()
+
+
+def test_advanced_checkbox_toggles_expert_fields_enabled() -> None:
+    widget = StructuredConfigWidget()
+    widget._build_form(_sample_schema_with_levels())
+    assert widget._root is not None and widget._root.children is not None
+    expert_widget = widget._root.children["gain"].widget
+
+    assert expert_widget.isEnabled() is False  # starts locked
+
+    widget.checkBoxAdvanced.setChecked(True)
+    assert expert_widget.isEnabled() is True
+
+    widget.checkBoxAdvanced.setChecked(False)
+    assert expert_widget.isEnabled() is False
+    widget.close()
+
+
 # -- StructuredConfigWidget: state population, dirty tracking, apply/reset ------------------
 
 

{pyobs_gui-2.3.0 → pyobs_gui-2.3.1}/uv.lock

@@ -3256,7 +3256,7 @@ wheels = [
 
 [[package]]
 name = "pyobs-core"
-version = "2.2.0"
+version = "2.7.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
@@ -3288,14 +3288,14 @@ dependencies = [
     { name = "tenacity" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/7b/77/f145aa80dcc2a3813576609f9a92bd565a9db9d61777f9cc124afb1878cc/pyobs_core-2.2.0.tar.gz", hash = "sha256:adede5c3c12722565e5ccb32f5fe49397dc14e74674c6778482d40f81ca300e1", size = 395720, upload-time = "2026-09-01T11:47:40.797Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9d/5e/8d4de011685819cd4b04ee8a5aa35822814e0d6c607f4dfe6917b37e71e2/pyobs_core-2.7.1.tar.gz", hash = "sha256:beb50633cc21b6ea5a99713fe114973eecf7999a17f69578a996f4335fcb1ed7", size = 409990, upload-time = "2026-09-04T09:44:17.492Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9c/84/5cf38ef1f504b0c7e76e38a84d7f721b9b4cdb68f389f1263591c75324fc/pyobs_core-2.2.0-py3-none-any.whl", hash = "sha256:9b14d86efff1360ee00d4cfcbf4a89ab6f8089f9c60de0d7e404a239da7a524d", size = 624091, upload-time = "2026-09-01T11:47:39.082Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/14/037a4e52b30816474fb4360a0741952499820e24af01c09f609311369379/pyobs_core-2.7.1-py3-none-any.whl", hash = "sha256:060de003b319e4f7a14dd80500d13d1d202df1e49364af74dac3e7715ff843cb", size = 639800, upload-time = "2026-09-04T09:44:16.291Z" },
 ]
 
 [[package]]
 name = "pyobs-gui"
-version = "2.3.0"
+version = "2.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "astroplan" },
@@ -3339,7 +3339,7 @@ requires-dist = [
     { name = "colour", specifier = ">=0.1.5,<0.2" },
     { name = "keyring", specifier = ">=25.7.0,<26" },
     { name = "matplotlib", specifier = ">=3.10.1,<4" },
-    { name = "pyobs-core", specifier = ">=2.2.0,<3" },
+    { name = "pyobs-core", specifier = ">=2.7.1,<3" },
     { name = "pyside6", specifier = ">=6.10.1" },
     { name = "qasync", specifier = ">=0.27.1,<0.29" },
     { name = "qfitswidget", specifier = ">=0.13.1" },