Remove use_cwd

Author: EdwardJXLi

src/codegen/sdk/utils.py

@@ -339,29 +339,3 @@ def is_minified_js(content):
     except Exception as e:
         print(f"Error analyzing content: {e}")
         return False
-
-
-@contextmanager
-def use_cwd(path):
-    """Context manager that temporarily changes the current working directory.
-
-    Args:
-        path (str): The directory path to change to.
-
-    Yields:
-        str: The new current working directory.
-
-    Example:
-        ```python
-        with use_cwd("/path/to/directory"):
-            # Code here runs with the working directory set to '/path/to/directory'
-            ...
-        # Working directory is restored to the original
-        ```
-    """
-    old_cwd = os.getcwd()
-    try:
-        os.chdir(path)
-        yield path
-    finally:
-        os.chdir(old_cwd)

tests/unit/codegen/conftest.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session

tests/unit/codegen/sdk/python/import_resolution/test_import_resolution.py

@@ -2,7 +2,6 @@
 
 from codegen.sdk.codebase.config import TestFlags
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.utils import use_cwd
 
 if TYPE_CHECKING:
     from codegen.sdk.core.file import SourceFile
@@ -273,31 +272,29 @@ def func():
 """,
         },
     ) as codebase:
-        # Wrap CWD since we are using py_resolve_syspath
-        with use_cwd(tmpdir):
-            src_file: SourceFile = codebase.get_file("a/b/c/src.py")
-            consumer_file: SourceFile = codebase.get_file("consumer.py")
+        src_file: SourceFile = codebase.get_file("a/b/c/src.py")
+        consumer_file: SourceFile = codebase.get_file("consumer.py")
 
-            # Enable resolution via sys.path
-            codebase.ctx.config.py_resolve_syspath = True
-            # Allow resolving files and modules outside of the repo path
-            codebase.ctx.config.allow_external = True
+        # Enable resolution via sys.path
+        codebase.ctx.config.py_resolve_syspath = True
+        # Allow resolving files and modules outside of the repo path
+        codebase.ctx.config.allow_external = True
 
-            # =====[ Imports cannot be found without sys.path being set ]=====
-            assert len(consumer_file.imports) == 1
-            src_import: Import = consumer_file.imports[0]
-            src_import_resolution: ImportResolution = src_import.resolve_import()
-            assert src_import_resolution is None
+        # =====[ Imports cannot be found without sys.path being set ]=====
+        assert len(consumer_file.imports) == 1
+        src_import: Import = consumer_file.imports[0]
+        src_import_resolution: ImportResolution = src_import.resolve_import()
+        assert src_import_resolution is None
 
-            # Modify sys.path for this test only
-            monkeypatch.syspath_prepend("a")
+        # Modify sys.path for this test only
+        monkeypatch.syspath_prepend("a")
 
-            # =====[ Imports can be found with sys.path set and active ]=====
-            codebase.ctx.config.py_resolve_syspath = True
-            src_import_resolution = src_import.resolve_import()
-            assert src_import_resolution
-            assert src_import_resolution.from_file is src_file
-            assert src_import_resolution.imports_file is True
+        # =====[ Imports can be found with sys.path set and active ]=====
+        codebase.ctx.config.py_resolve_syspath = True
+        src_import_resolution = src_import.resolve_import()
+        assert src_import_resolution
+        assert src_import_resolution.from_file is src_file
+        assert src_import_resolution.imports_file is True
 
 
 def test_import_resolution_file_custom_resolve_path(tmpdir: str) -> None:
@@ -371,32 +368,30 @@ def func():
 """,
         },
     ) as codebase:
