solstone-linux 0.4.3__tar.gz → 0.4.4__tar.gz

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to solstone-linux are documented here.
 The format is based on Keep a Changelog (https://keepachangelog.com/),
 and this project adheres to Semantic Versioning.
 
+## [0.4.4] - 2026-07-04
+
+### Fixed
+- stopping or restarting sol now shuts down promptly, even with an upload mid-retry. that upload used to wait out its full retry delay first; now it ends the moment you quit sol or the machine powers off. a bad retry setting in your config no longer leaves the uploader stuck, either.
+
 ## [0.4.3] - 2026-07-03
 
 ### Changed

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solstone-linux
-Version: 0.4.3
+Version: 0.4.4
 Summary: Standalone Linux desktop observer for solstone
 License-Expression: AGPL-3.0-only
 License-File: LICENSE

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "solstone-linux"
-version = "0.4.3"
+version = "0.4.4"
 description = "Standalone Linux desktop observer for solstone"
 readme = "README.md"
 license = "AGPL-3.0-only"

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/src/solstone_linux/__init__.py

@@ -3,4 +3,4 @@
 
 """Standalone Linux desktop observer for solstone."""
 
-__version__ = "0.4.3"
+__version__ = "0.4.4"

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/src/solstone_linux/sync.py

@@ -8,7 +8,8 @@ background task in the same event loop as capture. Walks cache days
 newest-to-oldest, queries server for existing segments, uploads missing ones.
 
 Refinements over tmux baseline:
-- Respects configured sync_max_retries (no hard min(config,3) cap)
+- Owns long retry/backoff and the circuit breaker; per-upload immediate
+  retries are bounded and interruptible in UploadClient
 - Circuit breaker tuned by error type: auth=immediate, transient=5-10
 - Transient circuit breaker recovers via half-open probe with exponential backoff
 - Auth/revoked circuit breaker is permanent (requires restart)
@@ -527,6 +528,7 @@ class SyncService:
         """Stop the sync service."""
         self._running = False
         self._trigger.set()
+        self._client.request_stop()
 
     async def run(self) -> None:
         """Main sync loop — waits for triggers, then syncs."""

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/src/solstone_linux/upload.py

@@ -7,7 +7,8 @@ Extracted from solstone's observe/remote_client.py. Accepts Config
 as constructor parameter instead of reading config internally.
 
 Refinements over tmux baseline:
-- Respects configured sync_max_retries without hard cap
+- Bounded immediate in-call retries (MAX_IMMEDIATE_ATTEMPTS); long retry is
+  owned by the sync loop + circuit breaker
 - Error classification: auth (401/403) vs transient (5xx/network)
 """
 
@@ -16,6 +17,7 @@ from __future__ import annotations
 import logging
 import platform
 import socket
+import threading
 import time
 from pathlib import Path
 from typing import Any, NamedTuple
@@ -35,6 +37,11 @@ EVENT_DRAIN_TIMEOUT = 3.0
 STREAM_TYPE = "desktop"
 OBSERVER_PROTOCOL_VERSION = 2
 OBSERVER_PROTOCOL_VERSION_HEADER = "X-Solstone-Protocol-Version"
+
+# Immediate in-call upload attempts before deferring to the sync loop.
+# Long retry/backoff is owned by SyncService + the circuit breaker, not here.
+MAX_IMMEDIATE_ATTEMPTS = 2
+
 _CONTENT_TYPES = {".flac": "audio/flac", ".webm": "video/webm"}
 
 
@@ -65,12 +72,16 @@ class UploadClient:
         self._key = config.key
         self._stream = config.stream
         self._revoked = False
+        self._stop_event = threading.Event()
         self._session = requests.Session()
         self._event_session = requests.Session()
         self._event_sender = EventSender(self.relay_event)
         self._retry_backoff = config.sync_retry_delays or [5, 30, 120, 300]
-        # Respect configured retry cap — no hard min(config, 3)
-        self._max_retries = config.sync_max_retries
+        # Immediate in-call attempts: floor at 1, honor a low cap, bound a high one.
+        # Long retry is owned by SyncService + circuit breaker (see upload_segment).
+        self._immediate_attempts = max(
+            1, min(config.sync_max_retries, MAX_IMMEDIATE_ATTEMPTS)
+        )
 
     @property
     def is_revoked(self) -> bool:
@@ -80,6 +91,10 @@ class UploadClient:
     def is_registered(self) -> bool:
         return bool(self._key)
 
+    def request_stop(self) -> None:
+        """Signal any in-flight upload retry wait to return promptly (transient)."""
+        self._stop_event.set()
+
     def _persist_registration(self, config: Config, key: str, stream: str) -> None:
         """Persist the server-issued handle and locked stream back to config."""
         from .config import save_config
@@ -171,7 +186,7 @@ class UploadClient:
 
         url = f"{self._url}/app/observer/ingest"
 
-        for attempt in range(self._max_retries):
+        for attempt in range(self._immediate_attempts):
             file_handles = []
             files_data = []
             error_type = None
@@ -243,12 +258,13 @@ class UploadClient:
                     except Exception:
                         pass
 
-            if attempt < self._max_retries - 1:
+            if attempt < self._immediate_attempts - 1:
                 delay = self._retry_backoff[min(attempt, len(self._retry_backoff) - 1)]
-                time.sleep(delay)
+                if self._stop_event.wait(delay):
+                    return UploadResult(False, error_type=ErrorType.TRANSIENT)
 
         logger.error(
-            f"Upload failed after {self._max_retries} attempts: {day}/{segment}"
+            f"Upload failed after {self._immediate_attempts} attempts: {day}/{segment}"
         )
         return UploadResult(False, error_type=error_type)
 
@@ -328,6 +344,7 @@ class UploadClient:
         self._event_sender.start()
 
     def stop(self) -> None:
+        self._stop_event.set()
         self._event_sender.stop(EVENT_DRAIN_TIMEOUT)
         self._event_session.close()
         self._session.close()

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/tests/test_sync.py

@@ -34,7 +34,12 @@ from solstone_linux.sync_health import (
     load_facts,
     save_facts,
 )
-from solstone_linux.upload import QueryResult, UploadClient, UploadResult
+from solstone_linux.upload import (
+    MAX_IMMEDIATE_ATTEMPTS,
+    QueryResult,
+    UploadClient,
+    UploadResult,
+)
 
 
 def _sha256(path: Path) -> str:
@@ -568,20 +573,65 @@ class TestCircuitBreakerRecovery:
 
 
 class TestRetryCapRespected:
-    """Test that upload respects configured retry cap (no hard min(config,3))."""
+    """Test that upload bounds immediate attempts while honoring low caps."""
 
-    def test_respects_configured_max_retries(self):
-        """Upload client should use the configured max_retries, not cap at 3."""
-        config = Config()
+    def test_high_config_bounded_to_immediate_cap(self, tmp_path: Path):
+        config = Config(
+            base_dir=tmp_path,
+            server_url="http://localhost:9999",
+            key="K",
+        )
         config.sync_max_retries = 10
+        config.sync_retry_delays = [0]
         client = UploadClient(config)
-        assert client._max_retries == 10
+        client._session = MagicMock()
+        client._session.post.return_value = MagicMock(
+            status_code=500,
+            text="boom",
+            json=lambda: {},
+        )
+        media = tmp_path / "audio.flac"
+        media.write_bytes(b"audio")
+
+        result = client.upload_segment("20260101", "120000_005", [media])
+
+        assert client._session.post.call_count == MAX_IMMEDIATE_ATTEMPTS
+        assert result.error_type == ErrorType.TRANSIENT
 
-    def test_low_max_retries_respected(self):
-        config = Config()
+    def test_low_config_single_attempt(self, tmp_path: Path):
+        config = Config(
+            base_dir=tmp_path,
+            server_url="http://localhost:9999",
+            key="K",
+        )
         config.sync_max_retries = 1
         client = UploadClient(config)
-        assert client._max_retries == 1
+        client._session = MagicMock()
+        client._session.post.return_value = MagicMock(
+            status_code=500,
+            text="boom",
+            json=lambda: {},
+        )
+        media = tmp_path / "audio.flac"
+        media.write_bytes(b"audio")
+
+        result = client.upload_segment("20260101", "120000_005", [media])
+
+        assert client._session.post.call_count == 1
+        assert result.error_type == ErrorType.TRANSIENT
+
+    def test_sync_stop_signals_client_interrupt(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path)
+        config.ensure_dirs()
+        client = UploadClient(config)
+        sync = SyncService(config, client)
+
+        assert client._stop_event.is_set() is False
+
+        sync.stop()
+
+        assert client._stop_event.is_set() is True
+        assert sync._running is False
 
 
 class TestSyncHealthFacts:

{solstone_linux-0.4.3 → solstone_linux-0.4.4}/tests/test_upload.py

@@ -8,7 +8,11 @@ import pytest
 
 from solstone_linux.config import Config, load_config
 from solstone_linux.sync_health import ErrorType
-from solstone_linux.upload import OBSERVER_PROTOCOL_VERSION_HEADER, UploadClient
+from solstone_linux.upload import (
+    MAX_IMMEDIATE_ATTEMPTS,
+    OBSERVER_PROTOCOL_VERSION_HEADER,
+    UploadClient,
+)
 
 
 def test_ensure_registered_posts_descriptor_and_persists(tmp_path: Path):
@@ -149,6 +153,129 @@ def test_upload_segment_returns_stored_key(
     assert result.stored_key == expected_key
 
 
+def test_upload_bounds_immediate_attempts(tmp_path: Path):
+    config = Config(
+        base_dir=tmp_path,
+        server_url="http://localhost:9999",
+        key="K",
+    )
+    config.sync_max_retries = 10
+    config.sync_retry_delays = [0]
+    client = UploadClient(config)
+    client._session = MagicMock()
+    client._session.post.return_value = MagicMock(
+        status_code=500,
+        text="boom",
+        json=lambda: {},
+    )
+    media = tmp_path / "audio.flac"
+    media.write_bytes(b"audio")
+
+    result = client.upload_segment("20260101", "120000_005", [media])
+
+    assert client._session.post.call_count == MAX_IMMEDIATE_ATTEMPTS
+    assert result.success is False
+    assert result.error_type == ErrorType.TRANSIENT
+
+
+def test_upload_low_cap_makes_single_attempt(tmp_path: Path):
+    config = Config(
+        base_dir=tmp_path,
+        server_url="http://localhost:9999",
+        key="K",
+    )
+    config.sync_max_retries = 1
+    client = UploadClient(config)
+    client._session = MagicMock()
+    client._session.post.return_value = MagicMock(
+        status_code=500,
+        text="boom",
+        json=lambda: {},
+    )
+    media = tmp_path / "audio.flac"
+    media.write_bytes(b"audio")
+
+    result = client.upload_segment("20260101", "120000_005", [media])
+
+    assert client._session.post.call_count == 1
+    assert result.success is False
+    assert result.error_type == ErrorType.TRANSIENT
+
+
+def test_upload_zero_retries_makes_single_attempt(tmp_path: Path):
+    config = Config(
+        base_dir=tmp_path,
+        server_url="http://localhost:9999",
+        key="K",
+    )
+    config.sync_max_retries = 0
+    client = UploadClient(config)
+    client._session = MagicMock()
+    client._session.post.return_value = MagicMock(
+        status_code=500,
+        text="boom",
+        json=lambda: {},
+    )
+    media = tmp_path / "audio.flac"
+    media.write_bytes(b"audio")
+
+    result = client.upload_segment("20260101", "120000_005", [media])
+
+    assert client._session.post.call_count == 1
+    assert result.success is False
+    assert result.error_type == ErrorType.TRANSIENT
+
+
+def test_upload_negative_retries_makes_single_attempt(tmp_path: Path):
+    config = Config(
+        base_dir=tmp_path,
+        server_url="http://localhost:9999",
+        key="K",
+    )
+    config.sync_max_retries = -1
+    client = UploadClient(config)
+    client._session = MagicMock()
+    client._session.post.return_value = MagicMock(
+        status_code=500,
+        text="boom",
+        json=lambda: {},
+    )
+    media = tmp_path / "audio.flac"
+    media.write_bytes(b"audio")
+
+    result = client.upload_segment("20260101", "120000_005", [media])
+
+    assert client._session.post.call_count == 1
+    assert result.success is False
+    assert result.error_type == ErrorType.TRANSIENT
+
+
+def test_upload_interrupt_during_wait_returns_transient(tmp_path: Path):
+    config = Config(
+        base_dir=tmp_path,
+        server_url="http://localhost:9999",
+        key="K",
+    )
+    config.sync_max_retries = 10
+    client = UploadClient(config)
+    client._session = MagicMock()
+    client._session.post.return_value = MagicMock(
+        status_code=500,
+        text="boom",
+        json=lambda: {},
+    )
+    media = tmp_path / "audio.flac"
+    media.write_bytes(b"audio")
+    client.request_stop()
+
+    result = client.upload_segment("20260101", "120000_005", [media])
+
+    assert client._session.post.call_count == 1
+    assert result.success is False
+    assert result.error_type == ErrorType.TRANSIENT
+    assert client.is_revoked is False
+
+
 def test_relay_event_uses_bearer_and_keyless_route(tmp_path: Path):
     config = Config(base_dir=tmp_path, server_url="http://localhost:9999", key="K")
     client = UploadClient(config)