yellowdog-python-examples 7.11.3__tar.gz → 7.11.4__tar.gz

{yellowdog_python_examples-7.11.3/yellowdog_python_examples.egg-info → yellowdog_python_examples-7.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.11.3
+Version: 7.11.4
 Summary: Example Python commands using the YellowDog Python SDK
 Home-page: https://github.com/yellowdog/python-examples
 Author: YellowDog Limited

yellowdog_python_examples-7.11.4/yd_commands/__init__.py

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

{yellowdog_python_examples-7.11.3 → yellowdog_python_examples-7.11.4}/yd_commands/list.py

@@ -32,6 +32,7 @@ from yellowdog_client.model import (
     NamespaceStorageConfiguration,
     Node,
     NodeSearch,
+    NodeStatus,
     ObjectDetail,
     Task,
     TaskGroup,
@@ -39,6 +40,7 @@ from yellowdog_client.model import (
     WorkerPool,
     WorkerPoolStatus,
     WorkerPoolSummary,
+    WorkerStatus,
     WorkRequirementStatus,
     WorkRequirementSummary,
 )
@@ -67,7 +69,7 @@ from yd_commands.wrapper import ARGS_PARSER, CLIENT, CONFIG_COMMON, main_wrapper
 @main_wrapper
 def main():
     if not check_for_valid_option():
-        raise Exception("Please choose a single, valid listing type")
+        raise Exception("Please choose a (single) listing type")
 
     # Always use interactive mode for selections
     ARGS_PARSER.interactive = True
@@ -265,16 +267,15 @@ def list_worker_pools():
 
     if ARGS_PARSER.nodes or ARGS_PARSER.workers:
         print_log(
-            "Please select the Worker Pool for which to list "
-            f"{'Nodes' if ARGS_PARSER.nodes else 'all Workers'}"
+            "Please select the Worker Pool(s) for which to list "
+            f"{'Nodes' if ARGS_PARSER.nodes else 'Workers'}"
         )
-        worker_pool_summary = select(
+        worker_pool_summaries = select(
             CLIENT,
             sorted_objects(worker_pool_summaries),
             showing_all=showing_all,
-            single_result=True,
         )
-        list_nodes(worker_pool_summary[0])
+        list_nodes(worker_pool_summaries)
         return
 
     if ARGS_PARSER.details:
@@ -376,23 +377,36 @@ def list_instances(compute_requirement: ComputeRequirement):
         print_numbered_object_list(CLIENT, instances)
 
 
-def list_nodes(worker_pool_summary: WorkerPoolSummary):
+def list_nodes(worker_pool_summaries: List[WorkerPoolSummary]):
     """
-    List the nodes in a Worker Pool.
+    List the Nodes in a list of Worker Pools.
     """
-    nodes_search = NodeSearch(worker_pool_summary.id)
-    search_client = CLIENT.worker_pool_client.get_nodes(search=nodes_search)
-    nodes: List[Node] = search_client.list_all()
+    nodes_all: List[Node] = []
+    for worker_pool_summary in worker_pool_summaries:
+        nodes_search = NodeSearch(
+            worker_pool_summary.id,
+            statuses=[NodeStatus.RUNNING] if ARGS_PARSER.active_only else None,
+        )
+        search_client = CLIENT.worker_pool_client.get_nodes(search=nodes_search)
+        nodes: List[Node] = search_client.list_all()
+        for node in nodes:
+            node.worker_pool_name = worker_pool_summary.name
+        nodes_all += nodes
+
+    if len(nodes_all) == 0:
+        print_log("No Nodes to display")
+        return
 
     if ARGS_PARSER.workers:
-        list_workers(nodes)
+        list_workers(nodes_all)
         return
 
     if ARGS_PARSER.details:
-        for node in select(CLIENT, nodes):
+        for node in select(CLIENT, nodes_all):
+            delattr(node, "worker_pool_name")
             print_yd_object(node)
     else:
-        print_numbered_object_list(CLIENT, nodes)
+        print_numbered_object_list(CLIENT, nodes_all)
 
 
 def list_workers(nodes: List[Node]):
@@ -402,16 +416,31 @@ def list_workers(nodes: List[Node]):
     workers_all: List[Worker] = []
     for node in nodes:
         for worker in node.workers:
+            if ARGS_PARSER.active_only:
+                if worker.status not in [
+                    WorkerStatus.SLEEPING,
+                    WorkerStatus.DOING_TASK,
+                    WorkerStatus.FOUND,
+                ]:
+                    continue
             # Add extra info to the Worker object
-            worker.workerTag = node.details.workerTag
-            worker.taskTypes = node.details.supportedTaskTypes
+            worker.worker_tag = node.details.workerTag
+            worker.task_types = node.details.supportedTaskTypes
+            worker.worker_pool_name = node.worker_pool_name
             workers_all.append(worker)
 
+    if len(workers_all) == 0:
+        print_log("No Workers to display")
+        return
+
     if not ARGS_PARSER.details:
         print_numbered_object_list(CLIENT, workers_all)
         return
 
     for worker in select(CLIENT, workers_all):
+        delattr(worker, "worker_tag")
+        delattr(worker, "task_types")
+        delattr(worker, "worker_pool_name")
         print_yd_object(worker)
 
 

{yellowdog_python_examples-7.11.3 → yellowdog_python_examples-7.11.4}/yd_commands/load_resources.py

@@ -2,7 +2,7 @@
 Load data for resource creation/update/removal requests.
 """
 
-from sys import argv, exit
+from sys import exit
 from typing import Dict, List
 
 from yd_commands.args import ARGS_PARSER

{yellowdog_python_examples-7.11.3 → yellowdog_python_examples-7.11.4}/yd_commands/printing.py

@@ -34,8 +34,6 @@ from yellowdog_client.model import (
     MachineImageFamilySummary,
     NamespacePolicy,
     Node,
-    NodeStatus,
-    NodeSummary,
     ObjectDetail,
     ObjectPath,
     ProvisionedWorkerPool,
@@ -43,7 +41,6 @@ from yellowdog_client.model import (
     Task,
     TaskGroup,
     Worker,
-    WorkerPool,
     WorkerPoolSummary,
     WorkRequirement,
     WorkRequirementSummary,
@@ -351,32 +348,16 @@ def worker_pool_table(
         "Worker Pool Name",
         "Type",
         "Status",
-        "Min/Run/Max",
         "ID",
     ]
     table = []
     for index, worker_pool_summary in enumerate(worker_pool_summaries):
-        worker_pool: WorkerPool = client.worker_pool_client.get_worker_pool_by_id(
-            worker_pool_summary.id
-        )
-        try:
-            min_nodes = str(worker_pool.properties.minNodes)
-        except:
-            min_nodes = "_"
-        try:
-            max_nodes = str(worker_pool.properties.maxNodes)
-        except:
-            max_nodes = "_"
-        node_summary: NodeSummary = worker_pool.nodeSummary
-        nodes_running = node_summary.statusCounts[NodeStatus.RUNNING]
-
         table.append(
             [
                 index + 1,
                 worker_pool_summary.name,
                 f"{worker_pool_summary.type.split('.')[-1:][0].replace('WorkerPool', '')}",
                 f"{worker_pool_summary.status}",
-                f"{min_nodes}/{nodes_running}/{max_nodes}",
                 worker_pool_summary.id,
             ]
         )
@@ -544,6 +525,7 @@ def nodes_table(
 ) -> (List[str], List[str]):
     headers = [
         "#",
+        "Worker Pool Name",
         "Provider",
         "RAM",
         "vCPUs",
@@ -560,6 +542,7 @@ def nodes_table(
         table.append(
             [
                 index + 1,
+                node.worker_pool_name,
                 node.details.provider,
                 node.details.ram,
                 node.details.vcpus,
@@ -578,6 +561,7 @@ def workers_table(
 ) -> (List[str], List[str]):
     headers = [
         "#",
+        "Worker Pool Name",
         "Task Types",
         "Worker Tag",
         "Status",
@@ -590,8 +574,9 @@ def workers_table(
         table.append(
             [
                 index + 1,
-                ", ".join(worker.taskTypes),
-                worker.workerTag,
+                worker.worker_pool_name,
+                ", ".join(worker.task_types),
+                worker.worker_tag,
                 worker.status,
                 worker.claimCount,
                 worker.exclusive,
@@ -816,10 +801,11 @@ def sorted_objects(
         return sorted(objects, key=lambda x: x.instanceType, reverse=reverse)
 
     if isinstance(objects[0], Node):
-        return sorted(objects, key=lambda x: str(x.status), reverse=reverse)
+        # Note: worker_pool property is added dynamically in yd_list
+        return sorted(objects, key=lambda x: str(x.worker_pool_name), reverse=reverse)
 
     if isinstance(objects[0], Worker):
-        return sorted(objects, key=lambda x: str(x.id), reverse=reverse)
+        return sorted(objects, key=lambda x: str(x.worker_pool_name), reverse=reverse)
 
     if isinstance(objects[0], AWSAvailabilityZone):
         return sorted(objects)

{yellowdog_python_examples-7.11.3 → yellowdog_python_examples-7.11.4/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.11.3
+Version: 7.11.4
 Summary: Example Python commands using the YellowDog Python SDK
 Home-page: https://github.com/yellowdog/python-examples
 Author: YellowDog Limited

yellowdog_python_examples-7.11.3/yd_commands/__init__.py

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