openjd-cli 0.7.5__tar.gz → 0.7.7__tar.gz

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openjd-cli
-Version: 0.7.5
+Version: 0.7.7
 Summary: Provides a command-line interface for working with Open Job Description templates.
 Project-URL: Homepage, https://github.com/OpenJobDescription/openjd-cli
 Project-URL: Source, https://github.com/OpenJobDescription/openjd-cli
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
-Requires-Dist: openjd-model<0.10,>=0.9
-Requires-Dist: openjd-sessions<0.11,>=0.10.7
+Requires-Dist: openjd-model<0.12,>=0.11.4
+Requires-Dist: openjd-sessions<0.13,>=0.12.0
 Description-Content-Type: text/markdown
 
 ## Open Job Description - CLI

openjd_cli-0.7.7/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.7.7'
+__version_tuple__ = version_tuple = (0, 7, 7)
+
+__commit_id__ = commit_id = None

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/hatch_version_hook.py

@@ -7,7 +7,6 @@ from dataclasses import dataclass
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
 from typing import Any, Optional
 
-
 _logger = logging.Logger(__name__, logging.INFO)
 _stdout_handler = logging.StreamHandler(sys.stdout)
 _stdout_handler.addFilter(lambda record: record.levelno <= logging.INFO)

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/pyproject.toml

@@ -29,8 +29,18 @@ classifiers = [
   "Intended Audience :: End Users/Desktop"
 ]
 dependencies = [
-  "openjd-sessions >= 0.10.7,< 0.11",
-  "openjd-model >= 0.9,< 0.10"
+  # 0.12.0 is the first release carrying `resolved_symtab` on all three of
+  # Session.enter_environment, Session.exit_environment and Session.run_task.
+  # It is also the release that removed `extra_let_bindings` from
+  # enter_environment: 0.10.11 through 0.11.0 have that keyword and no
+  # `resolved_symtab`, so there is no version satisfying both channels and the
+  # floor has to move rather than being feature-detected. Below 0.12.0 every
+  # call site here raises TypeError on the unexpected `resolved_symtab`.
+  "openjd-sessions >= 0.12.0,< 0.13",
+  # 0.11.4 is the first release exporting `create_job_with_symbol_tables` and
+  # `JobWithSymbolTables`. 0.11.3 and below have `create_job` only, so the
+  # step-scope resolved symbol tables cannot be obtained at all.
+  "openjd-model >= 0.11.4,< 0.12"
 ]
 
 [project.urls]

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/__main__.py

@@ -2,5 +2,4 @@
 
 from .cli._create_argparser import main
 
-
 main()

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_check/_check_command.py

@@ -41,7 +41,10 @@ def do_check(args: Namespace) -> OpenJDCliResult:
         if TemplateSpecificationVersion.is_job_template(template_version):
             decode_job_template(template=template_object, supported_extensions=extensions)
         elif TemplateSpecificationVersion.is_environment_template(template_version):
-            decode_environment_template(template=template_object)
+            # Pass `extensions` so env templates can declare e.g.
+            # WRAP_ACTIONS (RFC 0008) — without this the model rejects
+            # the extension declaration even though the CLI accepts it.
+            decode_environment_template(template=template_object, supported_extensions=extensions)
         else:
             return OpenJDCliResult(
                 status="error",

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_common/__init__.py

@@ -4,7 +4,7 @@ from argparse import ArgumentParser, Namespace, _SubParsersAction
 from dataclasses import asdict, dataclass
 from enum import Enum
 from pathlib import Path
-from typing import Callable, Literal
+from typing import TYPE_CHECKING, Callable, Literal
 import json
 import yaml
 import os
@@ -23,6 +23,10 @@ from ._validation_utils import (
 )
 from openjd.model import DecodeValidationError, Job, JobParameterValues, EnvironmentTemplate
 
+if TYPE_CHECKING:
+    # Annotations only; see the note in _job_from_template.py.
+    from openjd.expr import SerializedSymbolTable
+
 __all__ = [
     "add_extensions_argument",
     "get_doc_type",
@@ -118,7 +122,10 @@ def generate_job(
     environments: list[EnvironmentTemplate] = [],
     *,
     supported_extensions: list[str],
-) -> tuple[Job, JobParameterValues]:
+) -> tuple[Job, JobParameterValues, dict[str, "SerializedSymbolTable"]]:
+    """Returns the job, its parameter values, and the per-step resolved symbol
+    tables keyed by step name. See :func:`job_from_template` for why the tables
+    must be carried alongside the job rather than discarded."""
     try:
         # Raises: RuntimeError, DecodeValidationError
         template = read_job_template(args.path, supported_extensions=supported_extensions)

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_common/_extensions.py

@@ -3,14 +3,23 @@
 from argparse import ArgumentParser
 from typing import Optional
 
-# This is the list of Open Job Description extensions with implemented support
-SUPPORTED_EXTENSIONS = ["TASK_CHUNKING", "REDACTED_ENV_VARS", "FEATURE_BUNDLE_1"]
+# This is the list of Open Job Description extensions with implemented support.
+# EXPR (RFCs 0005/0006) and WRAP_ACTIONS (RFC 0008) are added so the CLI can run
+# templates that declare them. WRAP_ACTIONS implies EXPR; the model library
+# handles that implication when it parses the template.
+SUPPORTED_EXTENSIONS = [
+    "TASK_CHUNKING",
+    "REDACTED_ENV_VARS",
+    "FEATURE_BUNDLE_1",
+    "EXPR",
+    "WRAP_ACTIONS",
+]
 
 
 def add_extensions_argument(run_parser: ArgumentParser):
     run_parser.add_argument(
         "--extensions",
-        help=f"A comma-separated list of Open Job Description extension names to enable. Defaults to all that are implemented: {','.join(SUPPORTED_EXTENSIONS)}",
+        help=f"A comma-separated list of Open Job Description extension names that the CLI will accept from job templates. Templates declare which extensions they use. Defaults to all that are implemented: {','.join(SUPPORTED_EXTENSIONS)}",
     )
 
 

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_common/_job_from_template.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 import json
 from pathlib import Path
 import re
-from typing import Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 import yaml
 
 from ._validation_utils import get_doc_type
@@ -15,10 +15,17 @@ from openjd.model import (
     Job,
     JobParameterValues,
     JobTemplate,
-    create_job,
+    create_job_with_symbol_tables,
     preprocess_job_parameters,
 )
 
+if TYPE_CHECKING:
+    # Only for annotations: `openjd.expr` is a facade over the native
+    # extension, and importing the CLI must not load it. The tables the model
+    # hands back are already instances of this type, so nothing here
+    # constructs one.
+    from openjd.expr import SerializedSymbolTable
+
 
 def get_params_from_file(parameter_string: str) -> Union[dict, list]:
     """
@@ -111,10 +118,18 @@ def job_from_template(
     parameter_args: list[str] | None,
     job_template_dir: Path,
     current_working_dir: Path,
-) -> tuple[Job, JobParameterValues]:
+) -> tuple[Job, JobParameterValues, dict[str, "SerializedSymbolTable"]]:
     """
     Given a decoded Job Template and a user-input parameter dictionary,
-    generates a Job object and the parameter values for running the job.
+    generates a Job object, the parameter values for running the job, and the
+    per-step resolved symbol tables, keyed by step name.
+
+    A step's template-scope `let` bindings (RFC 0005 §3.6) are evaluated once
+    here, at job creation, and their resolved values reach a session only
+    through those tables -- neither the model nor the session re-derives them
+    from the source expressions. Sessions for a step must therefore be given
+    `step_symbol_tables[step.name]`, or the step's `let` produces no bindings
+    at all.
 
     Raises: RuntimeError if parameters are an unsupported type or don't correspond to the template
     """
@@ -132,11 +147,14 @@ def job_from_template(
         raise RuntimeError(str(ve))
 
     try:
-        job = create_job(
+        # `create_job_with_symbol_tables` returns the same Job that
+        # `create_job` does; it additionally returns the symbol tables that
+        # instantiation built instead of discarding them.
+        created = create_job_with_symbol_tables(
             job_template=template,
             job_parameter_values=parameter_values,
             environment_templates=environments,
         )
-        return (job, parameter_values)
+        return (created.job, parameter_values, created.step_symbol_tables)
     except DecodeValidationError as dve:
         raise RuntimeError(f"Could not generate Job from template and parameters: {str(dve)}")

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_common/_validation_utils.py

@@ -1,6 +1,6 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-from typing import Any
+from typing import Any, Optional
 from pathlib import Path
 
 from openjd.model import (
@@ -70,15 +70,29 @@ def read_job_template(template_file: Path, *, supported_extensions: list[str]) -
     return template
 
 
-def read_environment_template(template_file: Path) -> EnvironmentTemplate:
+def read_environment_template(
+    template_file: Path,
+    *,
+    supported_extensions: Optional[list[str]] = None,
+) -> EnvironmentTemplate:
     """Open a JSON or YAML-formatted file and attempt to parse it into an EnvironmentTemplate object.
     Raises a RuntimeError if the file doesn't exist or can't be opened, and raises a
     DecodeValidationError if its contents can't be parsed into a valid EnvironmentTemplate.
+
+    Environment templates may declare extensions just like job templates do
+    (e.g. ``WRAP_ACTIONS`` for RFC 0008's wrap hooks). Pass the CLI's allow-list
+    via ``supported_extensions`` so the model accepts those declarations;
+    omitting the argument preserves the legacy behavior of accepting only the
+    default model surface.
     """
     # Raises RuntimeError
     template_object = read_template(template_file)
 
+    decode_kwargs: dict[str, list[str]] = {}
+    if supported_extensions is not None:
+        decode_kwargs["supported_extensions"] = supported_extensions
+
     # Raises: DecodeValidationError
-    template = decode_environment_template(template=template_object)
+    template = decode_environment_template(template=template_object, **decode_kwargs)
 
     return template

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_create_argparser.py

@@ -14,7 +14,6 @@ from ._summary import populate_argparser as populate_summary_subparser
 from ._run import populate_argparser as populate_run_subparser
 from ._schema import populate_argparser as populate_schema_subparser
 
-
 # Our CLI subcommand construction requires that all leaf subcommands define a default
 # 'func' property which is a Callable[[],None] that implements the subcommand.
 # After parsing, we call that `func` argument of the resulting args object.

openjd_cli-0.7.7/src/openjd/cli/_run/_local_session/_actions.py

@@ -0,0 +1,174 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+from enum import Enum
+from typing import TYPE_CHECKING, Optional
+
+from openjd.model import Step, TaskParameterSet
+from openjd.model.v2023_09 import Environment
+from openjd.sessions import Session
+
+if TYPE_CHECKING:
+    # Annotations only: `openjd.expr` is a facade over the native extension and
+    # importing the CLI must not load it. These tables are produced by
+    # `create_job_with_symbol_tables` and forwarded unchanged.
+    from openjd.expr import SerializedSymbolTable
+
+
+class EnvironmentType(str, Enum):
+    """
+    The three different types of environment types that can be entered/exited in a session.
+    """
+
+    EXTERNAL = "EXTERNAL"
+    JOB = "JOB"
+    STEP = "STEP"
+    ALL = "ALL"
+
+    def matches(self, other: "EnvironmentType") -> bool:
+        """Environment types match if they are equal, or one of them is ALL."""
+        return self == other or self == EnvironmentType.ALL or other == EnvironmentType.ALL
+
+
+class SessionAction:
+    _session: Session
+    duration: float
+
+    def __init__(self, session: Session):
+        self._session = session
+
+    def run(self):
+        """
+        Subclasses of `SessionAction` should have
+        custom implementations of this depending on their type.
+        """
+
+
+class RunTaskAction(SessionAction):
+    _step: Step
+    _parameters: TaskParameterSet
+    _resolved_symtab: Optional["SerializedSymbolTable"]
+
+    def __init__(
+        self,
+        session: Session,
+        step: Step,
+        parameters: TaskParameterSet,
+        resolved_symtab: Optional["SerializedSymbolTable"] = None,
+    ):
+        super(RunTaskAction, self).__init__(session)
+        self._step = step
+        self._parameters = parameters
+        # The step's create-time resolved symbol table
+        # (`create_job_with_symbol_tables().step_symbol_tables[step.name]`).
+        # It is the only channel for the step's template-scope `let` values:
+        # the model does not merge them into `script.let`, and the session does
+        # not re-evaluate the source expressions.
+        self._resolved_symtab = resolved_symtab
+
+    def run(self):
+        self._session.run_task(
+            step_script=self._step.script,
+            task_parameter_values=self._parameters,
+            # RFC 0008: the step name feeds the WrappedStep.Name template
+            # variable inside an active onWrapTaskRun hook.
+            step_name=self._step.name,
+            resolved_symtab=self._resolved_symtab,
+        )
+
+    def __str__(self):
+        parameters = {name: parameter.value for name, parameter in self._parameters.items()}
+        return f"Run Step '{self._step.name}' with Task parameters '{str(parameters)}'"
+
+
+class EnterEnvironmentAction(SessionAction):
+    _environment: Environment
+    _id: str
+    _resolved_symtab: Optional["SerializedSymbolTable"]
+    _step_name: Optional[str]
+
+    def __init__(
+        self,
+        session: Session,
+        environment: Environment,
+        env_id: str,
+        resolved_symtab: Optional["SerializedSymbolTable"] = None,
+        step_name: Optional[str] = None,
+    ):
+        super(EnterEnvironmentAction, self).__init__(session)
+        self._environment = environment
+        self._id = env_id
+        # RFC 0005 §3.6: a step's environments are entered with the step's
+        # create-time resolved symbol table, which carries the step's
+        # template-scope `let` values so their variables/actions can reference
+        # them. Only step-environment enters have one; job and external
+        # environment enters leave it None.
+        self._resolved_symtab = resolved_symtab
+        # RFC 0007 §7.3.1 (EXPR): the owning step's name seeds Step.Name for
+        # a step environment's `let` bindings, variables, and actions. Only
+        # step-environment enters carry a step name; job/external enters
+        # leave it None.
+        self._step_name = step_name
+
+    def run(self):
+        # `step_name` is omitted rather than passed as None when this enter has
+        # no owning step. Passing None would be equivalent today, since
+        # enter_environment skips a None `step_name`, but omitting it keeps the
+        # call site's intent legible at the boundary and it is what
+        # test_localsession_step_env_enter_receives_step_name asserts — that
+        # assertion is currently the only check that job and external enters
+        # do not seed Step.Name, because a template referencing Step.Name
+        # outside a step is rejected by static validation before any session
+        # is built, so no loadable template can observe it.
+        #
+        # `resolved_symtab` is passed unconditionally: None is its documented
+        # "no table" value and there is no analogous assertion keyed on its
+        # absence.
+        optional_kwargs: dict[str, str] = {}
+        if self._step_name is not None:
+            optional_kwargs["step_name"] = self._step_name
+        self._session.enter_environment(
+            environment=self._environment,
+            identifier=self._id,
+            resolved_symtab=self._resolved_symtab,
+            **optional_kwargs,
+        )
+
+    def __str__(self):
+        return f"Enter Environment '{self._environment.name}'"
+
+
+class ExitEnvironmentAction(SessionAction):
+    _id: str
+    _keep_session_running: bool
+    _resolved_symtab: Optional["SerializedSymbolTable"]
+
+    def __init__(
+        self,
+        session: Session,
+        id: str,
+        keep_session_running: bool,
+        resolved_symtab: Optional["SerializedSymbolTable"] = None,
+    ):
+        super(ExitEnvironmentAction, self).__init__(session)
+        self._id = id
+        self._keep_session_running = keep_session_running
+        # The same table the environment was entered with, so its onExit
+        # resolves in the same scope as its onEnter (what
+        # Session.exit_environment documents for this argument).
+        #
+        # Unlike the worker agent, the CLI holds the table as an object rather
+        # than a JSON string served by the service, so there is no parse step
+        # here that could fail and no wrapper degrading a parse failure to None
+        # to keep teardown unconditional. An environment entered without a
+        # table simply exits without one.
+        self._resolved_symtab = resolved_symtab
+
+    def run(self):
+        self._session.exit_environment(
+            identifier=self._id,
+            keep_session_running=self._keep_session_running,
+            resolved_symtab=self._resolved_symtab,
+        )
+
+    def __str__(self):
+        return f"Exit Environment '{self._id}'"

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_run/_local_session/_session_manager.py

@@ -3,11 +3,12 @@
 from queue import Queue
 from threading import Event
 import time
-from typing import Any, Iterable, Optional, Type
+from typing import TYPE_CHECKING, Any, Iterable, Optional, Type
 from types import FrameType, TracebackType
 from signal import signal, SIGINT, SIGTERM, SIG_DFL
 from itertools import islice
 from datetime import datetime, timedelta, timezone
+from math import isfinite
 
 from ._actions import (
     EnterEnvironmentAction,
@@ -38,6 +39,10 @@ from openjd.sessions import (
     PathMappingRule,
 )
 
+if TYPE_CHECKING:
+    # Annotations only; see the note in _actions.py.
+    from openjd.expr import SerializedSymbolTable
+
 
 class LocalSessionFailed(RuntimeError):
     """
@@ -49,6 +54,50 @@ class LocalSessionFailed(RuntimeError):
         super().__init__(f"Action failed: {failed_action}")
 
 
+def _calculate_adaptive_chunk_size(
+    *,
+    current_chunk_size: int,
+    completed_task_count: int,
+    completed_task_duration: float,
+    target_runtime_seconds: float,
+) -> Optional[int]:
+    """The adaptive-chunking size estimate, or ``None`` to defer adjusting.
+
+    Implements steps 3-7 of the adaptive chunking algorithm in the Open Job
+    Description CLI specification (``specs/cli/run.md`` in openjd-rs): if the
+    cumulative duration is zero or non-finite, keep the current chunk size and
+    wait for a measurable sample.
+
+    Deferring matters because a zero ``duration_per_task`` makes the ideal size
+    unrepresentable. The two implementations fail differently without this
+    guard: the Rust CLI produces ``inf``, which saturates to a huge chunk size,
+    while Python raises ``ZeroDivisionError`` out of the run. Neither is
+    reachable through a normal ``openjd run`` today -- ``run_task`` always
+    spawns and waits on a real subprocess, so a measured chunk duration of
+    exactly ``0.0`` would need that round trip to complete inside one
+    ``perf_counter`` tick (~42 ns here) -- so this is spec conformance and
+    hardening rather than a fix for an observed failure.
+
+    Extracted as a module-level function, mirroring openjd-rs's
+    ``calculate_adaptive_chunk_size``, so the deferral is unit-testable without
+    needing to provoke an unreachable timing condition end to end.
+    """
+    if (
+        completed_task_count <= 0
+        or completed_task_duration <= 0.0
+        or not isfinite(completed_task_duration)
+    ):
+        return None
+
+    duration_per_task = completed_task_duration / completed_task_count
+    adaptive_chunk_size = target_runtime_seconds / duration_per_task
+    if completed_task_count < 10 and adaptive_chunk_size > current_chunk_size:
+        # When we have data about only a few tasks, gradually blend in the new
+        # estimate instead of cutting over immediately.
+        adaptive_chunk_size = 0.75 * current_chunk_size + 0.25 * adaptive_chunk_size
+    return max(int(adaptive_chunk_size), 1)
+
+
 class LocalSession:
     """
     A class to manage a `Session` object from the `sessions` module,
@@ -73,6 +122,8 @@ class LocalSession:
     _path_mapping_rules: Optional[list[PathMappingRule]]
     _environments: Optional[list[Any]]
     _environments_entered: list[tuple[EnvironmentType, str]]
+    _step_symbol_tables: dict[str, "SerializedSymbolTable"]
+    _entered_env_symtabs: dict[str, "SerializedSymbolTable"]
     _log_handler: LocalSessionLogHandler
     _cleanup_called: bool
 
@@ -82,6 +133,7 @@ class LocalSession:
         job: Job,
         job_parameter_values: JobParameterValues,
         session_id: str,
+        step_symbol_tables: Optional[dict[str, "SerializedSymbolTable"]] = None,
         timestamp_format: LoggingTimestampFormat = LoggingTimestampFormat.RELATIVE,
         path_mapping_rules: Optional[list[PathMappingRule]] = None,
         environments: Optional[list[Any]] = None,
@@ -97,11 +149,28 @@ class LocalSession:
         self._timestamp_format = timestamp_format
         self._path_mapping_rules = path_mapping_rules
         self._environments = environments
+        # The create-time resolved symbol tables from
+        # `create_job_with_symbol_tables`, keyed by step name. A step's
+        # template-scope `let` (RFC 0005 §3.6) is evaluated once at job
+        # creation, and this is the only channel its resolved values have into
+        # a session: the model does not fold them into `script.let` and the
+        # session does not re-evaluate the source expressions. A caller that
+        # omits them gets a session in which every step-level `let` is simply
+        # undefined.
+        self._step_symbol_tables = step_symbol_tables or {}
+        # The table each entered environment was entered with, keyed by
+        # environment identifier, so its exit can be given the same one --
+        # `Session.exit_environment` documents that as the way an onExit
+        # resolves in the same scope as its onEnter. Environments entered
+        # without a table are simply absent.
+        self._entered_env_symtabs = {}
 
         # Create an OpenJD Session
         self._openjd_session = Session(
             session_id=self.session_id,
             job_parameter_values=job_parameter_values,
+            # RFC 0007 §7.3.1 (EXPR): seeds the Job.Name template variable.
+            job_name=str(job.name),
             path_mapping_rules=self._path_mapping_rules,
             callback=self._action_callback,
             retain_working_dir=retain_working_dir,
@@ -197,7 +266,14 @@ class LocalSession:
         LOG.info("Interruption signal recieved.")
         self.cancel()
 
-    def run_environment_enters(self, environments: Optional[list[Any]], type: EnvironmentType):
+    def run_environment_enters(
+        self,
+        environments: Optional[list[Any]],
+        type: EnvironmentType,
+        *,
+        resolved_symtab: Optional["SerializedSymbolTable"] = None,
+        step_name: Optional[str] = None,
+    ):
         """Enter one or more environments in the session."""
         if environments is None:
             return
@@ -211,10 +287,55 @@ class LocalSession:
             env_id = f"{type.name} - {env.name}"
             self._action_ended.clear()
             self._current_action = EnterEnvironmentAction(
-                session=self._openjd_session, environment=env, env_id=env_id
+                session=self._openjd_session,
+                environment=env,
+                env_id=env_id,
+                # RFC 0005 §3.6: a step's environments see the step's resolved
+                # template-scope `let` values through its symbol table.
+                resolved_symtab=resolved_symtab,
+                # RFC 0007 §7.3.1 (EXPR): a step's environments see Step.Name.
+                # Only step-environment enters carry a step name.
+                step_name=step_name,
             )
             self._environments_entered.append((type, env_id))
-            self._current_action.run()
+            # Recorded before the enter runs, and deliberately not undone on
+            # failure: whether the enter succeeds or not, the exit that follows
+            # must be given the table the enter was attempted with.
+            if resolved_symtab is not None:
+                self._entered_env_symtabs[env_id] = resolved_symtab
+            try:
+                self._current_action.run()
+            except (RuntimeError, ValueError) as exc:
+                # Session.enter_environment raises (rather than reporting
+                # through the action-status callback) when it rejects the
+                # environment up front, before registering it — the RFC 0008
+                # "at most one Environment defining wrap hooks" RuntimeError is
+                # the trigger that reaches us in practice. Every failure it
+                # detects *after* registering goes through
+                # _fail_action_before_start() and returns normally instead, so
+                # as of openjd-sessions 0.12.0 nothing raises post-registration
+                # and the else-branch below is defensive. It is kept because the
+                # cost of being wrong is asymmetric: if a future release does
+                # raise after registering, dropping the environment from our
+                # list would skip its onExit and desynchronize us from the
+                # session's LIFO exit-ordering check, masking the original error
+                # with "Must exit Environment X first". So: only when the session
+                # did NOT register the environment may we drop it from our
+                # entered list (cleanup must not try to exit it). If the session
+                # did register it, it must stay in our list so cleanup exits it —
+                # popping it here would skip its onExit and desynchronize us
+                # from the session's LIFO exit ordering check, masking the
+                # original error with "Must exit Environment X first".
+                if env_id not in self._openjd_session.environments_entered:
+                    self._environments_entered.pop()
+                LOG.info(
+                    msg=f"Open Job Description CLI: ERROR entering environment '{env.name}': {exc}",
+                    extra={"session_id": self.session_id},
+                )
+                self.failed = True
+                self._failed_action = self._current_action
+                self._current_action = None
+                raise LocalSessionFailed(self._failed_action) from exc
             self._action_ended.wait()
             if self.failed:
                 self._failed_action = self._current_action
@@ -238,7 +359,12 @@ class LocalSession:
             prev_action_failed = self.failed
             self._action_ended.clear()
             self._current_action = ExitEnvironmentAction(
-                session=self._openjd_session, id=env_id, keep_session_running=keep_session_running
+                session=self._openjd_session,
+                id=env_id,
+                keep_session_running=keep_session_running,
+                # The same table the enter used, so onExit resolves in the same
+                # scope as onEnter. `pop` because an environment is exited once.
+                resolved_symtab=self._entered_env_symtabs.pop(env_id, None),
             )
             self._current_action.run()
             self._action_ended.wait()
@@ -258,7 +384,11 @@ class LocalSession:
 
         self._action_ended.clear()
         self._current_action = RunTaskAction(
-            session=self._openjd_session, step=step, parameters=parameter_set
+            session=self._openjd_session,
+            step=step,
+            parameters=parameter_set,
+            # RFC 0005 §3.6: the step's resolved template-scope `let` values.
+            resolved_symtab=self._step_symbol_tables.get(step.name),
         )
         self._current_action.run()
         self._action_ended.wait()
@@ -300,27 +430,28 @@ class LocalSession:
             # Estimate a chunk size based on the statistics, and update the iterator. Note that this
             # logic is very simple, providing a good starting point that behaves reasonably for other implementations
             # to follow.
-            duration_per_task = completed_task_duration / completed_task_count
-            adaptive_chunk_size = target_runtime_seconds / duration_per_task
+            new_chunk_size = _calculate_adaptive_chunk_size(
+                current_chunk_size=task_parameters.chunks_default_task_count,  # type: ignore
+                completed_task_count=completed_task_count,
+                completed_task_duration=completed_task_duration,
+                target_runtime_seconds=target_runtime_seconds,
+            )
+            # `None` means there is no measurable sample yet: keep the current chunk
+            # size and wait for one. Deliberately not `continue` -- the maximum-task
+            # countdown below must still run for this completed chunk.
             if (
-                completed_task_count < 10
-                and adaptive_chunk_size > task_parameters.chunks_default_task_count  # type: ignore
+                new_chunk_size is not None
+                and new_chunk_size != task_parameters.chunks_default_task_count
             ):
-                # When we have data about only a few tasks, gradually blend in the new estimate instead of cutting over immediately
-                adaptive_chunk_size = (
-                    0.75 * task_parameters.chunks_default_task_count + 0.25 * adaptive_chunk_size  # type: ignore
-                )
-            adaptive_chunk_size = max(int(adaptive_chunk_size), 1)
-            if adaptive_chunk_size != task_parameters.chunks_default_task_count:
                 LOG.info(
                     msg=f"Open Job Description CLI: Ran {completed_task_count} tasks in {timedelta(seconds=completed_task_duration)}, average {timedelta(seconds=completed_task_duration / completed_task_count)}",
                     extra={"session_id": self.session_id},
                 )
                 LOG.info(
-                    msg=f"Open Job Description CLI: Adjusting chunk size from {task_parameters.chunks_default_task_count} to {adaptive_chunk_size}",
+                    msg=f"Open Job Description CLI: Adjusting chunk size from {task_parameters.chunks_default_task_count} to {new_chunk_size}",
                     extra={"session_id": self.session_id},
                 )
-                task_parameters.chunks_default_task_count = adaptive_chunk_size
+                task_parameters.chunks_default_task_count = new_chunk_size
 
             # If a maximum task count was specified, count them down
             if maximum_tasks and maximum_tasks > 0:
@@ -348,8 +479,21 @@ class LocalSession:
         if task_parameters is None:
             task_parameters = StepParameterSpaceIterator(space=step.parameterSpace)
 
-        # Enter all the step environments
-        self.run_environment_enters(step.stepEnvironments, EnvironmentType.STEP)
+        # Enter all the step environments with the step's create-time resolved
+        # symbol table, so a step-level `let` (RFC 0005 §3.6) is visible to
+        # their variables and actions. The source expressions are not
+        # re-evaluated anywhere downstream, so a missing table here means the
+        # step's `let` names are undefined rather than merely stale.
+        resolved_symtab = self._step_symbol_tables.get(step.name)
+        self.run_environment_enters(
+            step.stepEnvironments,
+            EnvironmentType.STEP,
+            resolved_symtab=resolved_symtab,
+            # RFC 0007 §7.3.1 (EXPR): Step.Name is available to a step's
+            # environments (openjd-rs threads the step's resolved symbol
+            # table into enter_environment; this is the CLI counterpart).
+            step_name=step.name,
+        )
 
         try:
             # Run the tasks

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_run/_run_command.py

@@ -4,7 +4,7 @@ from argparse import ArgumentParser, Namespace
 from dataclasses import dataclass
 from pathlib import Path
 import json
-from typing import Iterable, Optional
+from typing import TYPE_CHECKING, Iterable, Optional
 import re
 import logging
 import time
@@ -40,6 +40,10 @@ from openjd.model import (
 )
 from openjd.sessions import PathMappingRule, LOG
 
+if TYPE_CHECKING:
+    # Annotations only; see the note in _local_session/_actions.py.
+    from openjd.expr import SerializedSymbolTable
+
 
 @dataclass
 class OpenJDRunResult(OpenJDCliResult):
@@ -321,6 +325,7 @@ def _run_local_session(
     *,
     job: Job,
     job_parameter_values: JobParameterValues,
+    step_symbol_tables: Optional[dict[str, "SerializedSymbolTable"]] = None,
     step_list: list[Step],
     selected_step: Optional[Step],
     timestamp_format: LoggingTimestampFormat,
@@ -338,6 +343,7 @@ def _run_local_session(
     Creates a Session object and listens for log messages to synchronously end the session.
     """
 
+    error_message = "Session ended with errors; see Task logs for details"
     try:
         start_seconds = time.perf_counter()
 
@@ -345,6 +351,9 @@ def _run_local_session(
         with LocalSession(
             job=job,
             job_parameter_values=job_parameter_values,
+            # RFC 0005 §3.6: each step's create-time resolved `let` values. The
+            # only channel they have into the session.
+            step_symbol_tables=step_symbol_tables,
             timestamp_format=timestamp_format,
             session_id="CLI-session",
             path_mapping_rules=path_mapping_rules,
@@ -367,6 +376,14 @@ def _run_local_session(
     except LocalSessionFailed:
         duration = time.perf_counter() - start_seconds
         session = None
+    except (RuntimeError, ValueError) as exc:
+        # Exceptions raised by openjd.sessions from within session actions
+        # (e.g. the RFC 0008 "at most one wrap environment" RuntimeError)
+        # rather than reported through the action-status callback. Report
+        # them as a clean error result instead of a raw traceback.
+        duration = time.perf_counter() - start_seconds
+        session = None
+        error_message = f"Session ended with errors: {exc}"
 
     preserved_message: str = ""
     if retain_working_dir and session is not None:
@@ -377,7 +394,7 @@ def _run_local_session(
     if session is None or session.failed:
         return OpenJDRunResult(
             status="error",
-            message="Session ended with errors; see Task logs for details" + preserved_message,
+            message=error_message + preserved_message,
             job_name=job.name,
             step_name=step_name,
             duration=duration,
@@ -415,7 +432,11 @@ def do_run(args: Namespace) -> OpenJDCliResult:
             filename = Path(env).expanduser()
             try:
                 # Raises: RuntimeError, DecodeValidationError
-                env_template = read_environment_template(filename)
+                # Pass `extensions` so env templates can declare e.g.
+                # WRAP_ACTIONS (RFC 0008) — without this they're parsed
+                # against the default model surface and reject the
+                # extension declaration.
+                env_template = read_environment_template(filename, supported_extensions=extensions)
                 environments.append(env_template)
             except (RuntimeError, DecodeValidationError) as e:
                 return OpenJDCliResult(status="error", message=str(e))
@@ -451,7 +472,7 @@ def do_run(args: Namespace) -> OpenJDCliResult:
 
     try:
         # Raises: RuntimeError
-        the_job, job_parameter_values = generate_job(
+        the_job, job_parameter_values, step_symbol_tables = generate_job(
             args, environments, supported_extensions=extensions
         )
 
@@ -543,14 +564,23 @@ def do_run(args: Namespace) -> OpenJDCliResult:
         return OpenJDCliResult(status="error", message=str(rte))
 
     # Create a RevisionExtensions object with the default specification version and enabled extensions
-    # We use the default v2023_09 since that's what we're currently supporting
+    # We use the default v2023_09 since that's what we're currently supporting.
+    # Extension behaviors activate only when declared by the templates being
+    # run (the job template and any external environment templates) — the
+    # CLI's --extensions list is what the CLI *accepts*, not what is enabled.
+    declared_extensions: list[str] = list(the_job.extensions or [])
+    for env_template in environments or []:
+        for ext_name in env_template.extensions or []:
+            if ext_name not in declared_extensions:
+                declared_extensions.append(ext_name)
     revision_extensions = RevisionExtensions(
-        spec_rev=the_job.revision, supported_extensions=extensions
+        spec_rev=the_job.revision, supported_extensions=declared_extensions
     )
 
     return _run_local_session(
         job=the_job,
         job_parameter_values=job_parameter_values,
+        step_symbol_tables=step_symbol_tables,
         step_list=step_list,
         selected_step=selected_step,
         task_parameter_values=task_parameter_values,

{openjd_cli-0.7.5 → openjd_cli-0.7.7}/src/openjd/cli/_summary/_summary_command.py

@@ -35,7 +35,7 @@ def do_summary(args: Namespace) -> OpenJDCliResult:
 
     try:
         # Raises: RuntimeError
-        sample_job, _ = generate_job(args, supported_extensions=extensions)
+        sample_job, _, _ = generate_job(args, supported_extensions=extensions)
     except RuntimeError as rte:
         return OpenJDCliResult(status="error", message=str(rte))
 

openjd_cli-0.7.7/src/openjd/cli/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.7.7'
+__version_tuple__ = version_tuple = (0, 7, 7)
+
+__commit_id__ = commit_id = None

openjd_cli-0.7.5/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '0.7.5'
-__version_tuple__ = version_tuple = (0, 7, 5)
-
-__commit_id__ = commit_id = None

openjd_cli-0.7.5/src/openjd/cli/_run/_local_session/_actions.py

@@ -1,89 +0,0 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-from enum import Enum
-
-from openjd.model import Step, TaskParameterSet
-from openjd.model.v2023_09 import Environment
-from openjd.sessions import Session
-
-
-class EnvironmentType(str, Enum):
-    """
-    The three different types of environment types that can be entered/exited in a session.
-    """
-
-    EXTERNAL = "EXTERNAL"
-    JOB = "JOB"
-    STEP = "STEP"
-    ALL = "ALL"
-
-    def matches(self, other: "EnvironmentType") -> bool:
-        """Environment types match if they are equal, or one of them is ALL."""
-        return self == other or self == EnvironmentType.ALL or other == EnvironmentType.ALL
-
-
-class SessionAction:
-    _session: Session
-    duration: float
-
-    def __init__(self, session: Session):
-        self._session = session
-
-    def run(self):
-        """
-        Subclasses of `SessionAction` should have
-        custom implementations of this depending on their type.
-        """
-
-
-class RunTaskAction(SessionAction):
-    _step: Step
-    _parameters: TaskParameterSet
-
-    def __init__(self, session: Session, step: Step, parameters: TaskParameterSet):
-        super(RunTaskAction, self).__init__(session)
-        self._step = step
-        self._parameters = parameters
-
-    def run(self):
-        self._session.run_task(
-            step_script=self._step.script, task_parameter_values=self._parameters
-        )
-
-    def __str__(self):
-        parameters = {name: parameter.value for name, parameter in self._parameters.items()}
-        return f"Run Step '{self._step.name}' with Task parameters '{str(parameters)}'"
-
-
-class EnterEnvironmentAction(SessionAction):
-    _environment: Environment
-    _id: str
-
-    def __init__(self, session: Session, environment: Environment, env_id: str):
-        super(EnterEnvironmentAction, self).__init__(session)
-        self._environment = environment
-        self._id = env_id
-
-    def run(self):
-        self._session.enter_environment(environment=self._environment, identifier=self._id)
-
-    def __str__(self):
-        return f"Enter Environment '{self._environment.name}'"
-
-
-class ExitEnvironmentAction(SessionAction):
-    _id: str
-    _keep_session_running: bool
-
-    def __init__(self, session: Session, id: str, keep_session_running: bool):
-        super(ExitEnvironmentAction, self).__init__(session)
-        self._id = id
-        self._keep_session_running = keep_session_running
-
-    def run(self):
-        self._session.exit_environment(
-            identifier=self._id, keep_session_running=self._keep_session_running
-        )
-
-    def __str__(self):
-        return f"Exit Environment '{self._id}'"

openjd_cli-0.7.5/src/openjd/cli/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '0.7.5'
-__version_tuple__ = version_tuple = (0, 7, 5)
-
-__commit_id__ = commit_id = None