hpcflow-new2 0.2.0a188__py3-none-any.whl → 0.2.0a190__py3-none-any.whl

hpcflow/sdk/app.py

@@ -2,26 +2,25 @@
 
 from __future__ import annotations
 
-from collections import defaultdict
+from collections import Counter
+from contextlib import AbstractContextManager, nullcontext
 from datetime import datetime, timezone
 import enum
 import json
 import shutil
 from functools import wraps
 from importlib import resources, import_module
-from logging import Logger
 import os
 from contextlib import contextmanager
 from pathlib import Path
 import sys
 from tempfile import TemporaryDirectory
-from typing import Any, Callable, Dict, List, Optional, Type, Union, Tuple
+from typing import Any, TypeVar, Generic, cast, TYPE_CHECKING
 import warnings
 import zipfile
 from platformdirs import user_cache_path, user_data_dir
 import requests
-from reretry import retry
-import rich
+from reretry import retry  # type: ignore
 from rich.console import Console, Group
 from rich.syntax import Syntax
 from rich.table import Table, box
@@ -29,50 +28,301 @@ from rich.text import Text
 from rich.padding import Padding
 from rich.panel import Panel
 from rich import print as rich_print
-from fsspec.core import url_to_fs
-from fsspec.implementations.local import LocalFileSystem
-
+from fsspec.core import url_to_fs  # type: ignore
+from fsspec.implementations.local import LocalFileSystem  # type: ignore
 
 from hpcflow import __version__
-from hpcflow.sdk.core.actions import EARStatus
-from hpcflow.sdk.core.errors import WorkflowNotFoundError
-from hpcflow.sdk.core.object_list import ObjectList
+from hpcflow.sdk.core.enums import EARStatus
 from hpcflow.sdk.core.utils import (
     read_YAML_str,
     read_YAML_file,
     read_JSON_file,
     write_YAML_file,
     write_JSON_file,
+    parse_timestamp,
+    get_file_context,
+    open_text_resource,
 )
 from hpcflow.sdk import sdk_classes, sdk_funcs, get_SDK_logger
 from hpcflow.sdk.config import Config, ConfigFile
 from hpcflow.sdk.core import ALL_TEMPLATE_FORMATS
 from hpcflow.sdk.log import AppLog, TimeIt
-from hpcflow.sdk.persistence import DEFAULT_STORE_FORMAT
+from hpcflow.sdk.persistence.defaults import DEFAULT_STORE_FORMAT
 from hpcflow.sdk.persistence.base import TEMPLATE_COMP_TYPES
 from hpcflow.sdk.runtime import RunTimeInfo
 from hpcflow.sdk.cli import make_cli
-from hpcflow.sdk.submission.jobscript_info import JobscriptElementState
+from hpcflow.sdk.submission.enums import JobscriptElementState
 from hpcflow.sdk.submission.shells import get_shell
 from hpcflow.sdk.submission.shells.os_version import (
     get_OS_info_POSIX,
     get_OS_info_windows,
 )
-from hpcflow.sdk.typing import PathLike
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
+    from logging import Logger
+    from types import ModuleType
+    from typing import ClassVar, Literal, Protocol
+    from typing_extensions import Final
+    from rich.status import Status
+    from .typing import (
+        BasicTemplateComponents,
+        KnownSubmission,
+        KnownSubmissionItem,
+        PathLike,
+        TemplateComponents,
+    )
+    from .config.config import ConfigOptions
+    from .core.actions import (
+        ElementActionRun,
+        ElementAction,
+        ActionEnvironment,
+        Action,
+        ActionScope,
+        ActionRule,
+    )
+    from .core.command_files import (
+        FileSpec,
+        FileNameSpec,
+        InputFileGenerator,
+        FileNameStem,
+        FileNameExt,
+        OutputFileParser,
+    )
+    from .core.commands import Command
+    from .core.element import (
+        ElementInputs,
+        ElementOutputs,
+        ElementInputFiles,
+        ElementOutputFiles,
+        ElementIteration,
+        Element,
+        ElementParameter,
+        ElementResources,
+        ElementFilter,
+        ElementGroup,
+    )
+    from .core.enums import ActionScopeType, InputSourceType, TaskSourceType
+    from .core.environment import (
+        NumCores,
+        Environment,
+        Executable as _Executable,
+        ExecutableInstance,
+    )
+    from .core.loop import Loop, WorkflowLoop
+    from .core.object_list import (
+        CommandFilesList as _CommandFilesList,
+        EnvironmentsList as _EnvironmentsList,
+        ExecutablesList,
+        GroupList,
+        ParametersList as _ParametersList,
+        ResourceList,
+        TaskList,
+        TaskSchemasList as _TaskSchemasList,
+        TaskTemplateList,
+        WorkflowLoopList,
+        WorkflowTaskList,
+    )
+    from .core.parameters import (
+        SchemaParameter,
+        InputValue,
+        Parameter,
+        ParameterValue,
+        InputSource,
+        ResourceSpec,
+        SchemaOutput,
+        ValueSequence,
+        SchemaInput,
+    )
+    from .core.rule import Rule
+    from .core.run_dir_files import RunDirAppFiles
+    from .core.task import (
+        Task,
+        WorkflowTask,
+        Parameters,
+        TaskInputParameters,
+        TaskOutputParameters,
+        ElementPropagation,
+        ElementSet,
+    )
+    from .core.task_schema import TaskSchema, TaskObjective
+    from .core.workflow import (
+        Workflow as _Workflow,
+        WorkflowTemplate as _WorkflowTemplate,
+    )
+    from .submission.jobscript import Jobscript
+    from .submission.submission import Submission
+    from .submission.schedulers import Scheduler, QueuedScheduler
+    from .submission.schedulers.direct import DirectPosix, DirectWindows
+    from .submission.schedulers.sge import SGEPosix
+    from .submission.schedulers.slurm import SlurmPosix
+    from .submission.shells.base import VersionInfo
+
+    # Complex types for SDK functions
+    class _MakeWorkflow(Protocol):
+        """Type of :py:meth:`BaseApp.make_workflow`"""
+
+        def __call__(
+            self,
+            template_file_or_str: PathLike | str,
+            is_string: bool = False,
+            template_format: Literal["json", "yaml"] | None = None,
+            path: PathLike = None,
+            name: str | None = None,
+            overwrite: bool = False,
+            store: str = DEFAULT_STORE_FORMAT,
+            ts_fmt: str | None = None,
+            ts_name_fmt: str | None = None,
+            store_kwargs: dict[str, Any] | None = None,
+            variables: dict[str, str] | None = None,
+            status: bool = True,
+        ) -> _Workflow:
+            ...
+
+    class _MakeDemoWorkflow(Protocol):
+        """Type of :py:meth:`BaseApp.make_demo_workflow`"""
+
+        def __call__(
+            self,
+            workflow_name: str,
+            template_format: Literal["json", "yaml"] | None = None,
+            path: PathLike | None = None,
+            name: str | None = None,
+            overwrite: bool = False,
+            store: str = DEFAULT_STORE_FORMAT,
+            ts_fmt: str | None = None,
+            ts_name_fmt: str | None = None,
+            store_kwargs: dict[str, Any] | None = None,
+            variables: dict[str, str] | None = None,
+            status: bool = True,
+        ) -> _Workflow:
+            ...
+
+    class _MakeAndSubmitWorkflow(Protocol):
+        """Type of :py:meth:`BaseApp.make_and_submit_workflow`"""
+
+        # Should be overloaded on return_idx, but not bothering
+        def __call__(
+            self,
+            template_file_or_str: PathLike | str,
+            is_string: bool = False,
+            template_format: Literal["json", "yaml"] | None = None,
+            path: PathLike | None = None,
+            name: str | None = None,
+            overwrite: bool = False,
+            store: str = DEFAULT_STORE_FORMAT,
+            ts_fmt: str | None = None,
+            ts_name_fmt: str | None = None,
+            store_kwargs: dict[str, Any] | None = None,
+            variables: dict[str, str] | None = None,
+            JS_parallelism: bool | None = None,
+            wait: bool = False,
+            add_to_known: bool = True,
+            return_idx: bool = False,
+            tasks: list[int] | None = None,
+            cancel: bool = False,
+            status: bool = True,
+        ) -> tuple[_Workflow, Mapping[int, Sequence[int]]] | _Workflow:
+            ...
+
+    class _MakeAndSubmitDemoWorkflow(Protocol):
+        """Type of :py:meth:`BaseApp.make_and_submit_demo_workflow`"""
+
+        # Should be overloaded on return_idx, but not bothering
+        def __call__(
+            self,
+            workflow_name: str,
+            template_format: Literal["json", "yaml"] | None = None,
+            path: PathLike | None = None,
+            name: str | None = None,
+            overwrite: bool = False,
+            store: str = DEFAULT_STORE_FORMAT,
+            ts_fmt: str | None = None,
+            ts_name_fmt: str | None = None,
+            store_kwargs: dict[str, Any] | None = None,
+            variables: dict[str, str] | None = None,
+            JS_parallelism: bool | None = None,
+            wait: bool = False,
+            add_to_known: bool = True,
+            return_idx: bool = False,
+            tasks: list[int] | None = None,
+            cancel: bool = False,
+            status: bool = True,
+        ) -> tuple[_Workflow, Mapping[int, Sequence[int]]] | _Workflow:
+            ...
+
+    class _SubmitWorkflow(Protocol):
+        """Type of :py:meth:`BaseApp.submit_workflow`"""
+
+        # Should be overloaded on return_idx, but not bothering
+        def __call__(
+            self,
+            workflow_path: PathLike,
+            JS_parallelism: bool | None = None,
+            wait: bool = False,
+            return_idx: bool = False,
+            tasks: list[int] | None = None,
+        ) -> Mapping[int, Sequence[int]] | None:
+            ...
+
+    class _GetKnownSubmissions(Protocol):
+        """Type of :py:meth:`BaseApp.get_known_submissions`"""
+
+        # Should be overloaded on as_json, but not bothering
+        def __call__(
+            self,
+            max_recent: int = 3,
+            no_update: bool = False,
+            as_json: bool = False,
+            status: Status | None = None,
+        ) -> Sequence[KnownSubmissionItem]:
+            ...
+
+    class _Show(Protocol):
+        """Type of :py:meth:`BaseApp.show`"""
+
+        def __call__(
+            self,
+            max_recent: int = 3,
+            full: bool = False,
+            no_update: bool = False,
+        ) -> None:
+            ...
+
+    class _Cancel(Protocol):
+        """Type of :py:meth:`BaseApp.cancel`"""
+
+        def __call__(
+            self,
+            workflow_ref: int | str | Path,
+            ref_is_path: str | None = None,
+        ) -> None:
+            ...
+
+    class _RunTests(Protocol):
+        """Type of :py:meth:`BaseApp.run_tests and run_hpcflow_tests`"""
+
+        def __call__(self, *args: str) -> int:
+            ...
+
 
 SDK_logger = get_SDK_logger(__name__)
 DEMO_WK_FORMATS = {".yaml": "yaml", ".yml": "yaml", ".json": "json", ".jsonc": "json"}
 
+T = TypeVar("T")
 
-def rate_limit_safe_url_to_fs(app, *args, logger=None, **kwargs):
-    R"""Call fsspec's ``url_to_fs`` but retry on ``requests.exceptions.HTTPError``\ s.
+
+def rate_limit_safe_url_to_fs(
+    app: BaseApp, *args, logger: Logger | None = None, **kwargs
+):
+    R"""
+    Call fsspec's ``url_to_fs`` but retry on ``requests.exceptions.HTTPError``\ s.
 
     References
     ----------
     [1]: https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?
             apiVersion=2022-11-28#about-secondary-rate-limits
     """
-
     auth = {}
     if app.run_time_info.in_pytest:
         gh_token = os.environ.get("GH_TOKEN")
@@ -81,10 +331,11 @@ def rate_limit_safe_url_to_fs(app, *args, logger=None, **kwargs):
             # requests allowed per hour to 1000 [1]. fsspec requires "username" to be
             # set if using "token":
             auth = {"username": "", "token": gh_token}
-            logger.info(
-                "calling fsspec's `url_to_fs` with a token from the env variable "
-                "`GH_TOKEN`."
-            )
+            if logger:
+                logger.info(
+                    "calling fsspec's `url_to_fs` with a token from the env variable "
+                    "`GH_TOKEN`."
+                )
 
     # GitHub actions testing is potentially highly concurrent, with multiple
     # Python versions and OSes being tested at the same time; so we might hit
@@ -104,48 +355,64 @@ def rate_limit_safe_url_to_fs(app, *args, logger=None, **kwargs):
     return _inner(*args, **kwargs)
 
 
-def __getattr__(name):
-    """Allow access to core classes and API functions (useful for type annotations)."""
+def __getattr__(name: str):
+    """Allow access to core classes and API functions."""
     try:
         return get_app_attribute(name)
     except AttributeError:
         raise AttributeError(f"module {__name__!r} has no attribute {name!r}.")
 
 
-def get_app_attribute(name):
-    """A function to assign to an app module `__getattr__` to access app attributes."""
+def get_app_attribute(name: str):
+    """
+    A function to assign to an app module `__getattr__` to access app attributes.
+    """
+    app_obj: BaseApp
     try:
-        app_obj = App.get_instance()
+        app_obj = cast("App", App.get_instance())
     except RuntimeError:
-        app_obj = BaseApp.get_instance()
+        app_obj = cast("BaseApp", BaseApp.get_instance())
     try:
         return getattr(app_obj, name)
     except AttributeError:
         raise AttributeError(f"module {app_obj.module!r} has no attribute {name!r}.")
 
 
-def get_app_module_all():
+def get_app_module_all() -> list[str]:
     """
     The list of all symbols exported by this module.
     """
-    return ["app"] + list(sdk_classes.keys()) + list(sdk_funcs)
+    return ["app", *sdk_classes, *sdk_funcs]
 
 
-def get_app_module_dir():
+def get_app_module_dir() -> Callable[[], list[str]]:
     """
     The sorted list of all symbols exported by this module.
     """
     return lambda: sorted(get_app_module_all())
 
 
-class Singleton(type):
+class Singleton(type, Generic[T]):
     """
     Metaclass that enforces that only one instance of a class can be made.
+
+    Type Parameters
+    ---------------
+    T
+        The type of the class that is a singleton.
     """
 
-    _instances = {}
+    _instances: ClassVar[dict[Singleton, Any]] = {}
+
+    def __call__(cls: Singleton[T], *args, **kwargs) -> T:
+        """
+        Get the current instance or make it if it doesn't already exist.
 
-    def __call__(cls, *args, **kwargs):
+        Return
+        ------
+        T:
+            The unique instance of the class.
+        """
         SDK_logger.info(
             f"App metaclass __call__: "
             f"name={kwargs['name']!r}, version={kwargs['version']!r}."
@@ -155,8 +422,15 @@ class Singleton(type):
             cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
         return cls._instances[cls]
 
-    def get_instance(cls):
-        """Retrieve the instance of the singleton class if initialised."""
+    def get_instance(cls: Singleton[T]) -> T:
+        """
+        Retrieve the instance of the singleton class if initialised.
+
+        Raises
+        ------
+        RuntimeError
+            If there is no instance already.
+        """
         try:
             return cls._instances[cls]
         except KeyError:
@@ -164,7 +438,8 @@ class Singleton(type):
 
 
 class BaseApp(metaclass=Singleton):
-    """Class to generate the hpcflow application.
+    """
+    Class to generate the hpcflow application.
 
     Parameters
     ----------
@@ -206,28 +481,29 @@ class BaseApp(metaclass=Singleton):
         URL to documentation.
     """
 
-    _known_subs_file_name = "known_submissions.txt"
-    _known_subs_file_sep = "::"
-    _submission_ts_fmt = r"%Y-%m-%d %H:%M:%S.%f"
+    _known_subs_file_name: ClassVar = "known_submissions.txt"
+    _known_subs_file_sep: ClassVar = "::"
+    _submission_ts_fmt: ClassVar = r"%Y-%m-%d %H:%M:%S.%f"
+    __load_pending: ClassVar = False
 
     def __init__(
         self,
-        name,
-        version,
-        module,
-        description,
-        gh_org,
-        gh_repo,
-        config_options,
-        scripts_dir,
-        workflows_dir: str = None,
-        demo_data_dir: str = None,
-        demo_data_manifest_dir: str = None,
-        template_components: Dict = None,
-        pytest_args=None,
-        package_name=None,
-        docs_import_conv=None,
-        docs_url=None,
+        name: str,
+        version: str,
+        module: str,
+        description: str,
+        gh_org: str,
+        gh_repo: str,
+        config_options: ConfigOptions,
+        scripts_dir: str,
+        workflows_dir: str | None = None,
+        demo_data_dir: str | None = None,
+        demo_data_manifest_dir: str | None = None,
+        template_components: dict[str, list[dict]] | None = None,
+        pytest_args: list[str] | None = None,
+        package_name: str | None = None,
+        docs_import_conv: str | None = None,
+        docs_url: str | None = None,
     ):
         SDK_logger.info(f"Generating {self.__class__.__name__} {name!r}.")
 
@@ -262,87 +538,1098 @@ class BaseApp(metaclass=Singleton):
         #: URL to documentation.
         self.docs_url = docs_url
 
-        #: Command line interface subsystem.
-        self.cli = make_cli(self)
+        #: Command line interface subsystem.
+        self.cli = make_cli(self)
+
+        self._log = AppLog(self)
+        self._run_time_info = RunTimeInfo(
+            self.name,
+            self.package_name,
+            self.version,
+            self.runtime_info_logger,
+        )
+
+        self._builtin_template_components = template_components or {}
+
+        self._config: Config | None = (
+            None  # assigned on first access to `config` property
+        )
+        self._config_files: dict[
+            str, ConfigFile
+        ] = {}  # assigned on config load, keys are string absolute paths
+
+        # Set by `_load_template_components`:
+        self._template_components: TemplateComponents = {}
+        self._parameters: _ParametersList | None = None
+        self._command_files: _CommandFilesList | None = None
+        self._environments: _EnvironmentsList | None = None
+        self._task_schemas: _TaskSchemasList | None = None
+        self._scripts: dict[str, Path] | None = None
+
+        self.__app_type_cache: dict[str, type] = {}
+        self.__app_func_cache: dict[str, Callable[..., Any]] = {}
+
+        # assigned on first access to respective properties
+        self._user_data_dir: Path | None = None
+        self._user_cache_dir: Path | None = None
+        self._user_runtime_dir: Path | None = None
+        self._user_data_hostname_dir: Path | None = None
+        self._user_cache_hostname_dir: Path | None = None
+        self._demo_data_cache_dir: Path | None = None
+
+    @property
+    def ElementActionRun(self) -> type[ElementActionRun]:
+        """
+        The :class:`ElementActionRun` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementActionRun")
+
+    @property
+    def ElementAction(self) -> type[ElementAction]:
+        """
+        The :class:`ElementAction` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementAction")
+
+    @property
+    def ElementFilter(self) -> type[ElementFilter]:
+        """
+        The :class:`ElementFilter` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementFilter")
+
+    @property
+    def ElementGroup(self) -> type[ElementGroup]:
+        """
+        The :class:`ElementGroup` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementGroup")
+
+    @property
+    def Environment(self) -> type[Environment]:
+        """
+        The :class:`Environment` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Environment")
+
+    @property
+    def Executable(self) -> type[_Executable]:
+        """
+        The :class:`Executable` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Executable")
+
+    @property
+    def ExecutableInstance(self) -> type[ExecutableInstance]:
+        """
+        The :class:`ExecutableInstance` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ExecutableInstance")
+
+    @property
+    def NumCores(self) -> type[NumCores]:
+        """
+        The :class:`NumCores` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("NumCores")
+
+    @property
+    def ActionEnvironment(self) -> type[ActionEnvironment]:
+        """
+        The :class:`ActionEnvironment` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ActionEnvironment")
+
+    @property
+    def Action(self) -> type[Action]:
+        """
+        The :class:`Action` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Action")
+
+    @property
+    def ActionRule(self) -> type[ActionRule]:
+        """
+        The :class:`ActionRule` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ActionRule")
+
+    @property
+    def ActionScope(self) -> type[ActionScope]:
+        """
+        The :class:`ActionScope` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ActionScope")
+
+    @property
+    def ActionScopeType(self) -> type[ActionScopeType]:
+        """
+        The :class:`ActionScopeType` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ActionScopeType")
+
+    @property
+    def FileSpec(self) -> type[FileSpec]:
+        """
+        The :class:`FileSpec` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("FileSpec")
+
+    @property
+    def FileNameSpec(self) -> type[FileNameSpec]:
+        """
+        The :class:`FileNameSpec` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("FileNameSpec")
+
+    @property
+    def FileNameStem(self) -> type[FileNameStem]:
+        """
+        The :class:`FileNameStem` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("FileNameStem")
+
+    @property
+    def FileNameExt(self) -> type[FileNameExt]:
+        """
+        The :class:`FileNameExt` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("FileNameExt")
+
+    @property
+    def OutputFileParser(self) -> type[OutputFileParser]:
+        """
+        The :class:`OutputFileParser` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("OutputFileParser")
+
+    @property
+    def InputSource(self) -> type[InputSource]:
+        """
+        The :class:`InputSource` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("InputSource")
+
+    @property
+    def InputSourceType(self) -> type[InputSourceType]:
+        """
+        The :class:`InputSourceType` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("InputSourceType")
+
+    @property
+    def ValueSequence(self) -> type[ValueSequence]:
+        """
+        The :class:`ValueSequence` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ValueSequence")
+
+    @property
+    def SchemaInput(self) -> type[SchemaInput]:
+        """
+        The :class:`SchemaInput` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("SchemaInput")
+
+    @property
+    def InputFileGenerator(self) -> type[InputFileGenerator]:
+        """
+        The :class:`InputFileGenerator` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("InputFileGenerator")
+
+    @property
+    def Command(self) -> type[Command]:
+        """
+        The :class:`Command` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Command")
+
+    @property
+    def ElementInputs(self) -> type[ElementInputs]:
+        """
+        The :class:`ElementInputs` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementInputs")
+
+    @property
+    def ElementOutputs(self) -> type[ElementOutputs]:
+        """
+        The :class:`ElementOutputs` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementOutputs")
+
+    @property
+    def ElementInputFiles(self) -> type[ElementInputFiles]:
+        """
+        The :class:`ElementInputFiles` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementInputFiles")
+
+    @property
+    def ElementOutputFiles(self) -> type[ElementOutputFiles]:
+        """
+        The :class:`ElementOutputFiles` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementOutputFiles")
+
+    @property
+    def ElementResources(self) -> type[ElementResources]:
+        """
+        The :class:`ElementResources` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementResources")
+
+    @property
+    def ElementIteration(self) -> type[ElementIteration]:
+        """
+        The :class:`ElementIteration` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementIteration")
+
+    @property
+    def ElementSet(self) -> type[ElementSet]:
+        """
+        The :class:`ElementSet` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementSet")
+
+    @property
+    def Element(self) -> type[Element]:
+        """
+        The :class:`Element` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Element")
+
+    @property
+    def ElementParameter(self) -> type[ElementParameter]:
+        """
+        The :class:`ElementParameter` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementParameter")
+
+    @property
+    def Loop(self) -> type[Loop]:
+        """
+        The :class:`Loop` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Loop")
+
+    @property
+    def WorkflowLoop(self) -> type[WorkflowLoop]:
+        """
+        The :class:`WorkflowLoop` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("WorkflowLoop")
+
+    @property
+    def CommandFilesList(self) -> type[_CommandFilesList]:
+        """
+        The :class:`CommandFilesList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("CommandFilesList")
+
+    @property
+    def EnvironmentsList(self) -> type[_EnvironmentsList]:
+        """
+        The :class:`EnvironmentsList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("EnvironmentsList")
+
+    @property
+    def ExecutablesList(self) -> type[ExecutablesList]:
+        """
+        The :class:`ExecutablesList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ExecutablesList")
+
+    @property
+    def GroupList(self) -> type[GroupList]:
+        """
+        The :class:`GroupList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("GroupList")
+
+    @property
+    def ParametersList(self) -> type[_ParametersList]:
+        """
+        The :class:`ParametersList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ParametersList")
+
+    @property
+    def ResourceList(self) -> type[ResourceList]:
+        """
+        The :class:`ResourceList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ResourceList")
+
+    @property
+    def ResourceSpec(self) -> type[ResourceSpec]:
+        """
+        The :class:`ResourceSpec` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ResourceSpec")
+
+    @property
+    def TaskList(self) -> type[TaskList]:
+        """
+        The :class:`TaskList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskList")
+
+    @property
+    def TaskSchemasList(self) -> type[_TaskSchemasList]:
+        """
+        The :class:`TaskSchemasList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskSchemasList")
+
+    @property
+    def TaskTemplateList(self) -> type[TaskTemplateList]:
+        """
+        The :class:`TaskTemplateList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskTemplateList")
+
+    @property
+    def WorkflowLoopList(self) -> type[WorkflowLoopList]:
+        """
+        The :class:`WorkflowLoopList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("WorkflowLoopList")
+
+    @property
+    def WorkflowTaskList(self) -> type[WorkflowTaskList]:
+        """
+        The :class:`WorkflowTaskList` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("WorkflowTaskList")
+
+    @property
+    def SchemaParameter(self) -> type[SchemaParameter]:
+        """
+        The :class:`SchemaParameter` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("SchemaParameter")
+
+    @property
+    def SchemaOutput(self) -> type[SchemaOutput]:
+        """
+        The :class:`SchemaOutput` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("SchemaOutput")
+
+    @property
+    def Rule(self) -> type[Rule]:
+        """
+        The :class:`Rule` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Rule")
+
+    @property
+    def RunDirAppFiles(self) -> type[RunDirAppFiles]:
+        """
+        The :class:`RunDirAppFiles` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("RunDirAppFiles")
+
+    @property
+    def WorkflowTask(self) -> type[WorkflowTask]:
+        """
+        The :class:`WorkflowTask` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("WorkflowTask")
+
+    @property
+    def Parameters(self) -> type[Parameters]:
+        """
+        The :class:`Parameters` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Parameters")
+
+    @property
+    def Parameter(self) -> type[Parameter]:
+        """
+        The :class:`Parameter` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Parameter")
+
+    @property
+    def ParameterValue(self) -> type[ParameterValue]:
+        """
+        The :class:`ParameterValue` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ParameterValue")
+
+    @property
+    def InputValue(self) -> type[InputValue]:
+        """
+        The :class:`InputValue` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("InputValue")
+
+    @property
+    def Task(self) -> type[Task]:
+        """
+        The :class:`Task` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Task")
+
+    @property
+    def TaskSchema(self) -> type[TaskSchema]:
+        """
+        The :class:`TaskSchema` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskSchema")
+
+    @property
+    def TaskSourceType(self) -> type[TaskSourceType]:
+        """
+        The :class:`TaskSourceType` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskSourceType")
+
+    @property
+    def TaskObjective(self) -> type[TaskObjective]:
+        """
+        The :class:`TaskObjective` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskObjective")
+
+    @property
+    def TaskInputParameters(self) -> type[TaskInputParameters]:
+        """
+        The :class:`TaskInputParameters` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskInputParameters")
+
+    @property
+    def TaskOutputParameters(self) -> type[TaskOutputParameters]:
+        """
+        The :class:`TaskOutputParameters` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("TaskOutputParameters")
+
+    @property
+    def ElementPropagation(self) -> type[ElementPropagation]:
+        """
+        The :class:`ElementPropagation` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("ElementPropagation")
+
+    @property
+    def WorkflowTemplate(self) -> type[_WorkflowTemplate]:
+        """
+        The :class:`WorkflowTemplate` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("WorkflowTemplate")
+
+    @property
+    def Workflow(self) -> type[_Workflow]:
+        """
+        The :class:`Workflow` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Workflow")
+
+    @property
+    def Jobscript(self) -> type[Jobscript]:
+        """
+        The :class:`Jobscript` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Jobscript")
+
+    @property
+    def Submission(self) -> type[Submission]:
+        """
+        The :class:`Submission` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("Submission")
+
+    @property
+    def DirectPosix(self) -> type[DirectPosix]:
+        """
+        The :class:`DirectPosix` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("DirectPosix")
+
+    @property
+    def DirectWindows(self) -> type[DirectWindows]:
+        """
+        The :class:`DirectWindows` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("DirectWindows")
+
+    @property
+    def SGEPosix(self) -> type[SGEPosix]:
+        """
+        The :class:`SGEPosix` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("SGEPosix")
+
+    @property
+    def SlurmPosix(self) -> type[SlurmPosix]:
+        """
+        The :class:`SlurmPosix` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("SlurmPosix")
+
+    @property
+    def QueuedScheduler(self) -> type[QueuedScheduler]:
+        """
+        The :class:`QueuedScheduler` class.
+
+        :meta private:
+        """
+        return self._get_app_core_class("QueuedScheduler")
+
+    @property
+    def make_workflow(self) -> _MakeWorkflow:
+        """
+        Generate a new workflow from a file or string containing a workflow
+        template parametrisation.
+
+        Parameters
+        ----------
+        template_path_or_str: str
+            Either a path to a template file in YAML or JSON format, or a YAML/JSON string.
+        is_string: bool
+            Determines if passing a file path or a string.
+        template_format: str
+            If specified, one of "json" or "yaml". This forces parsing from a particular
+            format.
+        path: str | Path
+            The directory in which the workflow will be generated. The current directory
+            if not specified.
+        name: str
+            The name of the workflow. If specified, the workflow directory will be `path`
+            joined with `name`. If not specified the workflow template name will be used,
+            in combination with a date-timestamp.
+        overwrite: bool
+            If True and the workflow directory (`path` + `name`) already exists, the
+            existing directory will be overwritten.
+        store: str
+            The persistent store type to use.
+        ts_fmt: str
+            The datetime format to use for storing datetimes. Datetimes are always stored
+            in UTC (because Numpy does not store time zone info), so this should not
+            include a time zone name.
+        ts_name_fmt: str
+            The datetime format to use when generating the workflow name, where it
+            includes a timestamp.
+        store_kwargs: dict[str, object]
+            Keyword arguments to pass to the store's `write_empty_workflow` method.
+        variables: dict[str, str]
+            String variables to substitute in `template_file_or_str`.
+        status: bool
+            If True, display a live status to track workflow creation progress.
+
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        """
+        return self.__get_app_func("make_workflow")
+
+    @property
+    def make_demo_workflow(self) -> _MakeDemoWorkflow:
+        """
+        Generate a new workflow from a builtin demo workflow template.
+
+        Parameters
+        ----------
+        workflow_name: str
+            Name of the demo workflow to make.
+        template_format: str
+            If specified, one of "json" or "yaml". This forces parsing from a particular
+            format.
+        path: str | Path
+            The directory in which the workflow will be generated. The current directory
+            if not specified.
+        name: str
+            The name of the workflow. If specified, the workflow directory will be `path`
+            joined with `name`. If not specified the workflow template name will be used,
+            in combination with a date-timestamp.
+        overwrite: bool
+            If True and the workflow directory (`path` + `name`) already exists, the
+            existing directory will be overwritten.
+        store: str
+            The persistent store type to use.
+        ts_fmt: str
+            The datetime format to use for storing datetimes. Datetimes are always stored
+            in UTC (because Numpy does not store time zone info), so this should not
+            include a time zone name.
+        ts_name_fmt: str
+            The datetime format to use when generating the workflow name, where it
+            includes a timestamp.
+        store_kwargs: dict[str, object]
+            Keyword arguments to pass to the store's `write_empty_workflow` method.
+        variables: dict[str, str]
+            String variables to substitute in the demo workflow template file.
+        status: bool
+            If True, display a live status to track workflow creation progress.
+
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        """
+        return self.__get_app_func("make_demo_workflow")
+
+    @property
+    def make_and_submit_workflow(self) -> _MakeAndSubmitWorkflow:
+        """
+        Generate and submit a new workflow from a file or string containing a
+        workflow template parametrisation.
+
+        Parameters
+        ----------
+
+        template_path_or_str: str
+            Either a path to a template file in YAML or JSON format, or a YAML/JSON string.
+        is_string: str
+            Determines whether `template_path_or_str` is a string or a file.
+        template_format: str
+            If specified, one of "json" or "yaml". This forces parsing from a particular
+            format.
+        path: str | Path
+            The directory in which the workflow will be generated. The current directory
+            if not specified.
+        name: str
+            The name of the workflow. If specified, the workflow directory will be `path`
+            joined with `name`. If not specified the `WorkflowTemplate` name will be used,
+            in combination with a date-timestamp.
+        overwrite: bool
+            If True and the workflow directory (`path` + `name`) already exists, the
+            existing directory will be overwritten.
+        store: str
+            The persistent store to use for this workflow.
+        ts_fmt: str
+            The datetime format to use for storing datetimes. Datetimes are always stored
+            in UTC (because Numpy does not store time zone info), so this should not
+            include a time zone name.
+        ts_name_fmt: str
+            The datetime format to use when generating the workflow name, where it
+            includes a timestamp.
+        store_kwargs: dict[str, object]
+            Keyword arguments to pass to the store's `write_empty_workflow` method.
+        variables: dict[str, str]
+            String variables to substitute in `template_file_or_str`.
+        JS_parallelism: bool
+            If True, allow multiple jobscripts to execute simultaneously. Raises if set to
+            True but the store type does not support the `jobscript_parallelism` feature. If
+            not set, jobscript parallelism will be used if the store type supports it.
+        wait: bool
+            If True, this command will block until the workflow execution is complete.
+        add_to_known: bool
+            If True, add the new submission to the known-submissions file, which is
+            used by the `show` command to monitor current and recent submissions.
+        return_idx: bool
+            If True, return a dict representing the jobscript indices submitted for each
+            submission.
+        tasks: list[int]
+            List of task indices to include in this submission. By default all tasks are
+            included.
+        cancel: bool
+            Immediately cancel the submission. Useful for testing and benchmarking.
+        status: bool
+            If True, display a live status to track workflow creation and submission
+            progress.
+
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        dict[int, list[int]]
+            Mapping of submission handles. If requested by ``return_idx`` parameter.
+        """
+        return self.__get_app_func("make_and_submit_workflow")
+
+    @property
+    def make_and_submit_demo_workflow(self) -> _MakeAndSubmitDemoWorkflow:
+        """
+        Generate and submit a new demo workflow from a file or string containing a
+        workflow template parametrisation.
+
+        Parameters
+        ----------
+        workflow_name: str
+            Name of the demo workflow to make. **Required.**
+        template_format: str
+            If specified, one of "json" or "yaml". This forces parsing from a particular
+            format.
+        path: str | Path
+            The directory in which the workflow will be generated. The current directory
+            if not specified.
+        name: str
+            The name of the workflow. If specified, the workflow directory will be `path`
+            joined with `name`. If not specified the `WorkflowTemplate` name will be used,
+            in combination with a date-timestamp.
+        overwrite: bool
+            If True and the workflow directory (`path` + `name`) already exists, the
+            existing directory will be overwritten.
+        store: str
+            The persistent store to use for this workflow.
+        ts_fmt: str
+            The datetime format to use for storing datetimes. Datetimes are always stored
+            in UTC (because Numpy does not store time zone info), so this should not
+            include a time zone name.
+        ts_name_fmt: str
+            The datetime format to use when generating the workflow name, where it
+            includes a timestamp.
+        store_kwargs: dict[str, object]
+            Keyword arguments to pass to the store's `write_empty_workflow` method.
+        variables: dict[str, str]
+            String variables to substitute in the demo workflow template file.
+        JS_parallelism: bool
+            If True, allow multiple jobscripts to execute simultaneously. Raises if set to
+            True but the store type does not support the `jobscript_parallelism` feature. If
+            not set, jobscript parallelism will be used if the store type supports it.
+        wait: bool
+            If True, this command will block until the workflow execution is complete.
+        add_to_known: bool
+            If True, add the new submission to the known-submissions file, which is
+            used by the `show` command to monitor current and recent submissions.
+        return_idx: bool
+            If True, return a dict representing the jobscript indices submitted for each
+            submission.
+        tasks: list[int]
+            List of task indices to include in this submission. By default all tasks are
+            included.
+        cancel: bool
+            Immediately cancel the submission. Useful for testing and benchmarking.
+        status: bool
+            If True, display a live status to track submission progress.
+
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        dict[int, list[int]]
+            Mapping of submission handles. If requested by ``return_idx`` parameter.
+        """
+        return self.__get_app_func("make_and_submit_demo_workflow")
+
+    @property
+    def submit_workflow(self) -> _SubmitWorkflow:
+        """
+        Submit an existing workflow.
+
+        Parameters
+        ----------
+        workflow_path: str
+            Path to an existing workflow
+        JS_parallelism: bool
+            If True, allow multiple jobscripts to execute simultaneously. Raises if set to
+            True but the store type does not support the `jobscript_parallelism` feature. If
+            not set, jobscript parallelism will be used if the store type supports it.
+        tasks: list[int]
+            List of task indices to include in this submission. By default all tasks are
+            included.
+
+        Returns
+        -------
+        dict[int, list[int]]
+            Mapping of submission handles. If requested by ``return_idx`` parameter.
+        """
+        return self.__get_app_func("submit_workflow")
+
+    @property
+    def run_hpcflow_tests(self) -> _RunTests:
+        """Run hpcflow test suite. This function is only available from derived apps."""
+        return self.__get_app_func("run_hpcflow_tests")
+
+    @property
+    def run_tests(self) -> _RunTests:
+        """Run the test suite."""
+        return self.__get_app_func("run_tests")
+
+    @property
+    def get_OS_info(self) -> Callable[[], Mapping[str, str]]:
+        """
+        Get information about the operating system.
+
+        Returns
+        -------
+        dict[str, str]
+            Key-value mapping containing system version information.
+        """
+        return self.__get_app_func("get_OS_info")
+
+    @property
+    def get_shell_info(self) -> Callable[[str, bool], VersionInfo]:
+        """
+        Get information about a given shell and the operating system.
+
+        Parameters
+        ----------
+        shell_name: str
+            One of the supported shell names.
+        exclude_os: bool
+            If True, exclude operating system information.
+
+        Returns
+        -------
+        VersionInfo
+            The shell version information descriptor.
+        """
+        return self.__get_app_func("get_shell_info")
+
+    @property
+    def get_known_submissions(self) -> _GetKnownSubmissions:
+        """
+        Retrieve information about active and recently inactive finished workflows.
+
+        This method removes workflows from the known-submissions file that are found to be
+        inactive on this machine (according to the scheduler/process ID).
+
+        Parameters
+        ----------
+        max_recent: int
+            Maximum number of inactive workflows to retrieve.
+        no_update: bool
+            If True, do not update the known-submissions file to set submissions that are
+            now inactive.
+        as_json: bool
+            If True, only include JSON-compatible information. This will exclude the
+            `submission` key, for instance.
 
-        self._log = AppLog(self)
-        self._run_time_info: RunTimeInfo = RunTimeInfo(
-            self.name,
-            self.package_name,
-            self.version,
-            self.runtime_info_logger,
-        )
+        Returns
+        -------
+        list[KnownSubmissionItem]
+            List of descriptions of known items.
+        """
+        return self.__get_app_func("get_known_submissions")
 
-        self._builtin_template_components = template_components or {}
+    @property
+    def show(self) -> _Show:
+        """
+        Show information about running workflows.
 
-        self._config = None  # assigned on first access to `config` property
-        self._config_files = {}  # assigned on config load, keys are string absolute paths
+        Parameters
+        ----------
+        max_recent: int
+            Maximum number of inactive workflows to show.
+        full: bool
+            If True, provide more information; output may spans multiple lines for each
+            workflow submission.
+        no_update: bool
+            If True, do not update the known-submissions file to remove workflows that are
+            no longer running.
+        """
+        return self.__get_app_func("show")
 
-        # Set by `_load_template_components`:
-        self._template_components = {}
-        self._parameters = None
-        self._command_files = None
-        self._environments = None
-        self._task_schemas = None
-        self._scripts = None
+    @property
+    def show_legend(self) -> Callable[[], None]:
+        """
+        Output a legend for the jobscript-element and EAR states that are displayed
+        by the `show` command.
+        """
+        return self.__get_app_func("show_legend")
 
-        self._app_attr_cache = {}
+    @property
+    def cancel(self) -> _Cancel:
+        """
+        Cancel the execution of a workflow submission.
 
-        # assigned on first access to respective properties
-        self._user_data_dir = None
-        self._user_cache_dir = None
-        self._user_runtime_dir = None
-        self._user_data_hostname_dir = None
-        self._user_cache_hostname_dir = None
-        self._demo_data_cache_dir = None
-
-    def __getattr__(self, name):
+        Parameters
+        ----------
+        workflow_ref: int | str | Path
+            Which workflow to cancel, by ID or path.
+        ref_is_path: str
+            One of "``id``", "``path``" or "``assume-id``" (the default)
+        """
+        return self.__get_app_func("cancel")
+
+    def __getattr__(self, name: str):
         if name in sdk_classes:
             return self._get_app_core_class(name)
         elif name in sdk_funcs:
-            return self._get_app_func(name)
+            return self.__get_app_func(name)
         else:
             raise AttributeError(f"module {__name__!r} has no attribute {name!r}.")
 
     def __repr__(self):
         return f"{self.__class__.__name__}(name={self.name!r}, version={self.version!r})"
 
-    def _get_app_core_class(self, name: str) -> Type:
-        if name not in self._app_attr_cache:
-            obj_mod = import_module(sdk_classes[name])
-            cls = getattr(obj_mod, name)
-            if issubclass(cls, enum.Enum):
-                sub_cls = cls
-            else:
-                dct = {}
-                if hasattr(cls, "_app_attr"):
-                    dct = {getattr(cls, "_app_attr"): self}
-                sub_cls = type(cls.__name__, (cls,), dct)
-                if cls.__doc__:
-                    sub_cls.__doc__ = cls.__doc__.format(app_name=self.name)
-            sub_cls.__module__ = self.module
-            self._app_attr_cache[name] = sub_cls
-
-        return self._app_attr_cache[name]
-
-    def _get_app_func(self, name) -> Callable:
-        if name not in self._app_attr_cache:
-
-            def wrap_func(func):
-                # this function avoids scope issues
-                return lambda *args, **kwargs: func(*args, **kwargs)
-
-            # retrieve the "private" function:
-            sdk_func = getattr(self, f"_{name}")
-
-            func = wrap_func(sdk_func)
-            func = wraps(sdk_func)(func)
-            if func.__doc__:
-                func.__doc__ = func.__doc__.format(app_name=self.name)
-            func.__module__ = self.module
-            self._app_attr_cache[name] = func
-
-        return self._app_attr_cache[name]
+    def _get_app_core_class(self, name: str) -> type:
+        if name in self.__app_type_cache:
+            return self.__app_type_cache[name]
+        obj_mod = import_module(sdk_classes[name])
+        cls = getattr(obj_mod, name)
+        if issubclass(cls, enum.Enum):
+            sub_cls = cls
+        else:
+            dct: dict[str, Any] = {}
+            if hasattr(cls, "_app_attr"):
+                dct = {getattr(cls, "_app_attr"): self}
+            sub_cls = type(cls.__name__, (cls,), dct)
+            if cls.__doc__:
+                sub_cls.__doc__ = cls.__doc__.format(app_name=self.name)
+        sub_cls.__module__ = self.module
+        self.__app_type_cache[name] = sub_cls
+        return sub_cls
+
+    def __get_app_func(self, name: str) -> Callable[..., Any]:
+        if name in self.__app_func_cache:
+            return self.__app_func_cache[name]
+
+        def wrap_func(func) -> Callable[..., Any]:
+            # this function avoids scope issues
+            return lambda *args, **kwargs: func(*args, **kwargs)
+
+        # retrieve the "private" function:
+        sdk_func = getattr(self, f"_{name}")
+
+        func = wrap_func(sdk_func)
+        func = wraps(sdk_func)(func)
+        if func.__doc__:
+            func.__doc__ = func.__doc__.format(app_name=self.name)
+        func.__module__ = self.module
+        self.__app_func_cache[name] = func
+        return func
 
     @property
     def run_time_info(self) -> RunTimeInfo:
@@ -370,107 +1657,118 @@ class BaseApp(metaclass=Singleton):
         TimeIt.active = bool(value)
 
     @property
-    def template_components(self) -> Dict[str, ObjectList]:
+    def template_components(self) -> TemplateComponents:
         """
         The template component data.
         """
         if not self.is_template_components_loaded:
+            if BaseApp.__load_pending:
+                return {}
+            BaseApp.__load_pending = True
             self._load_template_components()
+            BaseApp.__load_pending = False
         return self._template_components
 
-    def _ensure_template_component(self, name) -> None:
+    @property
+    def _shared_data(self) -> Mapping[str, Any]:
+        return cast("Mapping[str, Any]", self.template_components)
+
+    def _ensure_template_component(self, name: str) -> None:
         """Invoked by access to individual template components (e.g. parameters)"""
         if not getattr(self, f"_{name}"):
             self._load_template_components(name)
         else:
             self.logger.debug(f"Template component {name!r} already loaded")
 
-    def load_template_components(self, warn=True) -> None:
+    def load_template_components(self, warn: bool = True) -> None:
         """Load all template component data, warning by default if already loaded."""
         if warn and self.is_template_components_loaded:
             warnings.warn("Template components already loaded; reloading now.")
         self._load_template_components()
 
-    def reload_template_components(self, warn=True) -> None:
-        """Reload all template component data, warning by default if not already
-        loaded."""
+    def reload_template_components(self, warn: bool = True) -> None:
+        """
+        Reload all template component data, warning by default if not already
+        loaded.
+        """
         if warn and not self.is_template_components_loaded:
             warnings.warn("Template components not loaded; loading now.")
         self._load_template_components()
 
     @TimeIt.decorator
-    def _load_template_components(self, *include) -> None:
-        """Combine any builtin template components with user-defined template components
-        and initialise list objects."""
-
+    def _load_template_components(self, *include: str) -> None:
+        """
+        Combine any builtin template components with user-defined template components
+        and initialise list objects.
+        """
         if not include or "task_schemas" in include:
             # task schemas require all other template components to be loaded first
-            include = [
+            include = (
                 "parameters",
                 "command_files",
                 "environments",
                 "task_schemas",
                 "scripts",
-            ]
+            )
 
         self.logger.debug(f"Loading template components: {include!r}.")
 
-        self_tc = self._template_components
+        self_tc: Any = self._template_components
 
         if "parameters" in include:
-            params = self._builtin_template_components.get("parameters", [])
+            params: list[Any] = self._builtin_template_components.get("parameters", [])
             for path in self.config.parameter_sources:
                 params.extend(read_YAML_file(path))
-            self_tc["parameters"] = self.ParametersList.from_json_like(
-                params, shared_data=self_tc
-            )
-            self._parameters = self_tc["parameters"]
+            param_list = self.ParametersList.from_json_like(params, shared_data=self_tc)
+            self._template_components["parameters"] = param_list
+            self._parameters = param_list
 
         if "command_files" in include:
-            cmd_files = self._builtin_template_components.get("command_files", [])
+            cmd_files: list[Any] = self._builtin_template_components.get(
+                "command_files", []
+            )
             for path in self.config.command_file_sources:
                 cmd_files.extend(read_YAML_file(path))
-            self_tc["command_files"] = self.CommandFilesList.from_json_like(
-                cmd_files, shared_data=self_tc
-            )
-            self._command_files = self_tc["command_files"]
+            cf_list = self.CommandFilesList.from_json_like(cmd_files, shared_data=self_tc)
+            self._template_components["command_files"] = cf_list
+            self._command_files = cf_list
 
         if "environments" in include:
             envs = []
-            builtin_envs = self._builtin_template_components.get("environments", [])
-            for path in self.config.environment_sources:
-                envs_i_lst = read_YAML_file(path)
-                for env_j in envs_i_lst:
+            builtin_envs: list[Any] = self._builtin_template_components.get(
+                "environments", []
+            )
+            for e_path in self.config.environment_sources:
+                for env_j in read_YAML_file(e_path):
                     for b_idx, builtin_env in enumerate(list(builtin_envs)):
                         # overwrite builtin envs with user-supplied:
                         if builtin_env["name"] == env_j["name"]:
                             builtin_envs.pop(b_idx)
                     envs.append(env_j)
             envs = builtin_envs + envs
-            self_tc["environments"] = self.EnvironmentsList.from_json_like(
-                envs, shared_data=self_tc
-            )
-            self._environments = self_tc["environments"]
+            env_list = self.EnvironmentsList.from_json_like(envs, shared_data=self_tc)
+            self._template_components["environments"] = env_list
+            self._environments = env_list
 
         if "task_schemas" in include:
-            schemas = self._builtin_template_components.get("task_schemas", [])
+            schemas: list[Any] = self._builtin_template_components.get("task_schemas", [])
             for path in self.config.task_schema_sources:
                 schemas.extend(read_YAML_file(path))
-            self_tc["task_schemas"] = self.TaskSchemasList.from_json_like(
-                schemas, shared_data=self_tc
-            )
-            self._task_schemas = self_tc["task_schemas"]
+            ts_list = self.TaskSchemasList.from_json_like(schemas, shared_data=self_tc)
+            self._template_components["task_schemas"] = ts_list
+            self._task_schemas = ts_list
 
         if "scripts" in include:
-            self_tc["scripts"] = self._load_scripts()
-            self._scripts = self_tc["scripts"]
+            scripts = self._load_scripts()
+            self._template_components["scripts"] = scripts
+            self._scripts = scripts
 
         self.logger.info(f"Template components loaded ({include!r}).")
 
     @classmethod
     def load_builtin_template_component_data(
-        cls, package
-    ) -> Dict[str, Union[List, Dict]]:
+        cls, package: ModuleType | str
+    ) -> BasicTemplateComponents:
         """
         Load the template component data built into the package.
         This is as opposed to the template components defined by users.
@@ -478,55 +1776,57 @@ class BaseApp(metaclass=Singleton):
         SDK_logger.info(
             f"Loading built-in template component data for package: {package!r}."
         )
-        components = {}
+        components: BasicTemplateComponents = {}
         for comp_type in TEMPLATE_COMP_TYPES:
-            resource = f"{comp_type}.yaml"
-            fh = resources.files(package).joinpath(resource).open("rt")
-            SDK_logger.info(f"Parsing file as YAML: {fh.name!r}")
-            comp_dat = fh.read()
-            components[comp_type] = read_YAML_str(comp_dat)
-            fh.close()
+            with open_text_resource(package, f"{comp_type}.yaml") as fh:
+                SDK_logger.info(f"Parsing file as YAML: {fh.name!r}")
+                components[comp_type] = read_YAML_str(fh.read())
 
         return components
 
     @property
-    def parameters(self) -> get_app_attribute("ParametersList"):
+    def parameters(self) -> _ParametersList:
         """
         The known template parameters.
         """
         self._ensure_template_component("parameters")
+        assert self._parameters is not None
         return self._parameters
 
     @property
-    def command_files(self) -> get_app_attribute("CommandFilesList"):
+    def command_files(self) -> _CommandFilesList:
         """
         The known template command files.
         """
         self._ensure_template_component("command_files")
+        assert self._command_files is not None
         return self._command_files
 
     @property
-    def envs(self) -> get_app_attribute("EnvironmentsList"):
+    def envs(self) -> _EnvironmentsList:
         """
         The known template execution environments.
         """
         self._ensure_template_component("environments")
+        assert self._environments is not None
         return self._environments
 
     @property
-    def scripts(self):
+    def scripts(self) -> dict[str, Path]:
         """
         The known template scripts.
         """
         self._ensure_template_component("scripts")
+        assert self._scripts is not None
         return self._scripts
 
     @property
-    def task_schemas(self) -> get_app_attribute("TaskSchemasList"):
+    def task_schemas(self) -> _TaskSchemasList:
         """
         The known template task schemas.
         """
         self._ensure_template_component("task_schemas")
+        assert self._task_schemas is not None
         return self._task_schemas
 
     @property
@@ -597,10 +1897,11 @@ class BaseApp(metaclass=Singleton):
         """
         if not self.is_config_loaded:
             self.load_config()
+        assert self._config
         return self._config
 
     @property
-    def scheduler_lookup(self):
+    def scheduler_lookup(self) -> dict[tuple[str, str], type[Scheduler]]:
         """
         The scheduler mapping.
         """
@@ -611,14 +1912,20 @@ class BaseApp(metaclass=Singleton):
             ("slurm", "posix"): self.SlurmPosix,
         }
 
-    def get_scheduler(self, scheduler_name, os_name, scheduler_args=None):
+    def get_scheduler(
+        self,
+        scheduler_name: str,
+        os_name: str,
+        scheduler_args: dict[str, Any] | None = None,
+    ) -> Scheduler:
         """Get an arbitrary scheduler object."""
-        scheduler_args = scheduler_args or {}
+        scheduler_kwargs = scheduler_args or {}
 
         os_name = os_name.lower()
         if os_name == "nt" and "_" in scheduler_name:
             # e.g. WSL on windows uses *_posix
             key = tuple(scheduler_name.split("_"))
+            assert len(key) == 2
         else:
             key = (scheduler_name.lower(), os_name)
 
@@ -628,28 +1935,28 @@ class BaseApp(metaclass=Singleton):
             raise ValueError(
                 f"Unsupported combination of scheduler and operation system: {key!r}"
             )
-        return scheduler_cls(**scheduler_args)
+        return scheduler_cls(**scheduler_kwargs)
 
-    def get_OS_supported_schedulers(self):
-        """Retrieve a list of schedulers that are supported in principle by this operating
+    def get_OS_supported_schedulers(self) -> Iterator[str]:
+        """
+        Retrieve a list of schedulers that are supported in principle by this operating
         system.
 
         This does not necessarily mean all the returned schedulers are available on this
         system.
-
         """
-        out = []
         for k in self.scheduler_lookup:
             if os.name == "nt" and k == ("direct", "posix"):
                 # this is valid for WSL on Windows
-                out.append("_".join(k))
+                yield "_".join(k)
             elif k[1] == os.name:
-                out.append(k[0])
-        return out
+                yield k[0]
 
     def perm_error_retry(self):
-        """Return a decorator for retrying functions on permission and OS errors that
-        might be associated with cloud-storage desktop sync. engine operations."""
+        """
+        Return a decorator for retrying functions on permission and OS errors that
+        might be associated with cloud-storage desktop sync. engine operations.
+        """
         return retry(
             (PermissionError, OSError),
             tries=10,
@@ -696,7 +2003,6 @@ class BaseApp(metaclass=Singleton):
         We segregate by hostname to account for the case where multiple machines might
         use the same shared file system.
         """
-
         # This might need to cover e.g. multiple login nodes, as described in the
         # config file:
         if self._user_data_hostname_dir is None:
@@ -720,13 +2026,15 @@ class BaseApp(metaclass=Singleton):
         return self.user_data_dir
 
     def _ensure_user_runtime_dir(self) -> Path:
-        """Generate a user runtime directory for this machine in which we can create
+        """
+        Generate a user runtime directory for this machine in which we can create
         semi-persistent temporary files.
 
-        Note: unlike `_ensure_user_data_dir`, and `_ensure_user_data_hostname_dir`, this
+        Note
+        ----
+        Unlike `_ensure_user_data_dir`, and `_ensure_user_data_hostname_dir`, this
         method is not invoked on config load, because it might need to be created after
         each reboot, and it is not routinely used.
-
         """
         if not self.user_runtime_dir.exists():
             self.user_runtime_dir.mkdir(parents=True)
@@ -752,8 +2060,10 @@ class BaseApp(metaclass=Singleton):
         return self.demo_data_cache_dir
 
     def _ensure_user_data_hostname_dir(self) -> Path:
-        """Ensure a user data directory for this machine exists (used by the helper
-        process and the known-submissions file)."""
+        """
+        Ensure a user data directory for this machine exists (used by the helper
+        process and the known-submissions file).
+        """
         if not self.user_data_hostname_dir.exists():
             self.user_data_hostname_dir.mkdir(parents=True)
             self.logger.info(
@@ -771,46 +2081,48 @@ class BaseApp(metaclass=Singleton):
             )
         return self.user_cache_hostname_dir
 
-    def clear_user_runtime_dir(self):
+    def clear_user_runtime_dir(self) -> None:
         """Delete the contents of the user runtime directory."""
         if self.user_runtime_dir.exists():
             shutil.rmtree(self.user_runtime_dir)
             self._ensure_user_runtime_dir()
 
-    def clear_user_cache_dir(self):
+    def clear_user_cache_dir(self) -> None:
         """Delete the contents of the cache directory."""
         if self.user_cache_dir.exists():
             shutil.rmtree(self.user_cache_dir)
             self._ensure_user_cache_dir()
 
-    def clear_demo_data_cache_dir(self):
+    def clear_demo_data_cache_dir(self) -> None:
         """Delete the contents of the example data files cache directory."""
         if self.demo_data_cache_dir.exists():
             shutil.rmtree(self.demo_data_cache_dir)
             self._ensure_demo_data_cache_dir()
 
-    def clear_user_cache_hostname_dir(self):
+    def clear_user_cache_hostname_dir(self) -> None:
         """Delete the contents of the hostname-scoped cache directory."""
         if self.user_cache_hostname_dir.exists():
             shutil.rmtree(self.user_cache_hostname_dir)
             self._ensure_user_cache_hostname_dir()
 
     @TimeIt.decorator
-    def _load_config(self, config_dir, config_key, **overrides) -> None:
+    def _load_config(
+        self, config_dir: PathLike, config_key: str | None, **overrides
+    ) -> None:
         self.logger.info("Loading configuration.")
         self._ensure_user_data_dir()
-        config_dir = ConfigFile._resolve_config_dir(
+        resolved_config_dir = ConfigFile._resolve_config_dir(
             config_opt=self.config_options,
             logger=self.config_logger,
             directory=config_dir,
         )
-        if str(config_dir) not in self._config_files:
-            self._config_files[str(config_dir)] = ConfigFile(
-                directory=config_dir,
+        if str(resolved_config_dir) not in self._config_files:
+            self._config_files[str(resolved_config_dir)] = ConfigFile(
+                directory=resolved_config_dir,
                 logger=self.config_logger,
                 config_options=self.config_options,
             )
-        file = self._config_files[str(config_dir)]
+        file = self._config_files[str(resolved_config_dir)]
         self._config = Config(
             app=self,
             config_file=file,
@@ -830,26 +2142,35 @@ class BaseApp(metaclass=Singleton):
 
     def load_config(
         self,
-        config_dir=None,
-        config_key=None,
-        warn=True,
+        config_dir: PathLike = None,
+        config_key: str | None = None,
+        warn: bool = True,
         **overrides,
     ) -> None:
         """
         Load the user's configuration.
+
+        Parameters
+        ----------
+        config_dir:
+            Directory containing the configuration, if not default.
+        config_key:
+            Key to the configuration within the config file.
+        warn:
+            Whether to warn if a configuration is already loaded.
         """
         if warn and self.is_config_loaded:
             warnings.warn("Configuration is already loaded; reloading.")
         self._load_config(config_dir, config_key, **overrides)
 
-    def unload_config(self):
+    def unload_config(self) -> None:
         """
         Discard any loaded configuration.
         """
         self._config_files = {}
         self._config = None
 
-    def get_config_path(self, config_dir=None):
+    def get_config_path(self, config_dir: PathLike = None) -> Path:
         """Return the full path to the config file, without loading the config."""
         config_dir = ConfigFile._resolve_config_dir(
             config_opt=self.config_options,
@@ -858,7 +2179,7 @@ class BaseApp(metaclass=Singleton):
         )
         return ConfigFile.get_config_file_path(config_dir)
 
-    def _delete_config_file(self, config_dir=None):
+    def _delete_config_file(self, config_dir: PathLike = None) -> None:
         """Delete the config file."""
         config_path = self.get_config_path(config_dir=config_dir)
         self.logger.info(f"deleting config file: {str(config_path)!r}.")
@@ -866,13 +2187,13 @@ class BaseApp(metaclass=Singleton):
 
     def reset_config(
         self,
-        config_dir=None,
-        config_key=None,
-        warn=True,
+        config_dir: PathLike = None,
+        config_key: str | None = None,
+        warn: bool = True,
         **overrides,
     ) -> None:
         """Reset the config file to defaults, and reload the config."""
-        self.logger.info(f"resetting config")
+        self.logger.info("resetting config")
         self._delete_config_file(config_dir=config_dir)
         self._config = None
         self._config_files = {}
@@ -880,9 +2201,9 @@ class BaseApp(metaclass=Singleton):
 
     def reload_config(
         self,
-        config_dir=None,
-        config_key=None,
-        warn=True,
+        config_dir: PathLike = None,
+        config_key: str | None = None,
+        warn: bool = True,
         **overrides,
     ) -> None:
         """
@@ -896,59 +2217,61 @@ class BaseApp(metaclass=Singleton):
         self._load_config(config_dir, config_key, **overrides)
 
     @TimeIt.decorator
-    def _load_scripts(self):
-
+    def _load_scripts(self) -> dict[str, Path]:
+        """
+        Discover where the built-in scripts all are.
+        """
         # TODO: load custom directories / custom functions (via decorator)
         scripts_package = f"{self.package_name}.{self.scripts_dir}"
 
-        ctx = resources.as_file(resources.files(scripts_package))
-
-        scripts = {}
-        with ctx as path:
-            for dirpath, _, filenames in os.walk(path):
-                dirpath = Path(dirpath)
-                if dirpath.name == "__pycache__":
-                    continue
-                for filename in filenames:
-                    if filename == "__init__.py":
+        scripts: dict[str, Path] = {}
+        try:
+            with get_file_context(scripts_package) as path:
+                for dirpath, _, filenames in os.walk(path):
+                    dirpath_ = Path(dirpath)
+                    if dirpath_.name == "__pycache__":
                         continue
-                    val = dirpath.joinpath(filename)
-                    key = str(val.relative_to(path).as_posix())
-                    scripts[key] = Path(val)
-
+                    for filename in filenames:
+                        if filename == "__init__.py":
+                            continue
+                        val = dirpath_.joinpath(filename)
+                        scripts[val.relative_to(path).as_posix()] = Path(val)
+        except ModuleNotFoundError:
+            self.logger.exception("failed to find scripts package")
+        SDK_logger.info(f"loaded {len(scripts)} scripts from {scripts_package}")
         return scripts
 
-    def _get_demo_workflows(self) -> Dict[str, Path]:
+    def _get_demo_workflows(self) -> dict[str, Path]:
         """Get all builtin demo workflow template file paths."""
-        templates = {}
+        templates: dict[str, Path] = {}
         pkg = f"{self.package_name}.{self.workflows_dir}"
-        files = resources.files(pkg).iterdir()
-        for i in files:
-            if i.suffix in (".yaml", ".yml", ".json", ".jsonc"):
-                templates[i.stem] = i
+        for file in resources.files(pkg).iterdir():
+            p = Path(str(file))
+            if p.exists() and p.suffix in (".yaml", ".yml", ".json", ".jsonc"):
+                templates[p.stem] = p
         return templates
 
-    def list_demo_workflows(self) -> Tuple[str]:
+    def list_demo_workflows(self) -> tuple[str, ...]:
         """Return a list of demo workflow templates included in the app."""
-        return tuple(sorted(self._get_demo_workflows().keys()))
+        return tuple(sorted(self._get_demo_workflows()))
 
     @contextmanager
     def get_demo_workflow_template_file(
         self, name: str, doc: bool = True, delete: bool = True
-    ) -> Path:
-        """Context manager to get a (temporary) file path to an included demo workflow
+    ) -> Iterator[Path]:
+        """
+        Context manager to get a (temporary) file path to an included demo workflow
         template.
 
         Parameters
         ----------
-        name
+        name:
             Name of the builtin demo workflow template whose file path is to be retrieved.
-        doc
+        doc:
             If False, the yielded path will be to a file without the `doc` attribute (if
             originally present).
-        delete
+        delete:
             If True, remove the temporary file on exit.
-
         """
         tmp_dir = self._ensure_user_runtime_dir()
         builtin_path = self._get_demo_workflows()[name]
@@ -961,12 +2284,12 @@ class BaseApp(metaclass=Singleton):
             # load the file, modify, then dump to temp location:
             if builtin_path.suffix in (".yaml", ".yml"):
                 # use round-trip loader to preserve comments:
-                data = read_YAML_file(builtin_path, typ="rt", variables=False)
+                data = read_YAML_file(builtin_path, typ="rt", variables={})
                 data.pop("doc", None)
                 write_YAML_file(data, path, typ="rt")
 
             elif builtin_path.suffix in (".json", ".jsonc"):
-                data = read_JSON_file(builtin_path, variables=False)
+                data = read_JSON_file(builtin_path, variables={})
                 data.pop("doc", None)
                 write_JSON_file(data, path)
 
@@ -976,9 +2299,10 @@ class BaseApp(metaclass=Singleton):
             path.unlink()
 
     def copy_demo_workflow(
-        self, name: str, dst: Optional[PathLike] = None, doc: bool = True
+        self, name: str, dst: PathLike | None = None, doc: bool = True
     ) -> str:
-        """Copy a builtin demo workflow to the specified location.
+        """
+        Copy a builtin demo workflow to the specified location.
 
         Parameters
         ----------
@@ -991,7 +2315,6 @@ class BaseApp(metaclass=Singleton):
             If False, the copied workflow template file will not include the `doc`
             attribute (if originally present).
         """
-
         dst = dst or Path(".")
         with self.get_demo_workflow_template_file(name, doc=doc) as src:
             shutil.copy2(src, dst)  # copies metadata, and `dst` can be a dir
@@ -999,15 +2322,16 @@ class BaseApp(metaclass=Singleton):
         return src.name
 
     def show_demo_workflow(self, name: str, syntax: bool = True, doc: bool = False):
-        """Print the contents of a builtin demo workflow template file.
+        """
+        Print the contents of a builtin demo workflow template file.
 
         Parameters
         ----------
-        name
+        name:
             The name of the demo workflow file to print.
-        syntax
+        syntax:
             If True, use rich to syntax-highlight the output.
-        doc
+        doc:
             If False, the printed workflow template file contents will not include the
             `doc` attribute (if originally present).
         """
@@ -1017,42 +2341,43 @@ class BaseApp(metaclass=Singleton):
 
             if syntax:
                 fmt = DEMO_WK_FORMATS[path.suffix]
-                contents = Syntax(contents, fmt)
-                console = Console()
-                console.print(contents)
+                Console().print(Syntax(contents, fmt))
             else:
                 print(contents)
 
-    def load_demo_workflow(self, name: str) -> get_app_attribute("WorkflowTemplate"):
+    def load_demo_workflow(self, name: str) -> _WorkflowTemplate:
         """Load a WorkflowTemplate object from a builtin demo template file."""
         with self.get_demo_workflow_template_file(name) as path:
             return self.WorkflowTemplate.from_file(path)
 
-    def template_components_from_json_like(self, json_like):
+    def template_components_from_json_like(
+        self, json_like: dict[str, dict]
+    ) -> TemplateComponents:
         """
-        Get template components from a (simply parsed) JSOM document.
+        Get template components from a (simply parsed) JSON document.
         """
-        cls_lookup = {
-            "parameters": self.ParametersList,
-            "command_files": self.CommandFilesList,
-            "environments": self.EnvironmentsList,
-            "task_schemas": self.TaskSchemasList,
-        }
-        tc = {}
-        for k, v in cls_lookup.items():
-            tc_k = v.from_json_like(
-                json_like.get(k, {}),
-                shared_data=tc,
-                is_hashed=True,
-            )
-            tc[k] = tc_k
+        tc: TemplateComponents = {}
+        sd: Mapping[str, Any] = tc
+        tc["parameters"] = self.ParametersList.from_json_like(
+            json_like.get("parameters", {}), shared_data=sd, is_hashed=True
+        )
+        tc["command_files"] = self.CommandFilesList.from_json_like(
+            json_like.get("command_files", {}), shared_data=sd, is_hashed=True
+        )
+        tc["environments"] = self.EnvironmentsList.from_json_like(
+            json_like.get("environments", {}), shared_data=sd, is_hashed=True
+        )
+        tc["task_schemas"] = self.TaskSchemasList.from_json_like(
+            json_like.get("task_schemas", {}), shared_data=sd, is_hashed=True
+        )
         return tc
 
-    def get_parameter_task_schema_map(self) -> Dict[str, List[List]]:
-        """Get a dict mapping parameter types to task schemas that input/output each
-        parameter."""
-
-        param_map = {}
+    def get_parameter_task_schema_map(self) -> dict[str, list[list[str]]]:
+        """
+        Get a dict mapping parameter types to task schemas that input/output each
+        parameter.
+        """
+        param_map: dict[str, list[list[str]]] = {}
         for ts in self.task_schemas:
             for inp in ts.inputs:
                 if inp.parameter.typ not in param_map:
@@ -1065,7 +2390,7 @@ class BaseApp(metaclass=Singleton):
 
         return param_map
 
-    def get_info(self) -> Dict[str, Any]:
+    def get_info(self) -> dict[str, Any]:
         """
         Get miscellaneous runtime system information.
         """
@@ -1077,7 +2402,7 @@ class BaseApp(metaclass=Singleton):
         }
 
     @property
-    def known_subs_file_path(self):
+    def known_subs_file_path(self) -> Path:
         """
         The path to the file describing known submissions.
         """
@@ -1093,7 +2418,7 @@ class BaseApp(metaclass=Singleton):
         wk_path,
         start_time,
         end_time,
-    ):
+    ) -> str:
         line = [
             str(local_id),
             workflow_id,
@@ -1106,7 +2431,7 @@ class BaseApp(metaclass=Singleton):
         ]
         return self._known_subs_file_sep.join(line) + "\n"
 
-    def _parse_known_submissions_line(self, line: str) -> Dict:
+    def _parse_known_submissions_line(self, line: str) -> KnownSubmission:
         (
             local_id,
             workflow_id,
@@ -1117,7 +2442,7 @@ class BaseApp(metaclass=Singleton):
             start_time,
             end_time,
         ) = line.split(self._known_subs_file_sep, maxsplit=7)
-        item = {
+        return {
             "local_id": int(local_id),
             "workflow_id": workflow_id,
             "is_active": bool(int(is_active)),
@@ -1127,16 +2452,12 @@ class BaseApp(metaclass=Singleton):
             "start_time": start_time,
             "end_time": end_time.strip(),
         }
-        return item
 
     @TimeIt.decorator
-    def read_known_submissions_file(self) -> List[Dict]:
+    def read_known_submissions_file(self) -> list[KnownSubmission]:
         """Retrieve existing workflows that *might* be running."""
-        known = []
         with self.known_subs_file_path.open("rt", newline="\n") as fh:
-            for ln in fh.readlines():
-                known.append(self._parse_known_submissions_line(ln))
-        return known
+            return [self._parse_known_submissions_line(ln) for ln in fh.readlines()]
 
     def _add_to_known_submissions(
         self,
@@ -1145,9 +2466,10 @@ class BaseApp(metaclass=Singleton):
         sub_idx: int,
         sub_time: str,
     ) -> int:
-        """Ensure a the specified workflow submission is in the known-submissions file and
-        return the associated local ID."""
-
+        """
+        Ensure a the specified workflow submission is in the known-submissions file and
+        return the associated local ID.
+        """
         try:
             known = self.read_known_submissions_file()
         except FileNotFoundError:
@@ -1155,15 +2477,15 @@ class BaseApp(metaclass=Singleton):
 
         wk_path = str(wk_path)
         all_ids = []
-        for i in known:
-            all_ids.append(i["local_id"])
+        for known_sub in known:
+            all_ids.append(known_sub["local_id"])
             if (
-                wk_path == i["path"]
-                and sub_idx == i["sub_idx"]
-                and sub_time == i["submit_time"]
+                wk_path == known_sub["path"]
+                and sub_idx == known_sub["sub_idx"]
+                and sub_time == known_sub["submit_time"]
             ):
                 # workflow submission part already present
-                return i["local_id"]
+                return known_sub["local_id"]
 
         # get the next available local ID:
         if all_ids:
@@ -1194,13 +2516,16 @@ class BaseApp(metaclass=Singleton):
     @TimeIt.decorator
     def update_known_subs_file(
         self,
-        inactive_IDs: List[int],
-        start_times: Dict[int, str],
-        end_times: Dict[int, str],
-    ):
-        """Update submission records in the known-submission file.
+        inactive_IDs: list[int],
+        start_times: dict[int, str],
+        end_times: dict[int, str],
+    ) -> list[int]:
+        """
+        Update submission records in the known-submission file.
 
-        Note we aim for atomicity to help with the scenario where a new workflow
+        Note
+        ----
+        We aim for atomicity to help with the scenario where a new workflow
         submission is adding itself to the file at the same time as we have decided an
         existing workflow should no longer be part of this file. Ideally, such a scenario
         should not arise because both operations should only ever be interactively
@@ -1210,12 +2535,10 @@ class BaseApp(metaclass=Singleton):
 
         Returns
         -------
-        removed_IDs
+        list[int]
             List of local IDs removed from the known-submissions file due to the maximum
             number of recent workflows to store being exceeded.
-
         """
-
         self.submission_logger.info(
             f"setting these local IDs to inactive in known-submissions file: "
             f"{inactive_IDs}"
@@ -1225,12 +2548,14 @@ class BaseApp(metaclass=Singleton):
 
         # keys are line indices of non-running submissions, values are submission
         # date-times:
-        line_date = {}
+        line_date: dict[int, str] = {}
 
-        removed_IDs = []  # which submissions we completely remove from the file
+        removed_IDs: list[
+            int
+        ] = []  # which submissions we completely remove from the file
 
-        new_lines = []
-        line_IDs = []
+        new_lines: list[str] = []
+        line_IDs: list[int] = []
         for ln_idx, line in enumerate(self.known_subs_file_path.read_text().split("\n")):
             if not line.strip():
                 continue
@@ -1246,7 +2571,6 @@ class BaseApp(metaclass=Singleton):
             update_end = item["local_id"] in end_times
 
             if update_inactive or update_start or update_end:
-
                 updated = self._format_known_submissions_line(
                     local_id=item["local_id"],
                     workflow_id=item["workflow_id"],
@@ -1273,7 +2597,7 @@ class BaseApp(metaclass=Singleton):
             if is_inactive:
                 line_date[ln_idx] = item["submit_time"]
 
-        ld_srt_idx = list(dict(sorted(line_date.items(), key=lambda i: i[1])).keys())
+        ld_srt_idx = sorted(line_date, key=lambda x: line_date[x])
 
         if len(line_date) > max_inactive:
             # remove oldest inactive submissions:
@@ -1285,8 +2609,7 @@ class BaseApp(metaclass=Singleton):
             )
 
             # sort in reverse so we can remove indices from new_lines:
-            oldest_idx = sorted(ld_srt_idx[:num_remove], reverse=True)
-            for i in oldest_idx:
+            for i in sorted(ld_srt_idx[:num_remove], reverse=True):
                 new_lines.pop(i)
                 removed_IDs.append(line_IDs.pop(i))
 
@@ -1303,9 +2626,11 @@ class BaseApp(metaclass=Singleton):
 
         return removed_IDs
 
-    def clear_known_submissions_file(self):
-        """Clear the known-submissions file of all submissions. This shouldn't be needed
-        normally."""
+    def clear_known_submissions_file(self) -> None:
+        """
+        Clear the known-submissions file of all submissions. This shouldn't be needed
+        normally.
+        """
         self.submission_logger.warning(
             f"clearing the known-submissions file at {self.known_subs_file_path}"
         )
@@ -1314,20 +2639,21 @@ class BaseApp(metaclass=Singleton):
 
     def _make_workflow(
         self,
-        template_file_or_str: Union[PathLike, str],
-        is_string: Optional[bool] = False,
-        template_format: Optional[str] = None,
-        path: Optional[PathLike] = None,
-        name: Optional[str] = None,
-        overwrite: Optional[bool] = False,
-        store: Optional[str] = DEFAULT_STORE_FORMAT,
-        ts_fmt: Optional[str] = None,
-        ts_name_fmt: Optional[str] = None,
-        store_kwargs: Optional[Dict] = None,
-        variables: Optional[Dict[str, str]] = None,
-        status: Optional[bool] = True,
-    ) -> get_app_attribute("Workflow"):
-        """Generate a new {app_name} workflow from a file or string containing a workflow
+        template_file_or_str: PathLike | str,
+        is_string: bool = False,
+        template_format: Literal["json", "yaml"] | None = None,
+        path: PathLike = None,
+        name: str | None = None,
+        overwrite: bool = False,
+        store: str = DEFAULT_STORE_FORMAT,
+        ts_fmt: str | None = None,
+        ts_name_fmt: str | None = None,
+        store_kwargs: dict[str, Any] | None = None,
+        variables: dict[str, str] | None = None,
+        status: bool = True,
+    ) -> _Workflow:
+        """
+        Generate a new {app_name} workflow from a file or string containing a workflow
         template parametrisation.
 
         Parameters
@@ -1364,93 +2690,92 @@ class BaseApp(metaclass=Singleton):
             String variables to substitute in `template_file_or_str`.
         status
             If True, display a live status to track workflow creation progress.
-        """
 
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        """
         self.API_logger.info("make_workflow called")
 
-        if status:
-            console = rich.console.Console()
-            status = console.status("Making persistent workflow...")
-            status.start()
-
-        common = {
-            "path": path,
-            "name": name,
-            "overwrite": overwrite,
-            "store": store,
-            "ts_fmt": ts_fmt,
-            "ts_name_fmt": ts_name_fmt,
-            "store_kwargs": store_kwargs,
-            "variables": variables,
-            "status": status,
-        }
-
-        if not is_string:
-            wk = self.Workflow.from_file(
-                template_path=template_file_or_str,
-                template_format=template_format,
-                **common,
-            )
+        status_context: AbstractContextManager[Status] | AbstractContextManager[None] = (
+            Console().status("Making persistent workflow...") if status else nullcontext()
+        )
 
-        elif template_format == "json":
-            try:
-                wk = self.Workflow.from_JSON_string(
-                    JSON_str=template_file_or_str, **common
+        with status_context as status_:
+            if not is_string:
+                return self.Workflow.from_file(
+                    template_path=template_file_or_str,
+                    template_format=template_format,
+                    path=str(path) if path else None,
+                    name=name,
+                    overwrite=overwrite,
+                    store=store,
+                    ts_fmt=ts_fmt,
+                    ts_name_fmt=ts_name_fmt,
+                    store_kwargs=store_kwargs,
+                    variables=variables,
+                    status=status_,
                 )
-            except Exception:
-                if status:
-                    status.stop()
-                raise
-
-        elif template_format == "yaml":
-            try:
-                wk = self.Workflow.from_YAML_string(
-                    YAML_str=template_file_or_str, **common
+            elif template_format == "json":
+                return self.Workflow.from_JSON_string(
+                    JSON_str=str(template_file_or_str),
+                    path=str(path) if path else None,
+                    name=name,
+                    overwrite=overwrite,
+                    store=store,
+                    ts_fmt=ts_fmt,
+                    ts_name_fmt=ts_name_fmt,
+                    store_kwargs=store_kwargs,
+                    variables=variables,
+                    status=status_,
+                )
+            elif template_format == "yaml":
+                return self.Workflow.from_YAML_string(
+                    YAML_str=str(template_file_or_str),
+                    path=str(path) if path else None,
+                    name=name,
+                    overwrite=overwrite,
+                    store=store,
+                    ts_fmt=ts_fmt,
+                    ts_name_fmt=ts_name_fmt,
+                    store_kwargs=store_kwargs,
+                    variables=variables,
+                )
+            elif not template_format:
+                raise ValueError(
+                    f"Must specify `template_format` if parsing a workflow template from a "
+                    f"string; available options are: {ALL_TEMPLATE_FORMATS!r}."
+                )
+            else:
+                raise ValueError(
+                    f"Template format {template_format!r} not understood. Available template "
+                    f"formats are {ALL_TEMPLATE_FORMATS!r}."
                 )
-            except Exception:
-                if status:
-                    status.stop()
-                raise
-
-        elif not template_format:
-            raise ValueError(
-                f"Must specify `template_format` if parsing a workflow template from a "
-                f"string; available options are: {ALL_TEMPLATE_FORMATS!r}."
-            )
-
-        else:
-            raise ValueError(
-                f"Template format {template_format!r} not understood. Available template "
-                f"formats are {ALL_TEMPLATE_FORMATS!r}."
-            )
-
-        if status:
-            status.stop()
-
-        return wk
 
     def _make_and_submit_workflow(
         self,
-        template_file_or_str: Union[PathLike, str],
-        is_string: Optional[bool] = False,
-        template_format: Optional[str] = None,
-        path: Optional[PathLike] = None,
-        name: Optional[str] = None,
-        overwrite: Optional[bool] = False,
-        store: Optional[str] = DEFAULT_STORE_FORMAT,
-        ts_fmt: Optional[str] = None,
-        ts_name_fmt: Optional[str] = None,
-        store_kwargs: Optional[Dict] = None,
-        variables: Optional[Dict[str, str]] = None,
-        JS_parallelism: Optional[bool] = None,
-        wait: Optional[bool] = False,
-        add_to_known: Optional[bool] = True,
-        return_idx: Optional[bool] = False,
-        tasks: Optional[List[int]] = None,
-        cancel: Optional[bool] = False,
-        status: Optional[bool] = True,
-    ) -> Dict[int, int]:
-        """Generate and submit a new {app_name} workflow from a file or string containing a
+        template_file_or_str: PathLike | str,
+        is_string: bool = False,
+        template_format: Literal["json", "yaml"] | None = None,
+        path: PathLike | None = None,
+        name: str | None = None,
+        overwrite: bool = False,
+        store: str = DEFAULT_STORE_FORMAT,
+        ts_fmt: str | None = None,
+        ts_name_fmt: str | None = None,
+        store_kwargs: dict[str, Any] | None = None,
+        variables: dict[str, str] | None = None,
+        JS_parallelism: bool | None = None,
+        wait: bool = False,
+        add_to_known: bool = True,
+        return_idx: bool = False,
+        tasks: list[int] | None = None,
+        cancel: bool = False,
+        status: bool = True,
+    ) -> tuple[_Workflow, Mapping[int, Sequence[int]]] | _Workflow:
+        """
+        Generate and submit a new {app_name} workflow from a file or string containing a
         workflow template parametrisation.
 
         Parameters
@@ -1506,11 +2831,17 @@ class BaseApp(metaclass=Singleton):
         status
             If True, display a live status to track workflow creation and submission
             progress.
-        """
 
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        dict[int, list[int]]
+            Mapping of submission handles. If requested by ``return_idx`` parameter.
+        """
         self.API_logger.info("make_and_submit_workflow called")
 
-        wk = self.make_workflow(
+        wk = self._make_workflow(
             template_file_or_str=template_file_or_str,
             is_string=is_string,
             template_format=template_format,
@@ -1541,18 +2872,19 @@ class BaseApp(metaclass=Singleton):
     def _make_demo_workflow(
         self,
         workflow_name: str,
-        template_format: Optional[str] = None,
-        path: Optional[PathLike] = None,
-        name: Optional[str] = None,
-        overwrite: Optional[bool] = False,
-        store: Optional[str] = DEFAULT_STORE_FORMAT,
-        ts_fmt: Optional[str] = None,
-        ts_name_fmt: Optional[str] = None,
-        store_kwargs: Optional[Dict] = None,
-        variables: Optional[Dict[str, str]] = None,
-        status: Optional[bool] = True,
-    ) -> get_app_attribute("Workflow"):
-        """Generate a new {app_name} workflow from a builtin demo workflow template.
+        template_format: Literal["json", "yaml"] | None = None,
+        path: PathLike | None = None,
+        name: str | None = None,
+        overwrite: bool = False,
+        store: str = DEFAULT_STORE_FORMAT,
+        ts_fmt: str | None = None,
+        ts_name_fmt: str | None = None,
+        store_kwargs: dict[str, Any] | None = None,
+        variables: dict[str, str] | None = None,
+        status: bool = True,
+    ) -> _Workflow:
+        """
+        Generate a new {app_name} workflow from a builtin demo workflow template.
 
         Parameters
         ----------
@@ -1586,20 +2918,25 @@ class BaseApp(metaclass=Singleton):
             String variables to substitute in the demo workflow template file.
         status
             If True, display a live status to track workflow creation progress.
-        """
 
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        """
         self.API_logger.info("make_demo_workflow called")
 
-        if status:
-            console = rich.console.Console()
-            status = console.status("Making persistent workflow...")
-            status.start()
+        status_context: AbstractContextManager[Status] | AbstractContextManager[None] = (
+            Console().status("Making persistent workflow...") if status else nullcontext()
+        )
 
-        with self.get_demo_workflow_template_file(workflow_name) as template_path:
-            wk = self.Workflow.from_file(
+        with status_context as status_, self.get_demo_workflow_template_file(
+            workflow_name
+        ) as template_path:
+            return self.Workflow.from_file(
                 template_path=template_path,
                 template_format=template_format,
-                path=path,
+                path=str(path) if path else None,
                 name=name,
                 overwrite=overwrite,
                 store=store,
@@ -1607,33 +2944,31 @@ class BaseApp(metaclass=Singleton):
                 ts_name_fmt=ts_name_fmt,
                 store_kwargs=store_kwargs,
                 variables=variables,
-                status=status,
+                status=status_,
             )
-        if status:
-            status.stop()
-        return wk
 
     def _make_and_submit_demo_workflow(
         self,
         workflow_name: str,
-        template_format: Optional[str] = None,
-        path: Optional[PathLike] = None,
-        name: Optional[str] = None,
-        overwrite: Optional[bool] = False,
-        store: Optional[str] = DEFAULT_STORE_FORMAT,
-        ts_fmt: Optional[str] = None,
-        ts_name_fmt: Optional[str] = None,
-        store_kwargs: Optional[Dict] = None,
-        variables: Optional[Dict[str, str]] = None,
-        JS_parallelism: Optional[bool] = None,
-        wait: Optional[bool] = False,
-        add_to_known: Optional[bool] = True,
-        return_idx: Optional[bool] = False,
-        tasks: Optional[List[int]] = None,
-        cancel: Optional[bool] = False,
-        status: Optional[bool] = True,
-    ) -> Dict[int, int]:
-        """Generate and submit a new {app_name} workflow from a file or string containing a
+        template_format: Literal["json", "yaml"] | None = None,
+        path: PathLike | None = None,
+        name: str | None = None,
+        overwrite: bool = False,
+        store: str = DEFAULT_STORE_FORMAT,
+        ts_fmt: str | None = None,
+        ts_name_fmt: str | None = None,
+        store_kwargs: dict[str, Any] | None = None,
+        variables: dict[str, str] | None = None,
+        JS_parallelism: bool | None = None,
+        wait: bool = False,
+        add_to_known: bool = True,
+        return_idx: bool = False,
+        tasks: list[int] | None = None,
+        cancel: bool = False,
+        status: bool = True,
+    ) -> tuple[_Workflow, Mapping[int, Sequence[int]]] | _Workflow:
+        """
+        Generate and submit a new {app_name} workflow from a file or string containing a
         workflow template parametrisation.
 
         Parameters
@@ -1685,11 +3020,17 @@ class BaseApp(metaclass=Singleton):
             Immediately cancel the submission. Useful for testing and benchmarking.
         status
             If True, display a live status to track submission progress.
-        """
 
+        Returns
+        -------
+        Workflow
+            The created workflow.
+        dict[int, list[int]]
+            Mapping of submission handles. If requested by ``return_idx`` parameter.
+        """
         self.API_logger.info("make_and_submit_demo_workflow called")
 
-        wk = self.make_demo_workflow(
+        wk = self._make_demo_workflow(
             workflow_name=workflow_name,
             template_format=template_format,
             path=path,
@@ -1718,59 +3059,66 @@ class BaseApp(metaclass=Singleton):
     def _submit_workflow(
         self,
         workflow_path: PathLike,
-        JS_parallelism: Optional[bool] = None,
-        wait: Optional[bool] = False,
-        return_idx: Optional[bool] = False,
-        tasks: Optional[List[int]] = None,
-    ) -> Dict[int, int]:
-        """Submit an existing {app_name} workflow.
+        JS_parallelism: bool | None = None,
+        wait: bool = False,
+        return_idx: bool = False,
+        tasks: list[int] | None = None,
+    ) -> Mapping[int, Sequence[int]] | None:
+        """
+        Submit an existing {app_name} workflow.
 
         Parameters
         ----------
-        workflow_path
-            Path to an existing workflow
-        JS_parallelism
+        workflow_path:
+            Path to an existing workflow.
+        JS_parallelism:
             If True, allow multiple jobscripts to execute simultaneously. Raises if set to
             True but the store type does not support the `jobscript_parallelism` feature. If
             not set, jobscript parallelism will be used if the store type supports it.
-        tasks
+        wait:
+            Whether to wait for the submission to complete.
+        return_idx:
+            Whether to return the index information.
+        tasks:
             List of task indices to include in this submission. By default all tasks are
             included.
-        """
 
+        Returns
+        -------
+        dict[int, list[int]]
+            Mapping of submission handles, if requested by ``return_idx`` parameter.
+        """
         self.API_logger.info("submit_workflow called")
+        assert workflow_path is not None
         wk = self.Workflow(workflow_path)
-        return wk.submit(
-            JS_parallelism=JS_parallelism,
-            wait=wait,
-            return_idx=return_idx,
-            tasks=tasks,
-        )
+        if return_idx:
+            return wk.submit(
+                JS_parallelism=JS_parallelism,
+                wait=wait,
+                return_idx=True,
+                tasks=tasks,
+            )
+        wk.submit(JS_parallelism=JS_parallelism, wait=wait, tasks=tasks)
+        return None
 
-    def _run_hpcflow_tests(self, *args):
+    def _run_hpcflow_tests(self, *args: str) -> int:
         """Run hpcflow test suite. This function is only available from derived apps."""
-
         from hpcflow import app as hf
 
         return hf.app.run_tests(*args)
 
-    def _run_tests(self, *args):
+    def _run_tests(self, *args: str) -> int:
         """Run {app_name} test suite."""
-
         try:
             import pytest
         except ModuleNotFoundError:
             raise RuntimeError(
                 f"{self.name} has not been built with testing dependencies."
             )
-        test_args = (self.pytest_args or []) + list(args)
-        pkg = self.package_name
-        tests_dir = "tests"
-        ctx_man = resources.as_file(resources.files(pkg).joinpath(tests_dir))
-        with ctx_man as test_dir:
-            return pytest.main([str(test_dir)] + test_args)
-
-    def _get_OS_info(self) -> Dict:
+        with get_file_context(self.package_name, "tests") as test_dir:
+            return pytest.main([str(test_dir), *(self.pytest_args or ()), *args])
+
+    def _get_OS_info(self) -> Mapping[str, str]:
         """Get information about the operating system."""
         os_name = os.name
         if os_name == "posix":
@@ -1779,19 +3127,22 @@ class BaseApp(metaclass=Singleton):
             )
         elif os_name == "nt":
             return get_OS_info_windows()
+        else:
+            raise Exception(f"unsupported OS '{os_name}'")
 
     def _get_shell_info(
         self,
         shell_name: str,
-        exclude_os: Optional[bool] = False,
-    ) -> Dict:
-        """Get information about a given shell and the operating system.
+        exclude_os: bool = False,
+    ) -> VersionInfo:
+        """
+        Get information about a given shell and the operating system.
 
         Parameters
         ----------
-        shell_name
+        shell_name:
             One of the supported shell names.
-        exclude_os
+        exclude_os:
             If True, exclude operating system information.
         """
         shell = get_shell(
@@ -1806,9 +3157,10 @@ class BaseApp(metaclass=Singleton):
         max_recent: int = 3,
         no_update: bool = False,
         as_json: bool = False,
-        status: Optional[Any] = None,
-    ):
-        """Retrieve information about active and recently inactive finished {app_name}
+        status: Status | None = None,
+    ) -> Sequence[KnownSubmissionItem]:
+        """
+        Retrieve information about active and recently inactive finished {app_name}
         workflows.
 
         This method removes workflows from the known-submissions file that are found to be
@@ -1816,21 +3168,19 @@ class BaseApp(metaclass=Singleton):
 
         Parameters
         ----------
-        max_recent
+        max_recent:
             Maximum number of inactive workflows to retrieve.
-        no_update
+        no_update:
             If True, do not update the known-submissions file to set submissions that are
             now inactive.
-        as_json
+        as_json:
             If True, only include JSON-compatible information. This will exclude the
             `submission` key, for instance.
-
         """
-
-        out = []
-        inactive_IDs = []
-        start_times = {}
-        end_times = {}
+        out: list[KnownSubmissionItem] = []
+        inactive_IDs: list[int] = []
+        start_times: dict[int, str] = {}
+        end_times: dict[int, str] = {}
 
         ts_fmt = self._submission_ts_fmt
 
@@ -1841,28 +3191,28 @@ class BaseApp(metaclass=Singleton):
         except FileNotFoundError:
             known_subs = []
 
-        active_jobscripts = {}  # keys are (workflow path, submission index)
-        loaded_workflows = {}  # keys are workflow path
+        # keys are (workflow path, submission index)
+        active_jobscripts: dict[
+            tuple[str, int], Mapping[int, Mapping[int, JobscriptElementState]]
+        ] = {}
+        loaded_workflows: dict[str, _Workflow] = {}  # keys are workflow path
 
         # loop in reverse so we process more-recent submissions first:
         for file_dat_i in known_subs[::-1]:
             submit_time_str = file_dat_i["submit_time"]
-            submit_time_obj = datetime.strptime(submit_time_str, ts_fmt)
-            submit_time_obj = submit_time_obj.replace(tzinfo=timezone.utc).astimezone()
+            submit_time_obj = parse_timestamp(submit_time_str, ts_fmt)
 
             start_time_str = file_dat_i["start_time"]
             start_time_obj = None
             if start_time_str:
-                start_time_obj = datetime.strptime(start_time_str, ts_fmt)
-                start_time_obj = start_time_obj.replace(tzinfo=timezone.utc).astimezone()
+                start_time_obj = parse_timestamp(start_time_str, ts_fmt)
 
             end_time_str = file_dat_i["end_time"]
             end_time_obj = None
             if end_time_str:
-                end_time_obj = datetime.strptime(end_time_str, ts_fmt)
-                end_time_obj = end_time_obj.replace(tzinfo=timezone.utc).astimezone()
+                end_time_obj = parse_timestamp(end_time_str, ts_fmt)
 
-            out_item = {
+            out_item: KnownSubmissionItem = {
                 "local_id": file_dat_i["local_id"],
                 "workflow_id": file_dat_i["workflow_id"],
                 "workflow_path": file_dat_i["path"],
@@ -1924,12 +3274,8 @@ class BaseApp(metaclass=Singleton):
                         sub = wk_i.submissions[file_dat_i["sub_idx"]]
 
                         all_jobscripts = sub._submission_parts[submit_time_str]
-                        out_item.update(
-                            {
-                                "jobscripts": all_jobscripts,
-                                "submission": sub,
-                            }
-                        )
+                        out_item["jobscripts"] = all_jobscripts
+                        out_item["submission"] = sub
                         if not out_item["start_time"]:
                             start_time_obj = sub.start_time
                             if start_time_obj:
@@ -1949,11 +3295,17 @@ class BaseApp(metaclass=Singleton):
                     if file_dat_i["is_active"]:
                         # check it really is active:
                         run_key = (file_dat_i["path"], file_dat_i["sub_idx"])
+                        act_i_js: Mapping[int, Mapping[int, JobscriptElementState]]
                         if run_key in active_jobscripts:
                             act_i_js = active_jobscripts[run_key]
                         else:
                             try:
-                                act_i_js = sub.get_active_jobscripts(as_json=as_json)
+                                if as_json:
+                                    act_i_js = cast(  # not actually used?
+                                        Any, sub.get_active_jobscripts(as_json=True)
+                                    )
+                                else:
+                                    act_i_js = sub.get_active_jobscripts()
                             except KeyboardInterrupt:
                                 raise
                             except Exception:
@@ -1984,38 +3336,64 @@ class BaseApp(metaclass=Singleton):
             )
             # remove these from the output, to avoid confusion (if kept, they would not
             # appear in the next invocation of this method):
-            out = [i for i in out if i["local_id"] not in removed_IDs]
+            out = [item for item in out if item["local_id"] not in removed_IDs]
 
+        out_active, out_inactive = self.__partition(
+            out, lambda item: item["active_jobscripts"]
+        )
         # sort inactive by most-recently finished, then deleted:
-        out_inactive = [i for i in out if not i["active_jobscripts"]]
-        out_no_access = [i for i in out_inactive if (i["deleted"] or i["unloadable"])]
-        out_access = [i for i in out_inactive if not (i["deleted"] or i["unloadable"])]
+        out_no_access, out_access = self.__partition(
+            out_inactive, lambda item: item["deleted"] or item["unloadable"]
+        )
 
         # sort loadable inactive by end time or start time or submit time:
         out_access = sorted(
             out_access,
             key=lambda i: (
-                i["end_time_obj"] or i["start_time_obj"] or i["submit_time_obj"]
+                i["end_time_obj"]
+                or i["start_time_obj"]
+                or i.get("submit_time_obj")
+                or self.__DEF_TIMESTAMP
             ),
             reverse=True,
         )
         out_inactive = (out_access + out_no_access)[:max_recent]
 
-        out_active = [i for i in out if i["active_jobscripts"]]
-
         # show active submissions first:
         out = out_active + out_inactive
 
         if as_json:
-            for idx, _ in enumerate(out):
-                out[idx].pop("submission", None)
-                out[idx].pop("submit_time_obj")
+            for item in out:
+                item.pop("submission", None)
+                item.pop("submit_time_obj")
         return out
 
-    def _show_legend(self):
-        """ "Output a legend for the jobscript-element and EAR states that are displayed
-        by the `show` command."""
+    __DEF_TIMESTAMP: Final[datetime] = datetime.fromtimestamp(0, tz=timezone.utc)
+
+    @staticmethod
+    def __partition(
+        lst: Iterable[T], cond: Callable[[T], Any]
+    ) -> tuple[list[T], list[T]]:
+        """
+        Split a list into two by whether the condition holds for each item.
+
+        Returns
+        -------
+        true_items
+            List of items for which the condition is true (or at least truthy).
+        false_items
+            List of items for which the condition is false.
+        """
+        lists: tuple[list[T], list[T]] = [], []
+        for item in lst:
+            lists[not cond(item)].append(item)
+        return lists
 
+    def _show_legend(self) -> None:
+        """
+        Output a legend for the jobscript-element and EAR states that are displayed
+        by the `show` command.
+        """
         js_notes = Panel(
             "The [i]Status[/i] column of the `show` command output displays the set of "
             "unique jobscript-element states for that submission. Jobscript element "
@@ -2028,8 +3406,8 @@ class BaseApp(metaclass=Singleton):
         js_tab.add_column("Symbol")
         js_tab.add_column("State")
         js_tab.add_column("Description")
-        for state in JobscriptElementState.__members__.values():
-            js_tab.add_row(state.rich_repr, state.name, state.__doc__)
+        for jse_state in JobscriptElementState.__members__.values():
+            js_tab.add_row(jse_state.rich_repr, jse_state.name, jse_state.__doc__)
 
         act_notes = Panel(
             "\nThe [i]Actions[/i] column of the `show` command output displays either the "
@@ -2044,8 +3422,8 @@ class BaseApp(metaclass=Singleton):
         act_tab.add_column("Symbol")
         act_tab.add_column("State")
         act_tab.add_column("Description")
-        for state in EARStatus.__members__.values():
-            act_tab.add_row(state.rich_repr, state.name, state.__doc__)
+        for ear_state in EARStatus.__members__.values():
+            act_tab.add_row(ear_state.rich_repr, ear_state.name, ear_state.__doc__)
 
         group = Group(
             js_notes,
@@ -2061,22 +3439,21 @@ class BaseApp(metaclass=Singleton):
         max_recent: int = 3,
         full: bool = False,
         no_update: bool = False,
-        columns=None,
-    ):
-        """Show information about running {app_name} workflows.
+    ) -> None:
+        """
+        Show information about running {app_name} workflows.
 
         Parameters
         ----------
-        max_recent
+        max_recent:
             Maximum number of inactive workflows to show.
-        full
+        full:
             If True, provide more information; output may spans multiple lines for each
             workflow submission.
-        no_update
+        no_update:
             If True, do not update the known-submissions file to remove workflows that are
             no longer running.
         """
-
         # TODO: add --json to show, just returning this but without submissions?
 
         allowed_cols = {
@@ -2091,9 +3468,9 @@ class BaseApp(metaclass=Singleton):
             "actions_compact": "Actions",
         }
 
+        columns: tuple[str, ...]
         if full:
             columns = ("id", "name", "status", "times", "actions")
-
         else:
             columns = (
                 "id",
@@ -2105,11 +3482,11 @@ class BaseApp(metaclass=Singleton):
                 "actions_compact",
             )
 
-        unknown_cols = set(columns) - set(allowed_cols.keys())
+        unknown_cols = set(columns).difference(allowed_cols)
         if unknown_cols:
             raise ValueError(
                 f"Unknown column names: {unknown_cols!r}. Allowed columns are "
-                f"{list(allowed_cols.keys())!r}."
+                f"{list(allowed_cols)!r}."
             )
 
         # TODO: add --filter option to filter by ID or name
@@ -2119,167 +3496,163 @@ class BaseApp(metaclass=Singleton):
         ts_fmt_part = r"%H:%M:%S"
 
         console = Console()
-        status = console.status("Retrieving data...")
-        status.start()
-
-        try:
+        with console.status("Retrieving data...") as status:
             run_dat = self._get_known_submissions(
                 max_recent=max_recent,
                 no_update=no_update,
                 status=status,
             )
-        except (Exception, KeyboardInterrupt):
-            status.stop()
-            raise
-        else:
             if not run_dat:
-                status.stop()
                 return
 
-        status.update("Formatting...")
-        table = Table(box=box.SQUARE, expand=False)
-        for col_name in columns:
-            table.add_column(allowed_cols[col_name])
-
-        row_pad = 1 if full else 0
-
-        for dat_i in run_dat:
-            deleted = dat_i["deleted"]
-            unloadable = dat_i["unloadable"]
-            no_access = deleted or unloadable
-            act_js = dat_i["active_jobscripts"]
-            style = "grey42" if (no_access or not act_js) else ""
-            style_wk_name = "grey42 strike" if deleted else style
-            style_it = "italic grey42" if (no_access or not act_js) else "italic"
-
-            all_cells = {}
-            if "status" in columns:
-                if act_js:
-                    act_js_states = set([j for i in act_js.values() for j in i.values()])
-                    status_text = "/".join(
-                        f"[{i.colour}]{i.symbol}[/{i.colour}]" for i in act_js_states
-                    )
-                else:
-                    if deleted:
-                        txt = "deleted"
-                    elif unloadable:
-                        txt = "unloadable"
+            status.update("Formatting...")
+            table = Table(box=box.SQUARE, expand=False)
+            for col_name in columns:
+                table.add_column(allowed_cols[col_name])
+
+            row_pad = 1 if full else 0
+
+            for dat_i in run_dat:
+                deleted = dat_i["deleted"]
+                unloadable = dat_i["unloadable"]
+                no_access = deleted or unloadable
+                act_js = dat_i["active_jobscripts"]
+                style = "grey42" if (no_access or not act_js) else ""
+                style_wk_name = "grey42 strike" if deleted else style
+                style_it = "italic grey42" if (no_access or not act_js) else "italic"
+
+                all_cells: dict[str, str | Text | Padding] = {}
+                if "status" in columns:
+                    if act_js:
+                        act_js_states = set(
+                            js_state
+                            for jsinf in act_js.values()
+                            for js_state in jsinf.values()
+                        )
+                        all_cells["status"] = "/".join(
+                            js_state.rich_repr for js_state in act_js_states
+                        )
                     else:
-                        txt = "inactive"
-                    status_text = Text(txt, style=style_it)
-                all_cells["status"] = status_text
-
-            if "id" in columns:
-                all_cells["id"] = Text(str(dat_i["local_id"]), style=style)
+                        if deleted:
+                            txt = "deleted"
+                        elif unloadable:
+                            txt = "unloadable"
+                        else:
+                            txt = "inactive"
+                        all_cells["status"] = Text(txt, style=style_it)
 
-            if "name" in columns:
-                all_cells["name"] = Text(
-                    Path(dat_i["workflow_path"]).name, style=style_wk_name
-                )
+                if "id" in columns:
+                    all_cells["id"] = Text(str(dat_i["local_id"]), style=style)
 
-            start_time, end_time = None, None
-            if not no_access:
-                start_time = dat_i["start_time_obj"]
-                end_time = dat_i["end_time_obj"]
+                if "name" in columns:
+                    all_cells["name"] = Text(
+                        Path(dat_i["workflow_path"]).name, style=style_wk_name
+                    )
 
-            if "actions" in columns:
+                start_time, end_time = None, None
                 if not no_access:
-                    task_tab = Table(box=None, show_header=False)
-                    task_tab.add_column()
-                    task_tab.add_column()
-
-                    for task_idx, elements in dat_i[
-                        "submission"
-                    ].EARs_by_elements.items():
-                        task = dat_i["submission"].workflow.tasks[task_idx]
-
-                        # inner table for elements/actions:
-                        elem_tab_i = Table(box=None, show_header=False)
-                        elem_tab_i.add_column()
-                        for elem_idx, EARs in elements.items():
-                            elem_status = Text(f"{elem_idx} | ", style=style)
-                            for i in EARs:
-                                elem_status.append(i.status.symbol, style=i.status.colour)
-                            elem_tab_i.add_row(elem_status)
-                        task_tab.add_row(task.unique_name, elem_tab_i, style=style)
-                else:
-                    task_tab = ""
-
-                all_cells["actions"] = Padding(task_tab, (0, 0, row_pad, 0))
+                    start_time = cast("datetime", dat_i["start_time_obj"])
+                    end_time = cast("datetime", dat_i["end_time_obj"])
+
+                if "actions" in columns:
+                    task_tab: str | Table
+                    if not no_access:
+                        task_tab = Table(box=None, show_header=False)
+                        task_tab.add_column()
+                        task_tab.add_column()
+
+                        sub = dat_i["submission"]
+                        for task_idx, elements in sub.EARs_by_elements.items():
+                            task = sub.workflow.tasks[task_idx]
+
+                            # inner table for elements/actions:
+                            elem_tab_i = Table(box=None, show_header=False)
+                            elem_tab_i.add_column()
+                            for elem_idx, EARs in elements.items():
+                                elem_status = Text(f"{elem_idx} | ", style=style)
+                                for ear in EARs:
+                                    elem_status.append(
+                                        ear.status.symbol, style=ear.status.colour
+                                    )
+                                elem_tab_i.add_row(elem_status)
+                            task_tab.add_row(task.unique_name, elem_tab_i, style=style)
+                    else:
+                        task_tab = ""
 
-            if "actions_compact" in columns:
-                if not no_access:
-                    EAR_stat_count = defaultdict(int)
-                    for _, elements in dat_i["submission"].EARs_by_elements.items():
-                        for elem_idx, EARs in elements.items():
-                            for i in EARs:
-                                EAR_stat_count[i.status] += 1
-                    all_cells["actions_compact"] = " | ".join(
-                        f"[{k.colour}]{k.symbol}[/{k.colour}]:{v}"
-                        for k, v in EAR_stat_count.items()
-                    )
-                else:
-                    all_cells["actions_compact"] = ""
+                    all_cells["actions"] = Padding(task_tab, (0, 0, row_pad, 0))
 
-            if "submit_time" in columns or "times" in columns:
-                submit_time = (
-                    datetime.strptime(dat_i["submit_time"], self._submission_ts_fmt)
-                    .replace(tzinfo=timezone.utc)
-                    .astimezone()
-                )
-                submit_time_full = submit_time.strftime(ts_fmt)
-
-            if "start_time" in columns or "times" in columns:
-                start_time_full = start_time.strftime(ts_fmt) if start_time else "-"
-                start_time_part = start_time_full
-                if start_time and start_time.date() == submit_time.date():
-                    start_time_part = start_time.strftime(ts_fmt_part)
-
-            if "end_time" in columns or "times" in columns:
-                end_time_full = end_time.strftime(ts_fmt) if end_time else "-"
-                end_time_part = end_time_full
-                if end_time and end_time.date() == start_time.date():
-                    end_time_part = end_time.strftime(ts_fmt_part)
-
-            if "submit_time" in columns:
-                all_cells["submit_time"] = Padding(
-                    Text(submit_time_full, style=style), (0, 0, row_pad, 0)
-                )
+                if "actions_compact" in columns:
+                    if not no_access:
+                        EAR_stat_count = Counter(
+                            ear.status
+                            for elements in dat_i["submission"].EARs_by_elements.values()
+                            for EARs in elements.values()
+                            for ear in EARs
+                        )
+                        all_cells["actions_compact"] = " | ".join(
+                            f"[{k.colour}]{k.symbol}[/{k.colour}]:{v}"  # type: ignore
+                            for k, v in EAR_stat_count.items()
+                        )
+                    else:
+                        all_cells["actions_compact"] = ""
 
-            if "start_time" in columns:
-                all_cells["start_time"] = Padding(
-                    Text(start_time_part, style=style), (0, 0, row_pad, 0)
-                )
+                if "submit_time" in columns or "times" in columns:
+                    submit_time = parse_timestamp(
+                        dat_i["submit_time"], self._submission_ts_fmt
+                    )
+                    submit_time_full = submit_time.strftime(ts_fmt)
+
+                if "start_time" in columns or "times" in columns:
+                    start_time_full = start_time.strftime(ts_fmt) if start_time else "-"
+                    start_time_part = start_time_full
+                    if start_time and start_time.date() == submit_time.date():
+                        start_time_part = start_time.strftime(ts_fmt_part)
+
+                if "end_time" in columns or "times" in columns:
+                    end_time_full = end_time.strftime(ts_fmt) if end_time else "-"
+                    end_time_part = end_time_full
+                    if end_time and start_time and end_time.date() == start_time.date():
+                        end_time_part = end_time.strftime(ts_fmt_part)
+
+                if "submit_time" in columns:
+                    all_cells["submit_time"] = Padding(
+                        Text(submit_time_full, style=style), (0, 0, row_pad, 0)
+                    )
 
-            if "end_time" in columns:
-                all_cells["end_time"] = Padding(
-                    Text(end_time_part, style=style), (0, 0, row_pad, 0)
-                )
+                if "start_time" in columns:
+                    all_cells["start_time"] = Padding(
+                        Text(start_time_part, style=style), (0, 0, row_pad, 0)
+                    )
 
-            if "times" in columns:
-                # submit/start/end on separate lines:
-                times_tab = Table(box=None, show_header=False)
-                times_tab.add_column()
-                times_tab.add_column(justify="right")
+                if "end_time" in columns:
+                    all_cells["end_time"] = Padding(
+                        Text(end_time_part, style=style), (0, 0, row_pad, 0)
+                    )
 
-                times_tab.add_row(
-                    Text("sb.", style=style_it), Text(submit_time_full, style=style)
-                )
+                if "times" in columns:
+                    # submit/start/end on separate lines:
+                    times_tab = Table(box=None, show_header=False)
+                    times_tab.add_column()
+                    times_tab.add_column(justify="right")
 
-                if start_time:
-                    times_tab.add_row(
-                        Text("st.", style=style_it), Text(start_time_part, style=style)
-                    )
-                if end_time:
                     times_tab.add_row(
-                        Text("en.", style=style_it), Text(end_time_part, style=style)
+                        Text("sb.", style=style_it), Text(submit_time_full, style=style)
                     )
 
-                all_cells["times"] = Padding(times_tab, (0, 0, row_pad, 0))
+                    if start_time:
+                        times_tab.add_row(
+                            Text("st.", style=style_it),
+                            Text(start_time_part, style=style),
+                        )
+                    if end_time:
+                        times_tab.add_row(
+                            Text("en.", style=style_it), Text(end_time_part, style=style)
+                        )
 
-            table.add_row(*[all_cells[i] for i in columns])
+                    all_cells["times"] = Padding(times_tab, (0, 0, row_pad, 0))
+
+                table.add_row(*(all_cells[col_name] for col_name in columns))
 
-        status.stop()
         if table.row_count:
             console.print(table)
 
@@ -2289,18 +3662,12 @@ class BaseApp(metaclass=Singleton):
         except FileNotFoundError:
             known_subs = []
 
-        path = None
-        for i in known_subs:
-            if i["local_id"] == local_ID:
-                path = Path(i["path"])
-                break
-        if not path:
-            raise ValueError(f"Specified local ID is not valid: {local_ID}.")
-
-        return path
+        if any((witness := sub)["local_id"] == local_ID for sub in known_subs):
+            return Path(witness["path"])
+        raise ValueError(f"Specified local ID is not valid: {local_ID}.")
 
     def _resolve_workflow_reference(
-        self, workflow_ref, ref_type: Union[str, None]
+        self, workflow_ref: str, ref_type: str | None
     ) -> Path:
         path = None
         if ref_type == "path":
@@ -2343,24 +3710,27 @@ class BaseApp(metaclass=Singleton):
                 )
         return path.resolve()
 
-    def _cancel(self, workflow_ref: Union[int, str, PathLike], ref_is_path=None):
-        """Cancel the execution of a workflow submission.
+    def _cancel(
+        self, workflow_ref: int | str | Path, ref_is_path: str | None = None
+    ) -> None:
+        """
+        Cancel the execution of a workflow submission.
 
         Parameters
         ----------
         ref_is_path
             One of "id", "path" or "assume-id" (the default)
         """
-        path = self._resolve_workflow_reference(workflow_ref, ref_is_path)
+        path = self._resolve_workflow_reference(str(workflow_ref), ref_is_path)
         self.Workflow(path).cancel()
 
     def configure_env(
         self,
-        name,
-        setup=None,
-        executables=None,
-        use_current_env=False,
-        env_source_file=None,
+        name: str,
+        setup: list[str] | None = None,
+        executables: list[_Executable] | None = None,
+        use_current_env: bool = False,
+        env_source_file: Path | None = None,
     ):
         """
         Configure an execution environment.
@@ -2369,10 +3739,10 @@ class BaseApp(metaclass=Singleton):
             setup = []
         if not executables:
             executables = []
-        if not env_source_file:
-            env_source_file = self.config.get("config_directory").joinpath(
-                "configured_envs.yaml"
-            )
+        env_source = env_source_file or self.config.get("config_directory").joinpath(
+            "configured_envs.yaml"
+        )
+        assert isinstance(env_source, Path)
         if use_current_env:
             if self.run_time_info.is_conda_venv:
                 # use the currently activated conda environment for the new app environment:
@@ -2399,35 +3769,36 @@ class BaseApp(metaclass=Singleton):
             ]
 
         new_env = self.Environment(name=name, setup=setup, executables=executables)
-        new_env_dat = new_env.to_json_like(exclude="_hash_value")[0]
-        if env_source_file.exists():
-            existing_env_dat = read_YAML_file(env_source_file, typ="rt")
-            if name in [i["name"] for i in existing_env_dat]:
+        new_env_dat = new_env.to_json_like(exclude={"_hash_value"})[0]
+        if env_source.exists():
+            existing_env_dat: list[dict] = read_YAML_file(env_source, typ="rt")
+            if any(name == i["name"] for i in existing_env_dat):
                 # TODO: this doesn't check all app envs, just those added with this method
                 raise ValueError(f"Environment {name!r} already exists.")
 
-            all_env_dat = existing_env_dat + [new_env_dat]
+            all_env_dat = [*existing_env_dat, new_env_dat]
 
             # write a new temporary config file
-            tmp_file = env_source_file.with_suffix(env_source_file.suffix + ".tmp")
+            tmp_file = env_source.with_suffix(env_source.suffix + ".tmp")
             self.logger.debug(f"Creating temporary env source file: {tmp_file!r}.")
             write_YAML_file(all_env_dat, tmp_file, typ="rt")
 
             # atomic rename, overwriting original:
             self.logger.debug("Replacing original env source file with temporary file.")
-            os.replace(src=tmp_file, dst=env_source_file)
+            os.replace(src=tmp_file, dst=env_source)
 
         else:
             all_env_dat = [new_env_dat]
-            write_YAML_file(all_env_dat, env_source_file, typ="rt")
+            write_YAML_file(all_env_dat, env_source, typ="rt")
 
         cur_env_source_files = self.config.get("environment_sources")
-        if env_source_file not in cur_env_source_files:
-            self.config.append("environment_sources", str(env_source_file))
+        if env_source not in cur_env_source_files:
+            self.config.append("environment_sources", str(env_source))
             self.config.save()
 
-    def get_demo_data_files_manifest(self) -> Dict[str, Union[None, str]]:
-        """Get a dict whose keys are example data file names and whose values are the
+    def get_demo_data_files_manifest(self) -> dict[str, Any]:
+        """
+        Get a dict whose keys are example data file names and whose values are the
         source files if the source file required unzipping or `None` otherwise.
 
         If the config item `demo_data_manifest_file` is set, this is used as the manifest
@@ -2448,26 +3819,26 @@ class BaseApp(metaclass=Singleton):
                 logger=self.logger,
             )
             with fs.open(url_path) as fh:
-                manifest = json.load(fh)
+                return json.load(fh)
         else:
             self.logger.debug(
                 f"loading example data files manifest from the app attribute "
                 f"`demo_data_manifest_dir`: "
                 f"{self.demo_data_manifest_dir!r}."
             )
-            package = self.demo_data_manifest_dir
-            resource = "demo_data_manifest.json"
-            fh = resources.files(package).joinpath(resource).open("rt")
-            manifest = json.load(fh)
-            fh.close()
-        return manifest
-
-    def list_demo_data_files(self) -> Tuple[str]:
+            if (package := self.demo_data_manifest_dir) is None:
+                self.logger.warning("no demo data dir defined")
+                return {}
+            with open_text_resource(package, "demo_data_manifest.json") as fh:
+                return json.load(fh)
+
+    def list_demo_data_files(self) -> tuple[str, ...]:
         """List available example data files."""
-        return tuple(self.get_demo_data_files_manifest().keys())
+        return tuple(self.get_demo_data_files_manifest())
 
-    def _get_demo_data_file_source_path(self, file_name) -> Tuple[Path, bool, bool]:
-        """Get the full path to an example data file on the local file system, whether
+    def _get_demo_data_file_source_path(self, file_name: str) -> tuple[Path, bool, bool]:
+        """
+        Get the full path to an example data file on the local file system, whether
         the file must be unpacked, and whether the file should be deleted.
 
         If `config.demo_data_dir` is set, this directory will be used as the example data
@@ -2484,10 +3855,9 @@ class BaseApp(metaclass=Singleton):
         value of `config.demo_data_dir` (without saving to the persistent config file),
         and then retrieve the example data file path as above. The default value is set to
         the GitHub repo of the app using the current tag/version.
-
         """
 
-        def _retrieve_source_path_from_config(src_fn):
+        def _retrieve_source_path_from_config(src_fn: str):
             fs, url_path = rate_limit_safe_url_to_fs(
                 self,
                 self.config.demo_data_dir,
@@ -2517,7 +3887,7 @@ class BaseApp(metaclass=Singleton):
         if file_name not in manifest:
             raise ValueError(f"No such example data file {file_name!r}.")
 
-        spec = manifest[file_name]
+        spec: dict[str, str] = manifest[file_name]
         requires_unpack = bool(spec)
         src_fn = spec["in_zip"] if requires_unpack else file_name
 
@@ -2535,49 +3905,37 @@ class BaseApp(metaclass=Singleton):
                 f"source directory: {self.demo_data_dir!r}."
             )
             # `config.demo_data_dir` not set, so try to use `app.demo_data_dir`:
-            package = self.demo_data_dir
-            resource_exists = True
-            delete = False
-            try:
-                ctx_man = resources.as_file(resources.files(package).joinpath(src_fn))
-                # raises ModuleNotFoundError
-            except ModuleNotFoundError:
-                resource_exists = False
 
-            if resource_exists:
+            if package := self.demo_data_dir:
                 try:
-                    with ctx_man as path:
+                    with get_file_context(package, src_fn) as path:
                         out = path
+                        delete = False
                 except (ModuleNotFoundError, FileNotFoundError):
-                    # frozen app
-                    resource_exists = False
-
-            if not resource_exists:
-                # example data not included (e.g. frozen, or installed via PyPI/conda), so
-                # set a default value for `config.demo_data_dir` (point to the package
-                # GitHub repo for the current tag):
-                path = "/".join(package.split("."))
-                url = self._get_github_url(sha=f"v{self.version}", path=path)
-                self.logger.info(
-                    f"path {path!r} does not exist as a package resource (example data "
-                    f"was probably not included in the app), so non-persistently setting "
-                    f"the config item `demo_data_dir` to the app's GitHub repo path: "
-                    f"{url!r}."
-                )
-                self.config.demo_data_dir = url
-                out, delete = _retrieve_source_path_from_config(src_fn)
+                    # example data not included (e.g. frozen, or installed via
+                    # PyPI/conda), so set a default value for `config.demo_data_dir`
+                    # (point to the package GitHub repo for the current tag):
+                    path_ = package.replace(".", "/")
+                    url = self._get_github_url(sha=f"v{self.version}", path=path_)
+                    self.logger.info(
+                        f"path {path_!r} does not exist as a package resource (example data "
+                        f"was probably not included in the app), so non-persistently setting "
+                        f"the config item `demo_data_dir` to the app's GitHub repo path: "
+                        f"{url!r}."
+                    )
+                    self.config.demo_data_dir = url
+                    out, delete = _retrieve_source_path_from_config(src_fn)
 
         return out, requires_unpack, delete
 
-    def get_demo_data_file_path(self, file_name) -> Path:
-        """Get the full path to an example data file in the app cache directory.
+    def get_demo_data_file_path(self, file_name: str) -> Path:
+        """
+        Get the full path to an example data file in the app cache directory.
 
         If the file does not already exist in the app cache directory, it will be added
         (and unzipped if required). The file may first be downloaded from a remote file
         system such as GitHub (see `_get_demo_data_file_source_path` for details).
-
         """
-
         # check if file exists in cache dir already
         cache_file_path = self.demo_data_cache_dir.joinpath(file_name)
         if cache_file_path.exists():
@@ -2617,22 +3975,26 @@ class BaseApp(metaclass=Singleton):
                 src.unlink()
         return cache_file_path
 
-    def cache_demo_data_file(self, file_name) -> Path:
+    def cache_demo_data_file(self, file_name: str) -> Path:
         """
         Get the name of a cached demo data file.
         """
         return self.get_demo_data_file_path(file_name)
 
-    def cache_all_demo_data_files(self) -> List[Path]:
+    def cache_all_demo_data_files(self) -> list[Path]:
         """
         Get the name of all cached demo data file.
         """
-        return [self.get_demo_data_file_path(i) for i in self.list_demo_data_files()]
+        return [
+            self.get_demo_data_file_path(filename)
+            for filename in self.list_demo_data_files()
+        ]
 
     def copy_demo_data(
-        self, file_name: str, dst: Optional[PathLike] = None, doc: bool = True
+        self, file_name: str, dst: PathLike | None = None, doc: bool = True
     ) -> str:
-        """Copy a builtin demo data file to the specified location.
+        """
+        Copy a builtin demo data file to the specified location.
 
         Parameters
         ----------
@@ -2642,7 +4004,6 @@ class BaseApp(metaclass=Singleton):
             Directory or full file path to copy the demo data file to. If not specified,
             the current working directory will be used.
         """
-
         dst = dst or Path(".")
         src = self.get_demo_data_file_path(file_name)
         shutil.copy2(src, dst)  # copies metadata, and `dst` can be a dir
@@ -2650,8 +4011,10 @@ class BaseApp(metaclass=Singleton):
         return src.name
 
     def _get_github_url(self, sha: str, path: str):
-        """Return a fsspec URL for retrieving a file or directory on the app's GitHub
-        repository."""
+        """
+        Return a fsspec URL for retrieving a file or directory on the app's GitHub
+        repository.
+        """
         return f"github://{self.gh_org}:{self.gh_repo}@{sha}/{path}"