chartremotely 0.3.7__tar.gz → 0.3.9__tar.gz

{chartremotely-0.3.7 → chartremotely-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.3.7
+Version: 0.3.9
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 
@@ -219,7 +219,7 @@ Requires-Dist: pyobjc-framework-Quartz>=10; extra == "macos"
 Requires-Dist: pyobjc-framework-Security>=10; extra == "macos"
 Requires-Dist: mlx-whisper>=0.4.3; (sys_platform == "darwin" and platform_machine == "arm64") and extra == "macos"
 Provides-Extra: setup
-Requires-Dist: tollbooth-dpyc[nostr]==0.105.1; extra == "setup"
+Requires-Dist: tollbooth-dpyc[nostr]==0.106.0; extra == "setup"
 Provides-Extra: dev
 Requires-Dist: pytest>=8; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely/doctor.py

@@ -7,6 +7,7 @@ check names the fix, not just the symptom.
 
 from __future__ import annotations
 
+import os
 import urllib.error
 import urllib.request
 
@@ -33,18 +34,45 @@ def _check_app() -> tuple[str, str]:
     return OK, f"thinkorswim running (pid {app.processIdentifier()})"
 
 
-def _check_accessibility() -> tuple[str, str]:
-    """A denied grant looks like an empty tree, not an error."""
-    from . import ax
-    try:
-        app = ax.running_app()
-    except ax.NotRunning:
-        return WARN, "skipped - thinkorswim is not running"
-    windows = ax.attr(ax.handle(app), "AXWindows")
-    if not windows:
-        return BAD, ("no accessibility access - grant it in System Settings > "
-                     "Privacy & Security > Accessibility. This cannot be automated.")
-    return OK, f"accessibility granted ({len(windows)} windows visible)"
+def permission_verdict(granted: dict) -> tuple[str, str]:
+    """What the services' own Python holds; see :func:`services.probe_permissions`."""
+    if not granted:
+        return BAD, "the permission check did not answer - run: chartremotely setup"
+    missing = [name for name, key in (("Accessibility", "accessibility"),
+                                      ("Screen Recording", "screen_recording")) if not granted.get(key)]
+    if missing:
+        python = granted.get("python", "the services' Python")
+        return BAD, (f"{' and '.join(missing)} off for {python} - "
+                     "run: chartremotely setup (a Python upgrade revokes both)")
+    return OK, "Accessibility and Screen Recording allowed for the services' Python"
+
+
+def _check_permissions() -> tuple[str, str]:
+    """Asked as a launchd job, as the services run: the Terminal's own grants say nothing about theirs."""
+    import tempfile
+    from pathlib import Path
+
+    from . import services
+    return permission_verdict(services.probe_permissions(
+        request=False, out=Path(tempfile.gettempdir()) / "chartremotely-permissions.json"))
+
+
+def service_verdict(running: dict[str, str | None], exists=os.path.exists) -> tuple[str, str]:
+    """Each service, and whether the Python it runs is still on disk."""
+    stopped = [name for name, python in running.items() if python is None]
+    orphaned = [name for name, python in running.items() if python and not exists(python)]
+    if orphaned:
+        kick = "; ".join(f"launchctl kickstart -k gui/$UID/com.chartremotely.{name}" for name in orphaned)
+        return BAD, (f"{', '.join(orphaned)} still on a Python that was upgraded away - "
+                     f"restart: {kick}, then run: chartremotely doctor")
+    if stopped:
+        return BAD, f"{', '.join(stopped)} not running - run: chartremotely setup"
+    return OK, "serve and relay running"
+
+
+def _check_services() -> tuple[str, str]:
+    from . import services
+    return service_verdict({name: services.running_python(name) for name in services.LABELS})
 
 
 def _check_controls() -> tuple[str, str]:
@@ -97,7 +125,8 @@ def _check_listener() -> tuple[str, str]:
 CHECKS = (
     ("PyObjC", _check_pyobjc),
     ("thinkorswim", _check_app),
-    ("Accessibility", _check_accessibility),
+    ("Services", _check_services),
+    ("Permissions", _check_permissions),
     ("Chart controls", _check_controls),
     ("Registry", _check_registry),
     ("Listener", _check_listener),

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely/services.py

@@ -69,6 +69,31 @@ def loaded(label: str) -> bool:
                           capture_output=True, check=False).returncode == 0
 
 
+def pid_in(printed: str) -> int | None:
+    """The ``pid = N`` line of ``launchctl print``; None when the job is not running."""
+    for line in printed.splitlines():
+        key, _, value = line.strip().partition(" = ")
+        if key == "pid" and value.isdigit():
+            return int(value)
+    return None
+
+
+def running_python(command: str) -> str | None:
+    """The executable a running service was started from, or None if it is not running.
+
+    macOS grants Accessibility and Screen Recording to that exact file. A
+    Homebrew upgrade replaces it while the service keeps running the old,
+    deleted one - which then holds neither grant.
+    """
+    printed = subprocess.run(["launchctl", "print", f"{_domain()}/{LABELS[command]}"],
+                             capture_output=True, text=True, check=False)
+    pid = pid_in(printed.stdout) if printed.returncode == 0 else None
+    if pid is None:
+        return None
+    ps = subprocess.run(["ps", "-o", "comm=", "-p", str(pid)], capture_output=True, text=True, check=False)
+    return ps.stdout.strip() or None
+
+
 def install(command: str, settle: float = 10.0) -> Path:
     """Write and (re)start one service. Idempotent.
 

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely/setup.py

@@ -294,7 +294,9 @@ def run(ask: Ask = input, say: Say = print, operator_url: str = OPERATOR_URL) ->
     out.step(4, total, "Permissions")
     probe = Path(tempfile.gettempdir()) / "chartremotely-permissions.json"
     granted = services.probe_permissions(request=True, out=probe)
+    asked = False
     while not (granted.get("accessibility") and granted.get("screen_recording")):
+        asked = True
         python = granted.get("python", "the Python that runs ChartRemotely")
         missing = [name for name, key in (("Accessibility", "accessibility"),
                                           ("Screen Recording", "screen_recording")) if not granted.get(key)]
@@ -302,8 +304,14 @@ def run(ask: Ask = input, say: Say = print, operator_url: str = OPERATOR_URL) ->
         out.say(python)
         pane = "Privacy_Accessibility" if not granted.get("accessibility") else "Privacy_ScreenCapture"
         subprocess.run(["open", f"x-apple.systempreferences:com.apple.preference.security?{pane}"], check=False)
-        out.ask("Turn it on in System Settings, then press Return… ")
+        # The list's + picker will not select a bare executable; Finder can drag it in.
+        subprocess.run(["open", "-R", python], check=False)
+        out.ask("Switch it on in that list (or drag it in from the Finder window), then press Return… ")
         granted = services.probe_permissions(request=False, out=probe)
+    if asked:
+        # A grant reaches a running process only when it restarts.
+        for command in ("serve", "relay"):
+            services.install(command)
     out.ok("Accessibility and Screen Recording are allowed.")
 
     # 5. Hearing: the speech model, and the display names a sentence may say.

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely/snapshot.py

@@ -38,6 +38,29 @@ class ChartNotIsolated(LookupError):
     """The chart's own pane could not be told apart from the whole window."""
 
 
+class CaptureFailed(RuntimeError):
+    """macOS would not photograph the window; the message says why."""
+
+
+#: The fix for a refused capture. The grant belongs to the exact Python the
+#: services run, so a Homebrew upgrade of that Python silently revokes it.
+SCREEN_RECORDING_OFF = ("Screen Recording is off for this agent's Python "
+                        "(a Python upgrade revokes it). Run: chartremotely setup")
+
+
+def capture_failed(stderr: str, allowed: bool) -> CaptureFailed:
+    """Name why ``screencapture`` failed, in words a reply can carry.
+
+    ``allowed`` is whether this process holds Screen Recording. Without it,
+    that is the cause whatever screencapture printed; with it, its own first
+    line is the best account there is.
+    """
+    if not allowed:
+        return CaptureFailed(SCREEN_RECORDING_OFF)
+    said = next((line.strip() for line in (stderr or "").splitlines() if line.strip()), "")
+    return CaptureFailed(f"screencapture failed: {said}" if said else "screencapture failed and said nothing")
+
+
 def chart_crop(hit: tuple[int, int], panes: list[Rect], window: Rect,
                image: tuple[int, int]) -> Rect:
     """The chart's pane, in the capture's own pixels.

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely/window.py

@@ -140,8 +140,10 @@ def capture(app=None) -> bytes:
 
     with tempfile.TemporaryDirectory() as tmp:
         shot = Path(tmp) / "window.png"
-        subprocess.run(["screencapture", "-x", "-o", "-l", str(target["kCGWindowNumber"]), str(shot)],
-                       check=True, capture_output=True)
+        ran = subprocess.run(["screencapture", "-x", "-o", "-l", str(target["kCGWindowNumber"]), str(shot)],
+                             check=False, capture_output=True, text=True)
+        if ran.returncode != 0 or not shot.exists():
+            raise snapshot.capture_failed(ran.stderr, bool(Quartz.CGPreflightScreenCaptureAccess()))
         crop = snapshot.chart_crop(hit, panes, bounds, _pixel_size(shot))
         chart = Path(tmp) / "chart.png"
         _crop(shot, chart, *crop)

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.3.7
+Version: 0.3.9
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 
@@ -219,7 +219,7 @@ Requires-Dist: pyobjc-framework-Quartz>=10; extra == "macos"
 Requires-Dist: pyobjc-framework-Security>=10; extra == "macos"
 Requires-Dist: mlx-whisper>=0.4.3; (sys_platform == "darwin" and platform_machine == "arm64") and extra == "macos"
 Provides-Extra: setup
-Requires-Dist: tollbooth-dpyc[nostr]==0.105.1; extra == "setup"
+Requires-Dist: tollbooth-dpyc[nostr]==0.106.0; extra == "setup"
 Provides-Extra: dev
 Requires-Dist: pytest>=8; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ chartremotely.egg-info/requires.txt
 chartremotely.egg-info/top_level.txt
 chartremotely/assets/shortcut.plist
 tests/test_changelog.py
+tests/test_doctor.py
 tests/test_hearing.py
 tests/test_patron.py
 tests/test_popups.py

{chartremotely-0.3.7 → chartremotely-0.3.9}/chartremotely.egg-info/requires.txt

@@ -13,4 +13,4 @@ pyobjc-framework-Security>=10
 mlx-whisper>=0.4.3
 
 [setup]
-tollbooth-dpyc[nostr]==0.105.1
+tollbooth-dpyc[nostr]==0.106.0

{chartremotely-0.3.7 → chartremotely-0.3.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chartremotely"
-version = "0.3.7"
+version = "0.3.9"
 description = "Remote control of desktop charting applications on macOS"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -25,7 +25,7 @@ macos = [
 ]
 # `chartremotely setup` makes and proves Nostr identities. The key and proof
 # code is the tollbooth-dpyc SDK's own, never rewritten here.
-setup = ["tollbooth-dpyc[nostr]==0.105.1"]
+setup = ["tollbooth-dpyc[nostr]==0.106.0"]
 dev = ["pytest>=8", "ruff>=0.6"]
 
 [project.urls]

chartremotely-0.3.9/tests/test_doctor.py

@@ -0,0 +1,42 @@
+"""Doctor's verdicts on the services and their grants - the parts that need no Mac."""
+
+from chartremotely import doctor, services
+
+OLD = "/opt/homebrew/Cellar/python@3.12/3.12.13/Frameworks/Python.framework/Versions/3.12/bin/python3.12"
+NEW = OLD.replace("3.12.13", "3.12.15_1")
+
+
+def test_both_grants_held_is_ok():
+    status, _ = doctor.permission_verdict({"python": NEW, "accessibility": True, "screen_recording": True})
+    assert status == doctor.OK
+
+
+def test_a_missing_grant_names_it_the_python_and_the_fix():
+    status, detail = doctor.permission_verdict({"python": NEW, "accessibility": True, "screen_recording": False})
+    assert status == doctor.BAD
+    assert "Screen Recording" in detail and "Accessibility" not in detail
+    assert NEW in detail and "chartremotely setup" in detail
+
+
+def test_a_probe_that_never_answered_fails():
+    assert doctor.permission_verdict({})[0] == doctor.BAD
+
+
+def test_a_service_on_a_deleted_python_says_restart_it():
+    status, detail = doctor.service_verdict({"serve": NEW, "relay": OLD}, exists=lambda p: p == NEW)
+    assert status == doctor.BAD
+    assert "com.chartremotely.relay" in detail and "com.chartremotely.serve" not in detail
+
+
+def test_a_stopped_service_points_at_setup():
+    status, detail = doctor.service_verdict({"serve": None, "relay": NEW}, exists=lambda p: True)
+    assert status == doctor.BAD and "serve" in detail and "setup" in detail
+
+
+def test_both_running_on_a_live_python_is_ok():
+    assert doctor.service_verdict({"serve": NEW, "relay": NEW}, exists=lambda p: True)[0] == doctor.OK
+
+
+def test_launchctl_print_yields_the_pid_only_while_running():
+    assert services.pid_in("com.chartremotely.relay = {\n\tstate = running\n\tpid = 12804\n}") == 12804
+    assert services.pid_in("com.chartremotely.relay = {\n\tstate = not running\n}") is None

{chartremotely-0.3.7 → chartremotely-0.3.9}/tests/test_snapshot.py

@@ -61,3 +61,23 @@ def test_a_point_outside_every_pane_is_refused():
 def test_the_crop_never_runs_past_the_image():
     x, y, w, h = snapshot.chart_crop((10, 10), [(-50, -50, 400, 400)], (0, 0, 1000, 1000), (1000, 1000))
     assert (x, y) == (0, 0) and w <= 1000 and h <= 1000
+
+
+def test_a_refused_capture_names_screen_recording_and_its_fix():
+    failed = snapshot.capture_failed("could not create image from window\n", allowed=False)
+    assert isinstance(failed, snapshot.CaptureFailed)
+    assert "Screen Recording" in str(failed) and "chartremotely setup" in str(failed)
+
+
+def test_an_allowed_capture_that_fails_reports_what_screencapture_said():
+    failed = snapshot.capture_failed("\n  could not create image from window\nmore\n", allowed=True)
+    assert str(failed) == "screencapture failed: could not create image from window"
+
+
+def test_a_silent_failure_still_says_something():
+    assert "said nothing" in str(snapshot.capture_failed("", allowed=True))
+
+
+def test_the_screen_recording_message_survives_the_reply_limit():
+    # vocab._short keeps 120 characters; the fix must not be cut off.
+    assert len(snapshot.SCREEN_RECORDING_OFF) <= 120