experimaestro 1.8.0rc6__py3-none-any.whl → 1.8.3__py3-none-any.whl

experimaestro/core/{objects.py → objects/config.py}

@@ -1,25 +1,17 @@
 """Configuration and tasks"""
 
-from functools import cached_property
 import json
 
 from attr import define
+import fasteners
 
 from experimaestro import taskglobals
 
-try:
-    from types import NoneType
-except Exception:
-    # compatibility: python-3.8
-    NoneType = type(None)
 from termcolor import cprint
-import os
 from pathlib import Path
 import hashlib
 import logging
-import struct
 import io
-import fasteners
 from enum import Enum
 import inspect
 import importlib
@@ -42,306 +34,33 @@ from typing import (
 import sys
 import experimaestro
 from experimaestro.utils import logger
-from contextlib import contextmanager
-from experimaestro.core.types import DeprecatedAttribute, ObjectType
-from .context import SerializationContext, SerializedPath, SerializedPathLoader
+from experimaestro.core.types import DeprecatedAttribute, ObjectType, TypeVarType
+from ..context import SerializationContext, SerializedPath, SerializedPathLoader
 
 if TYPE_CHECKING:
-    from .callbacks import TaskEventListener
+    from ..callbacks import TaskEventListener
+    from ..identifier import Identifier
     from experimaestro.scheduler.base import Job
     from experimaestro.scheduler.workspace import RunMode
     from experimaestro.launchers import Launcher
     from experimaestro.scheduler import Workspace
 
-T = TypeVar("T", bound="Config")
-
-
-class Identifier:
-    def __init__(self, main: bytes):
-        self.main = main
-        self.has_loops = False
-
-    @cached_property
-    def all(self):
-        """Returns the overall identifier"""
-        return self.main
-
-    def __hash__(self) -> int:
-        return hash(self.main)
-
-    def state_dict(self):
-        return self.main.hex()
-
-    def __eq__(self, other: "Identifier"):
-        return self.main == other.main
-
-    @staticmethod
-    def from_state_dict(data: Union[Dict[str, str], str]):
-        if isinstance(data, str):
-            return Identifier(bytes.fromhex(data))
-
-        return Identifier(bytes.fromhex(data["main"]))
-
-    def __repr__(self):
-        return self.main.hex()
-
-
-def is_ignored(value):
-    """Returns True if the value should be ignored by itself"""
-    return value is not None and isinstance(value, Config) and (value.__xpm__.meta)
-
-
-def remove_meta(value):
-    """Cleanup a dict/list by removing ignored values"""
-    if isinstance(value, list):
-        return [el for el in value if not is_ignored(el)]
-    if isinstance(value, dict):
-        return {key: value for key, value in value.items() if not is_ignored(value)}
-    return value
-
-
-class ConfigPath:
-    """Used to keep track of cycles when computing a hash"""
-
-    def __init__(self):
-        self.loops: List[bool] = []
-        """Indicates whether a loop was detected up to this node"""
-
-        self.config2index = {}
-        """Associate an index in the list with a configuration"""
-
-    def detect_loop(self, config) -> Optional[int]:
-        """If there is a loop, return the relative index and update the path"""
-        index = self.config2index.get(id(config), None)
-        if index is not None:
-            for i in range(index, self.depth):
-                self.loops[i] = True
-            return self.depth - index
-
-    def has_loop(self):
-        return self.loops[-1]
-
-    @property
-    def depth(self):
-        return len(self.loops)
-
-    @contextmanager
-    def push(self, config):
-        config_id = id(config)
-        assert config_id not in self.config2index
-
-        self.config2index[config_id] = self.depth
-        self.loops.append(False)
-
-        try:
-            yield
-        finally:
-            self.loops.pop()
-            del self.config2index[config_id]
+from .config_walk import ConfigWalk, ConfigWalkContext
+from .config_utils import (
+    getqualattr,
+    add_to_path,
+    SealedError,
+    TaggedValue,
+    ObjectStore,
+    classproperty,
+)
 
+T = TypeVar("T", bound="Config")
 
-hash_logger = logging.getLogger("xpm.hash")
 
 DependentMarker = Callable[["Config"], None]
 
 
-class HashComputer:
-    """This class is in charge of computing a config/task identifier"""
-
-    OBJECT_ID = b"\x00"
-    INT_ID = b"\x01"
-    FLOAT_ID = b"\x02"
-    STR_ID = b"\x03"
-    PATH_ID = b"\x04"
-    NAME_ID = b"\x05"
-    NONE_ID = b"\x06"
-    LIST_ID = b"\x07"
-    TASK_ID = b"\x08"
-    DICT_ID = b"\x09"
-    ENUM_ID = b"\x0a"
-    CYCLE_REFERENCE = b"\x0b"
-    INIT_TASKS = b"\x0c"
-
-    def __init__(self, config: "Config", config_path: ConfigPath, *, version=None):
-        # Hasher for parameters
-        self._hasher = hashlib.sha256()
-        self.config = config
-        self.config_path = config_path
-        self.version = version or int(os.environ.get("XPM_HASH_COMPUTER", 2))
-        if hash_logger.isEnabledFor(logging.DEBUG):
-            hash_logger.debug(
-                "starting hash (%s): %s", hash(str(self.config)), self.config
-            )
-
-    def identifier(self) -> Identifier:
-        main = self._hasher.digest()
-        if hash_logger.isEnabledFor(logging.DEBUG):
-            hash_logger.debug("hash (%s): %s", hash(str(self.config)), str(main))
-        return Identifier(main)
-
-    def _hashupdate(self, bytes: bytes):
-        """Update the hash computers with some bytes"""
-        if hash_logger.isEnabledFor(logging.DEBUG):
-            hash_logger.debug(
-                "updating hash (%s): %s", hash(str(self.config)), str(bytes)
-            )
-        self._hasher.update(bytes)
-
-    def update(self, value, *, myself=False):  # noqa: C901
-        """Update the hash
-
-        :param value: The value to add to the hash
-        :param myself: True if the value is the configuration for which we wish
-            to compute the identifier, defaults to False
-        :raises NotImplementedError: If the value cannot be processed
-        """
-        if value is None:
-            self._hashupdate(HashComputer.NONE_ID)
-        elif isinstance(value, float):
-            self._hashupdate(HashComputer.FLOAT_ID)
-            self._hashupdate(struct.pack("!d", value))
-        elif isinstance(value, int):
-            self._hashupdate(HashComputer.INT_ID)
-            self._hashupdate(struct.pack("!q", value))
-        elif isinstance(value, str):
-            self._hashupdate(HashComputer.STR_ID)
-            self._hashupdate(value.encode("utf-8"))
-        elif isinstance(value, list):
-            values = [el for el in value if not is_ignored(el)]
-            self._hashupdate(HashComputer.LIST_ID)
-            self._hashupdate(struct.pack("!d", len(values)))
-            for x in values:
-                self.update(x)
-        elif isinstance(value, Enum):
-            self._hashupdate(HashComputer.ENUM_ID)
-            k = value.__class__
-            self._hashupdate(
-                f"{k.__module__}.{k.__qualname__ }:{value.name}".encode("utf-8"),
-            )
-        elif isinstance(value, dict):
-            self._hashupdate(HashComputer.DICT_ID)
-            items = [
-                (key, value) for key, value in value.items() if not is_ignored(value)
-            ]
-            items.sort(key=lambda x: x[0])
-            for key, value in items:
-                self.update(key)
-                self.update(value)
-
-        # Handles configurations
-        elif isinstance(value, Config):
-            # Encodes the identifier
-            self._hashupdate(HashComputer.OBJECT_ID)
-
-            # If we encode another config, then
-            if not myself:
-                if loop_ix := self.config_path.detect_loop(value):
-                    # Loop detected: use cycle reference
-                    self._hashupdate(HashComputer.CYCLE_REFERENCE)
-                    self._hashupdate(struct.pack("!q", loop_ix))
-
-                else:
-                    # Just use the object identifier
-                    value_id = HashComputer.compute(
-                        value, version=self.version, config_path=self.config_path
-                    )
-                    self._hashupdate(value_id.all)
-
-                # And that's it!
-                return
-
-            # Process tasks
-            if value.__xpm__.task is not None and (value.__xpm__.task is not value):
-                hash_logger.debug("Computing hash for task %s", value.__xpm__.task)
-                self._hashupdate(HashComputer.TASK_ID)
-                self.update(value.__xpm__.task)
-
-            xpmtype = value.__xpmtype__
-            self._hashupdate(xpmtype.identifier.name.encode("utf-8"))
-
-            # Process arguments (sort by name to ensure uniqueness)
-            arguments = sorted(xpmtype.arguments.values(), key=lambda a: a.name)
-            for argument in arguments:
-                # Ignored argument
-                if argument.ignored:
-                    argvalue = value.__xpm__.values.get(argument.name, None)
-
-                    # ... unless meta is set to false
-                    if (
-                        argvalue is None
-                        or not isinstance(argvalue, Config)
-                        or (argvalue.__xpm__.meta is not False)
-                    ):
-                        continue
-
-                if argument.generator:
-                    continue
-
-                # Argument value
-                # Skip if the argument is not a constant, and
-                # - optional argument: both value and default are None
-                # - the argument value is equal to the default value
-                argvalue = getattr(value, argument.name, None)
-                if not argument.constant and (
-                    (
-                        not argument.required
-                        and argument.default is None
-                        and argvalue is None
-                    )
-                    or (
-                        argument.default is not None
-                        and argument.default == remove_meta(argvalue)
-                    )
-                ):
-                    # No update if same value (and not constant)
-                    continue
-
-                if (
-                    argvalue is not None
-                    and isinstance(argvalue, Config)
-                    and argvalue.__xpm__.meta
-                ):
-                    continue
-
-                # Hash name
-                self.update(argument.name)
-
-                # Hash value
-                self._hashupdate(HashComputer.NAME_ID)
-                self.update(argvalue)
-
-        else:
-            raise NotImplementedError("Cannot compute hash of type %s" % type(value))
-
-    @staticmethod
-    def compute(
-        config: "Config", config_path: ConfigPath = None, version=None
-    ) -> Identifier:
-        """Compute the identifier for a configuration
-
-        :param config: the configuration for which we compute the identifier
-        :param config_path: used to track down cycles between configurations
-        :param version: version for the hash computation (None for the last one)
-        """
-
-        # Try to use the cached value first
-        # (if there are no loops)
-        if config.__xpm__._sealed:
-            identifier = config.__xpm__._raw_identifier
-            if identifier is not None and not identifier.has_loops:
-                return identifier
-
-        config_path = config_path or ConfigPath()
-
-        with config_path.push(config):
-            self = HashComputer(config, config_path, version=version)
-            self.update(config, myself=True)
-            identifier = self.identifier()
-            identifier.has_loop = config_path.has_loop()
-
-        return identifier
-
-
 def updatedependencies(
     dependencies, value: "Config", path: List[str], taskids: Set[int]
 ):
@@ -370,199 +89,9 @@ def updatedependencies(
         raise NotImplementedError("update dependencies for type %s" % type(value))
 
 
-class SealedError(Exception):
-    """Exception when trying to modify a sealed configuration"""
-
-    pass
-
-
-class TaggedValue:
-    def __init__(self, value):
-        self.value = value
-
-
-@contextmanager
-def add_to_path(p):
-    """Temporarily add a path to sys.path"""
-    import sys
-
-    old_path = sys.path
-    sys.path = sys.path[:]
-    sys.path.insert(0, p)
-    try:
-        yield
-    finally:
-        sys.path = old_path
-
-
-class ConfigWalkContext:
-    """Context when generating values in configurations"""
-
-    @property
-    def path(self):
-        """Returns the path of the job directory"""
-        raise NotImplementedError()
-
-    def __init__(self):
-        self._configpath = None
-
-    @property
-    def task(self):
-        return None
-
-    def currentpath(self) -> Path:
-        """Returns the configuration folder"""
-        if self._configpath:
-            return self.path / self._configpath
-        return self.path
-
-    @contextmanager
-    def push(self, key: str):
-        """Push a new key to contextualize paths"""
-        p = self._configpath
-        try:
-            self._configpath = (Path("out") if p is None else p) / key
-            yield key
-        finally:
-            self._configpath = p
-
-
 NOT_SET = object()
 
 
-class ConfigWalk:
-    """Allows to perform an operation on all nested configurations"""
-
-    def __init__(self, context: ConfigWalkContext = None, recurse_task=False):
-        """
-
-        :param recurse_task: Recurse into linked tasks
-        :param context: The context, by default only tracks the position in the
-            config tree
-        """
-        self.recurse_task = recurse_task
-        self.context = ConfigWalkContext() if context is None else context
-
-        # Stores already visited nodes
-        self.visited = {}
-
-    def preprocess(self, config: "Config") -> Tuple[bool, Any]:
-        """Returns a tuple boolean/value
-
-        The boolean value is used to stop the processing if False.
-        The value is returned
-        """
-        return True, None
-
-    def postprocess(self, stub, config: "Config", values: Dict[str, Any]):
-        return stub
-
-    def list(self, i: int):
-        return self.context.push(str(i))
-
-    def map(self, k: str):
-        return self.context.push(k)
-
-    def stub(self, config: "Config"):
-        return config
-
-    def __call__(self, x):
-        if isinstance(x, Config):
-            info = x.__xpm__  # type: ConfigInformation
-
-            # Avoid loops
-            xid = id(x)
-            if xid in self.visited:
-                return self.visited[xid]
-
-            # Get a stub
-            stub = self.stub(x)
-            self.visited[xid] = stub
-
-            # Pre-process
-            flag, value = self.preprocess(x)
-
-            if not flag:
-                # Stop processing and returns value
-                return value
-
-            # Process all the arguments
-            result = {}
-            for arg, v in info.xpmvalues():
-                if v is not None:
-                    with self.map(arg.name):
-                        result[arg.name] = self(v)
-                else:
-                    result[arg.name] = None
-
-            # Deals with pre-tasks
-            if info.pre_tasks:
-                with self.map("__pre_tasks__"):
-                    self(info.pre_tasks)
-
-            if info.init_tasks:
-                with self.map("__init_tasks__"):
-                    self(info.init_tasks)
-
-            # Process task if different
-            if (
-                x.__xpm__.task is not None
-                and self.recurse_task
-                and x.__xpm__.task is not x
-            ):
-                self(x.__xpm__.task)
-
-            processed = self.postprocess(stub, x, result)
-            self.visited[xid] = processed
-            return processed
-
-        if isinstance(x, list):
-            result = []
-            for i, sv in enumerate(x):
-                with self.list(i):
-                    result.append(self(sv))
-            return result
-
-        if isinstance(x, dict):
-            result = {}
-            for key, value in x.items():
-                assert isinstance(key, (str, float, int))
-                with self.map(key):
-                    result[key] = self(value)
-            return result
-
-        if isinstance(x, (float, int, str, Path, Enum)):
-            return x
-
-        raise NotImplementedError(f"Cannot handle a value of type {type(x)}")
-
-
-def getqualattr(module, qualname):
-    """Get a qualified attributed value"""
-    cls = module
-    for part in qualname.split("."):
-        cls = getattr(cls, part)
-    return cls
-
-
-class ObjectStore:
-    def __init__(self):
-        self.store: Dict[int, Any] = {}
-        self.constructed: Set[int] = set()
-
-    def set_constructed(self, identifier: int):
-        self.constructed.add(identifier)
-
-    def is_constructed(self, identifier: int):
-        return identifier in self.constructed
-
-    def retrieve(self, identifier: int):
-        return self.store.get(identifier, None)
-
-    def add_stub(self, identifier: int, stub: Any):
-        self.store[identifier] = stub
-
-
 @define()
 class WatchedOutput:
     #: The enclosing job
@@ -590,7 +119,7 @@ class ConfigInformation:
     # Set to true when loading from JSON
     LOADING: ClassVar[bool] = False
 
-    def __init__(self, pyobject: "TypeConfig"):
+    def __init__(self, pyobject: "ConfigMixin"):
         # The underlying pyobject and XPM type
         self.pyobject = pyobject
         self.xpmtype = pyobject.__xpmtype__  # type: ObjectType
@@ -616,6 +145,10 @@ class ConfigInformation:
         # Explicitely added dependencies
         self.dependencies = []
 
+        # Concrete type variables resolutions
+        # This is used to check typevars coherence
+        self.concrete_typevars: Dict[TypeVar, type] = {}
+
         # Lightweight tasks
         self.pre_tasks: List["LightweightTask"] = []
 
@@ -655,6 +188,8 @@ class ConfigInformation:
         return object.__getattribute__(self.pyobject, name)
 
     def set(self, k, v, bypass=False):
+        from experimaestro.generators import Generator
+
         # Not an argument, bypass
         if k not in self.xpmtype.arguments:
             setattr(self.pyobject, k, v)
@@ -666,10 +201,19 @@ class ConfigInformation:
         try:
             argument = self.xpmtype.arguments.get(k, None)
             if argument:
-                if not bypass and (argument.generator or argument.constant):
+                if not bypass and (
+                    (isinstance(argument.generator, Generator)) or argument.constant
+                ):
                     raise AttributeError("Property %s is read-only" % (k))
                 if v is not None:
                     self.values[k] = argument.validate(v)
+                    # Check for type variables
+                    if type(argument.type) is TypeVarType:
+                        self.check_typevar(argument.type.typevar, type(v))
+                    if isinstance(v, Config):
+                        # If the value is a Config, fuse type variables
+                        v.__xpm__.fuse_concrete_typevars(self.concrete_typevars)
+                        self.fuse_concrete_typevars(v.__xpm__.concrete_typevars)
                 elif argument.required:
                     raise AttributeError("Cannot set required attribute to None")
                 else:
@@ -682,6 +226,43 @@ class ConfigInformation:
             logger.error("Error while setting value %s in %s", k, self.xpmtype)
             raise
 
+    def fuse_concrete_typevars(self, typevars: Dict[TypeVar, type]):
+        """Fuses concrete type variables with the current ones"""
+        for typevar, v in typevars.items():
+            self.check_typevar(typevar, v)
+
+    def check_typevar(self, typevar: TypeVar, v: type):
+        """Check if a type variable is coherent with the current typevars bindings,
+        updates the bindings if necessary"""
+        if typevar not in self.concrete_typevars:
+            self.concrete_typevars[typevar] = v
+            return
+
+        concrete_typevar = self.concrete_typevars[typevar]
+        bound = typevar.__bound__
+        # Check that v is a subclass of the typevar OR that typevar is a subclass of v
+        # Then set the concrete type variable to the most generic type
+
+        # First, limiting to the specified bound
+        if bound is not None:
+            if not issubclass(v, bound):
+                raise TypeError(
+                    f"Type variable {typevar} is bound to {bound}, but tried to set it to {v}"
+                )
+
+        if issubclass(v, concrete_typevar):
+            # v is a subclass of the typevar, keep the typevar
+            return
+        if issubclass(concrete_typevar, v):
+            # typevar is a subclass of v, keep v
+            self.concrete_typevars[typevar] = v
+            return
+        raise TypeError(
+            f"Type variable {typevar} is already set to {self.concrete_typevars[typevar]}, "
+            f"but tried to set it to {v}"
+            f" (current typevars bindings: {self.concrete_typevars})"
+        )
+
     def addtag(self, name, value):
         self._tags[name] = value
 
@@ -752,18 +333,29 @@ class ConfigInformation:
 
             def postprocess(self, stub, config: Config, values):
                 # Generate values
+                from experimaestro.generators import Generator
+
                 for k, argument in config.__xpmtype__.arguments.items():
-                    if argument.generator:
-                        sig = inspect.signature(argument.generator)
-                        if len(sig.parameters) == 2:
-                            value = argument.generator(self.context, config)
-                        elif len(sig.parameters) == 0:
-                            value = argument.generator()
-                        else:
-                            assert (
-                                False
-                            ), "generator has either two parameters (context and config), or none"
-                        config.__xpm__.set(k, value, bypass=True)
+                    try:
+                        if argument.generator:
+                            if not isinstance(argument.generator, Generator):
+                                value = argument.generator()
+                            else:
+                                sig = inspect.signature(argument.generator)
+                                if len(sig.parameters) == 0:
+                                    value = argument.generator()
+                                elif len(sig.parameters) == 2:
+                                    value = argument.generator(self.context, config)
+                                else:
+                                    assert (
+                                        False
+                                    ), "generator has either two parameters (context and config), or none"
+                            config.__xpm__.set(k, value, bypass=True)
+                    except Exception:
+                        logger.error(
+                            "While setting %s of %s", argument.name, config.__xpmtype__
+                        )
+                        raise
 
                 config.__xpm__._sealed = True
 
@@ -805,6 +397,7 @@ class ConfigInformation:
 
     def identifiers(self, only_raw: bool):
         """Computes the unique identifier"""
+        from ..identifier import IdentifierComputer, Identifier
 
         raw_identifier = self._raw_identifier
         full_identifier = self._full_identifier
@@ -812,7 +405,7 @@ class ConfigInformation:
         # Computes raw identifier if needed
         if raw_identifier is None or not self._sealed:
             # Get the main identifier
-            raw_identifier = HashComputer.compute(self.pyobject)
+            raw_identifier = IdentifierComputer.compute(self.pyobject)
             if self._sealed:
                 self._raw_identifier = raw_identifier
 
@@ -833,7 +426,7 @@ class ConfigInformation:
 
             # Adds init tasks
             if self.init_tasks:
-                hasher.update(HashComputer.INIT_TASKS)
+                hasher.update(IdentifierComputer.INIT_TASKS)
                 for init_task in self.init_tasks:
                     hasher.update(init_task.__xpm__.raw_identifier.all)
 
@@ -847,13 +440,13 @@ class ConfigInformation:
         return raw_identifier, full_identifier
 
     @property
-    def raw_identifier(self) -> Identifier:
+    def raw_identifier(self) -> "Identifier":
         """Computes the unique identifier (without task modifiers)"""
         raw_identifier, _ = self.identifiers(True)
         return raw_identifier
 
     @property
-    def full_identifier(self) -> Identifier:
+    def full_identifier(self) -> "Identifier":
         """Computes the unique identifier (with task modifiers)"""
         _, full_identifier = self.identifiers(False)
         return full_identifier
@@ -954,7 +547,7 @@ class ConfigInformation:
 
         :param callback: _description_
         """
-        from .callbacks import TaskEventListener
+        from ..callbacks import TaskEventListener
 
         TaskEventListener.on_completed(self, callback)
 
@@ -968,7 +561,7 @@ class ConfigInformation:
     ):
         from experimaestro.scheduler import experiment, JobContext
         from experimaestro.scheduler.workspace import RunMode
-        from .callbacks import TaskEventListener
+        from ..callbacks import TaskEventListener
 
         # --- Prepare the object
 
@@ -1355,7 +948,7 @@ class ConfigInformation:
         as_instance=True,
         save_directory: Optional[Path] = None,
         discard_id: bool = False,
-    ) -> "TypeConfig":
+    ) -> "ConfigMixin":
         ...
 
     @overload
@@ -1390,6 +983,7 @@ class ConfigInformation:
         o = None
         objects = {}
         import experimaestro.taskglobals as taskglobals
+        from ..identifier import Identifier
 
         # Loop over all the definitions and create objects
         for definition in definitions:
@@ -1656,28 +1250,7 @@ def clone(v):
     raise NotImplementedError("Clone not implemented for type %s" % type(v))
 
 
-def cache(fn, name: str):
-    def __call__(config, *args, **kwargs):
-        import experimaestro.taskglobals as taskglobals
-
-        # Get path and create directory if needed
-        hexid = config.__xpmidentifier__  # type: Identifier
-        typename = config.__xpmtypename__  # type: str
-        dir = taskglobals.Env.instance().wspath / "config" / typename / hexid.all.hex()
-
-        if not dir.exists():
-            dir.mkdir(parents=True, exist_ok=True)
-
-        path = dir / name
-        ipc_lock = fasteners.InterProcessLock(path.with_suffix(path.suffix + ".lock"))
-        with ipc_lock:
-            r = fn(config, path, *args, **kwargs)
-            return r
-
-    return __call__
-
-
-class TypeConfig:
+class ConfigMixin:
     """Class for configuration objects"""
 
     __xpmtype__: ObjectType
@@ -1828,7 +1401,7 @@ class TypeConfig:
 
     def add_pretasks_from(self, *configs: "Config"):
         assert all(
-            [isinstance(config, TypeConfig) for config in configs]
+            [isinstance(config, ConfigMixin) for config in configs]
         ), "One of the parameters is not a configuration object"
         for config in configs:
             self.add_pretasks(*config.__xpm__.pre_tasks)
@@ -1851,11 +1424,6 @@ class TypeConfig:
         self.__xpm__.add_dependencies(*other.__xpm__.dependencies)
 
 
-class classproperty(property):
-    def __get__(self, owner_self, owner_cls):
-        return self.fget(owner_cls)
-
-
 class Config:
     """Base type for all objects in python interface"""
 
@@ -1873,24 +1441,20 @@ class Config:
 
     @classproperty
     def XPMConfig(cls):
-        if issubclass(cls, TypeConfig):
+        if issubclass(cls, ConfigMixin):
             return cls
         return cls.__getxpmtype__().configtype
 
-    @classproperty
-    def C(cls):
-        return cls.XPMConfig
-
     @classproperty
     def XPMValue(cls):
         """Returns the value object for this configuration"""
-        if issubclass(cls, TypeConfig):
+        if issubclass(cls, ConfigMixin):
             return cls.__xpmtype__.objecttype
 
         if value_cls := cls.__dict__.get("__XPMValue__", None):
             pass
         else:
-            from .types import XPMValue
+            from ..types import XPMValue
 
             __objectbases__ = tuple(
                 s.XPMValue
@@ -1907,9 +1471,20 @@ class Config:
 
         return value_cls
 
+    @classproperty
+    def C(cls):
+        """Alias for XPMConfig"""
+        return cls.XPMConfig
+
+    @classproperty
+    def V(cls):
+        """Alias for XPMValue"""
+        return cls.XPMValue
+
     @classmethod
     def __getxpmtype__(cls) -> "ObjectType":
-        """Get (and create if necessary) the Object type of this"""
+        """Get (and create if necessary) the Object type associated
+        with thie Config object"""
         xpmtype = cls.__dict__.get("__xpmtype__", None)
         if xpmtype is None:
             from experimaestro.core.types import ObjectType
@@ -1923,9 +1498,12 @@ class Config:
         return xpmtype
 
     def __new__(cls: Type[T], *args, **kwargs) -> T:
-        """Returns an instance of a TypeConfig (for compatibility, use XPMConfig
-        or C if possible)"""
+        """Returns an instance of a ConfigMixin (for compatibility, use XPMConfig
+        or C if possible)
 
+        :deprecated: Use Config.C or Config.XPMConfig to construct a new
+            configuration, and Config.V (or Config.XPMValue) for a new value
+        """
         # If this is an XPMValue, just return a new instance
         from experimaestro.core.types import XPMValue
 
@@ -1934,15 +1512,24 @@ class Config:
 
         # If this is the XPMConfig, just return a new instance
         # __init__ will be called
-        if issubclass(cls, TypeConfig):
+        if issubclass(cls, ConfigMixin):
             return object.__new__(cls)
 
+        # Log a deprecation warning for this way of creating a configuration
+        caller = inspect.getframeinfo(inspect.stack()[1][0])
+        logger.warning(
+            "Creating a configuration using Config.__new__ is deprecated, and will be removed in a future version. "
+            "Use Config.C or Config.XPMConfig to create a new configuration. "
+            "Issue created at %s:%s",
+            str(Path(caller.filename).absolute()),
+            caller.lineno,
+        )
+
         # otherwise, we use the configuration type
-        o: TypeConfig = object.__new__(cls.__getxpmtype__().configtype)
+        o: ConfigMixin = object.__new__(cls.__getxpmtype__().configtype)
         try:
             o.__init__(*args, **kwargs)
         except Exception:
-            caller = inspect.getframeinfo(inspect.stack()[1][0])
             logger.error(
                 "Init error in %s:%s"
                 % (str(Path(caller.filename).absolute()), caller.lineno)
@@ -1963,8 +1550,8 @@ class Config:
         """Returns a JSON version of the object (if possible)"""
         return self.__xpm__.__json__()
 
-    def __identifier__(self) -> Identifier:
-        return self.__xpm__.identifier
+    def __identifier__(self) -> "Identifier":
+        return self.__xpm__.full_identifier
 
     def add_pretasks(self, *tasks: "LightweightTask"):
         """Add pre-tasks"""
@@ -2069,3 +1656,24 @@ def setmeta(config: Config, flag: bool):
     """Flags the configuration as a meta-parameter"""
     config.__xpm__.set_meta(flag)
     return config
+
+
+def cache(fn, name: str):
+    def __call__(config, *args, **kwargs):
+        import experimaestro.taskglobals as taskglobals
+
+        # Get path and create directory if needed
+        hexid = config.__xpmidentifier__  # type: Identifier
+        typename = config.__xpmtypename__  # type: str
+        dir = taskglobals.Env.instance().wspath / "config" / typename / hexid.all.hex()
+
+        if not dir.exists():
+            dir.mkdir(parents=True, exist_ok=True)
+
+        path = dir / name
+        ipc_lock = fasteners.InterProcessLock(path.with_suffix(path.suffix + ".lock"))
+        with ipc_lock:
+            r = fn(config, path, *args, **kwargs)
+            return r
+
+    return __call__