-        # Wrap CWD since we are using py_resolve_syspath
-        with use_cwd(tmpdir):
-            src_file: SourceFile = codebase.get_file("a/b/c/src.py")
-            consumer_file: SourceFile = codebase.get_file("consumer.py")
-
-            # Ensure we don't have overrites and enable syspath resolution
-            codebase.ctx.config.import_resolution_paths = []
-            codebase.ctx.config.py_resolve_syspath = True
-            # Allow resolving files and modules outside of the repo path
-            codebase.ctx.config.allow_external = True
-
-            # =====[ Import with sys.path set can be found ]=====
-            assert len(consumer_file.imports) == 1
-            # Modify sys.path for this test only
-            monkeypatch.syspath_prepend("a")
-            src_import: Import = consumer_file.imports[0]
-            src_import_resolution = src_import.resolve_import()
-            assert src_import_resolution
-            assert src_import_resolution.from_file.file_path == "a/c/src.py"
-
-            # =====[ Imports can be found with custom resolve over sys.path ]=====
-            codebase.ctx.config.import_resolution_paths = ["a/b"]
-            src_import_resolution = src_import.resolve_import()
-            assert src_import_resolution
-            assert src_import_resolution.from_file is src_file
-            assert src_import_resolution.imports_file is True
+        src_file: SourceFile = codebase.get_file("a/b/c/src.py")
+        consumer_file: SourceFile = codebase.get_file("consumer.py")
+
+        # Ensure we don't have overrites and enable syspath resolution
+        codebase.ctx.config.import_resolution_paths = []
+        codebase.ctx.config.py_resolve_syspath = True
+        # Allow resolving files and modules outside of the repo path
+        codebase.ctx.config.allow_external = True
+
+        # =====[ Import with sys.path set can be found ]=====
+        assert len(consumer_file.imports) == 1
+        # Modify sys.path for this test only
+        monkeypatch.syspath_prepend("a")
+        src_import: Import = consumer_file.imports[0]
+        src_import_resolution = src_import.resolve_import()
+        assert src_import_resolution
+        assert src_import_resolution.from_file.file_path == "a/c/src.py"
+
+        # =====[ Imports can be found with custom resolve over sys.path ]=====
+        codebase.ctx.config.import_resolution_paths = ["a/b"]
+        src_import_resolution = src_import.resolve_import()
+        assert src_import_resolution
+        assert src_import_resolution.from_file is src_file
+        assert src_import_resolution.imports_file is True
 
 
 def test_import_resolution_default_conflicts_overrite(tmpdir: str, monkeypatch) -> None:
@@ -421,38 +416,36 @@ def func():
 """,
         },
     ) as codebase:
-        # Wrap CWD since we are using py_resolve_syspath
-        with use_cwd(tmpdir):
-            src_file: SourceFile = codebase.get_file("a/src.py")
-            src_file_overrite: SourceFile = codebase.get_file("b/a/src.py")
-            consumer_file: SourceFile = codebase.get_file("consumer.py")
-
-            # Ensure we don't have overrites and enable syspath resolution
-            codebase.ctx.config.import_resolution_paths = []
-            codebase.ctx.config.py_resolve_syspath = True
-            # Allow resolving files and modules outside of the repo path
-            codebase.ctx.config.allow_external = True
-
-            # =====[ Default import works ]=====
-            assert len(consumer_file.imports) == 1
-            src_import: Import = consumer_file.imports[0]
-            src_import_resolution = src_import.resolve_import()
-            assert src_import_resolution
-            assert src_import_resolution.from_file is src_file
-
-            # =====[ Sys.path overrite has precedence ]=====
-            monkeypatch.syspath_prepend("b")
-            src_import_resolution = src_import.resolve_import()
-            assert src_import_resolution
-            assert src_import_resolution.from_file is not src_file
-            assert src_import_resolution.from_file is src_file_overrite
-
-            # =====[ Custom overrite has precedence ]=====
-            codebase.ctx.config.import_resolution_paths = ["b"]
-            src_import_resolution = src_import.resolve_import()
-            assert src_import_resolution
-            assert src_import_resolution.from_file is not src_file
-            assert src_import_resolution.from_file is src_file_overrite
+        src_file: SourceFile = codebase.get_file("a/src.py")
+        src_file_overrite: SourceFile = codebase.get_file("b/a/src.py")
+        consumer_file: SourceFile = codebase.get_file("consumer.py")
+
+        # Ensure we don't have overrites and enable syspath resolution
+        codebase.ctx.config.import_resolution_paths = []
+        codebase.ctx.config.py_resolve_syspath = True
+        # Allow resolving files and modules outside of the repo path
+        codebase.ctx.config.allow_external = True
+
+        # =====[ Default import works ]=====
+        assert len(consumer_file.imports) == 1
+        src_import: Import = consumer_file.imports[0]
+        src_import_resolution = src_import.resolve_import()
+        assert src_import_resolution
+        assert src_import_resolution.from_file is src_file
+
+        # =====[ Sys.path overrite has precedence ]=====
+        monkeypatch.syspath_prepend("b")
+        src_import_resolution = src_import.resolve_import()
+        assert src_import_resolution
+        assert src_import_resolution.from_file is not src_file
+        assert src_import_resolution.from_file is src_file_overrite
+
+        # =====[ Custom overrite has precedence ]=====
+        codebase.ctx.config.import_resolution_paths = ["b"]
+        src_import_resolution = src_import.resolve_import()
+        assert src_import_resolution
+        assert src_import_resolution.from_file is not src_file
+        assert src_import_resolution.from_file is src_file_overrite
 
 
 def test_import_resolution_init_wildcard(tmpdir: str) -> None: