CI: fix healthcheck schema path, update stale thinking-hot-tail test, add flask_client fixture

Author: rangehow

healthcheck.py

@@ -205,19 +205,31 @@ def warn(msg):
     'trading_intel_cache', 'trading_strategies',
 ]
 
-# Schema definitions moved from lib/database.py → lib/database/_schema.py
-_schema_file = 'lib/database/_schema.py'
-try:
-    with open(_schema_file) as f:
-        db_source = f.read()
+# Schema definitions moved from lib/database.py → lib/database/_schema_{pg,sqlite}.py.
+# We check BOTH backends: every required table must be defined in both files.
+_schema_files = ['lib/database/_schema_pg.py', 'lib/database/_schema_sqlite.py']
+_schema_sources = {}
+for _sf in _schema_files:
+    try:
+        with open(_sf) as f:
+            _schema_sources[_sf] = f.read()
+    except Exception as e:
+        logger.warning('Failed to read %s: %s', _sf, e, exc_info=True)
+        fail(f"Cannot read {_sf}: {e}")
+
+if _schema_sources:
     for table in required_tables:
-        if f"CREATE TABLE IF NOT EXISTS {table}" in db_source:
-            ok(f"Table '{table}' defined in schema")
+        # PG uses CREATE TABLE IF NOT EXISTS; SQLite also uses that form.
+        # The trading_* tables may be gated by TRADING_ENABLED at runtime but
+        # their DDL should still appear in the schema files.
+        missing_in = [
+            sf for sf, src in _schema_sources.items()
+            if f"CREATE TABLE IF NOT EXISTS {table}" not in src
+        ]
+        if not missing_in:
+            ok(f"Table '{table}' defined in both backends")
         else:
-            fail(f"Table '{table}' NOT found in schema")
-except Exception as e:
-    logger.warning('Failed to read %s: %s', _schema_file, e, exc_info=True)
-    fail(f"Cannot read {_schema_file}: {e}")
+            fail(f"Table '{table}' NOT found in: {missing_in}")
 
 
 # ═══════════════════════════════════════════════════════════════════════

tests/conftest.py

@@ -0,0 +1,79 @@
+"""Shared pytest fixtures for the Tofu test suite.
+
+Provides the ``flask_client`` fixture consumed by ``tests/test_api_integration.py``
+and ``tests/test_conversation_search.py``.
+
+Design:
+  * Each test session gets a fresh, isolated SQLite database via ``CHATUI_DB_PATH``
+    pointing at a temp file — no PostgreSQL required, no cross-test contamination.
+  * The Flask ``app`` is imported lazily AFTER env-vars are set so
+    ``lib.database._core`` picks the right backend at import time.
+  * ``flask_client`` is function-scoped so each test gets a clean test client
+    with its own cookie jar.
+"""
+
+from __future__ import annotations
+
+import os
+import tempfile
+
+import pytest
+
+
+# ─── Session-level: one SQLite DB per pytest run ──────────────────────
+@pytest.fixture(scope="session", autouse=True)
+def _configure_test_env():
+    """Set env vars BEFORE importing the Flask app so the DB layer picks
+    SQLite and isolates data to a temp file. Trading features are disabled
+    to keep the surface area small.
+    """
+    tmpdir = tempfile.mkdtemp(prefix="tofu-test-")
+    db_path = os.path.join(tmpdir, "chatui-test.db")
+
+    os.environ.setdefault("CHATUI_DB_BACKEND", "sqlite")
+    os.environ.setdefault("CHATUI_DB_PATH", db_path)
+    os.environ.setdefault("TRADING_ENABLED", "0")
+    os.environ.setdefault("PPTX_TRANSLATE_ENABLED", "0")
+    # Avoid accidental real LLM calls in CI.
+    os.environ.setdefault("LLM_API_KEY", "test-key-placeholder")
+    os.environ.setdefault("LLM_API_KEYS", "test-key-placeholder")
+
+    yield
+
+    # Best-effort cleanup — don't fail the run if files are still locked.
+    try:
+        import shutil
+        shutil.rmtree(tmpdir, ignore_errors=True)
+    except Exception:
+        pass
+
+
+# ─── Session-level: build the Flask app once ──────────────────────────
+@pytest.fixture(scope="session")
+def flask_app(_configure_test_env):
+    """Import and return the Flask app AFTER env-vars are set.
+
+    This runs exactly once per test session so importing 800+ modules
+    (server.py's full blueprint stack) doesn't dominate the wall-clock.
+    """
+    import server  # noqa: F401 — importing triggers app construction
+    from server import app
+
+    app.config.update(
+        TESTING=True,
+        # Disable Flask-Compress in tests — it can chunk responses in ways
+        # the Werkzeug test client doesn't fully assemble.
+        COMPRESS_REGISTER=False,
+    )
+    return app
+
+
+# ─── Function-level: fresh test client per test ───────────────────────
+@pytest.fixture()
+def flask_client(flask_app):
+    """Return a Werkzeug test client with its own cookie jar.
+
+    Used by API integration tests and conversation-search tests.
+    """
+    with flask_app.test_client() as client:
+        yield client

tests/test_compaction_improvements.py

@@ -150,14 +150,17 @@ def _make_messages(self, n_assistants=10, thinking_size=5000):
 
     def test_strips_old_thinking_blocks(self):
         from lib.tasks_pkg.compaction import _THINKING_HOT_TAIL, micro_compact
-        messages = self._make_messages(n_assistants=10, thinking_size=5000)
+        # Need more than _THINKING_HOT_TAIL assistants for stripping to kick in.
+        # (Stripping only applies to the cold tail beyond the hot tail.)
+        n_total = _THINKING_HOT_TAIL + 5
+        messages = self._make_messages(n_assistants=n_total, thinking_size=5000)
 
         # Count reasoning_content before
         rc_before = sum(
             1 for m in messages
             if m.get('role') == 'assistant' and m.get('reasoning_content')
         )
-        assert rc_before == 10
+        assert rc_before == n_total
 
         saved = micro_compact(messages, conv_id='test123')
         assert saved > 0