From 342879f267e5cfa5b99ead3ae49b9000dea2aabe Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Thu, 3 Sep 2026 16:35:01 -0700 Subject: [PATCH] fix(compat-fallout): repoint 7 test files that still imported hermes_state/run_agent names from the old facade --- .../test_session_list_reader_disposable.py | 3 ++- tests/hermes_state/test_append_messages_batch.py | 6 ++---- .../hermes_state/test_composite_carrier_rewind.py | 8 ++------ tests/run_agent/test_unicode_ascii_codec.py | 8 +------- tests/state/test_fts_runtime_rebuild.py | 14 +++----------- tests/test_hermes_state_compression_busy_retry.py | 7 ++----- tests/test_state_db_write_durability.py | 6 ++---- 7 files changed, 14 insertions(+), 38 deletions(-) diff --git a/tests/hermes_cli/test_session_list_reader_disposable.py b/tests/hermes_cli/test_session_list_reader_disposable.py index 0ffeb23829..402cb9ff24 100644 --- a/tests/hermes_cli/test_session_list_reader_disposable.py +++ b/tests/hermes_cli/test_session_list_reader_disposable.py @@ -28,7 +28,8 @@ import shutil from hermes_cli.sqlite_safe_read import LiveConnectionError, offline_file_access from hermes_cli.web_server_sessions import _open_session_db_at_path -from hermes_state import SessionDB, _db_fingerprint +from hermes_state import SessionDB +from hermes_state_repair import _db_fingerprint def _ids(db) -> list: diff --git a/tests/hermes_state/test_append_messages_batch.py b/tests/hermes_state/test_append_messages_batch.py index a65436ee93..41f7b85f48 100644 --- a/tests/hermes_state/test_append_messages_batch.py +++ b/tests/hermes_state/test_append_messages_batch.py @@ -11,10 +11,8 @@ import sqlite3 import pytest -from hermes_state import ( - CompressionSessionClosedError, - SessionDB, -) +from hermes_state import SessionDB +from hermes_state_errors import CompressionSessionClosedError @pytest.fixture() diff --git a/tests/hermes_state/test_composite_carrier_rewind.py b/tests/hermes_state/test_composite_carrier_rewind.py index b086e463ee..3da39f4486 100644 --- a/tests/hermes_state/test_composite_carrier_rewind.py +++ b/tests/hermes_state/test_composite_carrier_rewind.py @@ -12,12 +12,8 @@ from agent.context_compressor import ( _MERGED_SUMMARY_DELIMITER, _SUMMARY_END_MARKER, ) -from hermes_state import ( - CompressionSessionClosedError, - SessionCompressionInProgressError, - SessionDB, - SessionTurnLeaseLostError, -) +from hermes_state import SessionCompressionInProgressError, SessionDB +from hermes_state_errors import CompressionSessionClosedError, SessionTurnLeaseLostError def _carrier(ask: str = "REAL ASK") -> str: diff --git a/tests/run_agent/test_unicode_ascii_codec.py b/tests/run_agent/test_unicode_ascii_codec.py index 22cf97483f..d9f94f4623 100644 --- a/tests/run_agent/test_unicode_ascii_codec.py +++ b/tests/run_agent/test_unicode_ascii_codec.py @@ -6,13 +6,7 @@ that can't encode non-ASCII characters in API request payloads. import pytest -from run_agent import ( - _strip_non_ascii, - _sanitize_messages_non_ascii, - _sanitize_structure_non_ascii, - _sanitize_tools_non_ascii, - _sanitize_messages_surrogates, -) +from agent.message_sanitization import _strip_non_ascii, _sanitize_messages_non_ascii, _sanitize_structure_non_ascii, _sanitize_tools_non_ascii, _sanitize_messages_surrogates class TestStripNonAscii: diff --git a/tests/state/test_fts_runtime_rebuild.py b/tests/state/test_fts_runtime_rebuild.py index d6f0a6eeea..c4e4e5a8e1 100644 --- a/tests/state/test_fts_runtime_rebuild.py +++ b/tests/state/test_fts_runtime_rebuild.py @@ -22,17 +22,9 @@ import pytest import hermes_state import hermes_state_holders import hermes_state_schema -from hermes_state import ( - FTS_REBUILD_DEFERRAL_KEY, - FTS_STALE_KEY, - LEGACY_FTS_SQL, - LEGACY_FTS_TRIGRAM_SQL, - SCHEMA_SQL, - SessionDB, - _FTS_TRIGGERS, - _concrete_state_db_holder_pids, - _is_inactive_orphan_desktop_holder, -) +from hermes_state import SessionDB +from hermes_state_common import FTS_REBUILD_DEFERRAL_KEY, FTS_STALE_KEY, LEGACY_FTS_SQL, LEGACY_FTS_TRIGRAM_SQL, SCHEMA_SQL, _FTS_TRIGGERS +from hermes_state_dbfile import _concrete_state_db_holder_pids, _is_inactive_orphan_desktop_holder @pytest.fixture diff --git a/tests/test_hermes_state_compression_busy_retry.py b/tests/test_hermes_state_compression_busy_retry.py index aed45712a2..86c9ba62a5 100644 --- a/tests/test_hermes_state_compression_busy_retry.py +++ b/tests/test_hermes_state_compression_busy_retry.py @@ -22,11 +22,8 @@ from pathlib import Path import pytest -from hermes_state import ( - CompressionSessionBusyError, - SessionCompressionInProgressError, - SessionDB, -) +from hermes_state import SessionCompressionInProgressError, SessionDB +from hermes_state_errors import CompressionSessionBusyError @pytest.fixture diff --git a/tests/test_state_db_write_durability.py b/tests/test_state_db_write_durability.py index 04ab8c88f1..1385ddccf0 100644 --- a/tests/test_state_db_write_durability.py +++ b/tests/test_state_db_write_durability.py @@ -35,10 +35,8 @@ import sys from pathlib import Path import hermes_state -from hermes_state import ( - _connect_repair_durable, - repair_state_db_schema, -) +from hermes_state import repair_state_db_schema +from hermes_state_repair import _connect_repair_durable def _make_db(tmp_path: Path) -> Path: