chartremotely 0.3.3__tar.gz → 0.3.5__tar.gz

{chartremotely-0.3.3 → chartremotely-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.3.3
+Version: 0.3.5
 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.102.1; extra == "setup"
+Requires-Dist: tollbooth-dpyc[nostr]==0.105.0; extra == "setup"
 Provides-Extra: dev
 Requires-Dist: pytest>=8; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{chartremotely-0.3.3 → chartremotely-0.3.5}/chartremotely/config.py

@@ -35,7 +35,7 @@ DEFAULTS: dict = {
     "agent_id": None,
     "agent_secret": None,
     # Whose display this is: the npub voice commands are billed to. Its
-    # sign-in (the dpop_token) lives in the login Keychain, never here.
+    # sign-in (this Mac's connection tokens) lives in the login Keychain, never here.
     "owner_npub": None,
     "token": None,
     "port": 8899,

{chartremotely-0.3.3 → chartremotely-0.3.5}/chartremotely/keystore.py

@@ -1,8 +1,8 @@
 """Keep a patron's secrets in their login Keychain, never in this agent's files.
 
 Two kinds, never mixed: the Nostr key ``setup`` may make for the human, and
-the voice sign-in - the ``dpop_token`` the operator returns once the owner
-has proven their npub by DM - which the listener passes on each priced call.
+the voice sign-in - this Mac's OAuth tokens on the operator, whose connection
+holds the owner's npub once they have proven it by DM.
 
 A key made by ``setup`` belongs to the human. It goes into their login
 Keychain as an internet password for the ChartRemotely site, and it is

{chartremotely-0.3.3 → chartremotely-0.3.5}/chartremotely/patron.py

@@ -172,13 +172,13 @@ def renew(base: str, npub: str, sleep: Callable[[float], None] = time.sleep) ->
 def _renew(base: str, npub: str, sleep: Callable[[float], None]) -> None:
     try:
         sent = _call(base, npub, "chart_request_npub_proof", {"patron_npub": npub, "reason": REASON})
-        phrase = sent.get("dpop_token")
+        phrase = sent.get("nonce")
         if not phrase:
             requestlog.outcome("serve", "renew", "", refusal(sent) or "no proof request was sent")
             return
         for delay in RENEW_DELAYS:
             sleep(delay)
-            got = _call(base, npub, "chart_receive_npub_proof", {"patron_npub": npub, "dpop_token": phrase})
+            got = _call(base, npub, "chart_receive_npub_proof", {"patron_npub": npub, "nonce": phrase})
             if got.get("success") is not False and not got.get("error"):
                 # Proven into this Mac's connection; nothing to keep here.
                 requestlog.outcome("serve", "renew", "", None)

{chartremotely-0.3.3 → chartremotely-0.3.5}/chartremotely/setup.py

@@ -10,9 +10,10 @@ what is already done, so running setup again is always safe:
    A made key is kept for the human - their Keychain, then Safari's saved
    passwords - and used once, in memory, to sign the pairing. It is never
    written to this agent's config. Then **pairing**, without a code to copy: setup adopts this machine's code itself.
-   and **voice sign-in**: the ``dpop_token`` from the owner's DM proof, kept in
-   the login Keychain (their npub goes in the config), so the listener can
-   call the operator's priced tools as that patron.
+   and **voice sign-in**: this Mac's connection to the operator, into which the
+   owner's DM proof puts their npub; its OAuth tokens are kept in the login
+   Keychain (their npub goes in the config), so the listener can call the
+   operator's priced tools as that patron.
 2. **Tailscale**: the Mac's tailnet address, with ``/chart`` forwarded to the agent.
 3. **Services**: the listener and the relay, under launchd.
 4. **Permissions**: Accessibility and Screen Recording, asked for by the
@@ -61,7 +62,7 @@ def prove_by_dm(client: mcpclient.Client, npub: str, ask: Ask, say: Say) -> None
     sent = client.call("chart_request_npub_proof", {
         "patron_npub": npub, "verify_at": SITE,
         "reason": "You asked to pair a Mac with ChartRemotely."})
-    phrase = sent.get("dpop_token")
+    phrase = sent.get("nonce")
     if not phrase:
         raise SetupError(sent.get("error") or "the operator did not send a proof request")
     say(f"A Nostr DM is on its way to {npub[:12]}…")
@@ -70,7 +71,7 @@ def prove_by_dm(client: mcpclient.Client, npub: str, ask: Ask, say: Say) -> None
     say("may set cache_duration (30 days, or unlimited) so voice keeps working that")
     say("long; left alone, the sign-in lasts 2 hours.")
     ask("Press Return once you have replied… ")
-    got = client.call("chart_receive_npub_proof", {"patron_npub": npub, "dpop_token": phrase})
+    got = client.call("chart_receive_npub_proof", {"patron_npub": npub, "nonce": phrase})
     if got.get("error"):
         raise SetupError(got["error"])
 

{chartremotely-0.3.3 → chartremotely-0.3.5}/chartremotely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.3.3
+Version: 0.3.5
 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.102.1; extra == "setup"
+Requires-Dist: tollbooth-dpyc[nostr]==0.105.0; extra == "setup"
 Provides-Extra: dev
 Requires-Dist: pytest>=8; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{chartremotely-0.3.3 → chartremotely-0.3.5}/chartremotely.egg-info/requires.txt

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

{chartremotely-0.3.3 → chartremotely-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chartremotely"
-version = "0.3.3"
+version = "0.3.5"
 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.102.1"]
+setup = ["tollbooth-dpyc[nostr]==0.105.0"]
 dev = ["pytest>=8", "ruff>=0.6"]
 
 [project.urls]

{chartremotely-0.3.3 → chartremotely-0.3.5}/tests/test_patron.py

@@ -28,8 +28,8 @@ class FakeOperator:
         self.calls = []
         self.answers = {"chart_show_chart": {"ok": True, "display": "Desk", "result": "Showing PLTR"},
                         "chart_read_chart": {"ok": True, "display": "Desk", "result": "PLTR at daily"},
-                        "chart_request_npub_proof": {"success": True, "dpop_token": "fresh-code"},
-                        "chart_receive_npub_proof": [{"success": True, "dpop_token": "fresh-code"}]}
+                        "chart_request_npub_proof": {"success": True, "nonce": "fresh-code"},
+                        "chart_receive_npub_proof": [{"success": True, "nonce": "fresh-code"}]}
         self.gate = threading.Event()
         self.gate.set()
         self.lock = threading.Lock()
@@ -168,7 +168,7 @@ def test_an_expired_sign_in_is_spoken_and_renewed_once(operator, monkeypatch):
     operator.answers["chart_receive_npub_proof"] = [
         {"success": False, "error_code": "courier_not_found", "error": "No reply found"},
         {"success": False, "error_code": "courier_not_found", "error": "No reply found"},
-        {"success": True, "dpop_token": "fresh-code"}]
+        {"success": True, "nonce": "fresh-code"}]
     assert patron.send("set PLTR | half", "") == patron.EXPIRED
     assert patron.send("set PLTR | half", "") == patron.EXPIRED
     _wait_for_renewal()

{chartremotely-0.3.3 → chartremotely-0.3.5}/tests/test_setup.py

@@ -199,8 +199,8 @@ class StubClient:
 
 
 def test_an_existing_npub_is_proven_by_dm_and_no_key_is_asked_for():
-    client = StubClient({"chart_request_npub_proof": {"dpop_token": "seven-amber-door"},
-                         "chart_receive_npub_proof": {"success": True, "dpop_token": "seven-amber-door"}})
+    client = StubClient({"chart_request_npub_proof": {"nonce": "seven-amber-door"},
+                         "chart_receive_npub_proof": {"success": True, "nonce": "seven-amber-door"}})
     asked, said = [], []
     # Proven into the connection `client` carries: nothing comes back to keep.
     assert setup.prove_by_dm(client, NPUB, lambda q: asked.append(q) or "", said.append) is None
@@ -211,7 +211,7 @@ def test_an_existing_npub_is_proven_by_dm_and_no_key_is_asked_for():
 
 
 def test_a_dm_that_was_not_answered_stops_setup():
-    client = StubClient({"chart_request_npub_proof": {"dpop_token": "x"},
+    client = StubClient({"chart_request_npub_proof": {"nonce": "x"},
                          "chart_receive_npub_proof": {"error": "no reply yet"}})
     with pytest.raises(setup.SetupError, match="no reply yet"):
         setup.prove_by_dm(client, NPUB, lambda q: "", lambda s: None)
@@ -316,8 +316,8 @@ def _stand_in_the_mac(monkeypatch, tmp_path, answers):
 
 def test_a_dm_proven_owner_keeps_the_sign_in_in_the_keychain_not_the_config(monkeypatch, tmp_path):
     vault = _stand_in_the_mac(monkeypatch, tmp_path, {
-        "chart_request_npub_proof": {"dpop_token": "seven-amber-door"},
-        "chart_receive_npub_proof": {"success": True, "dpop_token": "seven-amber-door"},
+        "chart_request_npub_proof": {"nonce": "seven-amber-door"},
+        "chart_receive_npub_proof": {"success": True, "nonce": "seven-amber-door"},
         "chart_pair_agent": {"ok": True, "display": "Desk", "agent_id": "a1"}})
     answers = iter(["", "1", NPUB, "", "Desk"])
     said = []
@@ -330,8 +330,8 @@ def test_a_dm_proven_owner_keeps_the_sign_in_in_the_keychain_not_the_config(monk
 
 def test_an_already_paired_mac_is_signed_in_for_voice_by_dm(monkeypatch, tmp_path):
     vault = _stand_in_the_mac(monkeypatch, tmp_path, {
-        "chart_request_npub_proof": {"dpop_token": "seven-amber-door"},
-        "chart_receive_npub_proof": {"success": True, "dpop_token": "seven-amber-door"}})
+        "chart_request_npub_proof": {"nonce": "seven-amber-door"},
+        "chart_receive_npub_proof": {"success": True, "nonce": "seven-amber-door"}})
     config.update(operator_url="https://op.test", agent_id="a1", agent_secret="agent-secret")
     answers = iter(["", NPUB, "y", ""])
     assert setup.run(ask=lambda q: next(answers), say=lambda s: None) == 0
@@ -341,8 +341,8 @@ def test_an_already_paired_mac_is_signed_in_for_voice_by_dm(monkeypatch, tmp_pat
 
 def test_setup_removes_a_retired_ask_shortcut_and_names_any_it_could_not(monkeypatch, tmp_path):
     _stand_in_the_mac(monkeypatch, tmp_path, {
-        "chart_request_npub_proof": {"dpop_token": "seven-amber-door"},
-        "chart_receive_npub_proof": {"success": True, "dpop_token": "seven-amber-door"}})
+        "chart_request_npub_proof": {"nonce": "seven-amber-door"},
+        "chart_receive_npub_proof": {"success": True, "nonce": "seven-amber-door"}})
     config.update(operator_url="https://op.test", agent_id="a1", agent_secret="agent-secret")
     monkeypatch.setattr(shortcut, "remove_retired", lambda: (["ChartRemotely Ask"], ["ChartRemotely Ask 2"]))
     answers = iter(["", NPUB, "y", ""])