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

{yellowdog_python_examples-7.11.2 → yellowdog_python_examples-7.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.11.2
+Version: 7.11.3
 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

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

{yellowdog_python_examples-7.11.2 → yellowdog_python_examples-7.11.3}/yd_commands/args.py

@@ -516,6 +516,18 @@ class CLIParser:
                 required=False,
                 help="list compute instances",
             )
+            parser.add_argument(
+                "--nodes",
+                action="store_true",
+                required=False,
+                help="list worker pool nodes",
+            )
+            parser.add_argument(
+                "--workers",
+                action="store_true",
+                required=False,
+                help="list all workers in a worker pool",
+            )
             parser.add_argument(
                 "--public-ips-only",
                 action="store_true",
@@ -1328,6 +1340,16 @@ class CLIParser:
     def instances(self) -> Optional[bool]:
         return self.args.instances
 
+    @property
+    @allow_missing_attribute
+    def nodes(self) -> Optional[bool]:
+        return self.args.nodes
+
+    @property
+    @allow_missing_attribute
+    def workers(self) -> Optional[bool]:
+        return self.args.workers
+
     @property
     @allow_missing_attribute
     def allowances(self) -> Optional[bool]:

{yellowdog_python_examples-7.11.2 → yellowdog_python_examples-7.11.3}/yd_commands/items.py

@@ -16,10 +16,12 @@ from yellowdog_client.model import (
     MachineImageFamilySummary,
     NamespacePolicy,
     NamespaceStorageConfiguration,
+    Node,
     ObjectPath,
     ProvisionedWorkerPool,
     Task,
     TaskGroup,
+    Worker,
     WorkerPoolSummary,
     WorkRequirementSummary,
 )
@@ -44,6 +46,8 @@ Item = TypeVar(
     ProvisionedWorkerPool,
     Task,
     TaskGroup,
+    Worker,
     WorkRequirementSummary,
     WorkerPoolSummary,
+    Node,
 )

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

@@ -30,9 +30,12 @@ from yellowdog_client.model import (
     NamespacePolicy,
     NamespacePolicySearch,
     NamespaceStorageConfiguration,
+    Node,
+    NodeSearch,
     ObjectDetail,
     Task,
     TaskGroup,
+    Worker,
     WorkerPool,
     WorkerPoolStatus,
     WorkerPoolSummary,
@@ -73,7 +76,7 @@ def main():
         list_object_paths()
     elif ARGS_PARSER.work_requirements or ARGS_PARSER.task_groups or ARGS_PARSER.tasks:
         list_work_requirements()
-    elif ARGS_PARSER.worker_pools:
+    elif ARGS_PARSER.worker_pools or ARGS_PARSER.nodes or ARGS_PARSER.workers:
         list_worker_pools()
     elif ARGS_PARSER.compute_requirements or ARGS_PARSER.instances:
         list_compute_requirements()
@@ -100,21 +103,23 @@ def check_for_valid_option() -> bool:
     Only one of the listing options must be selected.
     """
     if [
-        ARGS_PARSER.object_paths,
-        ARGS_PARSER.work_requirements,
-        ARGS_PARSER.task_groups,
-        ARGS_PARSER.tasks,
-        ARGS_PARSER.worker_pools,
+        ARGS_PARSER.allowances,
+        ARGS_PARSER.attribute_definitions,
         ARGS_PARSER.compute_requirements,
         ARGS_PARSER.compute_templates,
-        ARGS_PARSER.source_templates,
-        ARGS_PARSER.keyrings,
         ARGS_PARSER.image_families,
-        ARGS_PARSER.namespace_storage_configurations,
         ARGS_PARSER.instances,
-        ARGS_PARSER.allowances,
-        ARGS_PARSER.attribute_definitions,
+        ARGS_PARSER.keyrings,
         ARGS_PARSER.namespace_policies,
+        ARGS_PARSER.namespace_storage_configurations,
+        ARGS_PARSER.nodes,
+        ARGS_PARSER.object_paths,
+        ARGS_PARSER.source_templates,
+        ARGS_PARSER.task_groups,
+        ARGS_PARSER.tasks,
+        ARGS_PARSER.work_requirements,
+        ARGS_PARSER.worker_pools,
+        ARGS_PARSER.workers,
     ].count(True) == 1:
         return True
     else:
@@ -257,6 +262,21 @@ def list_worker_pools():
     if len(worker_pool_summaries) == 0:
         print_log("No Worker Pools to display")
         return
+
+    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'}"
+        )
+        worker_pool_summary = select(
+            CLIENT,
+            sorted_objects(worker_pool_summaries),
+            showing_all=showing_all,
+            single_result=True,
+        )
+        list_nodes(worker_pool_summary[0])
+        return
+
     if ARGS_PARSER.details:
         for worker_pool_summary in select(
             CLIENT, sorted_objects(worker_pool_summaries), showing_all=showing_all
@@ -330,9 +350,7 @@ def list_instances(compute_requirement: ComputeRequirement):
     """
     List the instances within a Compute Requirement.
     """
-    instance_search: InstanceSearch = InstanceSearch(
-        computeRequirementId=compute_requirement.id
-    )
+    instance_search = InstanceSearch(computeRequirementId=compute_requirement.id)
     search_client: SearchClient = CLIENT.compute_client.get_instances(
         instance_search=instance_search
     )
@@ -352,10 +370,49 @@ def list_instances(compute_requirement: ComputeRequirement):
         return
 
     if ARGS_PARSER.details:
-        for instance in select(CLIENT, search_client.list_all()):
+        for instance in select(CLIENT, instances):
             print_yd_object(instance)
     else:
-        print_numbered_object_list(CLIENT, search_client.list_all())
+        print_numbered_object_list(CLIENT, instances)
+
+
+def list_nodes(worker_pool_summary: WorkerPoolSummary):
+    """
+    List the nodes in a Worker Pool.
+    """
+    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()
+
+    if ARGS_PARSER.workers:
+        list_workers(nodes)
+        return
+
+    if ARGS_PARSER.details:
+        for node in select(CLIENT, nodes):
+            print_yd_object(node)
+    else:
+        print_numbered_object_list(CLIENT, nodes)
+
+
+def list_workers(nodes: List[Node]):
+    """
+    Display a list of workers across all nodes in a worker pool.
+    """
+    workers_all: List[Worker] = []
+    for node in nodes:
+        for worker in node.workers:
+            # Add extra info to the Worker object
+            worker.workerTag = node.details.workerTag
+            worker.taskTypes = node.details.supportedTaskTypes
+            workers_all.append(worker)
+
+    if not ARGS_PARSER.details:
+        print_numbered_object_list(CLIENT, workers_all)
+        return
+
+    for worker in select(CLIENT, workers_all):
+        print_yd_object(worker)
 
 
 def list_compute_templates():

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

@@ -33,6 +33,7 @@ from yellowdog_client.model import (
     KeyringSummary,
     MachineImageFamilySummary,
     NamespacePolicy,
+    Node,
     NodeStatus,
     NodeSummary,
     ObjectDetail,
@@ -41,6 +42,7 @@ from yellowdog_client.model import (
     ProvisionedWorkerPoolProperties,
     Task,
     TaskGroup,
+    Worker,
     WorkerPool,
     WorkerPoolSummary,
     WorkRequirement,
@@ -212,11 +214,13 @@ TYPE_MAP = {
     KeyringSummary: "Keyring",
     MachineImageFamilySummary: "Machine Image Family",
     NamespacePolicy: "Namespace Policy",
+    Node: "Node",
     ObjectPath: "Object Path",
     ProvisionedWorkerPool: "Provisioned Worker Pool",
     Task: "Task",
     TaskGroup: "Task Group",
     WorkRequirementSummary: "Work Requirement",
+    Worker: "Worker",
     WorkerPoolSummary: "Worker Pool",
 }
 
@@ -535,6 +539,68 @@ def instances_table(
     return headers, table
 
 
+def nodes_table(
+    nodes: List[Node],
+) -> (List[str], List[str]):
+    headers = [
+        "#",
+        "Provider",
+        "RAM",
+        "vCPUs",
+        "Task Types",
+        "Worker Tag",
+        "# Workers",
+        "Status",
+        "ID",
+    ]
+    table = []
+    for index, node in enumerate(nodes):
+        if node.details is None:
+            continue
+        table.append(
+            [
+                index + 1,
+                node.details.provider,
+                node.details.ram,
+                node.details.vcpus,
+                ", ".join(node.details.supportedTaskTypes),
+                node.details.workerTag,
+                len(node.workers),
+                node.status,
+                node.id,
+            ]
+        )
+    return headers, table
+
+
+def workers_table(
+    workers: List[Worker],
+) -> (List[str], List[str]):
+    headers = [
+        "#",
+        "Task Types",
+        "Worker Tag",
+        "Status",
+        "Claims",
+        "Exclusive?",
+        "ID",
+    ]
+    table = []
+    for index, worker in enumerate(workers):
+        table.append(
+            [
+                index + 1,
+                ", ".join(worker.taskTypes),
+                worker.workerTag,
+                worker.status,
+                worker.claimCount,
+                worker.exclusive,
+                worker.id,
+            ]
+        )
+    return headers, table
+
+
 def allowances_table(
     allowances: List[Allowance],
 ) -> (List[str], List[str]):
@@ -691,6 +757,10 @@ def print_numbered_object_list(
         headers, table = attribute_definitions_table(objects)
     elif isinstance(objects[0], NamespacePolicy):
         headers, table = namespace_policies_table(objects)
+    elif isinstance(objects[0], Node):
+        headers, table = nodes_table(objects)
+    elif isinstance(objects[0], Worker):
+        headers, table = workers_table(objects)
     else:
         table = []
         for index, obj in enumerate(objects):
@@ -731,7 +801,7 @@ def sorted_objects(
     """
     Sort objects by their 'name' property, or 'namespace' in the case of
     Namespace Storage Configurations, or 'instanceType' in the case of
-    Instances.
+    Instances, etc.
     """
     if len(objects) == 0:
         return objects
@@ -745,6 +815,12 @@ def sorted_objects(
     if isinstance(objects[0], Instance):
         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)
+
+    if isinstance(objects[0], Worker):
+        return sorted(objects, key=lambda x: str(x.id), reverse=reverse)
+
     if isinstance(objects[0], AWSAvailabilityZone):
         return sorted(objects)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.11.2
+Version: 7.11.3
 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.2/yd_commands/__init__.py

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