removed redundat load .env

Author: TamarZanzouri

server-utils/server_utils/settings_utils.py

@@ -1,6 +1,5 @@
 """Shared helpers for server settings."""
 
-from dotenv import load_dotenv
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -13,8 +12,9 @@ def get_dot_env_path(env_prefix: str) -> str | None:
     When unset, no ``.env`` file is loaded and all settings come from
     environment variables or their defaults.
 
-    If a path is found, ``load_dotenv`` is called so the values are
-    available to anything that reads ``os.environ`` directly.
+    The returned path is intended to be passed as ``_env_file`` to a
+    Pydantic ``BaseSettings`` constructor so that Pydantic handles the
+    actual file loading (prefix matching, type coercion, etc.).
     """
 
     class _Environment(BaseSettings):
@@ -26,7 +26,4 @@ class _Environment(BaseSettings):
         )
         model_config = SettingsConfigDict(env_prefix=env_prefix)
 
-    path = _Environment().dot_env_path
-    if path:
-        load_dotenv(path)
-    return path
+    return _Environment().dot_env_path

server-utils/tests/test_settings_utils.py

@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def env_file(tmp_path: Path) -> Path:
-    """Create a temporary .env file with a test variable."""
+    """Create a temporary .env file."""
     p = tmp_path / ".env"
     p.write_text("MY_TEST_VAR=from_dotenv\n")
     return p
@@ -32,30 +32,23 @@ def test_returns_path_when_env_var_is_set(env_file: Path) -> None:
     assert result == str(env_file)
 
 
-def test_loads_dotenv_when_path_is_set(env_file: Path) -> None:
-    """When a path is returned, load_dotenv should populate os.environ."""
+def test_respects_env_prefix() -> None:
+    """Only the env var with the correct prefix is read."""
     with patch.dict(
         os.environ,
-        {"OT_TEST_SERVER_dot_env_path": str(env_file)},
+        {"OT_OTHER_SERVER_dot_env_path": "/some/path"},
         clear=False,
     ):
-        get_dot_env_path("OT_TEST_SERVER_")
-        assert os.environ.get("MY_TEST_VAR") == "from_dotenv"
-
-
-def test_does_not_load_dotenv_when_no_path() -> None:
-    """When no path is set, load_dotenv should not be called."""
-    with patch("server_utils.settings_utils.load_dotenv") as mock_load:
-        get_dot_env_path("OT_NONEXISTENT_PREFIX_")
-    mock_load.assert_not_called()
+        result = get_dot_env_path("OT_MY_SERVER_")
+    assert result is None
 
 
-def test_respects_env_prefix() -> None:
-    """Only the env var with the correct prefix is read."""
+def test_does_not_modify_os_environ(env_file: Path) -> None:
+    """The function should not call load_dotenv or modify os.environ."""
     with patch.dict(
         os.environ,
-        {"OT_OTHER_SERVER_dot_env_path": "/some/path"},
+        {"OT_TEST_SERVER_dot_env_path": str(env_file)},
         clear=False,
     ):
-        result = get_dot_env_path("OT_MY_SERVER_")
-    assert result is None
+        get_dot_env_path("OT_TEST_SERVER_")
+        assert "MY_TEST_VAR" not in os.environ