Implementing suggestions made in PR comments

Author: ialarmedalien

linkml_runtime/utils/compile_python.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import sys
 from logging import warning
@@ -17,7 +19,7 @@ def file_text(txt_or_fname: str) -> str:
     return txt_or_fname
 
 
-def compile_python(text_or_fn: str, package_path: str = None, module_name: str = None) -> ModuleType:
+def compile_python(text_or_fn: str, package_path: str | None = None, module_name: str | None = "test") -> ModuleType:
     """
     Compile the text or file and return the resulting module
 
@@ -26,7 +28,7 @@ def compile_python(text_or_fn: str, package_path: str = None, module_name: str =
     :param module_name: Used in an import statement, default 'test'
     :return: Compiled module
     """
-    if module_name is None:
+    if not module_name:
         module_name = "test"
     python_txt = file_text(text_or_fn)
     if package_path is None and python_txt != text_or_fn:

tests/test_utils/test_compile_python.py

@@ -1,10 +1,14 @@
+from __future__ import annotations
+
+from types import ModuleType
+
 import pytest
 
 from linkml_runtime.utils.compile_python import compile_python
 
 
-@pytest.fixture
-def module_1():
+@pytest.fixture(scope="module")
+def base_module() -> str:
     return """
 x: int = 2
 
@@ -13,28 +17,47 @@ def fun(value: int):
 """
 
 
-@pytest.fixture
-def module_2():
+@pytest.fixture(scope="module")
+def importing_module() -> str:
     return """
-import module_1 as m
+import MODULE_NAME as m
 
 def more_fun(message: str):
     return f'got "{message}"'
 """
 
 
-def test_compile(module_1, module_2):
-    m1 = compile_python(module_1, module_name="module_1")
-    assert m1.__name__ == "module_1"
-    assert m1.x == 2
-    assert m1.fun(3) == "known value 3"
-    m2 = compile_python(module_2, module_name="module_2", package_path=".")
+def check_generated_module(module: ModuleType, module_name: str) -> None:
+    assert isinstance(module, ModuleType)
+    assert module.__name__ == module_name
+    assert module.x == 2
+    assert module.fun(3) == "known value 3"
+
+
+@pytest.mark.parametrize(("name_arg", "module_name"), [(None, "test"), ("", "test"), ("base_module", "base_module")])
+def test_compile_python_module_name(base_module: str, name_arg: str | None, module_name: str) -> None:
+    """Test the compilation of python code to create a module."""
+    m = compile_python(base_module, module_name=name_arg)
+    check_generated_module(m, module_name)
+
+
+@pytest.mark.parametrize(("name_arg", "module_name"), [(None, "test"), ("", "test"), ("base_module", "base_module")])
+def test_compile_python_importing_module_local_module(
+    base_module: str,
+    importing_module: str,
+    name_arg: str | None,
+    module_name: str,
+) -> None:
+    """Test the compilation of python code to create a local module and then compile a second module that imports the first."""
+    m = compile_python(base_module, module_name=name_arg)
+    check_generated_module(m, module_name)
+
+    # switch in the appropriate module name
+    importing_module_text = importing_module.replace("MODULE_NAME", module_name)
+    m2 = compile_python(importing_module_text, package_path=".", module_name="module_2")
+    assert isinstance(m2, ModuleType)
     assert m2.__name__ == "module_2"
     assert m2.more_fun("hello") == 'got "hello"'
-    assert m2.m.fun(4) == "known value 4"
-    assert m2.m.x == 2
-
 
-def test_default_module_name(module_1):
-    m = compile_python(module_1)
-    assert m.__name__ == "test"
+    # check the imported module, m2.m, has the correct type, name, etc.
+    check_generated_module(m2.m, module_name)