bot_bottle/cli/__init__.py

@@ -10,7 +10,7 @@ import sys
 from ..errors import MissingEnvVarError
 from ..log import Die, die, error
 from ..manifest import ManifestError
-from ..store_manager import StoreManager
+from ..store.store_manager import StoreManager
 from ._common import PROG
 from . import list as _list_mod
 from .backend import cmd_backend

bot_bottle/image_cache.py

@@ -6,7 +6,7 @@ from datetime import datetime, timezone
 from pathlib import Path
 
 try:
-    from .config_store import ConfigStore
+    from .store.config_store import ConfigStore
 except ImportError:
     from config_store import ConfigStore  # type: ignore[import-not-found]  # pylint: disable=import-error,no-name-in-module
 

bot_bottle/orchestrator/__main__.py

@@ -16,7 +16,7 @@ import secrets
 from pathlib import Path
 
 from .. import log
-from ..store_manager import StoreManager
+from ..store.store_manager import StoreManager
 from .broker import LaunchBroker, StubBroker
 from .control_plane import make_server
 from .docker_broker import DockerBroker

bot_bottle/orchestrator/config_store.py

@@ -11,8 +11,8 @@ import os
 import sqlite3
 from pathlib import Path
 
-from ..db_store import DbStore
-from ..migrations import TableMigrations
+from ..store.db_store import DbStore
+from ..store.migrations import TableMigrations
 from ..paths import host_db_path
 
 TEARDOWN_TIMEOUT_ENV = "BOT_BOTTLE_ORCHESTRATOR_TEARDOWN_TIMEOUT_SECONDS"

bot_bottle/orchestrator/registry.py

@@ -36,8 +36,8 @@ from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
 
-from ..db_store import DbStore
-from ..migrations import TableMigrations
+from ..store.db_store import DbStore
+from ..store.migrations import TableMigrations
 from ..paths import host_db_path
 
 # 256 bits of urandom, URL-safe — unguessable per-bottle identity token.

bot_bottle/store/__init__.py

@@ -0,0 +1,9 @@
+"""SQLite-backed persistence for bot-bottle.
+
+The store family: a shared `DbStore` base (versioned `migrations`) and the
+concrete stores built on it — `ConfigStore`, `AuditStore`, `QueueStore` — plus
+`StoreManager`, which migrates them together against the one per-host DB.
+
+Callers import the concrete module they need directly, e.g.
+`from bot_bottle.store.store_manager import StoreManager`.
+"""

bot_bottle/store/audit_store.py

@@ -6,8 +6,8 @@ import sqlite3
 from pathlib import Path
 
 try:
-    from .supervise_types import AuditEntry
-    from .paths import host_db_path
+    from ..supervise_types import AuditEntry
+    from ..paths import host_db_path
     from .db_store import DbStore
     from .migrations import TableMigrations
 except ImportError:

bot_bottle/store/config_store.py

@@ -7,7 +7,7 @@ from pathlib import Path
 try:
     from .db_store import DbStore
     from .migrations import TableMigrations
-    from .paths import host_db_path
+    from ..paths import host_db_path
 except ImportError:
     from db_store import DbStore  # type: ignore[import-not-found]  # pylint: disable=import-error,no-name-in-module
     from migrations import TableMigrations  # type: ignore[import-not-found]  # pylint: disable=import-error,no-name-in-module

bot_bottle/store/queue_store.py

@@ -7,8 +7,8 @@ import sqlite3
 from pathlib import Path
 
 try:
-    from .supervise_types import Proposal, Response
-    from .paths import host_db_path
+    from ..supervise_types import Proposal, Response
+    from ..paths import host_db_path
     from .db_store import DbStore
     from .migrations import TableMigrations
 except ImportError:

bot_bottle/store/store_manager.py

@@ -26,7 +26,7 @@ class StoreManager:
     def __init__(self, db_path: Path | None = None) -> None:
         if db_path is None:
             try:
-                from .paths import host_db_path
+                from ..paths import host_db_path
             except ImportError:
                 from paths import host_db_path  # type: ignore[import-not-found]  # pylint: disable=import-error,no-name-in-module
             db_path = host_db_path()

bot_bottle/supervise.py

@@ -98,9 +98,9 @@ def audit_log_path(component: str, slug: str) -> Path:
 
 
 try:
-    from .queue_store import QueueStore
-    from .audit_store import AuditStore
-    from .store_manager import StoreManager
+    from .store.queue_store import QueueStore
+    from .store.audit_store import AuditStore
+    from .store.store_manager import StoreManager
 except ImportError:
     # Gateway: files are flat-copied under /app, not a package.
     from queue_store import QueueStore  # type: ignore[import-not-found]  # pylint: disable=import-error,no-name-in-module

tests/unit/test_cli_dispatch.py

@@ -12,10 +12,10 @@ from unittest.mock import patch
 
 import bot_bottle.cli as climod
 from bot_bottle.cli import main
-from bot_bottle.db_store import DbStore
+from bot_bottle.store.db_store import DbStore
 from bot_bottle.log import Die
 from bot_bottle.manifest import ManifestError
-from bot_bottle.store_manager import StoreManager
+from bot_bottle.store.store_manager import StoreManager
 
 
 class TestMainDispatch(unittest.TestCase):

tests/unit/test_config_store.py

@@ -7,11 +7,11 @@ import tempfile
 import unittest
 from pathlib import Path
 
-from bot_bottle.config_store import (
+from bot_bottle.store.config_store import (
     DEFAULT_CACHED_IMAGE_STALE_WARNING_DAYS,
     ConfigStore,
 )
-from bot_bottle.store_manager import StoreManager
+from bot_bottle.store.store_manager import StoreManager
 
 
 class TestConfigStore(unittest.TestCase):

tests/unit/test_db_store.py

@@ -7,8 +7,8 @@ import tempfile
 import unittest
 from pathlib import Path
 
-from bot_bottle.db_store import DbStore
-from bot_bottle.migrations import TableMigrations
+from bot_bottle.store.db_store import DbStore
+from bot_bottle.store.migrations import TableMigrations
 
 
 def _store(tmp: Path) -> DbStore:

tests/unit/test_orchestrator_control_plane.py

@@ -24,7 +24,7 @@ from bot_bottle.orchestrator.broker import StubBroker
 from bot_bottle.orchestrator.control_plane import dispatch, make_server
 from bot_bottle.orchestrator.registry import BottleRecord, RegistryStore
 from bot_bottle.orchestrator.service import Orchestrator
-from bot_bottle.store_manager import StoreManager
+from bot_bottle.store.store_manager import StoreManager
 from bot_bottle.supervise import (
     Proposal,
     TOOL_EGRESS_ALLOW,

tests/unit/test_orchestrator_service.py

@@ -15,7 +15,7 @@ from bot_bottle.orchestrator.broker import LaunchBroker, LaunchRequest, StubBrok
 from bot_bottle.orchestrator.registry import RegistryStore
 from bot_bottle.orchestrator.service import Orchestrator
 from bot_bottle.orchestrator.secret_store import new_env_var_secret
-from bot_bottle.store_manager import StoreManager
+from bot_bottle.store.store_manager import StoreManager
 from bot_bottle.supervise import (
     Proposal,
     STATUS_APPROVED,

tests/unit/test_supervise.py

@@ -10,8 +10,8 @@ from pathlib import Path
 from bot_bottle import supervise
 from bot_bottle.paths import host_db_path
 from tests.unit import use_bottle_root
-from bot_bottle.audit_store import AuditStore
-from bot_bottle.queue_store import QueueStore
+from bot_bottle.store.audit_store import AuditStore
+from bot_bottle.store.queue_store import QueueStore
 from bot_bottle.supervise import (
     AuditEntry,
     Proposal,

tests/unit/test_supervise_edge.py

@@ -11,9 +11,9 @@ from pathlib import Path
 from unittest.mock import patch
 
 from bot_bottle import supervise
-from bot_bottle.audit_store import AuditStore
+from bot_bottle.store.audit_store import AuditStore
 from bot_bottle.paths import bot_bottle_root
-from bot_bottle.queue_store import QueueStore
+from bot_bottle.store.queue_store import QueueStore
 from bot_bottle.supervise import (
     AuditEntry,
     Proposal,

tests/unit/test_supervise_server.py

@@ -19,8 +19,8 @@ from pathlib import Path
 from tests.unit import use_bottle_root
 
 from bot_bottle import supervise as _sv
-from bot_bottle import queue_store as _qs
-from bot_bottle import audit_store as _as
+from bot_bottle.store import queue_store as _qs
+from bot_bottle.store import audit_store as _as
 
 from bot_bottle import supervise_server  # noqa: E402
 from bot_bottle.supervise_server import (