didericis/bot-bottle
1
0
Fork 0
Code Issues 13 Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Extract supervise types, eliminate get_supervise_mod() #329

Merged
didericis-claude merged 2 commits from supervise-types-extraction into sqlite-local-storage 2026-07-06 14:54:16 -04:00
Conversation 4 Commits 2 Files Changed 8
+30 -30
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fb83ef1b0 - Show all commits
Dockerfile.sidecars
+1 -1
View File
@@ -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
didericis commented 2026-07-06 14:19:52 -04:00
Outdated
Review
Copy Link
Copy Source

Probably shouldn't be prepended by a _/should treat this as public.

Probably shouldn't be prepended by a `_`/should treat this as public.
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
bot_bottle/audit_store.py
+2 -2
View File
@@ -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
bot_bottle/queue_store.py
+2 -2
View File
@@ -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
bot_bottle/supervise.py
+2 -2
View File
@@ -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,
bot_bottle/_supervise_types.py → bot_bottle/supervise_types.py
+1 -1
View File
@@ -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
tests/unit/test_supervise.py
+10 -10
View File
@@ -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
tests/unit/test_supervise_cli.py
+4 -4
View File
@@ -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()
tests/unit/test_supervise_server.py
+8 -8
View File
@@ -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