openjd-cli 0.4.3__tar.gz → 0.5.1__tar.gz

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: openjd-cli
-Version: 0.4.3
+Version: 0.5.1
 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.4.*
-Requires-Dist: openjd-sessions==0.7.*
+Requires-Dist: openjd-model==0.6.*
+Requires-Dist: openjd-sessions==0.10.*
 Description-Content-Type: text/markdown
 
 ## Open Job Description - CLI
@@ -307,7 +307,12 @@ For example, if you would like to verify your download of the wheel for version
 
 ## Security
 
-See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
+We take all security reports seriously. When we receive such reports, we will 
+investigate and subsequently address any potential vulnerabilities as quickly 
+as possible. If you discover a potential security issue in this project, please 
+notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/)
+or directly via email to [AWS Security](aws-security@amazon.com). Please do not 
+create a public GitHub issue in this project.
 
 ## License
 

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/README.md

@@ -279,7 +279,12 @@ For example, if you would like to verify your download of the wheel for version
 
 ## Security
 
-See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
+We take all security reports seriously. When we receive such reports, we will 
+investigate and subsequently address any potential vulnerabilities as quickly 
+as possible. If you discover a potential security issue in this project, please 
+notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/)
+or directly via email to [AWS Security](aws-security@amazon.com). Please do not 
+create a public GitHub issue in this project.
 
 ## License
 

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/hatch.toml

@@ -21,7 +21,7 @@ lint = [
 ]
 
 [[envs.all.matrix]]
-python = ["3.9", "3.10", "3.11"]
+python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
 [envs.codebuild.scripts]
 build = "hatch build"

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/openjd/cli/_check/_check_command.py

@@ -27,7 +27,7 @@ def do_check(args: Namespace) -> OpenJDCliResult:
 
         # Raises: DecodeValidationError
         if TemplateSpecificationVersion.is_job_template(template_version):
-            decode_job_template(template=template_object)
+            decode_job_template(template=template_object, supported_extensions=["TASK_CHUNKING"])
         elif TemplateSpecificationVersion.is_environment_template(template_version):
             decode_environment_template(template=template_object)
         else:

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/openjd/cli/_common/_validation_utils.py

@@ -62,7 +62,7 @@ def read_job_template(template_file: Path) -> JobTemplate:
     template_object = read_template(template_file)
 
     # Raises: DecodeValidationError
-    template = decode_job_template(template=template_object)
+    template = decode_job_template(template=template_object, supported_extensions=["TASK_CHUNKING"])
 
     return template
 

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/openjd/cli/_run/_local_session/_session_manager.py

@@ -46,7 +46,8 @@ class LocalSession:
     _start_seconds: float
     _end_seconds: float
     _inner_session: Session
-    _action_queue: Queue[SessionAction]
+    _enter_env_queue: Queue[EnterEnvironmentAction]
+    _action_queue: Queue[RunTaskAction]
     _current_action: Optional[SessionAction]
     _action_ended: Event
     _path_mapping_rules: Optional[list[PathMappingRule]]
@@ -90,7 +91,8 @@ class LocalSession:
         )
 
         # Initialize the action queue
-        self._action_queue: Queue[SessionAction] = Queue()
+        self._enter_env_queue: Queue[EnterEnvironmentAction] = Queue()
+        self._action_queue: Queue[RunTaskAction] = Queue()
         self._current_action = None
 
         self._should_print_logs = should_print_logs
@@ -222,25 +224,52 @@ class LocalSession:
                     RunTaskAction(self._inner_session, step=step, parameters=param_set)
                 )
 
-        # Finally, enqueue ExitEnvironment Actions in reverse order to EnterEnvironment
-        for env_id in reversed(session_environment_ids):
-            self._action_queue.put(ExitEnvironmentAction(self._inner_session, env_id))
-
     def run(self) -> None:
         if self._inner_session.state != SessionState.READY:
             raise RuntimeError("Session is not in a READY state")
 
+        environments_entered = list[str]()
+        failed_action: Optional[SessionAction] = None
+
         self._start_seconds = time.perf_counter()
+
+        # Enter all of the Environments, and keep track of which ones we've entered
+        while not self._enter_env_queue.empty() and not self.failed:
+            self._action_ended.clear()
+            action = self._enter_env_queue.get()
+            environments_entered.append(action._id)
+            self._current_action = action
+            self._current_action.run()
+            self._action_ended.wait()
+            if self.failed:
+                failed_action = self._current_action
+
+        # Run all of the Tasks that are enqueued
         while not self._action_queue.empty() and not self.failed:
             self._action_ended.clear()
             self._current_action = self._action_queue.get()
             self._current_action.run()
             self._action_ended.wait()
+            if self.failed:
+                failed_action = self._current_action
+
+        # Exit all environments that were entered. We always try to exit all failed environments; even
+        # if an environment-enter, task, or environment exit failed.
+        while environments_entered:
+            prev_action_failed = self.failed
+            self._action_ended.clear()
+            self._current_action = ExitEnvironmentAction(
+                self._inner_session, environments_entered.pop()
+            )
+            self._current_action.run()
+            self._action_ended.wait()
+            if self.failed and not prev_action_failed:
+                failed_action = self._current_action
 
         if self.failed:
             # Action encountered an error; clean up resources and end session
             LOG.info(
-                msg=f"Open Job Description CLI: ERROR executing action: '{str(self._current_action)}' (see Task logs for details)",
+                msg=f"Open Job Description CLI: ERROR executing action: '{str(failed_action)}' (see Task logs for details)",
                 extra={"session_id": self.session_id},
             )
 
@@ -347,13 +376,13 @@ class LocalSession:
             if isinstance(self._current_action, RunTaskAction):
                 self.tasks_run += 1
             self._action_ended.set()
-        if new_status.state in (ActionState.FAILED, ActionState.CANCELED):
+        if new_status.state in (ActionState.FAILED, ActionState.CANCELED, ActionState.TIMEOUT):
             self.failed = True
             self._action_ended.set()
 
     def _add_environments(self, envs: list) -> list[str]:
         ids: list[str] = []
         for env in envs:
-            self._action_queue.put(EnterEnvironmentAction(self._inner_session, env, env.name))
+            self._enter_env_queue.put(EnterEnvironmentAction(self._inner_session, env, env.name))
             ids.append(env.name)
         return ids

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/openjd/cli/_run/_run_command.py

@@ -69,9 +69,10 @@ def add_run_arguments(run_parser: ArgumentParser):
         dest="task_params",
         metavar="PARAM=VALUE",
         help=(
-            "This argument instructs the command to run a single task in a Session with the given value for one of the task parameters "
-            "defined for the Step. The option must be provided once for each task parameter defined for the Step, with each instance "
-            "providing the value for a different task parameter. Mutually exclusive with --tasks and --maximum-tasks."
+            "This argument instructs the command to run a single task or chunk of tasks in a Session with the given value for "
+            "one of the task parameters defined for the Step. The option must be provided once for each task parameter defined "
+            "for the Step, with each instance providing the value for a different task parameter. Mutually exclusive with "
+            "--tasks and --maximum-tasks."
         ),
     )
     group.add_argument(
@@ -81,9 +82,9 @@ def add_run_arguments(run_parser: ArgumentParser):
         dest="tasks",
         metavar='file://tasks.json OR file://tasks.yaml OR [{"Param": "Value1", ...}, {"Param": "Value2", ...}]',
         help=(
-            "This argument instructs the command to run one or more tasks for the Step in a Session. The argument must be either "
-            "the filename of a JSON or YAML file containing an array of maps from task parameter name to value; or an inlined "
-            "JSON string of the same. Mutually exclusive with --task-param/-tp and --maximum-tasks."
+            "This argument instructs the command to run one or more tasks/chunks of tasks for the Step in a Session. "
+            "The argument must be either the filename of a JSON or YAML file containing an array of maps from task parameter "
+            "name to value; or an inlined JSON string of the same. Mutually exclusive with --task-param/-tp and --maximum-tasks."
         ),
     )
     group.add_argument(
@@ -206,10 +207,8 @@ def _process_task_params(arguments: list[str]) -> dict[str, str]:
             )
 
     if error_list:
-        error_msg = "Found the following errors collecting Task parameters:"
-        for error in error_list:
-            error_msg += f"\n- {error}"
-        raise RuntimeError(error_msg)
+        error_msgs = "".join(f"\n - {error}" for error in error_list)
+        raise RuntimeError("Found the following errors collecting Task parameters:" + error_msgs)
 
     return parameter_set
 
@@ -278,8 +277,8 @@ def _validate_task_params(step: Step, task_params: list[dict[str, str]]) -> None
 
     # Collect the names of all of the task parameters defined in the step.
     if step.parameterSpace is not None:
-        parameter_space = StepParameterSpaceIterator(space=step.parameterSpace)
-        task_parameter_names: set[str] = set(parameter_space.names)
+        param_space_iter = StepParameterSpaceIterator(space=step.parameterSpace)
+        task_parameter_names: set[str] = set(param_space_iter.names)
     else:
         task_parameter_names = set[str]()
 
@@ -298,7 +297,6 @@ def _validate_task_params(step: Step, task_params: list[dict[str, str]]) -> None
             error_list.append(
                 f"Task {i} is missing values for parameters: {', '.join(sorted(missing_names))}"
             )
-
     if error_list:
         error_msg = "Errors defining task parameter values:\n - "
         error_msg += "\n - ".join(error_list)

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/openjd/cli/_schema/_schema_command.py

@@ -59,10 +59,7 @@ def do_get_schema(args: Namespace) -> OpenJDCliResult:
     schema_doc: dict = {}
 
     try:
-        # The `schema` attribute will have to be updated if/when Pydantic
-        # is updated to v2.
-        # (AFAIK it can be replaced with `model_json_schema()`.)
-        schema_doc = Template.schema()
+        schema_doc = Template.model_json_schema()
         _process_regex(schema_doc)
     except Exception as e:
         return OpenJDCliResult(status="error", message=f"ERROR generating schema: {str(e)}")

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/openjd/cli/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.3'
-__version_tuple__ = version_tuple = (0, 4, 3)
+__version__ = version = '0.5.1'
+__version_tuple__ = version_tuple = (0, 5, 1)

{openjd_cli-0.4.3 → openjd_cli-0.5.1}/pyproject.toml

@@ -29,8 +29,8 @@ classifiers = [
   "Intended Audience :: End Users/Desktop"
 ]
 dependencies = [
-  "openjd-sessions == 0.7.*",
-  "openjd-model == 0.4.*"
+  "openjd-sessions == 0.10.*",
+  "openjd-model == 0.6.*"
 ]
 
 [project.urls]