yellowdog-python-examples 7.8.5__tar.gz → 7.8.7__tar.gz

{yellowdog_python_examples-7.8.5/yellowdog_python_examples.egg-info → yellowdog_python_examples-7.8.7}/PKG-INFO

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

{yellowdog_python_examples-7.8.5 → yellowdog_python_examples-7.8.7}/README.md

@@ -10,6 +10,7 @@
 * [Configuration](#configuration)
 * [Naming Rules](#naming-rules)
 * [Common Properties](#common-properties)
+   * [Importing common properties](#importing-common-properties)
    * [HTTPS Proxy Support](#https-proxy-support)
    * [Specifying Common Properties using the Command Line or Environment Variables](#specifying-common-properties-using-the-command-line-or-environment-variables)
    * [Variable Substitutions in Common Properties](#variable-substitutions-in-common-properties)
@@ -113,7 +114,7 @@
    * [yd-boost](#yd-boost)
 
 <!-- Created by https://github.com/ekalinin/github-markdown-toc -->
-<!-- Added by: pwt, at: Fri Mar 22 14:38:21 GMT 2024 -->
+<!-- Added by: pwt, at: Fri Apr 19 11:43:37 BST 2024 -->
 
 <!--te-->
 
@@ -307,6 +308,28 @@ An example `common` section is shown below:
 
 Indentation is optional in TOML files and is for readability only.
 
+## Importing `common` properties
+
+The `common` section can import properties from a separate TOML file, using the `importCommon` property. For example, the `key` and `secret` might be in a shared TOML file called `app_credentials.toml`, with the following contents:
+
+```toml
+[common]
+    key = "asdfghjklzxcvb-1234567"
+    secret = "qwertyuiopasdfghjklzxcvbnm1234567890qwertyu"
+```
+
+This could be imported into the main configuration as follows:
+
+```toml
+[common]
+    importCommon = "app_credentials.toml"
+
+    namespace = "project-x"
+    tag = "testing-{{username}}"
+```
+
+Properties set in the imported file are superseded by any of the same properties that are present in the main configuration file.
+
 ## HTTPS Proxy Support
 
 The commands will respect the value of the environment variable `HTTPS_PROXY` if routing through a proxy is required.

yellowdog_python_examples-7.8.7/yd_commands/__init__.py

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

{yellowdog_python_examples-7.8.5 → yellowdog_python_examples-7.8.7}/yd_commands/args.py

@@ -127,8 +127,6 @@ class CLIParser:
             for module in [
                 "boost",
                 "resize",
-                "create",
-                "remove",
                 "cloudwizard",
                 "follow",
             ]

{yellowdog_python_examples-7.8.5 → yellowdog_python_examples-7.8.7}/yd_commands/load_config.py

@@ -88,9 +88,12 @@ def load_config_common() -> ConfigCommon:
         common_section = CONFIG_TOML.get(COMMON_SECTION, {})
 
         # Check for IMPORT directive ('common' section in a separate file)
-        common_section_import_file = common_section.get(IMPORT_COMMON, None)
+        common_section_import_file = common_section.pop(IMPORT_COMMON, None)
         if common_section_import_file is not None:
-            common_section = import_toml(common_section_import_file)
+            common_section_imported = import_toml(common_section_import_file)
+            # Local properties supersede imported properties
+            common_section_imported.update(common_section)
+            common_section = common_section_imported
 
         # Replace common section properties with command line or
         # environment variable overrides. Precedence is:

{yellowdog_python_examples-7.8.5 → yellowdog_python_examples-7.8.7}/yd_commands/remove.py

@@ -9,6 +9,9 @@ from typing import Dict, List, Optional
 
 from requests.exceptions import HTTPError
 from yellowdog_client.model import (
+    MachineImage,
+    MachineImageFamily,
+    MachineImageGroup,
     NamespaceStorageConfiguration,
     WorkerPoolStatus,
     WorkerPoolSummary,
@@ -353,9 +356,26 @@ def remove_resource_by_id(resource_id: str):
 
         elif resource_id.startswith("ydid:imgfam:"):
             if confirmed(f"Remove Image Family '{resource_id}'?"):
-                CLIENT.images_client.delete_image_family(resource_id)
+                family: MachineImageFamily = (
+                    CLIENT.images_client.get_image_family_by_id(resource_id)
+                )
+                CLIENT.images_client.delete_image_family(family)
+                print_log(f"Removed Image Family {resource_id} (if present)")
+
+        elif resource_id.startswith("ydid:imggrp:"):
+            if confirmed(f"Remove Image Group '{resource_id}'?"):
+                group: MachineImageGroup = CLIENT.images_client.get_image_group_by_id(
+                    resource_id
+                )
+                CLIENT.images_client.delete_image_group(group)
                 print_log(f"Removed Image Family {resource_id} (if present)")
 
+        elif resource_id.startswith("ydid:image:"):
+            if confirmed(f"Remove Image '{resource_id}'?"):
+                image: MachineImage = CLIENT.images_client.get_image(resource_id)
+                CLIENT.images_client.delete_image(image)
+                print_log(f"Removed Image {resource_id} (if present)")
+
         elif resource_id.startswith("ydid:keyring:"):
             if confirmed(f"Remove Keyring {resource_id}?"):
                 keyrings = CLIENT.keyring_client.find_all_keyrings()

{yellowdog_python_examples-7.8.5 → yellowdog_python_examples-7.8.7}/yd_commands/upload_utils.py

@@ -100,19 +100,20 @@ def upload_file_core(
         destination_file_name=remote_file,
     )
     session.start()
+
     # Wait for upload to complete
     session = session.when_status_matches(lambda status: status.is_finished()).result()
+
     if session.status != FileTransferStatus.Completed:
-        print_error(f"Failed to upload file: {local_file}")
-        # Continue here?
-    else:
-        print_log(
-            f"Uploaded file '{local_file}' to"
-            f" '{namespace}{NAMESPACE_PREFIX_SEPARATOR}{remote_file}'"
-        )
-        remote_file = remote_file.replace("/", "%2F")
-        link_ = link(
-            url,
-            f"#/objects/{namespace}/{remote_file}?object=true",
-        )
-        print_log(f"Object URL: {link_}")
+        raise Exception(f"Failed to upload file: {local_file}")
+
+    print_log(
+        f"Uploaded file '{local_file}' to"
+        f" '{namespace}{NAMESPACE_PREFIX_SEPARATOR}{remote_file}'"
+    )
+    remote_file = remote_file.replace("/", "%2F")
+    link_ = link(
+        url,
+        f"#/objects/{namespace}/{remote_file}?object=true",
+    )
+    print_log(f"Object URL: {link_}")

{yellowdog_python_examples-7.8.5 → yellowdog_python_examples-7.8.7/yellowdog_python_examples.egg-info}/PKG-INFO

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

yellowdog_python_examples-7.8.5/yd_commands/__init__.py

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