merge

Author: allenwang28

src/forge/controller/provisioner.py

@@ -4,8 +4,6 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-from forge.env import MONARCH_HOSTMESH_V1
-
 """Remote and local resource manager for allocation and provisioning."""
 import asyncio
 import functools
@@ -22,7 +20,7 @@
 
 from forge.controller.launcher import BaseLauncher, get_launcher
 
-from forge.env import all_env_vars, FORGE_DISABLE_METRICS
+from forge.env import all_env_vars, FORGE_DISABLE_METRICS, MONARCH_HOSTMESH_V1
 
 from forge.types import ProcessConfig, ProvisionerConfig
 

src/forge/env.py

@@ -6,7 +6,6 @@
 
 """Centralized constants for environment variable names used in the project."""
 
-import functools
 import os
 from dataclasses import dataclass
 from typing import Any
@@ -113,7 +112,6 @@ def get_value(self) -> Any:
 )
 
 
-@functools.cache
 def all_env_vars() -> list[EnvVar]:
     """Retrieves all registered environment variable names."""
     env_vars = []

tests/unit_tests/test_env_constants.py

@@ -109,12 +109,6 @@ def test_all_env_vars_contains_expected_constants(self):
         assert "FORGE_DISABLE_METRICS" in env_var_names
         assert "MONARCH_STDERR_LOG" in env_var_names
 
-    def test_all_env_vars_is_cached(self):
-        """Test that all_env_vars uses caching."""
-        first_call = all_env_vars()
-        second_call = all_env_vars()
-        assert first_call is second_call
-
     def test_all_env_vars_can_iterate_and_get_values(self):
         """Test that all_env_vars can be used to iterate and get values."""
         for env_var in all_env_vars():