yellowdog-python-examples 7.10.0__tar.gz → 7.10.2__tar.gz

{yellowdog_python_examples-7.10.0/yellowdog_python_examples.egg-info → yellowdog_python_examples-7.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.10.0
+Version: 7.10.2
 Summary: Example Python commands using the YellowDog Python SDK
 Home-page: https://github.com/yellowdog/python-examples
 Author: YellowDog Limited
@@ -15,7 +15,7 @@ Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: yellowdog-sdk>=8.0.0
+Requires-Dist: yellowdog-sdk>=8.0.2
 Requires-Dist: toml
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: PyPAC>=0.16.4

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/README.md

@@ -581,6 +581,7 @@ All properties are optional except for **`taskType`** (or **`taskTypes`**).
 | `maxWorkers`                           | The maximum number of Workers that can be claimed for the associated Task Group. E.g., `10`.                                                                                                                                               | Yes  | Yes | Yes  |      |
 | `minWorkers`                           | The minimum number of Workers that the associated Task Group requires. This many workers must be claimed before the associated Task Group will start working. E.g., `1`.                                                                   | Yes  | Yes | Yes  |      |
 | `name`                                 | The name of the Work Requirement, Task Group or Task. E.g., `"wr_name"`. Note that the `name` property is not inherited.                                                                                                                   | Yes  | Yes | Yes  | Yes  |
+| `namespaces`                           | Only Worker Pools whose workers match one of the namespaces in this list can be claimed by the Task Group. E.g., `["namespace_1", "namespace_2"]. Defaults to `None`.                                                                      | Yes  | Yes | Yes  |      |
 | `outputs`                              | The files to be uploaded to the YellowDog Object Store by a Worker node on completion of the Task. E.g., `["results_1.txt", "results_2.txt"]`.                                                                                             | Yes  | Yes | Yes  | Yes  |
 | `outputsOther`                         | Files to be uploaded to the YellowDog Object Store from outside the Tasks's Working Directory by a Worker node on completion of a Task. E.g., `outputsOther = [{"directoryName" = "tmp", "filePattern" = "out.txt", "required" = false}]`. | Yes  | Yes | Yes  | Yes  |
 | `outputsRequired`                      | The files that *must* be uploaded to the YellowDog Object Store by a Worker node on completion of the Task. The Task will fail if any outputs are unavailable.                                                                             | Yes  | Yes | Yes  | Yes  |
@@ -774,6 +775,7 @@ Here's an example of the `workRequirement` section of a TOML configuration file,
     ]
     inputsOptional = ["optional.txt"]
     instanceTypes = ["t3a.micro", "t3.micro"]
+    namespaces = ["namespace_1", "namespace_2"]
     maxWorkers = 1
     maximumTaskRetries = 0
     minWorkers = 1
@@ -832,6 +834,7 @@ Showing all possible properties at the Work Requirement level:
   "maximumTaskRetries": 0,
   "minWorkers": 1,
   "name": "my-work-requirement",
+  "namespaces": ["namespace_1", "namespace_2"],
   "outputs": ["results.txt"],
   "outputsOther": [{"directoryName": "my_output_dir", "filePattern": "out.txt", "required": true}],
   "outputsRequired": ["results_required.txt"],
@@ -892,6 +895,7 @@ Showing all possible properties at the Task Group level:
       "maxWorkers": 1,
       "minWorkers": 1,
       "name": "first-task-group",
+      "namespaces": ["namespace_1", "namespace_2"],
       "outputs": ["results.txt"],
       "outputsOther": [{"directoryName": "my_output_dir", "filePattern": "out.txt", "required": true}],
       "outputsRequired": ["results_required.txt"],

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/pyproject.toml

@@ -47,6 +47,7 @@
     yd-provision = "yd_commands.provision:main"
     yd-remove = "yd_commands.remove:main"
     yd-resize = "yd_commands.resize:main"
+    yd-show = "yd_commands.show:main"
     yd-shutdown = "yd_commands.shutdown:main"
     yd-submit = "yd_commands.submit:main"
     yd-start = "yd_commands.start:main"

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/requirements.txt

@@ -1,4 +1,4 @@
-yellowdog-sdk >= 8.0.0
+yellowdog-sdk >= 8.0.2
 toml
 tabulate >= 0.9.0
 PyPAC >= 0.16.4

yellowdog_python_examples-7.10.2/yd_commands/__init__.py

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

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yd_commands/args.py

@@ -1003,6 +1003,14 @@ class CLIParser:
                 ),
             )
 
+        if any(module in sys.argv[0] for module in ["show"]):
+            parser.add_argument(
+                "--show-token",
+                action="store_true",
+                required=False,
+                help="display the worker pool token when showing the details of a configured worker pool",
+            )
+
         self.args = parser.parse_args()
 
         if self.args.docs:
@@ -1443,6 +1451,11 @@ class CLIParser:
     def public_ips_only(self) -> Optional[bool]:
         return self.args.public_ips_only
 
+    @property
+    @allow_missing_attribute
+    def show_token(self) -> Optional[bool]:
+        return self.args.show_token
+
 
 def lookup_module_description(module_name: str) -> Optional[str]:
     """
@@ -1489,6 +1502,8 @@ def lookup_module_description(module_name: str) -> Optional[str]:
         suffix = "holding (pausing) running Work Requirements"
     elif "boost" in module_name:
         suffix = "boosting Allowances"
+    elif "show" in module_name:
+        suffix = "showing the JSON details of entities referenced by their YDIDs"
 
     return None if suffix is None else prefix + suffix
 

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yd_commands/config_types.py

@@ -43,6 +43,7 @@ class ConfigWorkRequirement:
     max_retries: int = 0
     max_workers: Optional[int] = None
     min_workers: Optional[int] = None
+    namespaces: Optional[List[str]] = None
     outputs_optional: List[str] = field(default_factory=list)
     outputs_other: List[Dict] = field(default_factory=list)
     outputs_required: List[str] = field(default_factory=list)

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yd_commands/load_config.py

@@ -291,6 +291,7 @@ def load_config_work_requirement() -> Optional[ConfigWorkRequirement]:
             max_retries=wr_section.get(MAX_RETRIES, 0),
             max_workers=wr_section.get(MAX_WORKERS, None),
             min_workers=wr_section.get(MIN_WORKERS, None),
+            namespaces=wr_section.get(NAMESPACES, None),
             outputs_optional=wr_section.get(OUTPUTS_OPTIONAL, []),
             outputs_other=wr_section.get(OUTPUTS_OTHER, []),
             outputs_required=wr_section.get(OUTPUTS_REQUIRED, []),

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yd_commands/printing.py

@@ -136,6 +136,21 @@ def print_string(msg: str = "", no_fill: bool = False) -> str:
     )
 
 
+def print_simple(
+    log_message: str = "",
+    override_quiet: bool = False,
+    no_fill: bool = False,
+):
+    """
+    Simple print function without timestamp.
+    Set 'override_quiet' to print when '-q' is set.
+    """
+    if ARGS_PARSER.quiet and override_quiet is False:
+        return
+
+    CONSOLE.print(log_message)
+
+
 def print_log(
     log_message: str = "",
     override_quiet: bool = False,

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yd_commands/property_names.py

@@ -47,6 +47,7 @@ MIN_NODES = "minNodes"  # Integer
 MIN_WORKERS = "minWorkers"  # Integer
 NAME = "name"  # String
 NAMESPACE = "namespace"  # String
+NAMESPACES = "namespaces"  # List of Strings
 NAME_TAG = "tag"  # String
 NODE_BOOT_TIMEOUT = "nodeBootTimeout"  # Float
 OUTPUTS_OPTIONAL = "outputs"  # List of Strings
@@ -144,6 +145,7 @@ ALL_KEYS = [
     MIN_NODES,
     MIN_WORKERS,
     NAMESPACE,
+    NAMESPACES,
     NAME_TAG,
     NODE_BOOT_TIMEOUT,
     OUTPUTS_OPTIONAL,

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yd_commands/show.py

@@ -6,7 +6,7 @@ Command to show the JSON details of YellowDog entities via their IDs.
 
 from typing import List
 
-from yellowdog_client.model import Task, TaskSearch
+from yellowdog_client.model import ConfiguredWorkerPool, Task, TaskSearch
 from yellowdog_client.model.exceptions import InvalidRequestException
 
 from yd_commands.printing import print_log, print_warning, print_yd_object
@@ -16,11 +16,7 @@ from yd_commands.wrapper import ARGS_PARSER, CLIENT, main_wrapper
 @main_wrapper
 def main():
 
-    ydids_set = set(ARGS_PARSER.yellowdog_ids)
-    if len(ydids_set) < len(ARGS_PARSER.yellowdog_ids):
-        print_warning("Dropping duplicate YDIDs")
-
-    for ydid in ydids_set:
+    for ydid in ARGS_PARSER.yellowdog_ids:
         show_details(ydid)
 
 
@@ -51,13 +47,21 @@ def show_details(ydid: str):
             for source in compute_requirement.provisionStrategy.sources:
                 if source.id == ydid:
                     print_yd_object(source)
-                    break
+                    return
             else:
                 print_warning(f"Compute Source ID '{ydid}' not found")
 
         elif ":wrkrpool:" in ydid:
             print_log(f"Showing details of Worker Pool ID '{ydid}'")
-            print_yd_object(CLIENT.worker_pool_client.get_worker_pool_by_id(ydid))
+            worker_pool = CLIENT.worker_pool_client.get_worker_pool_by_id(ydid)
+            print_yd_object(worker_pool)
+            if ARGS_PARSER.show_token and isinstance(worker_pool, ConfiguredWorkerPool):
+                print_log("Showing Configured Worker Pool token data")
+                print_yd_object(
+                    CLIENT.worker_pool_client.get_configured_worker_pool_token_by_id(
+                        ydid
+                    )
+                )
 
         elif ":node:" in ydid:
             print_log(f"Showing details of Node ID '{ydid}'")
@@ -71,7 +75,7 @@ def show_details(ydid: str):
             for worker in node.workers:
                 if worker.id == ydid:
                     print_yd_object(worker)
-                    break
+                    return
             else:
                 print_warning(f"Worker ID '{ydid}' not found")
 
@@ -87,7 +91,7 @@ def show_details(ydid: str):
             for task_group in work_requirement.taskGroups:
                 if task_group.id == ydid:
                     print_yd_object(task_group)
-                    break
+                    return
             else:
                 print_warning(f"Task Group ID '{ydid}' not found")
 
@@ -110,6 +114,7 @@ def show_details(ydid: str):
             for task in tasks:
                 if task.id == ydid:
                     print_yd_object(task)
+                    return
             else:
                 print_warning(f"Task ID '{ydid}' not found")
 
@@ -131,7 +136,7 @@ def show_details(ydid: str):
             for keyring in keyrings:
                 if keyring.id == ydid:
                     print_yd_object(keyring)
-                    break
+                    return
             else:
                 print_warning(f"Keyring ID '{ydid}' not found")
 
@@ -142,8 +147,6 @@ def show_details(ydid: str):
         else:
             print_warning(f"Unknown (or unsupported) YellowDog ID type for '{ydid}'")
 
-    except InvalidRequestException as e:
-        print_warning(f"Unable to show details for '{ydid}': {e}")
     except Exception as e:
         print_warning(f"Unable to show details for '{ydid}': {e}")
 

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yd_commands/submit.py

@@ -486,6 +486,11 @@ def create_task_group(
             task_group_data.get(REGIONS, wr_data.get(REGIONS, config_wr.regions))
         ),
         taskTimeout=task_timeout,
+        namespaces=check_list(
+            task_group_data.get(
+                NAMESPACES, wr_data.get(NAMESPACES, config_wr.namespaces)
+            )
+        ),
     )
     ctttl_data = check_float_or_int(
         task_group_data.get(

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.10.0
+Version: 7.10.2
 Summary: Example Python commands using the YellowDog Python SDK
 Home-page: https://github.com/yellowdog/python-examples
 Author: YellowDog Limited
@@ -15,7 +15,7 @@ Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: yellowdog-sdk>=8.0.0
+Requires-Dist: yellowdog-sdk>=8.0.2
 Requires-Dist: toml
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: PyPAC>=0.16.4

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yellowdog_python_examples.egg-info/entry_points.txt

@@ -15,6 +15,7 @@ yd-list = yd_commands.list:main
 yd-provision = yd_commands.provision:main
 yd-remove = yd_commands.remove:main
 yd-resize = yd_commands.resize:main
+yd-show = yd_commands.show:main
 yd-shutdown = yd_commands.shutdown:main
 yd-start = yd_commands.start:main
 yd-submit = yd_commands.submit:main

{yellowdog_python_examples-7.10.0 → yellowdog_python_examples-7.10.2}/yellowdog_python_examples.egg-info/requires.txt

@@ -1,4 +1,4 @@
-yellowdog-sdk>=8.0.0
+yellowdog-sdk>=8.0.2
 toml
 tabulate>=0.9.0
 PyPAC>=0.16.4

yellowdog_python_examples-7.10.0/yd_commands/__init__.py

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