From d397711b47b08d6fceface368d097131a51df275 Mon Sep 17 00:00:00 2001
From: Rajat Ahuja <rahuja445@gmail.com>
Date: Thu, 19 Mar 2026 16:12:56 -0400
Subject: [PATCH] fix: populate test harness DB config from docker compose

---
 tests/bench/README.md  |  2 +-
 tests/bench/harness.py | 45 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/tests/bench/README.md b/tests/bench/README.md
index 02feebbb..3fccc4e0 100644
--- a/tests/bench/README.md
+++ b/tests/bench/README.md
@@ -131,7 +131,7 @@ When you run the harness, it will start:
 
 The harness uses environment variables to configure Honcho's database connection:
 
-- `DB_CONNECTION_URI`: Set to `postgresql+psycopg://testuser:testpwd@localhost:{port}/honcho`
+- `DB_CONNECTION_URI`: Derived from the database credentials in `docker-compose.yml.example` (e.g. `postgresql+psycopg://postgres:postgres@localhost:{port}/postgres`)
 
 The script will print the actual configuration that Honcho is using after the FastAPI server starts. This gives you complete visibility into how Honcho's configuration system resolved the settings from environment variables, config files, and defaults.
 
diff --git a/tests/bench/harness.py b/tests/bench/harness.py
index 9b9c5f51..6f725bf7 100755
--- a/tests/bench/harness.py
+++ b/tests/bench/harness.py
@@ -20,6 +20,7 @@ import tempfile
 import threading
 import time
 from pathlib import Path
+from typing import Any
 
 import yaml
 
@@ -59,6 +60,35 @@ class HonchoHarness:
         self.processes: list[tuple[str, subprocess.Popen[str]]] = []
         self.env_file_backup: Path | None = None
         self.output_threads: list[threading.Thread] = []
+        # DB credentials — populated from docker-compose.yml.example in create_temp_docker_compose
+        self.db_user: str = "postgres"
+        self.db_password: str = "postgres"
+        self.db_name: str = "postgres"
+
+    def _extract_db_credentials(self, compose_data: dict[str, Any]) -> None:
+        """Extract POSTGRES_USER/PASSWORD/DB from the database service environment."""
+        services: dict[str, Any] = compose_data.get("services", {})
+        database: dict[str, Any] = services.get("database", {})
+        db_env: list[Any] = database.get("environment", [])
+        env_map: dict[str, str] = {}
+        for entry in db_env:
+            if isinstance(entry, str) and "=" in entry:
+                # Handle "- KEY=VALUE" format
+                key, _, value = entry.partition("=")
+                env_map[key.strip()] = value.strip()
+        self.db_user = env_map.get("POSTGRES_USER", self.db_user)
+        self.db_password = env_map.get("POSTGRES_PASSWORD", self.db_password)
+        self.db_name = env_map.get("POSTGRES_DB", self.db_name)
+
+    @property
+    def db_connection_uri(self) -> str:
+        """SQLAlchemy-style connection URI for the test database."""
+        return f"postgresql+psycopg://{self.db_user}:{self.db_password}@localhost:{self.db_port}/{self.db_name}"
+
+    @property
+    def db_connection_uri_plain(self) -> str:
+        """Plain psycopg connection URI (no +psycopg driver prefix)."""
+        return f"postgresql://{self.db_user}:{self.db_password}@localhost:{self.db_port}/{self.db_name}"
 
     def create_temp_docker_compose(self) -> Path:
         """
@@ -72,6 +102,9 @@ class HonchoHarness:
         with open(example_file) as f:
             compose_data = yaml.safe_load(f)
 
+        # Extract DB credentials from the compose file so the harness stays in sync
+        self._extract_db_credentials(compose_data)
+
         # Update the database port
         compose_data["services"]["database"]["ports"] = [f"{self.db_port}:5432"]
 
@@ -165,7 +198,7 @@ class HonchoHarness:
             Dictionary of environment variables for database connection, cache, and API keys
         """
         return {
-            "DB_CONNECTION_URI": f"postgresql+psycopg://testuser:testpwd@localhost:{self.db_port}/honcho",
+            "DB_CONNECTION_URI": self.db_connection_uri,
             "CACHE_ENABLED": "true",
             "CACHE_URL": f"redis://localhost:{self.redis_port}/0",
         }
@@ -336,7 +369,7 @@ class HonchoHarness:
                         "-p",
                         str(self.db_port),
                         "-U",
-                        "testuser",
+                        self.db_user,
                     ],
                     capture_output=True,
                     text=True,
@@ -354,9 +387,7 @@ class HonchoHarness:
                 try:
                     import psycopg
 
-                    conn = psycopg.connect(
-                        f"postgresql://testuser:testpwd@localhost:{self.db_port}/honcho"
-                    )
+                    conn = psycopg.connect(self.db_connection_uri_plain)
                     conn.close()
                     print("Database is ready!")
                     return True
@@ -401,9 +432,7 @@ class HonchoHarness:
             import psycopg
 
             # Connect to the database using instance-specific connection string
-            conn_string = (
-                f"postgresql://testuser:testpwd@localhost:{self.db_port}/honcho"
-            )
+            conn_string = self.db_connection_uri_plain
             conn = psycopg.connect(conn_string)
 
             with conn.cursor() as cursor: