chartremotely 0.2.14__tar.gz → 0.2.15__tar.gz

{chartremotely-0.2.14 → chartremotely-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.2.14
+Version: 0.2.15
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 

{chartremotely-0.2.14 → chartremotely-0.2.15}/chartremotely/shortcut.py

@@ -5,8 +5,8 @@ placeholders where its address and token go. Talk, or type when it asks:
 
 * It records one sentence - "Palantir, half, on mac mini" - posts it to this
   Mac, which hears it with Whisper (:mod:`voice`), and speaks the reply. When
-  the reply is a question (it ends "I'm listening.") it records again, at
-  most three times.
+  the reply is a question (it ends "I'm listening.") it records again; the
+  third spoken miss asks its question in the text box instead.
 * When nothing usable was recorded (no microphone, silence, noise) the reply
   is ``TYPE:`` and a prompt: the Shortcut shows that prompt in a one-line
   text box and posts the typed sentence instead. On a Mac it goes straight

{chartremotely-0.2.14 → chartremotely-0.2.15}/chartremotely/voice.py

@@ -10,7 +10,9 @@ PLTR at half scale sent to mac mini. Good luck."
 A follow-up question ends with :data:`LISTENING`. The Shortcut records again
 when it hears that word, and what was understood the first time is held for
 :data:`FOLLOW_UP_SECONDS`: "Palantir" then "half" is one request, as is
-"Palantir half" then "PLTR" after "Did you mean PLTR or PLTX?".
+"Palantir half" then "PLTR" after "Did you mean PLTR or PLTX?". Speech gets
+:data:`VOICE_TRIES` chances, as Siri gives: the last spoken miss asks its
+question in the text box instead, with what was heard so far still held.
 
 When nothing usable was recorded - no microphone, silence, noise - the
 reply is not a sentence but :data:`TYPE` and a prompt. The Shortcut shows
@@ -42,25 +44,28 @@ TYPED_MAX = 200
 #: The word every follow-up question ends with; the Shortcut listens again on it.
 LISTENING = "I'm listening."
 FOLLOW_UP_SECONDS = 45.0
+#: Spoken tries at one request before the question moves to the text box.
+VOICE_TRIES = 3
 
 _pending: dict = {}
 _pending_lock = threading.Lock()
 
 
-def _held(now: float) -> Understanding | None:
+def _held(now: float) -> tuple[Understanding | None, int]:
+    """The request being completed and how many spoken tries it has had."""
     with _pending_lock:
         got = _pending.get("u")
         if got and now - _pending.get("at", 0.0) <= FOLLOW_UP_SECONDS:
-            return got
+            return got, _pending.get("misses", 0)
         _pending.clear()
-        return None
+        return None, 0
 
 
-def _hold(u: Understanding | None, now: float) -> None:
+def _hold(u: Understanding | None, now: float, misses: int = 0) -> None:
     with _pending_lock:
         _pending.clear()
         if u is not None:
-            _pending.update(u=u, at=now)
+            _pending.update(u=u, at=now, misses=misses)
 
 
 def merge(new: Understanding, old: Understanding | None) -> Understanding:
@@ -110,11 +115,14 @@ def command(u: Understanding) -> str:
 def _answer(text: str, rows: list[dict], lately: list[str], places: list[str],
             send: Callable[[str, str], str], at: float, typed: bool) -> str:
     """Understand one request, spoken or typed: ask for what is missing, or send it."""
-    got = merge(understand(text, recent=lately, displays=places, rows=rows), _held(at))
+    old, misses = _held(at)
+    got = merge(understand(text, recent=lately, displays=places, rows=rows), old)
     names = {t: resolve.spoken_name(r["n"]) for r in rows if (t := r["t"]) in got.ambiguous}
+    misses = misses if typed else misses + 1
+    typed = typed or misses >= VOICE_TRIES
     ask = question(got, names, "Type" if typed else "Say")
     if ask:
-        _hold(got, at)
+        _hold(got, at, misses)
         requestlog.request("type" if typed else "hear", "ask", got.where or "", "")
         return typing(ask) if typed else f"{ask} {LISTENING}"
     _hold(None, at)

{chartremotely-0.2.14 → chartremotely-0.2.15}/chartremotely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.2.14
+Version: 0.2.15
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 

{chartremotely-0.2.14 → chartremotely-0.2.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chartremotely"
-version = "0.2.14"
+version = "0.2.15"
 description = "Remote control of desktop charting applications on macOS"
 readme = "README.md"
 requires-python = ">=3.12"

{chartremotely-0.2.14 → chartremotely-0.2.15}/tests/test_voice.py

@@ -97,6 +97,20 @@ def test_a_follow_up_expires():
     assert ear.respond() == f"Which company at daily? {voice.LISTENING}"
 
 
+def test_the_third_spoken_miss_asks_in_the_text_box_and_keeps_what_was_heard():
+    ear = Ear("mumble", "Nvidia", "grumble")
+    assert ear.respond().endswith(voice.LISTENING)
+    assert ear.respond() == f"I heard Nvidia but no scale. Say the scale, like half or daily. {voice.LISTENING}"
+    assert ear.respond() == "TYPE:I heard Nvidia but no scale. Type the scale, like half or daily."
+    assert ear.typed("daily") == "sent set NVDA | daily to this Mac"
+
+
+def test_a_heard_request_resets_the_spoken_tries():
+    ear = Ear("mumble", "mumble", "Palantir half", "mumble")
+    ear.respond(), ear.respond(), ear.respond()
+    assert ear.respond().endswith(voice.LISTENING)
+
+
 def test_a_completed_request_is_not_carried_into_the_next():
     ear = Ear("Palantir half", "daily")
     ear.respond()