Python AdjustAnnotations class improvements

- Improve correspondence with eponymous C++ class.
- Make Python class available outside a test context.

Author: greenc-FNAL

plugins/python/CMakeLists.txt

@@ -21,3 +21,8 @@ target_link_libraries(pymodule PRIVATE phlex::module Python::Python Python::NumP
 target_compile_definitions(pymodule PRIVATE NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
 
 install(TARGETS pymodule LIBRARY DESTINATION lib)
+
+install(
+  DIRECTORY python/phlex
+  DESTINATION lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages
+)

test/python/variant.py plugins/python/python/phlex/__init__.pytest/python/variant.py renamed to plugins/python/python/phlex/__init__.py

@@ -1,8 +1,6 @@
-"""Annotation helper for C++ typing variants.
+"""Phlex Python Utilities.
 
-Python algorithms are generic, like C++ templates, but the Phlex registration
-process requires a single unique signature. These helpers generate annotated
-functions for registration with the proper C++ types.
+Call helpers and type annotation tools for the Phlex framework.
 """
 
 import copy
@@ -63,6 +61,12 @@ def __init__(
         self.__name__ = name
         self._allow_call = allow_call
 
+        # Expose __code__ from the underlying callable if available, to aid
+        # introspection (e.g. by C++ modulewrap).
+        self.__code__ = getattr(self.phlex_callable, "__code__", None)
+        self.__defaults__ = getattr(self.phlex_callable, "__defaults__", None)
+        self.__kwdefaults__ = getattr(self.phlex_callable, "__kwdefaults__", None)
+
     def __call__(self, *args, **kwargs):
         """Raises an error if called directly.
 
@@ -77,6 +81,3 @@ def __call__(self, *args, **kwargs):
             f"The framework should extract phlex_callable instead."
         )
         return self.phlex_callable(*args, **kwargs)  # type: ignore
-
-
-Variant = AdjustAnnotations

test/python/CMakeLists.txt

@@ -194,6 +194,9 @@ set_tests_properties(
 list(APPEND ACTIVE_PY_CPHLEX_TESTS py:failure)
 
 set(TEST_PYTHONPATH ${CMAKE_CURRENT_SOURCE_DIR})
+# Add the python plugin source directory to PYTHONPATH so tests can use phlex package
+set(TEST_PYTHONPATH ${TEST_PYTHONPATH}:${PROJECT_SOURCE_DIR}/plugins/python/python)
+
 # Always add site-packages to PYTHONPATH for tests, as embedded python might
 # not find them especially in spack environments where they are in
 # non-standard locations

test/python/adder.py

@@ -6,7 +6,7 @@
 
 from typing import Protocol, TypeVar
 
-from variant import AdjustAnnotations
+from phlex import AdjustAnnotations
 
 
 class AddableProtocol[T](Protocol):