Merge branch 'tickets/DM-31507'

python/lsst/pex/config/configChoiceField.py

@@ -34,6 +34,8 @@
 from .comparison import getComparisonName, compareScalars, compareConfigs
 from .callStack import getCallStack, getStackFrame
 
+import weakref
+
 
 class SelectionSet(collections.abc.MutableSet):
     """A mutable set class that tracks the selection of multi-select
@@ -65,7 +67,7 @@ def __init__(self, dict_, value, at=None, label="assignment", setHistory=True):
             at = getCallStack()
         self._dict = dict_
         self._field = self._dict._field
-        self._config = self._dict._config
+        self._config_ = weakref.ref(self._dict._config)
         self.__history = self._config._history.setdefault(self._field.name, [])
         if value is not None:
             try:
@@ -83,6 +85,13 @@ def __init__(self, dict_, value, at=None, label="assignment", setHistory=True):
         if setHistory:
             self.__history.append(("Set selection to %s" % self, at, label))
 
+    @property
+    def _config(self) -> Config:
+        # Config Fields should never outlive their config class instance
+        # assert that as such here
+        assert(self._config_() is not None)
+        return self._config_()
+
     def add(self, value, at=None):
         """Add a value to the selected set.
         """

python/lsst/pex/config/configurableField.py

@@ -33,6 +33,8 @@
 from .comparison import compareConfigs, getComparisonName
 from .callStack import getCallStack, getStackFrame
 
+import weakref
+
 
 class ConfigurableInstance:
     """A retargetable configuration in a `ConfigurableField` that proxies
@@ -68,7 +70,7 @@ def __initValue(self, at, label):
         object.__setattr__(self, "_value", value)
 
     def __init__(self, config, field, at=None, label="default"):
-        object.__setattr__(self, "_config", config)
+        object.__setattr__(self, "_config_", weakref.ref(config))
         object.__setattr__(self, "_field", field)
         object.__setattr__(self, "__doc__", config)
         object.__setattr__(self, "_target", field.target)
@@ -83,6 +85,13 @@ def __init__(self, config, field, at=None, label="default"):
         history = config._history.setdefault(field.name, [])
         history.append(("Targeted and initialized from defaults", at, label))
 
+    @property
+    def _config(self) -> Config:
+        # Config Fields should never outlive their config class instance
+        # assert that as such here
+        assert(self._config_() is not None)
+        return self._config_()
+
     target = property(lambda x: x._target)
     """The targeted configurable (read-only).
     """

python/lsst/pex/config/convert.py

@@ -33,6 +33,15 @@
     dafBase = None
 
 
+def _helper(ps, prefix, dict_):
+    for k, v in dict_.items():
+        name = prefix + "." + k if prefix is not None else k
+        if isinstance(v, dict):
+            _helper(ps, name, v)
+        elif v is not None:
+            ps.set(name, v)
+
+
 def makePropertySet(config):
     """Convert a configuration into a `lsst.daf.base.PropertySet`.
 
@@ -55,14 +64,6 @@ def makePropertySet(config):
     if dafBase is None:
         raise RuntimeError("lsst.daf.base is not available")
 
-    def _helper(ps, prefix, dict_):
-        for k, v in dict_.items():
-            name = prefix + "." + k if prefix is not None else k
-            if isinstance(v, dict):
-                _helper(ps, name, v)
-            elif v is not None:
-                ps.set(name, v)
-
     if config is not None:
         ps = dafBase.PropertySet()
         _helper(ps, None, config.toDict())

python/lsst/pex/config/dictField.py

@@ -29,10 +29,12 @@
 
 import collections.abc
 
-from .config import Field, FieldValidationError, _typeStr, _autocast, _joinNamePath
+from .config import Field, FieldValidationError, _typeStr, _autocast, _joinNamePath, Config
 from .comparison import getComparisonName, compareScalars
 from .callStack import getCallStack, getStackFrame
 
+import weakref
+
 
 class Dict(collections.abc.MutableMapping):
     """An internal mapping container.
@@ -42,7 +44,7 @@ class Dict(collections.abc.MutableMapping):
 
     def __init__(self, config, field, value, at, label, setHistory=True):
         self._field = field
-        self._config = config
+        self._config_ = weakref.ref(config)
         self._dict = {}
         self._history = self._config._history.setdefault(self._field.name, [])
         self.__doc__ = field.doc
@@ -58,6 +60,13 @@ def __init__(self, config, field, value, at, label, setHistory=True):
         if setHistory:
             self._history.append((dict(self._dict), at, label))
 
+    @property
+    def _config(self) -> Config:
+        # Config Fields should never outlive their config class instance
+        # assert that as such here
+        assert(self._config_() is not None)
+        return self._config_()
+
     history = property(lambda x: x._history)
     """History (read-only).
     """
@@ -132,7 +141,7 @@ def __setattr__(self, attr, value, at=None, label="assignment"):
         if hasattr(getattr(self.__class__, attr, None), '__set__'):
             # This allows properties to work.
             object.__setattr__(self, attr, value)
-        elif attr in self.__dict__ or attr in ["_field", "_config", "_history", "_dict", "__doc__"]:
+        elif attr in self.__dict__ or attr in ["_field", "_config_", "_history", "_dict", "__doc__"]:
             # This allows specific private attributes to work.
             object.__setattr__(self, attr, value)
         else:

python/lsst/pex/config/listField.py

@@ -29,10 +29,12 @@
 
 import collections.abc
 
-from .config import Field, FieldValidationError, _typeStr, _autocast, _joinNamePath
+from .config import Field, FieldValidationError, _typeStr, _autocast, _joinNamePath, Config
 from .comparison import compareScalars, getComparisonName
 from .callStack import getCallStack, getStackFrame
 
+import weakref
+
 
 class List(collections.abc.MutableSequence):
     """List collection used internally by `ListField`.
@@ -63,7 +65,7 @@ class List(collections.abc.MutableSequence):
 
     def __init__(self, config, field, value, at, label, setHistory=True):
         self._field = field
-        self._config = config
+        self._config_ = weakref.ref(config)
         self._history = self._config._history.setdefault(self._field.name, [])
         self._list = []
         self.__doc__ = field.doc
@@ -73,10 +75,17 @@ def __init__(self, config, field, value, at, label, setHistory=True):
                     self.insert(i, x, setHistory=False)
             except TypeError:
                 msg = "Value %s is of incorrect type %s. Sequence type expected" % (value, _typeStr(value))
-                raise FieldValidationError(self._field, self._config, msg)
+                raise FieldValidationError(self._field, config, msg)
         if setHistory:
             self.history.append((list(self._list), at, label))
 
+    @property
+    def _config(self) -> Config:
+        # Config Fields should never outlive their config class instance
+        # assert that as such here
+        assert(self._config_() is not None)
+        return self._config_()
+
     def validateItem(self, i, x):
         """Validate an item to determine if it can be included in the list.
 
@@ -204,7 +213,7 @@ def __setattr__(self, attr, value, at=None, label="assignment"):
         if hasattr(getattr(self.__class__, attr, None), '__set__'):
             # This allows properties to work.
             object.__setattr__(self, attr, value)
-        elif attr in self.__dict__ or attr in ["_field", "_config", "_history", "_list", "__doc__"]:
+        elif attr in self.__dict__ or attr in ["_field", "_config_", "_history", "_list", "__doc__"]:
             # This allows specific private attributes to work.
             object.__setattr__(self, attr, value)
         else: