refactor: enhance dynamic_import function to accept base_prefix and improve stub generation

Author: tlambert03

src/scyjava/_stubs/_dynamic_import.py

@@ -1,11 +1,14 @@
 import ast
 from logging import warning
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any, Callable, Sequence
 
 
 def dynamic_import(
-    module_name: str, module_file: str, *endpoints: str
+    module_name: str,
+    module_file: str,
+    endpoints: Sequence[str] = (),
+    base_prefix: str = "",
 ) -> tuple[list[str], Callable[[str], Any]]:
     import scyjava
     import scyjava.config
@@ -35,27 +38,25 @@ def module_getattr(name: str, mod_name: str = module_name) -> Any:
         if module_all and name not in module_all:
             raise AttributeError(f"module {module_name!r} has no attribute {name!r}")
 
-        # this strip is important... and tricky, because it depends on the
-        # namespace that we intend to install the stubs into.
-        install_path = "scyjava.types."
-        if mod_name.startswith(install_path):
-            mod_name = mod_name[len(install_path) :]
+        # cut the mod_name to only the part including the base_prefix and after
+        if base_prefix in mod_name:
+            mod_name = mod_name[mod_name.index(base_prefix) :]
 
-        full_name = f"{mod_name}.{name}"
+        class_path = f"{mod_name}.{name}"
 
         class ProxyMeta(type):
             def __repr__(self) -> str:
-                return f"<scyjava class {full_name!r}>"
+                return f"<scyjava class {class_path!r}>"
 
         class Proxy(metaclass=ProxyMeta):
             def __new__(_cls_, *args: Any, **kwargs: Any) -> Any:
-                cls = scyjava.jimport(full_name)
+                cls = scyjava.jimport(class_path)
                 return cls(*args, **kwargs)
 
         Proxy.__name__ = name
         Proxy.__qualname__ = name
         Proxy.__module__ = module_name
-        Proxy.__doc__ = f"Proxy for {full_name}"
+        Proxy.__doc__ = f"Proxy for {class_path}"
         return Proxy
 
     return module_all, module_getattr

src/scyjava/_stubs/_genstubs.py

@@ -116,6 +116,7 @@ def _patched_start(*args: Any, **kwargs: Any) -> None:
     output_dir = Path(output_dir)
     if add_runtime_imports:
         logger.info("Adding runtime imports to generated stubs")
+
     for stub in output_dir.rglob("*.pyi"):
         stub_ast = ast.parse(stub.read_text())
         members = {node.name for node in stub_ast.body if hasattr(node, "name")}
@@ -127,8 +128,13 @@ def _patched_start(*args: Any, **kwargs: Any) -> None:
             continue
         if add_runtime_imports:
             real_import = stub.with_suffix(".py")
-            endpoint_args = ", ".join(repr(x) for x in endpoints)
-            real_import.write_text(INIT_TEMPLATE.format(endpoints=endpoint_args))
+            base_prefix = stub.relative_to(output_dir).parts[0]
+            real_import.write_text(
+                INIT_TEMPLATE.format(
+                    endpoints=repr(endpoints),
+                    base_prefix=repr(base_prefix),
+                )
+            )
 
     ruff_check(output_dir.absolute())
 
@@ -141,7 +147,12 @@ def _patched_start(*args: Any, **kwargs: Any) -> None:
 # see scyjava._stubs for implementation details.
 from scyjava._stubs import dynamic_import
 
-__all__, __getattr__ = dynamic_import(__name__, __file__, {endpoints})
+__all__, __getattr__ = dynamic_import(
+    __name__,
+    __file__,
+    endpoints={endpoints},
+    base_prefix={base_prefix},
+)
 """