dulus 3.9.3__tar.gz → 3.9.5__tar.gz

{dulus-3.9.3/dulus.egg-info → dulus-3.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dulus
-Version: 3.9.3
+Version: 3.9.5
 Summary: Use IA as an agent without an API key. $0. Harvest your browser session for Gemini (guest, no login), Claude.ai, Claude Code, Kimi.com, Qwen, DeepSeek — drive them like an API, no per-token billing. Plus LiteLLM (100+ paid providers), local models via Ollama, /lang in 34 languages, Mesa Redonda, voice, OCR, MemPalace, embedded sandbox OS.
 Author: KevRojo
 License: GPL-3.0

{dulus-3.9.3 → dulus-3.9.5}/config.py

@@ -198,8 +198,34 @@ def load_config() -> dict:
 
 def save_config(cfg: dict):
     CONFIG_DIR.mkdir(exist_ok=True)
-    # Strip internal runtime keys (e.g. _run_query_callback) before saving
-    data = {k: v for k, v in cfg.items() if not k.startswith("_")}
+    # Build a complete config from defaults + whatever is already on disk, THEN
+    # apply the runtime changes on top. This prevents catastrophic resets: if a
+    # caller passes a thin `cfg` (e.g. only {"lang", "user_name"} at early
+    # startup or from a command that rebuilt a minimal dict), we must NOT drop
+    # every other key the user had. Previously we wrote `cfg` verbatim, so a
+    # thin dict wiped the entire config down to those few keys — exactly the
+    # "config shrank to lang+user_name" bug. Mirror the private repo's logic.
+    data = dict(DEFAULTS)
+    if CONFIG_FILE.exists():
+        try:
+            existing = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
+            if isinstance(existing, dict):
+                data.update(existing)
+        except Exception:
+            # Corrupt on-disk config: fall back to the last-known-good backup so
+            # we still don't lose the user's keys on this save.
+            try:
+                backup = CONFIG_FILE.with_suffix(".json.bak")
+                if backup.exists():
+                    bdata = json.loads(backup.read_text(encoding="utf-8"))
+                    if isinstance(bdata, dict):
+                        data.update(bdata)
+            except Exception:
+                pass
+    # Strip internal runtime keys (e.g. _run_query_callback), then apply the
+    # caller's runtime changes on top of the merged base.
+    runtime = {k: v for k, v in cfg.items() if not k.startswith("_")}
+    data.update(runtime)
     # Encrypt API keys before saving
     data = _secure_keys(dict(data))
     payload = json.dumps(data, indent=2)

{dulus-3.9.3 → dulus-3.9.5/dulus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dulus
-Version: 3.9.3
+Version: 3.9.5
 Summary: Use IA as an agent without an API key. $0. Harvest your browser session for Gemini (guest, no login), Claude.ai, Claude Code, Kimi.com, Qwen, DeepSeek — drive them like an API, no per-token billing. Plus LiteLLM (100+ paid providers), local models via Ollama, /lang in 34 languages, Mesa Redonda, voice, OCR, MemPalace, embedded sandbox OS.
 Author: KevRojo
 License: GPL-3.0

{dulus-3.9.3 → dulus-3.9.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dulus"
-version = "3.9.3"
+version = "3.9.5"
 description = "Use IA as an agent without an API key. $0. Harvest your browser session for Gemini (guest, no login), Claude.ai, Claude Code, Kimi.com, Qwen, DeepSeek — drive them like an API, no per-token billing. Plus LiteLLM (100+ paid providers), local models via Ollama, /lang in 34 languages, Mesa Redonda, voice, OCR, MemPalace, embedded sandbox OS."
 readme = "README.md"
 requires-python = ">=3.11"

{dulus-3.9.3 → dulus-3.9.5}/voice/tts.py

@@ -33,16 +33,45 @@ _stop_event = threading.Event()
 _say_lock = threading.Lock()
 
 def _watch_for_cancel() -> None:
-    """Background thread: set _stop_event if user presses 'c'."""
+    """Background thread: set _stop_event if user presses 'c'.
+
+    Two detection paths, because one alone is unreliable:
+      1. msvcrt.kbhit() — only sees keys when the raw console owns stdin.
+         When prompt_toolkit (the fancy REPL input) is active, IT consumes
+         the keystroke first and msvcrt never sees the 'c' — which is why
+         cancel "sometimes didn't work" and you had to wait out the audio.
+      2. GetAsyncKeyState(VK 'C') — reads the PHYSICAL key state straight
+         from the OS, regardless of who owns stdin. Edge-detected (up→down)
+         so a held key doesn't retrigger.
+    Also sleeps 30ms per iteration — the old loop busy-spun at 100% CPU.
+    """
     try:
         import msvcrt
+        try:
+            import ctypes
+            _user32 = ctypes.windll.user32
+        except Exception:
+            _user32 = None
+        VK_C = 0x43
+        was_down = bool(_user32 and (_user32.GetAsyncKeyState(VK_C) & 0x8000))
         while not _stop_event.is_set():
+            # Path 1: classic console read (works when no prompt is active).
             if msvcrt.kbhit():
                 ch = msvcrt.getwch()
                 if ch.lower() == 'c':
                     _stop_event.set()
                     print("\n  ⏹  TTS stopped.", flush=True)
                     return
+            # Path 2: physical key state — catches the press even when
+            # prompt_toolkit swallowed the stdin byte.
+            if _user32 is not None:
+                is_down = bool(_user32.GetAsyncKeyState(VK_C) & 0x8000)
+                if is_down and not was_down:
+                    _stop_event.set()
+                    print("\n  ⏹  TTS stopped.", flush=True)
+                    return
+                was_down = is_down
+            time.sleep(0.03)
     except Exception:
         pass