fix(foundry): detect db url in .env files in from_package

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: olivermeyer

pyproject.toml

@@ -58,6 +58,7 @@ dependencies = [
     "psutil>=6",
     "pydantic>=2,<3",
     "pydantic-settings>=2,<3",
+    "python-dotenv>=1,<2",
     "rich>=14,<15",
     "sentry-sdk>=2,<3",
     "sqlalchemy[asyncio]>=2,<3",

src/aignostics_foundry_core/foundry.py

@@ -27,6 +27,7 @@
 from importlib import metadata
 from pathlib import Path
 
+from dotenv import dotenv_values
 from pydantic import BaseModel, Field
 
 from aignostics_foundry_core.database import DatabaseSettings
@@ -122,14 +123,20 @@ def from_package(cls, package_name: str) -> FoundryContext:
         project_path = _find_project_path(package_name)
         vcs_ref = os.environ.get("VCS_REF") or (project_path and _get_vcs_ref_from_git(project_path)) or "unknown"
         env_prefix = f"{name_upper}_"
-        database = DatabaseSettings(_env_prefix=f"{env_prefix}DB_") if os.environ.get(f"{env_prefix}DB_URL") else None
+        env_files = _build_env_file_list(name, name_upper, environment)
+        db_url_key = f"{env_prefix}DB_URL"
+        database = (
+            DatabaseSettings(_env_prefix=f"{env_prefix}DB_", _env_file=env_files)
+            if os.environ.get(db_url_key) or _any_env_file_has(db_url_key, env_files)
+            else None
+        )
         return cls(
             name=name,
             version=version,
             version_full=_build_version_full(version, vcs_ref),
             version_with_vcs_ref=_build_version_with_vcs_ref(version, vcs_ref),
             environment=environment,
-            env_file=_build_env_file_list(name, name_upper, environment),
+            env_file=env_files,
             env_prefix=env_prefix,
             repository_url=repository_url,
             documentation_url=documentation_url,
@@ -264,6 +271,19 @@ def _build_env_file_list(name: str, name_upper: str, environment: str) -> list[P
     return paths
 
 
+def _any_env_file_has(key: str, env_files: list[Path]) -> bool:
+    """Return True if *key* appears in any of the given env files.
+
+    Args:
+        key: The environment variable key to look for.
+        env_files: Ordered list of env file paths to search.
+
+    Returns:
+        True if *key* is found in any readable env file, False otherwise.
+    """
+    return any(key in dotenv_values(f) for f in env_files if f.is_file())
+
+
 def _extract_urls(package_name: str) -> tuple[str, str]:
     """Return ``(repository_url, documentation_url)`` from package metadata."""
     pkg_metadata = metadata.metadata(package_name)

tests/aignostics_foundry_core/foundry_test.py

@@ -23,6 +23,7 @@
 SQLITE_URL = "sqlite+aiosqlite:///test.db"
 DB_URL_ENV_KEY = f"{PACKAGE_NAME.upper()}_DB_URL"
 DB_POOL_SIZE_ENV_KEY = f"{PACKAGE_NAME.upper()}_DB_POOL_SIZE"
+ENV_FILE_ENV_KEY = f"{PACKAGE_NAME.upper()}_ENV_FILE"
 ERROR_MSG_FRAGMENT = "set_context"
 VCS_REF_VALUE = "abc123"
 VCS_REF_OVERRIDE = "ci-override-ref"
@@ -675,6 +676,78 @@ def test_from_package_called_twice_is_safe() -> None:
     assert result.returncode == 0, result.stderr
 
 
+@pytest.mark.integration
+def test_from_package_sets_database_when_db_url_only_in_env_file(tmp_path: Path) -> None:
+    """from_package() populates database when DB_URL is only in a .env file, not in OS env."""
+    env_file = tmp_path / ".env"
+    env_file.write_text(f"{DB_URL_ENV_KEY}={SQLITE_URL}\n")
+
+    script = textwrap.dedent(f"""
+        from aignostics_foundry_core.foundry import FoundryContext
+        ctx = FoundryContext.from_package("{PACKAGE_NAME}")
+        assert ctx.database is not None, "database should not be None"
+        assert ctx.database.get_url() == "{SQLITE_URL}", f"expected {SQLITE_URL!r}, got {{ctx.database.get_url()!r}}"
+    """)
+    env = os.environ.copy()
+    env.pop(DB_URL_ENV_KEY, None)
+    env[ENV_FILE_ENV_KEY] = str(env_file)
+    result = subprocess.run([sys.executable, "-c", script], capture_output=True, text=True, env=env, check=False)
+    assert result.returncode == 0, result.stderr
+
+
+@pytest.mark.integration
+def test_from_package_database_is_none_when_db_url_absent_from_env_file(tmp_path: Path) -> None:
+    """from_package() sets database=None when DB_URL is absent from both OS env and .env file."""
+    env_file = tmp_path / ".env"
+    env_file.write_text("SOME_OTHER_KEY=value\n")
+
+    script = textwrap.dedent(f"""
+        from aignostics_foundry_core.foundry import FoundryContext
+        ctx = FoundryContext.from_package("{PACKAGE_NAME}")
+        assert ctx.database is None, "database should be None when DB_URL is absent"
+    """)
+    env = os.environ.copy()
+    env.pop(DB_URL_ENV_KEY, None)
+    env[ENV_FILE_ENV_KEY] = str(env_file)
+    result = subprocess.run([sys.executable, "-c", script], capture_output=True, text=True, env=env, check=False)
+    assert result.returncode == 0, result.stderr
+
+
+@pytest.mark.integration
+def test_from_package_reads_pool_settings_from_env_file(tmp_path: Path) -> None:
+    """from_package() reads pool_size from .env file when DB_URL is also in the .env file."""
+    env_file = tmp_path / ".env"
+    env_file.write_text(f"{DB_URL_ENV_KEY}={SQLITE_URL}\n{DB_POOL_SIZE_ENV_KEY}=3\n")
+
+    script = textwrap.dedent(f"""
+        from aignostics_foundry_core.foundry import FoundryContext
+        ctx = FoundryContext.from_package("{PACKAGE_NAME}")
+        assert ctx.database is not None, "database should not be None"
+        assert ctx.database.pool_size == 3, f"expected pool_size=3, got {{ctx.database.pool_size}}"
+    """)
+    env = os.environ.copy()
+    env.pop(DB_URL_ENV_KEY, None)
+    env.pop(DB_POOL_SIZE_ENV_KEY, None)
+    env[ENV_FILE_ENV_KEY] = str(env_file)
+    result = subprocess.run([sys.executable, "-c", script], capture_output=True, text=True, env=env, check=False)
+    assert result.returncode == 0, result.stderr
+
+
+@pytest.mark.integration
+def test_from_package_sets_database_when_db_url_in_os_env_and_env_file_absent(tmp_path: Path) -> None:
+    """from_package() populates database when DB_URL is in OS env and no .env file is set — regression."""
+    script = textwrap.dedent(f"""
+        from aignostics_foundry_core.foundry import FoundryContext
+        ctx = FoundryContext.from_package("{PACKAGE_NAME}")
+        assert ctx.database is not None, "database should not be None when DB_URL is in OS env"
+    """)
+    env = os.environ.copy()
+    env[DB_URL_ENV_KEY] = SQLITE_URL
+    env.pop(ENV_FILE_ENV_KEY, None)
+    result = subprocess.run([sys.executable, "-c", script], capture_output=True, text=True, env=env, check=False)
+    assert result.returncode == 0, result.stderr
+
+
 @pytest.mark.integration
 def test_make_context_without_prior_from_package() -> None:
     """Constructing FoundryContext directly (no from_package()) has database=None."""