pyobs-gui 2.7.0__tar.gz → 2.8.0__tar.gz

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Entries for releases before this file existed were generated from commit subjects.
 
+## [Unreleased]
+
+### Changed
+
+- Recognize a missing VFS root by the new `pyobs.vfs.UnknownRootError` instead of matching the
+  error message. Requires pyobs-core 2.19.0 or newer.
+
+### Added
+
+- Magenta observing-monitor app icon for Qt windows, desktop notifications and
+  Windows Start Menu shortcuts; update existing shortcuts without changing their targets (#197).
+
 ## [2.7.0] - 2026-10-15
 
 ### Added

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyobs-gui
-Version: 2.7.0
+Version: 2.8.0
 Summary: A remote GUI for pyobs
 Project-URL: Homepage, https://www.pyobs.org
 Project-URL: Documentation, https://docs.pyobs.org
@@ -19,7 +19,7 @@ Requires-Dist: keyring<26,>=25.7.0
 Requires-Dist: matplotlib<4,>=3.10.1
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: pydantic<3,>=2.12.5
-Requires-Dist: pyobs-core<3,>=2.18.0
+Requires-Dist: pyobs-core<3,>=2.19.0
 Requires-Dist: pyside6-essentials>=6.10.1
 Requires-Dist: pywin32>=312; sys_platform == 'win32'
 Requires-Dist: pyyaml<7,>=6.0.2

pyobs_gui-2.8.0/pyobs_gui/appicon.py

@@ -0,0 +1,19 @@
+"""Shared app artwork as real files for Qt, notifications and Windows shortcuts."""
+
+from pathlib import Path
+from typing import TYPE_CHECKING, Literal
+
+if TYPE_CHECKING:
+    from PySide6.QtGui import QIcon
+
+
+def icon_path(format: Literal["png", "ico"] = "png") -> Path:
+    """Installed package data, also placed beside this module by Nuitka."""
+    return Path(__file__).resolve().with_name("icons") / f"pyobs-gui.{format}"
+
+
+def window_icon() -> "QIcon":
+    """Qt reads all resolutions in the ICO, including the small window-title icon."""
+    from PySide6.QtGui import QIcon
+
+    return QIcon(str(icon_path("ico")))

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyobs_gui/base.py

@@ -46,17 +46,12 @@ async def show_remote_error(parent: QtWidgets.QWidget, exception: Exception) ->
 
 
 def missing_root_message(exception: Exception, path: str, module: str) -> str | None:
-    """User-facing text if `exception` is the VFS's "unknown root" error, else None.
+    """User-facing text if `exception` is the VFS's `UnknownRootError`, else None."""
+    from pyobs.vfs import UnknownRootError
 
-    `VirtualFileSystem.open_file()` raises a plain `ValueError("Could not find root ...")`, so the
-    message prefix is the only way to tell it from other `ValueError`s.
-    """
-    from pyobs.vfs import VirtualFileSystem
-
-    if not isinstance(exception, ValueError) or not str(exception).startswith("Could not find root"):
+    if not isinstance(exception, UnknownRootError):
         return None
-    root, _ = VirtualFileSystem.split_root(path)
-    return f"Cannot open '{path}' from module '{module}': the VFS root '{root}' is not configured."
+    return f"Cannot open '{path}' from module '{module}': the VFS root '{exception.root}' is not configured."
 
 
 async def cancel_and_drain(task: asyncio.Task[Any]) -> None:

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyobs_gui/gui.py

@@ -12,6 +12,7 @@ if TYPE_CHECKING:
 from pyobs.interfaces import FitsHeaderEntry, IFitsHeaderBefore
 from pyobs.modules import Module
 
+from .appicon import window_icon
 from .nowheelfilter import NoWheelWhenUnfocused
 from .guisignals import gui_signals
 from .notificationmanager import NotificationManager
@@ -147,6 +148,7 @@ class GUI(Module, IFitsHeaderBefore):
     @staticmethod
     def new_event_loop() -> asyncio.AbstractEventLoop:
         GUI.app = QtWidgets.QApplication(sys.argv)
+        GUI.app.setWindowIcon(window_icon())
         # standalone/login mode briefly has zero visible top-level windows while the login
         # dialog closes and the (old or new) MainWindow hasn't opened yet -- Qt's default
         # "quit when the last window closes" would tear down the whole event loop right there,

pyobs_gui-2.8.0/pyobs_gui/icons/README.md

@@ -0,0 +1,13 @@
+# pyobs GUI icon
+
+White observing monitor and crosshair on magenta (`#d63384`), following the fleet's
+white-symbol-on-colour app icons. Original artwork created for pyobs-gui and
+approved on 2026-10-15; distributed under this repository's MIT licence.
+
+`pyobs-gui.svg` is the editable source. PNG exports cover 16, 24, 32, 48, 64,
+128, 256 and 512 pixels. `pyobs-gui.png` is the 256-pixel notification icon;
+`pyobs-gui.ico` contains 16 through 256-pixel renditions for Qt and Windows.
+
+These files must remain ordinary package data: desktop-notifier and the Windows
+shortcut require filesystem paths, rather than Qt resource URLs. Nuitka includes
+them with `--include-package-data=pyobs_gui` in `pysidedeploy.spec`.

pyobs_gui-2.8.0/pyobs_gui/icons/pyobs-gui.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+  <title>pyobs GUI icon</title>
+  <desc>A white observing monitor with a crosshair on a magenta rounded square.</desc>
+  <rect width="256" height="256" rx="52" fill="#d63384"/>
+  <g fill="none" stroke="#fff" stroke-width="14" stroke-linecap="round" stroke-linejoin="round">
+    <rect x="42" y="53" width="172" height="119" rx="13"/>
+    <path d="M128 174v29M96 204h64"/>
+  </g>
+  <g fill="none" stroke="#fff" stroke-width="10" stroke-linecap="round">
+    <circle cx="128" cy="112" r="20"/>
+    <path d="M128 78v16M128 130v16M94 112h16M146 112h16"/>
+  </g>
+</svg>

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyobs_gui/loginwindow.py

@@ -14,6 +14,7 @@ from dataclasses import dataclass
 from PySide6 import QtCore, QtGui, QtWidgets
 from pyobs.comm.xmpp import is_valid_jid
 
+from .appicon import window_icon
 from .accounts import SavedAccountsModel
 
 log = logging.getLogger(__name__)
@@ -86,6 +87,7 @@ def build_connection_request(
 class LoginWindow(QtWidgets.QDialog):
     def __init__(self, accounts: SavedAccountsModel | None = None, parent: QtWidgets.QWidget | None = None) -> None:
         super().__init__(parent)
+        self.setWindowIcon(window_icon())
         self.setWindowTitle("pyobs - Sign in")
         self.resize(640, 480)
 

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyobs_gui/mainwindow.py

@@ -37,6 +37,7 @@ from pyobs.interfaces import (
     IStructuredConfig,
 )
 
+from .appicon import window_icon
 from .base import BaseWindow, BaseWidget, cancel_and_drain
 from .acquisitionwidget import AcquisitionWidget
 from .autofocuswidget import AutoFocusWidget
@@ -641,6 +642,7 @@ class MainWindow(QtWidgets.QMainWindow, BaseWindow, Ui_MainWindow):  # type: ign
         QtWidgets.QMainWindow.__init__(self)
         BaseWindow.__init__(self)
         self.setupUi(self)  # type: ignore
+        self.setWindowIcon(window_icon())
         self.resize(1600, 900)
 
         # store stuff

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyobs_gui/notifier_backend.py

@@ -11,6 +11,7 @@ from typing import TYPE_CHECKING, Any
 
 from PySide6 import QtCore  # type: ignore
 
+from .appicon import icon_path
 from .notifier import NotifierError
 
 if TYPE_CHECKING:
@@ -77,9 +78,9 @@ class DesktopNotifierBackend:
             if self._factory is not None:
                 self._notifier = self._factory()
             else:
-                from desktop_notifier import DesktopNotifier
+                from desktop_notifier import DesktopNotifier, Icon
 
-                self._notifier = DesktopNotifier(app_name=APP_NAME)
+                self._notifier = DesktopNotifier(app_name=APP_NAME, app_icon=Icon(path=icon_path()))
         return self._notifier
 
     async def ensure_authorisation(self) -> None:

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyobs_gui/settingsdialog.py

@@ -18,6 +18,7 @@ from pydantic import ValidationError
 from pyobs.object import get_class_from_string
 from PySide6 import QtWidgets  # type: ignore
 
+from .appicon import window_icon
 from .notifier import NotifierError
 from .settings import GuiSettings, NotificationSettings, VfsSettings
 
@@ -83,6 +84,7 @@ class SettingsDialog(QtWidgets.QDialog):
         parent: QtWidgets.QWidget | None = None,
     ) -> None:
         super().__init__(parent)
+        self.setWindowIcon(window_icon())
         self.setWindowTitle("Settings")
         self.resize(640, 480)
         self._on_apply = on_apply

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyobs_gui/windows_identity.py

@@ -19,6 +19,8 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from collections.abc import Callable
 
+from .appicon import icon_path
+
 log = logging.getLogger(__name__)
 
 SHORTCUT_NAME = "pyobs-gui.lnk"
@@ -52,6 +54,7 @@ def create_link_com(path: Path, target: str, arguments: str, app_id: str) -> Non
 
     link = pythoncom.CoCreateInstance(shell.CLSID_ShellLink, None, pythoncom.CLSCTX_INPROC_SERVER, shell.IID_IShellLink)
     link.SetPath(target)
+    link.SetIconLocation(str(icon_path("ico")), 0)
     if arguments:
         link.SetArguments(arguments)
     store = link.QueryInterface(propsys.IID_IPropertyStore)
@@ -60,15 +63,36 @@ def create_link_com(path: Path, target: str, arguments: str, app_id: str) -> Non
     link.QueryInterface(pythoncom.IID_IPersistFile).Save(str(path), 0)
 
 
+def update_link_icon_com(path: Path) -> bool:
+    """Upgrade an existing shortcut's icon, preserving its target and app identity.
+
+    Like create_link_com(), this still needs verification on Windows (#192).
+    """
+    import pythoncom  # type: ignore[import-not-found]
+    from win32com.shell import shell  # type: ignore[import-not-found]
+
+    link = pythoncom.CoCreateInstance(shell.CLSID_ShellLink, None, pythoncom.CLSCTX_INPROC_SERVER, shell.IID_IShellLink)
+    persist = link.QueryInterface(pythoncom.IID_IPersistFile)
+    persist.Load(str(path))
+    location = (str(icon_path("ico")), 0)
+    if link.GetIconLocation() == location:
+        return False
+    link.SetIconLocation(*location)
+    persist.Save(str(path), 0)
+    return True
+
+
 def ensure_shortcut(
     app_id: str,
     path: Path | None = None,
     command: tuple[str, str] | None = None,
     create_link: Callable[[Path, str, str, str], None] = create_link_com,
+    update_icon: Callable[[Path], bool] = update_link_icon_com,
 ) -> bool:
     """Make sure the Start Menu shortcut with the AppUserModelID exists.
 
-    An existing shortcut is left alone, whatever it points to.
+    An existing shortcut keeps its target and identity; only its icon is updated.
+    Repeated starts leave the file alone when the icon already matches.
 
     Returns:
         Whether a shortcut was created.
@@ -78,6 +102,7 @@ def ensure_shortcut(
     """
     path = shortcut_path() if path is None else path
     if path.exists():
+        update_icon(path)
         return False
     target, arguments = launch_command() if command is None else command
     path.parent.mkdir(parents=True, exist_ok=True)

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-gui"
-version = "2.7.0"
+version = "2.8.0"
 description = "A remote GUI for pyobs"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11"
@@ -15,7 +15,7 @@ dependencies = [
     "astroquery>=0.4.10,<0.5",
     "QtAwesome>=1.4.0,<2",
     "qfitswidget>=1.2.0",
-    "pyobs-core>=2.18.0,<3",
+    "pyobs-core>=2.19.0,<3",
     "pyside6-essentials>=6.10.1",
     "astroplan>=0.10.1",
     "astropy>=7.0.1,<8",
@@ -58,6 +58,9 @@ dev = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.hatch.build.targets.wheel]
+packages = ["pyobs_gui"]
+
 [tool.black]
 line-length = 120
 target-version = ['py311']

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/pysidedeploy.spec

@@ -16,7 +16,7 @@ exec_directory = dist
 project_file = 
 
 # application icon
-icon = /home/husser/code/pyobs/pyobs-gui/.venv/lib/python3.13/site-packages/PySide6/scripts/deploy_lib/pyside_icon.jpg
+icon = pyobs_gui/icons/pyobs-gui.png
 
 [python]
 
@@ -68,7 +68,7 @@ macos.permissions =
 mode = standalone
 
 # specify any extra nuitka arguments
-extra_args = --quiet --noinclude-qt-translations --python-flag=-m --include-package=astropy.units.format --include-package=astropy.units.format.generic_parsetab --include-package=astropy.units.format.generic_lextab --include-package=astropy.units.format.cds_parsetab --include-package=astropy.units.format.cds_lextab --include-package=astropy.units.format.ogip_parsetab --include-package=astropy.units.format.ogip_lextab --include-package=astropy.coordinates.angles --include-package=astropy.coordinates.angles.angle_parsetab --include-package=astropy.coordinates.angles.angle_lextab --include-package=astropy.extern.ply --include-package-data=astropy --include-package-data=sunpy --include-package-data=matplotlib --include-package-data=qfitswidget --include-package-data=astropy_iers_data --include-package=pyobs.vfs --include-package-data=astroquery --include-package=slixmpp --include-package=pyobs_gui --noinclude-dlls=*webengine* --noinclude-dlls=*WebEngine* --include-distribution-metadata=astropy --include-distribution-metadata=numpy --include-distribution-metadata=PyYAML --include-distribution-metadata=sunpy --include-distribution-metadata=matplotlib --include-distribution-metadata=qfitswidget --include-distribution-metadata=astroquery --include-distribution-metadata=pyobs-core --include-distribution-metadata=pyobs-gui
+extra_args = --quiet --noinclude-qt-translations --python-flag=-m --include-package=astropy.units.format --include-package=astropy.units.format.generic_parsetab --include-package=astropy.units.format.generic_lextab --include-package=astropy.units.format.cds_parsetab --include-package=astropy.units.format.cds_lextab --include-package=astropy.units.format.ogip_parsetab --include-package=astropy.units.format.ogip_lextab --include-package=astropy.coordinates.angles --include-package=astropy.coordinates.angles.angle_parsetab --include-package=astropy.coordinates.angles.angle_lextab --include-package=astropy.extern.ply --include-package-data=astropy --include-package-data=sunpy --include-package-data=matplotlib --include-package-data=qfitswidget --include-package-data=astropy_iers_data --include-package=pyobs.vfs --include-package-data=astroquery --include-package=slixmpp --include-package=pyobs_gui --include-package-data=pyobs_gui --noinclude-dlls=*webengine* --noinclude-dlls=*WebEngine* --include-distribution-metadata=astropy --include-distribution-metadata=numpy --include-distribution-metadata=PyYAML --include-distribution-metadata=sunpy --include-distribution-metadata=matplotlib --include-distribution-metadata=qfitswidget --include-distribution-metadata=astroquery --include-distribution-metadata=pyobs-core --include-distribution-metadata=pyobs-gui
 
 [buildozer]
 

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/specs/plans/2026-10-04-settings-dialog.md

@@ -21,7 +21,7 @@ settings).
       `VideoWidget` (`_resolve_url` records it, `_init` shows it if no stream resolved).
 - [x] Tests (`tests/test_missing_vfs_root.py`): message content, once-per-root, other
       `ValueError`s still propagate, video init shows the box and stays disabled.
-- [ ] Follow-up in core: a dedicated exception for an unknown root, so the message-prefix match in
+- [x] Follow-up in core (pyobs-core#941): a dedicated exception for an unknown root, so the message-prefix match in
       `missing_root_message()` can go.
 
 ## 3. Settings schema and store

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/tests/test_missing_vfs_root.py

@@ -2,19 +2,19 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 from pyobs.events import NewImageEvent
-from pyobs.vfs import VirtualFileSystem
+from pyobs.vfs import UnknownRootError, VirtualFileSystem
 
 from pyobs_gui.base import missing_root_message
 from pyobs_gui.datadisplaywidget import DataDisplayWidget
 from pyobs_gui.videowidget import VideoWidget
 
 
-def _missing_root_error() -> ValueError:
+def _missing_root_error() -> UnknownRootError:
     try:
         VirtualFileSystem().open_file("/cache/img.fits", "rb")
-    except ValueError as e:
+    except UnknownRootError as e:
         return e
-    raise AssertionError("expected ValueError")
+    raise AssertionError("expected UnknownRootError")
 
 
 def test_missing_root_message_names_root_path_and_module() -> None:
@@ -25,6 +25,7 @@ def test_missing_root_message_names_root_path_and_module() -> None:
 
 def test_missing_root_message_ignores_other_errors() -> None:
     assert missing_root_message(ValueError("something else"), "/cache/img.fits", "cam") is None
+    assert missing_root_message(ValueError("Could not find root cache for file."), "/cache/img.fits", "cam") is None
     assert missing_root_message(OSError("Could not find root"), "/cache/img.fits", "cam") is None
 
 

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/tests/test_notifier_backend.py

@@ -203,3 +203,14 @@ async def test_guard_passes_everything_on() -> None:
 
 def test_app_name_is_what_windows_uses_as_the_id() -> None:
     assert APP_NAME == "pyobs-gui"
+
+
+def test_default_notifier_uses_packaged_app_icon(monkeypatch: pytest.MonkeyPatch) -> None:
+    from desktop_notifier import Icon
+    from pyobs_gui.appicon import icon_path
+
+    factory = MagicMock()
+    monkeypatch.setattr("desktop_notifier.DesktopNotifier", factory)
+    backend = DesktopNotifierBackend(ensure_identity=MagicMock())
+    backend._get()
+    factory.assert_called_once_with(app_name=APP_NAME, app_icon=Icon(path=icon_path()))

{pyobs_gui-2.7.0 → pyobs_gui-2.8.0}/tests/test_windows_identity.py

@@ -1,6 +1,7 @@
 import sys
 from pathlib import Path
 from typing import Any
+from unittest.mock import MagicMock
 
 import pytest
 
@@ -34,7 +35,9 @@ def test_an_existing_shortcut_is_left_alone(tmp_path: Path) -> None:
     path = tmp_path / SHORTCUT_NAME
     path.write_text("mine")
     create = Recorder()
-    assert ensure_shortcut("pyobs-gui", path, ("x", ""), create) is False
+    update = MagicMock(return_value=True)
+    assert ensure_shortcut("pyobs-gui", path, ("x", ""), create, update) is False
+    update.assert_called_once_with(path)
     assert create.calls == [] and path.read_text() == "mine"
 
 
@@ -67,3 +70,52 @@ def test_launch_command_for_the_pip_launcher(monkeypatch: pytest.MonkeyPatch, tm
 def test_launch_command_otherwise_starts_the_module(monkeypatch: pytest.MonkeyPatch, argv0: Any) -> None:
     monkeypatch.setattr(sys, "argv", [argv0])
     assert launch_command() == (sys.executable, "-m pyobs_gui")
+
+
+@pytest.fixture
+def com_link(monkeypatch: pytest.MonkeyPatch) -> MagicMock:
+    """Exercise our COM calls without requiring a Windows notification service."""
+    from types import ModuleType
+
+    link = MagicMock()
+    pythoncom = MagicMock()
+    pythoncom.CoCreateInstance.return_value = link
+    monkeypatch.setitem(sys.modules, "pythoncom", pythoncom)
+    monkeypatch.setitem(sys.modules, "win32com", ModuleType("win32com"))
+    monkeypatch.setitem(sys.modules, "win32com.shell", MagicMock())
+    monkeypatch.setitem(sys.modules, "win32com.propsys", MagicMock())
+    return link
+
+
+def test_new_com_shortcut_has_the_packaged_icon(com_link: MagicMock, tmp_path: Path) -> None:
+    from pyobs_gui.appicon import icon_path
+    from pyobs_gui.windows_identity import create_link_com
+
+    create_link_com(tmp_path / SHORTCUT_NAME, "python.exe", "-m pyobs_gui", "pyobs-gui")
+    com_link.SetIconLocation.assert_called_once_with(str(icon_path("ico")), 0)
+    com_link.SetPath.assert_called_once_with("python.exe")
+    com_link.SetArguments.assert_called_once_with("-m pyobs_gui")
+
+
+def test_existing_com_shortcut_gets_icon_without_changing_target(com_link: MagicMock, tmp_path: Path) -> None:
+    from pyobs_gui.appicon import icon_path
+    from pyobs_gui.windows_identity import update_link_icon_com
+
+    path = tmp_path / SHORTCUT_NAME
+    com_link.GetIconLocation.return_value = ("python.exe", 0)
+    assert update_link_icon_com(path) is True
+    com_link.QueryInterface.return_value.Load.assert_called_once_with(str(path))
+    com_link.SetIconLocation.assert_called_once_with(str(icon_path("ico")), 0)
+    com_link.QueryInterface.return_value.Save.assert_called_once_with(str(path), 0)
+    com_link.SetPath.assert_not_called()
+    com_link.SetArguments.assert_not_called()
+
+
+def test_matching_com_shortcut_is_not_rewritten(com_link: MagicMock, tmp_path: Path) -> None:
+    from pyobs_gui.appicon import icon_path
+    from pyobs_gui.windows_identity import update_link_icon_com
+
+    com_link.GetIconLocation.return_value = (str(icon_path("ico")), 0)
+    assert update_link_icon_com(tmp_path / SHORTCUT_NAME) is False
+    com_link.SetIconLocation.assert_not_called()
+    com_link.QueryInterface.return_value.Save.assert_not_called()