wesktop 0.4.2__tar.gz → 0.4.4__tar.gz

wesktop-0.4.4/.rlsbl/changes/.validated

@@ -0,0 +1 @@
+6a9c578efc84dad1ba896d5ff0187f37d445f76f

wesktop-0.4.4/.rlsbl/changes/0.4.3.jsonl

@@ -0,0 +1,4 @@
+{"commits":["2f8324d5c49da11628b1efb016ccfc9680747141"],"user_facing":false}
+{"commits":["ad39a610a91db62ce6642c8cba5e68db4c7f8327"],"user_facing":true,"description":"**Fix.** `serve(foreground=False)` signal handler patch now survives thread start race condition. Previous fix was ineffective because the noop was restored before the daemon thread executed startup.","type":"fix"}
+{"commits":["7b12c3c937671b5ed6b5c83a06fbb9cefd722e4a"],"user_facing":false}
+{"commits":["ecd619cf4ce0539d740a8e4880811f9efea01920"],"user_facing":false}

wesktop-0.4.4/.rlsbl/changes/0.4.3.md

@@ -0,0 +1,5 @@
+## 0.4.3
+
+### Fixes
+
+- **Fix.** `serve(foreground=False)` signal handler patch now survives thread start race condition. Previous fix was ineffective because the noop was restored before the daemon thread executed startup.

wesktop-0.4.4/.rlsbl/changes/0.4.4.jsonl

@@ -0,0 +1,3 @@
+{"commits":["2816ad70db01fb893b36bfd47832845ca890a6ed"],"user_facing":true,"description":"**Feature.** `ensure_gui_backend()` finds and loads system PyGObject in isolated venvs. Called automatically by `run()`.","type":"feature"}
+{"commits":["d2eb0dcc8a74e8245486abbf03ae723fc3f39182"],"user_facing":false}
+{"commits":["4ff7529eb66e6ecc20ccbf3402b522d56b20dbcb"],"user_facing":false}

wesktop-0.4.4/.rlsbl/changes/0.4.4.md

@@ -0,0 +1,5 @@
+## 0.4.4
+
+### Features
+
+- **Feature.** `ensure_gui_backend()` finds and loads system PyGObject in isolated venvs. Called automatically by `run()`.

wesktop-0.4.4/.rlsbl/releases/v0.4.3.toml

@@ -0,0 +1,3 @@
+bump = "patch"
+include = ["pypi"]
+exclude = []

wesktop-0.4.4/.rlsbl/releases/v0.4.4.toml

@@ -0,0 +1,3 @@
+bump = "patch"
+include = ["pypi"]
+exclude = []

{wesktop-0.4.2 → wesktop-0.4.4}/.selfdoc/hashes/hashes.json

@@ -12,7 +12,7 @@
     "description": "3d5281d2398fdfd3797661b5a27cbbf1bcfb7672e0dc7593edfe887fde57c9c4"
   },
   "cli-index.md": {
-    "content": "4b621158082758133bec3a20d1a8de97613128dc90d4d3359e50b6a97086c4da",
+    "content": "58ebe7861b04a95005551cf2c5a6fd07a918232f6cdff036bb167fef50b27b34",
     "description": "eb7d99d2e046110a9cad0e28ea4636e1fa5269bf53c7727a6385e3962beedd53"
   },
   "en/api.md": {
@@ -56,7 +56,7 @@
     "description": "a845d0e6199b15cb03e8f3be172de7d59ea3076039bb2dee4af03a1178f1780f"
   },
   "src-wesktop-desktop.md": {
-    "content": "5bf4f1a6264195aaac494e6cf89e8cf90b218a5d259f253528e27d5af643d2d3",
+    "content": "a8692b5a12c2c71fca09c1e083072ee028c39fc1531b6b14e34b720819ec5b34",
     "description": "e9839f6cb1270a463ba16d41b5afd1020800331b819d5ebb1f6a67cd21a83340"
   },
   "src-wesktop-dev.md": {
@@ -140,7 +140,7 @@
     "description": "8f9b1d5078c4c523c5e346f478af2d571065613cb8e562a71d1c9c3ddeaccc73"
   },
   "src-wesktop.md": {
-    "content": "2aa767b12b24bc8eb8dbb1d22d288780e2c742ef74db97494665f840cbb1709d",
+    "content": "09aa24170e09a40f949ae6d783a0d24dbb7c3d4347ca706c9e5af070e4c26cd4",
     "description": "efa694eed1f01acd89f1ccd505c0810c9820e27c53c1857edbe635bd3c5e0474"
   }
 }

{wesktop-0.4.2 → wesktop-0.4.4}/.strictcli/schema.json

@@ -33,7 +33,7 @@
     }
   },
   "name": "wesktop",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "help": "A Python framework for building web-based desktop applications",
   "config": true,
   "commands": {

{wesktop-0.4.2 → wesktop-0.4.4}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 # Changelog
 
+## 0.4.4
+
+### Features
+
+- **Feature.** `ensure_gui_backend()` finds and loads system PyGObject in isolated venvs. Called automatically by `run()`.
+
+## 0.4.3
+
+### Fixes
+
+- **Fix.** `serve(foreground=False)` signal handler patch now survives thread start race condition. Previous fix was ineffective because the noop was restored before the daemon thread executed startup.
+
 ## 0.4.2
 
 ### Fixes

{wesktop-0.4.2 → wesktop-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wesktop
-Version: 0.4.2
+Version: 0.4.4
 Summary: A Python framework for building web-based desktop applications
 Author-email: smm-h <smmh72@gmail.com>
 License-Expression: MIT

{wesktop-0.4.2 → wesktop-0.4.4}/docs/cli-index.md

@@ -12,7 +12,7 @@ order: 91
 
 A Python framework for building web-based desktop applications
 
-Version: 0.4.1
+Version: 0.4.3
 
 ## Commands
 

{wesktop-0.4.2 → wesktop-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wesktop"
-version = "0.4.2"
+version = "0.4.4"
 description = "A Python framework for building web-based desktop applications"
 requires-python = ">=3.11"
 license = "MIT"

{wesktop-0.4.2 → wesktop-0.4.4}/selfdoc.json

@@ -1,11 +1,11 @@
 {
-  "version": "0.4.1",
+  "version": "0.4.3",
   "language": "python",
   "source": ["src/wesktop/"],
   "docs": "docs/",
   "output": "docs/_build/",
   "base_url": "https://wesktop.smmh.dev",
-  "versions": [{"version": "0.4.1", "indexed": true}],
+  "versions": [{"version": "0.4.3", "indexed": true}],
   "locales": [{"code": "en", "label": "English", "default": true}],
   "deploy": {
     "provider": "cloudflare-pages",

{wesktop-0.4.2 → wesktop-0.4.4}/src/wesktop/__init__.py

@@ -193,6 +193,8 @@ __all__ = [
     "ServerStatus",
     "run",
     "dev",
+    # desktop
+    "ensure_gui_backend",
     # features
     "FeatureFlags",
     # audit
@@ -263,6 +265,13 @@ __all__ = [
 ]
 
 
+def ensure_gui_backend() -> bool:
+    """Make pywebview's GUI backend importable in isolated venvs."""
+    from wesktop.desktop import ensure_gui_backend as _ensure_gui_backend
+
+    return _ensure_gui_backend()
+
+
 def run(
     target: str | Callable,
     *,

{wesktop-0.4.2 → wesktop-0.4.4}/src/wesktop/desktop.py

@@ -2,8 +2,11 @@
 
 from __future__ import annotations
 
+import glob
 import logging
+import os
 import signal
+import sys
 import webbrowser
 from pathlib import Path
 from typing import Callable
@@ -11,6 +14,42 @@ from typing import Callable
 log = logging.getLogger(__name__)
 
 
+def ensure_gui_backend() -> bool:
+    """Make pywebview's GUI backend importable in isolated venvs.
+
+    If gi (PyGObject) is not importable, searches common system
+    site-packages locations and adds the first one found to sys.path.
+    Returns True if a backend is available, False otherwise.
+    """
+    try:
+        import gi  # noqa: F401
+
+        return True
+    except ImportError:
+        pass
+
+    # gi not in venv -- search system site-packages
+    patterns = [
+        "/usr/lib64/python3.*/site-packages",
+        "/usr/lib/python3.*/site-packages",
+        "/usr/lib/python3/dist-packages",  # Debian/Ubuntu
+    ]
+
+    for pattern in patterns:
+        for path in sorted(glob.glob(pattern), reverse=True):
+            gi_path = os.path.join(path, "gi")
+            if os.path.isdir(gi_path) and path not in sys.path:
+                sys.path.insert(0, path)
+                try:
+                    import gi  # noqa: F401
+
+                    return True
+                except ImportError:
+                    sys.path.remove(path)
+
+    return False
+
+
 def _has_gui_backend() -> bool:
     """Probe whether pywebview can load a GUI backend (GTK or Qt).
 
@@ -107,6 +146,9 @@ def run(
         reload=reload,
     )
 
+    # Make system PyGObject visible in isolated venvs before importing webview
+    ensure_gui_backend()
+
     # Late import so headless mode (serve) has no pywebview dependency
     try:
         import webview

{wesktop-0.4.2 → wesktop-0.4.4}/src/wesktop/server.py

@@ -278,15 +278,15 @@ def serve(
         # daemon threads.  Signal handling is unnecessary here -- the daemon
         # thread dies when the main thread exits.
         from granian import _signals
+        from granian.server import common as _granian_common
 
-        _original = _signals.set_main_signals
-        _signals.set_main_signals = lambda *a, **kw: None
+        _noop = lambda *a, **kw: None
+        _signals.set_main_signals = _noop
+        _granian_common.set_main_signals = _noop
 
         thread = threading.Thread(target=server.serve, daemon=True)
         thread.start()
 
-        _signals.set_main_signals = _original
-
         log.info("%s started in background on %s", name, url)
         return url
 

wesktop-0.4.4/tests/test_gui_backend.py

@@ -0,0 +1,155 @@
+"""Tests for ensure_gui_backend() -- system PyGObject discovery for isolated venvs."""
+
+from __future__ import annotations
+
+import builtins
+import importlib
+import os
+import socket
+import sys
+from unittest.mock import MagicMock, patch
+
+from wesktop.desktop import ensure_gui_backend
+
+
+def _free_port() -> int:
+    """Find an ephemeral port that is currently free."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.bind(("127.0.0.1", 0))
+        return s.getsockname()[1]
+
+
+def test_ensure_gui_backend_gi_already_importable() -> None:
+    """When gi is already importable, returns True without touching sys.path."""
+    mock_gi = MagicMock()
+    original_path = sys.path.copy()
+
+    with patch.dict(sys.modules, {"gi": mock_gi}):
+        result = ensure_gui_backend()
+
+    assert result is True
+    assert sys.path == original_path
+
+
+def test_ensure_gui_backend_finds_system_gi() -> None:
+    """When gi is not in the venv, finds it via system site-packages glob."""
+    original_import = builtins.__import__
+    call_count = 0
+
+    def fake_import(name, *args, **kwargs):
+        nonlocal call_count
+        if name == "gi":
+            call_count += 1
+            if call_count == 1:
+                # First attempt (venv) fails
+                raise ImportError("no gi in venv")
+            # Second attempt (after sys.path modification) succeeds
+            return MagicMock()
+        return original_import(name, *args, **kwargs)
+
+    fake_system_path = "/usr/lib64/python3.12/site-packages"
+
+    with (
+        patch("builtins.__import__", side_effect=fake_import),
+        patch("wesktop.desktop.glob.glob", return_value=[fake_system_path]),
+        patch("os.path.isdir", return_value=True),
+    ):
+        # Ensure our fake path is not already in sys.path
+        original_path = sys.path.copy()
+        try:
+            result = ensure_gui_backend()
+            assert result is True
+            assert fake_system_path in sys.path
+        finally:
+            # Clean up sys.path
+            if fake_system_path in sys.path:
+                sys.path.remove(fake_system_path)
+
+
+def test_ensure_gui_backend_returns_false_when_gi_nowhere() -> None:
+    """When gi is not available anywhere, returns False."""
+    original_import = builtins.__import__
+
+    def fake_import(name, *args, **kwargs):
+        if name == "gi":
+            raise ImportError("no gi anywhere")
+        return original_import(name, *args, **kwargs)
+
+    with (
+        patch("builtins.__import__", side_effect=fake_import),
+        patch("wesktop.desktop.glob.glob", return_value=[]),
+    ):
+        result = ensure_gui_backend()
+
+    assert result is False
+
+
+def test_ensure_gui_backend_skips_paths_without_gi_dir() -> None:
+    """Paths that exist but don't contain a gi/ directory are skipped."""
+    original_import = builtins.__import__
+
+    def fake_import(name, *args, **kwargs):
+        if name == "gi":
+            raise ImportError("no gi")
+        return original_import(name, *args, **kwargs)
+
+    fake_path = "/usr/lib64/python3.12/site-packages"
+
+    with (
+        patch("builtins.__import__", side_effect=fake_import),
+        patch("wesktop.desktop.glob.glob", return_value=[fake_path]),
+        patch("os.path.isdir", return_value=False),
+    ):
+        result = ensure_gui_backend()
+
+    assert result is False
+    assert fake_path not in sys.path
+
+
+def test_run_calls_ensure_gui_backend_before_webview() -> None:
+    """run() calls ensure_gui_backend() before importing webview."""
+    call_order: list[str] = []
+
+    original_ensure = ensure_gui_backend
+
+    def tracking_ensure():
+        call_order.append("ensure_gui_backend")
+        return True
+
+    port = _free_port()
+
+    with (
+        patch("wesktop.desktop.ensure_gui_backend", side_effect=tracking_ensure),
+        patch("wesktop.desktop._has_gui_backend", return_value=True),
+        patch("webview.start"),
+        patch("webview.create_window"),
+        patch("wesktop.server.serve", return_value=f"http://127.0.0.1:{port}"),
+    ):
+        from wesktop.desktop import run
+
+        run("myapp:app", host="127.0.0.1", port=port)
+
+    assert "ensure_gui_backend" in call_order
+
+
+def test_ensure_gui_backend_removes_path_on_failed_import() -> None:
+    """If adding a system path still doesn't make gi importable, the path is removed."""
+    original_import = builtins.__import__
+
+    def fake_import(name, *args, **kwargs):
+        if name == "gi":
+            raise ImportError("no gi")
+        return original_import(name, *args, **kwargs)
+
+    fake_path = "/usr/lib64/python3.12/site-packages"
+    original_sys_path = sys.path.copy()
+
+    with (
+        patch("builtins.__import__", side_effect=fake_import),
+        patch("wesktop.desktop.glob.glob", return_value=[fake_path]),
+        patch("os.path.isdir", return_value=True),
+    ):
+        result = ensure_gui_backend()
+
+    assert result is False
+    assert fake_path not in sys.path

{wesktop-0.4.2 → wesktop-0.4.4}/uv.lock

@@ -826,7 +826,7 @@ wheels = [
 
 [[package]]
 name = "wesktop"
-version = "0.4.2"
+version = "0.4.4"
 source = { editable = "." }
 dependencies = [
     { name = "bcrypt" },

wesktop-0.4.2/.rlsbl/changes/.validated

@@ -1 +0,0 @@
-dadb8c9c66ead3a0767827bbb13dd9dca62321a1