yellowdog-python-examples 7.16.2__tar.gz → 7.16.3__tar.gz

{yellowdog_python_examples-7.16.2/yellowdog_python_examples.egg-info → yellowdog_python_examples-7.16.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.16.2
+Version: 7.16.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 Project-URL: Homepage, https://github.com/yellowdog/python-examples
@@ -15,12 +15,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyPAC>=0.16.4
 Requires-Dist: dateparser
-Requires-Dist: jsons==1.4.2
 Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml
-Requires-Dist: yellowdog-sdk==9.0.0
+Requires-Dist: yellowdog-sdk>=9.1.1
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-7.16.2 → yellowdog_python_examples-7.16.3}/requirements.txt

@@ -1,8 +1,7 @@
 PyPAC >= 0.16.4
 dateparser
-jsons == 1.4.2
 requests
 rich == 13.9.4
 tabulate >= 0.9.0
 toml
-yellowdog-sdk == 9.0.0
+yellowdog-sdk >= 9.1.1

yellowdog_python_examples-7.16.3/yellowdog_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.16.3"

{yellowdog_python_examples-7.16.2 → yellowdog_python_examples-7.16.3}/yellowdog_cli/cancel.py

@@ -4,13 +4,9 @@
 A script to cancel Work Requirements and optionally abort Tasks.
 """
 
-from time import sleep
 from typing import List
 
 from yellowdog_client.model import (
-    Task,
-    TaskSearch,
-    TaskStatus,
     WorkRequirement,
     WorkRequirementStatus,
     WorkRequirementSummary,
@@ -18,15 +14,14 @@ from yellowdog_client.model import (
 
 from yellowdog_cli.utils.entity_utils import (
     get_filtered_work_requirements,
-    get_task_group_name,
     get_work_requirement_summary_by_name_or_id,
 )
 from yellowdog_cli.utils.follow_utils import follow_ids
 from yellowdog_cli.utils.interactive import confirmed, select
 from yellowdog_cli.utils.misc_utils import link_entity
-from yellowdog_cli.utils.printing import print_error, print_log
-from yellowdog_cli.utils.settings import TASK_ABORT_CHECK_INTERVAL
+from yellowdog_cli.utils.printing import print_error, print_log, print_warning
 from yellowdog_cli.utils.wrapper import ARGS_PARSER, CLIENT, CONFIG_COMMON, main_wrapper
+from yellowdog_cli.utils.ydid_utils import YDIDType, get_ydid_type
 
 
 @main_wrapper
@@ -64,12 +59,16 @@ def main():
         )
 
     if len(selected_work_requirement_summaries) > 0 and confirmed(
-        f"Cancel {len(selected_work_requirement_summaries)} Work Requirement(s)?"
+        f"Cancel {len(selected_work_requirement_summaries)} "
+        f"Work Requirement(s)"
+        f"{'' if not ARGS_PARSER.abort else ' and abort all allocated tasks'}?"
     ):
         for work_summary in selected_work_requirement_summaries:
             if work_summary.status != WorkRequirementStatus.CANCELLING:
                 try:
-                    CLIENT.work_client.cancel_work_requirement_by_id(work_summary.id)
+                    CLIENT.work_client.cancel_work_requirement_by_id(
+                        work_summary.id, ARGS_PARSER.abort
+                    )
                     work_requirement: WorkRequirement = (
                         CLIENT.work_client.get_work_requirement_by_id(work_summary.id)
                     )
@@ -77,7 +76,9 @@ def main():
                     print_log(
                         f"Cancelled {link_entity(CONFIG_COMMON.url, work_requirement)} "
                         f"('{work_summary.name}')"
+                        f"{'' if not ARGS_PARSER.abort else ' and aborted all allocated tasks'}"
                     )
+
                 except Exception as e:
                     print_error(
                         f"Failed to cancel Work Requirement '{work_summary.name}': {e}"
@@ -95,12 +96,6 @@ def main():
         elif cancelled_count == 0 and cancelling_count == 0:
             print_log("No Work Requirements to cancel")
 
-        if ARGS_PARSER.abort:
-            if cancelled_count == 0 and cancelling_count == 0:
-                print_log("No Tasks to abort")
-            else:
-                _abort_and_follow(selected_work_requirement_summaries)
-
         if ARGS_PARSER.follow:
             follow_ids(work_requirement_ids)
 
@@ -108,50 +103,27 @@ def main():
         print_log("No Work Requirements to cancel")
 
 
-def _abort_all_tasks(
-    selected_work_requirement_summaries: List[WorkRequirementSummary],
-) -> int:
-    """
-    Abort all Tasks in selected Work Requirements.
-    """
-    aborted_tasks = 0
-    for wr_summary in selected_work_requirement_summaries:
-        task_search = TaskSearch(
-            workRequirementId=wr_summary.id,
-            statuses=[
-                TaskStatus.EXECUTING,
-                TaskStatus.DOWNLOADING,
-                TaskStatus.UPLOADING,
-            ],
-        )
-        tasks: List[Task] = CLIENT.work_client.find_tasks(task_search)
-        for task in tasks:
-            try:
-                CLIENT.work_client.cancel_task(task, abort=True)
-                print_log(
-                    f"Aborting Task '{task.name}' in Task Group"
-                    f" '{get_task_group_name(CLIENT, wr_summary, task)}' in Work"
-                    f" Requirement '{wr_summary.name}'"
-                )
-                aborted_tasks += 1
-            except Exception as e:
-                print_error(f"Error aborting Task '{task.name}': {e}")
-
-    if aborted_tasks == 0:
-        print_log("No Tasks to abort")
-    if aborted_tasks <= 5:
-        pass
-    else:
-        print_log(f"Aborting {aborted_tasks} Task(s)")
-    return aborted_tasks
-
-
 def _cancel_work_requirements_by_name_or_id(names_or_ids: List[str]):
     """
     Cancel Work Requirements by their names or IDs.
     """
     work_requirement_summaries: List[WorkRequirementSummary] = []
+
     for name_or_id in names_or_ids:
+
+        # Handle a task ID
+        if get_ydid_type(name_or_id) == YDIDType.TASK:
+            if not confirmed(
+                f"Cancel {'' if not ARGS_PARSER.abort else 'and abort '}"
+                f"Task '{name_or_id}'?"
+            ):
+                continue
+            try:
+                CLIENT.work_client.cancel_task_by_id(name_or_id, ARGS_PARSER.abort)
+            except Exception as e:
+                print_error(f"Failed to cancel Task '{name_or_id}': {e}")
+            continue
+
         work_requirement_summary: WorkRequirementSummary = (
             get_work_requirement_summary_by_name_or_id(CLIENT, name_or_id)
         )
@@ -163,53 +135,36 @@ def _cancel_work_requirements_by_name_or_id(names_or_ids: List[str]):
             WorkRequirementStatus.RUNNING,
             WorkRequirementStatus.HELD,
         ]:
-            raise Exception(
+            print_warning(
                 f"Work Requirement '{name_or_id}' is not in a valid state"
                 f" ('{work_requirement_summary.status}') for cancellation"
             )
+            continue
 
         work_requirement_summaries.append(work_requirement_summary)
         if work_requirement_summary.status == WorkRequirementStatus.CANCELLING:
             print_log(f"Work Requirement '{name_or_id}' is already cancelling")
         else:
-            if not confirmed(f"Cancel Work Requirement '{name_or_id}'?"):
+            if not confirmed(
+                f"Cancel Work Requirement '{name_or_id}'"
+                f"{'' if not ARGS_PARSER.abort else ' and abort all allocated tasks'}?"
+            ):
                 continue
             try:
                 CLIENT.work_client.cancel_work_requirement_by_id(
-                    work_requirement_summary.id
+                    work_requirement_summary.id, ARGS_PARSER.abort
+                )
+                print_log(
+                    f"Cancelled Work Requirement '{name_or_id}'"
+                    f"{'' if not ARGS_PARSER.abort else ' and aborted all allocated tasks'}"
                 )
-                print_log(f"Cancelled Work Requirement '{name_or_id}'")
             except Exception as e:
                 print_error(f"Failed to cancel Work Requirement '{name_or_id}': {e}")
 
-    if ARGS_PARSER.abort:
-        _abort_and_follow(work_requirement_summaries)
-
     if ARGS_PARSER.follow:
         follow_ids([wrs.id for wrs in work_requirement_summaries])
 
 
-def _abort_and_follow(work_requirement_summaries: List[WorkRequirementSummary]):
-    """
-    Abort Tasks in one or more Work Requirements and optionally follow
-    abort progress.
-    """
-    if ARGS_PARSER.follow:
-        attempt = 0
-        while True:
-            attempt += 1
-            print_log(f"Collecting Tasks to abort (attempt {attempt})")
-            if _abort_all_tasks(work_requirement_summaries) == 0:
-                break
-            print_log(
-                f"Waiting {TASK_ABORT_CHECK_INTERVAL}s for abort confirmation ..."
-            )
-            sleep(TASK_ABORT_CHECK_INTERVAL)
-    else:
-        print_log("Aborting all currently running Tasks")
-        _abort_all_tasks(work_requirement_summaries)
-
-
 # Entry point
 if __name__ == "__main__":
     main()

{yellowdog_python_examples-7.16.2 → yellowdog_python_examples-7.16.3}/yellowdog_cli/create.py

@@ -333,10 +333,16 @@ def create_compute_requirement_template(resource: Dict):
         _get_images_id(images_id, resource, PROP_IMAGES_ID)
 
     if ARGS_PARSER.dry_run:
-        _get_model_object(type, resource)  # Report extras and omissions
+        _get_model_object(type, resource)  # Report omissions, extras, errors
         print_json(resource)
         return
 
+    # Overwrite source dictionaries with ComputeSourceUsage objects
+    resource[PROP_SOURCES] = [
+        _get_model_object("ComputeSourceUsage", source)
+        for source in resource.get(PROP_SOURCES, [])
+    ]
+
     compute_template = _get_model_object(type, resource)
 
     # Check for an existing ID

{yellowdog_python_examples-7.16.2 → yellowdog_python_examples-7.16.3}/yellowdog_cli/utils/args.py

@@ -343,7 +343,7 @@ class CLIParser:
                 "-a",
                 action="store_true",
                 required=False,
-                help="abort all running tasks with immediate effect",
+                help="abort running tasks with immediate effect",
             )
             parser.add_argument(
                 "--follow",
@@ -816,7 +816,7 @@ class CLIParser:
                 type=str,
                 help=(
                     "the name(s) or YellowDog ID(s) of the work requirement(s) to be"
-                    " cancelled"
+                    " cancelled; can also supply task IDs"
                 ),
             )
 

{yellowdog_python_examples-7.16.2 → yellowdog_python_examples-7.16.3}/yellowdog_cli/utils/settings.py

@@ -19,8 +19,6 @@ MAX_BATCH_SUBMIT_ATTEMPTS = 4  # Initial attempt plus retries
 
 CR_BATCH_SIZE_DEFAULT = 10000
 
-TASK_ABORT_CHECK_INTERVAL = 20  # Seconds
-
 EVENT_STREAM_RETRY_INTERVAL = 5.0  # Seconds
 
 NAMESPACE_OBJECT_STORE_PREFIX_SEPARATOR = "::"

{yellowdog_python_examples-7.16.2 → yellowdog_python_examples-7.16.3/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.16.2
+Version: 7.16.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 Project-URL: Homepage, https://github.com/yellowdog/python-examples
@@ -15,12 +15,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyPAC>=0.16.4
 Requires-Dist: dateparser
-Requires-Dist: jsons==1.4.2
 Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml
-Requires-Dist: yellowdog-sdk==9.0.0
+Requires-Dist: yellowdog-sdk>=9.1.1
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-7.16.2 → yellowdog_python_examples-7.16.3}/yellowdog_python_examples.egg-info/requires.txt

@@ -1,11 +1,10 @@
 PyPAC>=0.16.4
 dateparser
-jsons==1.4.2
 requests
 rich==13.9.4
 tabulate>=0.9.0
 toml
-yellowdog-sdk==9.0.0
+yellowdog-sdk>=9.1.1
 
 [cloudwizard]
 boto3

yellowdog_python_examples-7.16.2/yellowdog_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "7.16.2"