Merge branch 'main' into fix/local-default-provider-config

Author: fubuloubu

src/ape/managers/project.py

@@ -450,7 +450,9 @@ def get(
             if check_for_changes and self._detect_change(source_id):
                 compiled = {
                     ct.name: ct
-                    for ct in self.compiler_manager.compile(source_id, project=self.project)
+                    for ct in self.compiler_manager.compile(
+                        self.project.path / source_id, project=self.project
+                    )
                     if ct.name
                 }
                 if compiled:

src/ape_console/_cli.py

@@ -157,7 +157,12 @@ def _load_extras_file(self, extras_file: Path) -> dict:
         if ape_init_extras is not None:
             func_spec = inspect.getfullargspec(ape_init_extras)
             init_kwargs: dict[str, Any] = {k: self._get_from_ape(k) for k in func_spec.args}
+
             extras = ape_init_extras(**init_kwargs)
+            if inspect.iscoroutine(extras):
+                from IPython.core.async_helpers import get_asyncio_loop
+
+                extras = get_asyncio_loop().run_until_complete(extras)
 
             if isinstance(extras, dict):
                 all_extras.update(extras)

tests/functional/test_console.py

@@ -85,6 +85,25 @@ def test_extras_load_using_ape_namespace(self, scope):
         extras_content = """
 def ape_init_extras(project):
     return {"foo": type(project)}
+"""
+        with create_tempdir() as temp:
+            extras_file = temp / CONSOLE_EXTRAS_FILENAME
+            extras_file.write_text(extras_content)
+            extras.__dict__[f"_{scope}_path"] = extras_file
+            extras.__dict__.pop(f"_{scope}_extras", None)
+            assert extras["foo"] is LocalProject
+
+    @pytest.mark.parametrize("scope", ("local", "global"))
+    def test_extras_async_ape_init_extras(self, scope):
+        """
+        ``ape_init_extras`` is allowed to be defined as an ``async`` function;
+        it gets awaited before its result is merged into the namespace.
+        """
+        extras = ApeConsoleNamespace()
+        _ = getattr(extras, f"_{scope}_path")
+        extras_content = """
+async def ape_init_extras(project):
+    return {"foo": type(project)}
 """
         with create_tempdir() as temp:
             extras_file = temp / CONSOLE_EXTRAS_FILENAME

tests/functional/test_project.py

@@ -1108,6 +1108,24 @@ def test_values(self, small_temp_project):
         new_count = len(small_temp_project.contracts)
         assert new_count == count - 1
 
+    def test_get_after_change_from_other_cwd(self, small_temp_project):
+        # Regression: getting a contract whose source has changed must not
+        # depend on cwd happening to equal the project root.
+        small_temp_project.load_contracts(use_cache=False)
+        source_path = small_temp_project.contracts_folder / "Other.json"
+        source_path.write_text(source_path.read_text(encoding="utf8") + "\n", encoding="utf8")
+
+        original_cwd = Path.cwd()
+        with create_tempdir() as elsewhere:
+            os.chdir(elsewhere)
+            try:
+                actual = small_temp_project.contracts.get("Other")
+            finally:
+                os.chdir(original_cwd)
+
+        assert isinstance(actual, ContractContainer)
+        assert actual.contract_type.name == "Other"
+
 
 class TestDeploymentManager:
     def test_track(self, project, owner):