From 9fb83ef1b0ea3ce0fc4b7ac497fa0f349712f7ce Mon Sep 17 00:00:00 2001 From: claude Date: Mon, 6 Jul 2026 18:25:01 +0000 Subject: [PATCH] =?UTF-8?q?refactor:=20rename=20=5Fsupervise=5Ftypes=20?= =?UTF-8?q?=E2=86=92=20supervise=5Ftypes=20(treat=20as=20public)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 --- Dockerfile.sidecars | 2 +- bot_bottle/audit_store.py | 4 ++-- bot_bottle/queue_store.py | 4 ++-- bot_bottle/supervise.py | 4 ++-- ..._supervise_types.py => supervise_types.py} | 2 +- tests/unit/test_supervise.py | 20 +++++++++---------- tests/unit/test_supervise_cli.py | 8 ++++---- tests/unit/test_supervise_server.py | 16 +++++++-------- 8 files changed, 30 insertions(+), 30 deletions(-) rename bot_bottle/{_supervise_types.py => supervise_types.py} (98%) diff --git a/Dockerfile.sidecars b/Dockerfile.sidecars index 3feaf4d..89b33b3 100644 --- a/Dockerfile.sidecars +++ b/Dockerfile.sidecars @@ -68,7 +68,7 @@ COPY bot_bottle/dlp_detectors.py /app/dlp_detectors.py COPY bot_bottle/yaml_subset.py /app/yaml_subset.py COPY bot_bottle/migrations.py /app/migrations.py COPY bot_bottle/db_store.py /app/db_store.py -COPY bot_bottle/_supervise_types.py /app/_supervise_types.py +COPY bot_bottle/supervise_types.py /app/supervise_types.py COPY bot_bottle/queue_store.py /app/queue_store.py COPY bot_bottle/audit_store.py /app/audit_store.py COPY bot_bottle/store_manager.py /app/store_manager.py diff --git a/bot_bottle/audit_store.py b/bot_bottle/audit_store.py index 7411a10..20c9cbc 100644 --- a/bot_bottle/audit_store.py +++ b/bot_bottle/audit_store.py @@ -6,11 +6,11 @@ import sqlite3 from pathlib import Path try: - from ._supervise_types import AuditEntry, host_db_path + from .supervise_types import AuditEntry, host_db_path from .db_store import DbStore from .migrations import TableMigrations except ImportError: - from _supervise_types import AuditEntry, host_db_path # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module + from supervise_types import AuditEntry, host_db_path # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module 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 diff --git a/bot_bottle/queue_store.py b/bot_bottle/queue_store.py index 17a0a0b..93e62a2 100644 --- a/bot_bottle/queue_store.py +++ b/bot_bottle/queue_store.py @@ -7,11 +7,11 @@ import sqlite3 from pathlib import Path try: - from ._supervise_types import Proposal, Response, host_db_path + from .supervise_types import Proposal, Response, host_db_path from .db_store import DbStore from .migrations import TableMigrations except ImportError: - from _supervise_types import Proposal, Response, host_db_path # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module + from supervise_types import Proposal, Response, host_db_path # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module 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 diff --git a/bot_bottle/supervise.py b/bot_bottle/supervise.py index 5dd1dc5..e6b6343 100644 --- a/bot_bottle/supervise.py +++ b/bot_bottle/supervise.py @@ -38,7 +38,7 @@ from dataclasses import dataclass from pathlib import Path try: - from ._supervise_types import ( + from .supervise_types import ( ACTION_OPERATOR_EDIT, AuditEntry, HOST_DB_FILENAME, @@ -57,7 +57,7 @@ try: bot_bottle_root, ) except ImportError: - from _supervise_types import ( # type: ignore[import-not-found,no-redef] # pylint: disable=import-error,no-name-in-module + from supervise_types import ( # type: ignore[import-not-found,no-redef] # pylint: disable=import-error,no-name-in-module ACTION_OPERATOR_EDIT, AuditEntry, HOST_DB_FILENAME, diff --git a/bot_bottle/_supervise_types.py b/bot_bottle/supervise_types.py similarity index 98% rename from bot_bottle/_supervise_types.py rename to bot_bottle/supervise_types.py index d71cdfe..75d9f92 100644 --- a/bot_bottle/_supervise_types.py +++ b/bot_bottle/supervise_types.py @@ -49,7 +49,7 @@ def bot_bottle_root() -> Path: def host_db_path() -> Path: # Look up bot_bottle_root through this module's live namespace so that - # monkey-patches on _supervise_types.bot_bottle_root take effect. + # monkey-patches on supervise_types.bot_bottle_root take effect. return sys.modules[__name__].bot_bottle_root() / HOST_DB_FILENAME diff --git a/tests/unit/test_supervise.py b/tests/unit/test_supervise.py index a75c19f..bc69b89 100644 --- a/tests/unit/test_supervise.py +++ b/tests/unit/test_supervise.py @@ -8,7 +8,7 @@ from datetime import datetime, timezone from pathlib import Path from bot_bottle import supervise -from bot_bottle import _supervise_types as _sv_types +from bot_bottle import supervise_types as sv_types from bot_bottle.audit_store import AuditStore from bot_bottle.queue_store import QueueStore from bot_bottle.supervise import ( @@ -124,17 +124,17 @@ class TestQueueIO(unittest.TestCase): def _patch_home(self, fake_home: Path): original_sv = supervise.bot_bottle_root - original_svt = _sv_types.bot_bottle_root + original_svt = sv_types.bot_bottle_root def fake_root() -> Path: return fake_home / ".bot-bottle" supervise.bot_bottle_root = fake_root # type: ignore[assignment] - _sv_types.bot_bottle_root = fake_root # type: ignore[assignment] + sv_types.bot_bottle_root = fake_root # type: ignore[assignment] def restore() -> None: supervise.bot_bottle_root = original_sv # type: ignore[assignment] - _sv_types.bot_bottle_root = original_svt # type: ignore[assignment] + sv_types.bot_bottle_root = original_svt # type: ignore[assignment] return restore @@ -241,17 +241,17 @@ class TestAuditLog(unittest.TestCase): def _patch_home(self, fake_home: Path): original_sv = supervise.bot_bottle_root - original_svt = _sv_types.bot_bottle_root + original_svt = sv_types.bot_bottle_root def fake_root() -> Path: return fake_home / ".bot-bottle" supervise.bot_bottle_root = fake_root # type: ignore[assignment] - _sv_types.bot_bottle_root = fake_root # type: ignore[assignment] + sv_types.bot_bottle_root = fake_root # type: ignore[assignment] def restore() -> None: supervise.bot_bottle_root = original_sv # type: ignore[assignment] - _sv_types.bot_bottle_root = original_svt # type: ignore[assignment] + sv_types.bot_bottle_root = original_svt # type: ignore[assignment] return restore @@ -401,17 +401,17 @@ class TestSupervisePrepare(unittest.TestCase): def _patch_home(self, fake_home: Path): original_sv = supervise.bot_bottle_root - original_svt = _sv_types.bot_bottle_root + original_svt = sv_types.bot_bottle_root def fake_root() -> Path: return fake_home / ".bot-bottle" supervise.bot_bottle_root = fake_root # type: ignore[assignment] - _sv_types.bot_bottle_root = fake_root # type: ignore[assignment] + sv_types.bot_bottle_root = fake_root # type: ignore[assignment] def restore() -> None: supervise.bot_bottle_root = original_sv # type: ignore[assignment] - _sv_types.bot_bottle_root = original_svt # type: ignore[assignment] + sv_types.bot_bottle_root = original_svt # type: ignore[assignment] return restore diff --git a/tests/unit/test_supervise_cli.py b/tests/unit/test_supervise_cli.py index 9d1dc66..9903da3 100644 --- a/tests/unit/test_supervise_cli.py +++ b/tests/unit/test_supervise_cli.py @@ -12,7 +12,7 @@ from pathlib import Path from unittest.mock import patch from bot_bottle import supervise -from bot_bottle import _supervise_types as _sv_types +from bot_bottle import supervise_types as sv_types from bot_bottle.audit_store import AuditStore from bot_bottle.cli import supervise as supervise_cli from bot_bottle.queue_store import QueueStore @@ -56,17 +56,17 @@ class _FakeHomeMixin: def _setup_fake_home(self): self._tmp = tempfile.TemporaryDirectory(prefix="supervise-test.") original_sv = supervise.bot_bottle_root - original_svt = _sv_types.bot_bottle_root + original_svt = sv_types.bot_bottle_root def fake_root() -> Path: return Path(self._tmp.name) / ".bot-bottle" supervise.bot_bottle_root = fake_root # type: ignore[assignment] - _sv_types.bot_bottle_root = fake_root # type: ignore[assignment] + sv_types.bot_bottle_root = fake_root # type: ignore[assignment] def restore() -> None: supervise.bot_bottle_root = original_sv # type: ignore[assignment] - _sv_types.bot_bottle_root = original_svt # type: ignore[assignment] + sv_types.bot_bottle_root = original_svt # type: ignore[assignment] self._restore_home = restore QueueStore("").migrate() diff --git a/tests/unit/test_supervise_server.py b/tests/unit/test_supervise_server.py index ca8573d..9ea47e5 100644 --- a/tests/unit/test_supervise_server.py +++ b/tests/unit/test_supervise_server.py @@ -19,10 +19,10 @@ sys.path.insert(0, str(Path(__file__).resolve().parent.parent.parent / "bot_bott import supervise as _sv # noqa: E402 # type: ignore import queue_store as _qs # noqa: E402 # type: ignore import audit_store as _as # noqa: E402 # type: ignore -import _supervise_types as _svt_flat # noqa: E402 # type: ignore +import supervise_types as svt_flat # noqa: E402 # type: ignore from bot_bottle import supervise_server # noqa: E402 -from bot_bottle import _supervise_types as _svt_pkg # noqa: E402 +from bot_bottle import supervise_types as svt_pkg # noqa: E402 from bot_bottle.supervise_server import ( ERR_INTERNAL, ERR_INVALID_PARAMS, @@ -280,20 +280,20 @@ class TestHandleToolsCall(unittest.TestCase): def _patch_home(self, fake_home: Path): original_sv = _sv.bot_bottle_root - original_flat = _svt_flat.bot_bottle_root - original_pkg = _svt_pkg.bot_bottle_root + original_flat = svt_flat.bot_bottle_root + original_pkg = svt_pkg.bot_bottle_root def fake_root() -> Path: return fake_home / ".bot-bottle" _sv.bot_bottle_root = fake_root # type: ignore[assignment] - _svt_flat.bot_bottle_root = fake_root # type: ignore[assignment] - _svt_pkg.bot_bottle_root = fake_root # type: ignore[assignment] + svt_flat.bot_bottle_root = fake_root # type: ignore[assignment] + svt_pkg.bot_bottle_root = fake_root # type: ignore[assignment] def restore() -> None: _sv.bot_bottle_root = original_sv # type: ignore[assignment] - _svt_flat.bot_bottle_root = original_flat # type: ignore[assignment] - _svt_pkg.bot_bottle_root = original_pkg # type: ignore[assignment] + svt_flat.bot_bottle_root = original_flat # type: ignore[assignment] + svt_pkg.bot_bottle_root = original_pkg # type: ignore[assignment] return restore