bot_bottle/orchestrator/__init__.py

@@ -28,7 +28,7 @@ orchestrator -> firecracker).
 
 from __future__ import annotations
 
-from .registry import BottleRecord, RegistryStore, new_identity_token
+from .store.registry_store import BottleRecord, RegistryStore, new_identity_token
 from .broker import (
     BrokerAuthError,
     LaunchBroker,

bot_bottle/orchestrator/__main__.py

@@ -20,7 +20,7 @@ from .store.store_manager import StoreManager
 from .broker import LaunchBroker, StubBroker
 from .server import make_server
 from .docker_broker import DockerBroker
-from .registry import RegistryStore, default_db_path
+from .store.registry_store import RegistryStore, default_db_path
 from .service import Orchestrator
 
 

bot_bottle/orchestrator/service.py

@@ -26,7 +26,7 @@ from collections.abc import Iterable
 from datetime import datetime, timezone
 
 from .broker import LaunchBroker, LaunchRequest, sign_request
-from .registry import DEFAULT_REAP_GRACE_SECONDS, BottleRecord, RegistryStore
+from .store.registry_store import DEFAULT_REAP_GRACE_SECONDS, BottleRecord, RegistryStore
 from .supervisor import (
     AuditEntry,
     COMPONENT_FOR_TOOL,

bot_bottle/orchestrator/store/__init__.py

@@ -1,9 +1,9 @@
 """Orchestrator-owned SQLite stores.
 
 The stores whose tables only the orchestrator (control plane) opens: the
-supervise proposal/response `queue_store`, the agent-secret `secret_store`, and
-the orchestrator `config_store`. They build on the shared `DbStore` /
-`migrations` base in `bot_bottle.store`.
+per-host bottle `registry_store`, the supervise proposal/response `queue_store`,
+the agent-secret `secret_store`, and the orchestrator `config_store`. They build
+on the shared `DbStore` / `migrations` base in `bot_bottle.store`.
 
 Callers import the concrete module directly, e.g.
 `from bot_bottle.orchestrator.store.queue_store import QueueStore`.

bot_bottle/orchestrator/store/registry_store.py

@@ -36,9 +36,9 @@ from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
 
-from ..store.db_store import DbStore
-from ..store.migrations import TableMigrations
-from ..paths import host_db_path
+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.
 IDENTITY_TOKEN_BYTES = 32

tests/unit/test_orchestrator_registry_store.py

@@ -9,7 +9,7 @@ import unittest
 from contextlib import closing
 from pathlib import Path
 
-from bot_bottle.orchestrator.registry import (
+from bot_bottle.orchestrator.store.registry_store import (
     BottleRecord,
     RegistryStore,
     new_identity_token,

tests/unit/test_orchestrator_server.py

@@ -22,7 +22,7 @@ from unittest.mock import patch
 from bot_bottle.orchestrator_auth import ROLE_CLI, ROLE_GATEWAY, mint
 from bot_bottle.orchestrator.broker import StubBroker
 from bot_bottle.orchestrator.server import dispatch, make_server
-from bot_bottle.orchestrator.registry import BottleRecord, RegistryStore
+from bot_bottle.orchestrator.store.registry_store import BottleRecord, RegistryStore
 from bot_bottle.orchestrator.service import Orchestrator
 from bot_bottle.orchestrator.store.store_manager import StoreManager
 from bot_bottle.orchestrator.supervisor import (

tests/unit/test_orchestrator_service.py

@@ -12,7 +12,7 @@ from pathlib import Path
 from unittest.mock import patch
 
 from bot_bottle.orchestrator.broker import LaunchBroker, LaunchRequest, StubBroker
-from bot_bottle.orchestrator.registry import RegistryStore
+from bot_bottle.orchestrator.store.registry_store import RegistryStore
 from bot_bottle.orchestrator.service import Orchestrator
 from bot_bottle.orchestrator.store.secret_store import new_env_var_secret
 from bot_bottle.orchestrator.store.store_manager import StoreManager