yellowdog-python-examples 8.1.4__tar.gz → 8.1.6__tar.gz

{yellowdog_python_examples-8.1.4/yellowdog_python_examples.egg-info → yellowdog_python_examples-8.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.1.4
+Version: 8.1.6
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0

yellowdog_python_examples-8.1.6/yellowdog_cli/__init__.py

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

{yellowdog_python_examples-8.1.4 → yellowdog_python_examples-8.1.6}/yellowdog_cli/create.py

@@ -1319,8 +1319,10 @@ def create_namespace(resource: Dict):
         )
     except Exception as e:
         if "ConflictException" in str(e):
-            raise Exception(f"Namespace '{name}' already exists")
-        raise Exception(f"Failed to create namespace '{name}' ({e})")
+            print_warning(f"Namespace '{name}' already exists")
+            return
+        else:
+            raise Exception(f"Failed to create namespace '{name}' ({e})")
 
     print_log(f"Created namespace '{name}' ({namespace_id})")
 

{yellowdog_python_examples-8.1.4 → yellowdog_python_examples-8.1.6}/yellowdog_cli/remove.py

@@ -151,7 +151,7 @@ def remove_compute_source_template(resource: Dict):
 
     source_id = find_compute_source_template_id_by_name(CLIENT, name)
     if source_id is None:
-        print_error(f"Cannot find Compute Source Template '{name}'")
+        print_warning(f"Cannot find Compute Source Template '{name}'")
         return
 
     if not confirmed(f"Remove Compute Source Template '{name}'?"):
@@ -181,7 +181,7 @@ def remove_compute_requirement_template(resource: Dict):
 
     template_id = find_compute_requirement_template_id_by_name(CLIENT, name)
     if template_id is None:
-        print_error(f"Cannot find Compute Requirement Template '{name}'")
+        print_warning(f"Cannot find Compute Requirement Template '{name}'")
         return
 
     if not confirmed(f"Remove Compute Requirement Template '{name}' ({template_id})?"):
@@ -215,7 +215,7 @@ def remove_keyring(resource: Dict):
         print_log(f"Removed Keyring '{name}'")
     except HTTPError as e:
         if e.response.status_code == 404:
-            print_error(f"Cannot find Keyring '{name}'")
+            print_warning(f"Cannot find Keyring '{name}'")
         else:
             print_error(f"Unable to remove Keyring '{name}': {e}")
 
@@ -245,7 +245,7 @@ def remove_credential(resource: Dict):
         )
     except HTTPError as e:
         if e.response.status_code == 404:
-            print_error(
+            print_warning(
                 f"Cannot find Keyring '{keyring_name}'(possibly already deleted,"
                 " including its credentials?)"
             )
@@ -275,7 +275,7 @@ def remove_image_family(resource: Dict):
         )
     except HTTPError as e:
         if e.response.status_code == 404:
-            print_error(f"Cannot find Machine Image Family '{fq_name}'")
+            print_warning(f"Cannot find Machine Image Family '{fq_name}'")
             return
         else:
             raise e
@@ -304,7 +304,7 @@ def remove_namespace_configuration(resource: Dict):
         CLIENT.object_store_client.get_namespace_storage_configurations()
     )
     if namespace not in [x.namespace for x in namespaces]:
-        print_error(f"Cannot find Namespace Storage Configuration '{namespace}'")
+        print_warning(f"Cannot find Namespace Storage Configuration '{namespace}'")
         return
 
     if not confirmed(f"Remove Namespace Storage Configuration '{namespace}'?"):
@@ -365,7 +365,7 @@ def remove_configured_worker_pool(resource: Dict):
                 return
 
     else:
-        print_error(f"Cannot find Configured Worker Pool '{fq_name}'")
+        print_warning(f"Cannot find Configured Worker Pool '{fq_name}'")
 
 
 def remove_allowance(resource: Dict):
@@ -428,7 +428,7 @@ def remove_resource_by_id(resource_id: str):
                         CLIENT.keyring_client.delete_keyring_by_name(keyring.name)
                         print_log(f"Removed Keyring {resource_id}")
                         return
-                raise Exception(f"Cannot find Keyring {resource_id}")
+                print_warning(f"Cannot find Keyring {resource_id}")
 
         elif get_ydid_type(resource_id) == YDIDType.WORKER_POOL:
             if confirmed(f"Shut down Worker Pool {resource_id}?"):
@@ -497,7 +497,7 @@ def remove_namespace_policy(resource: Dict):
             return
     except Exception:
         # Assume it's not found ... 404 from API
-        print_error(f"Cannot find Namespace Policy '{namespace}'")
+        print_warning(f"Cannot find Namespace Policy '{namespace}'")
         return
 
     if not confirmed(f"Remove Namespace Policy '{namespace}'?"):

{yellowdog_python_examples-8.1.4 → yellowdog_python_examples-8.1.6}/yellowdog_cli/utils/entity_utils.py

@@ -54,7 +54,7 @@ from yellowdog_client.model import (
 
 from yellowdog_cli.utils.args import ARGS_PARSER
 from yellowdog_cli.utils.interactive import confirmed, select
-from yellowdog_cli.utils.printing import print_log
+from yellowdog_cli.utils.printing import print_log, print_warning
 from yellowdog_cli.utils.settings import NAMESPACE_PREFIX_SEPARATOR
 from yellowdog_cli.utils.ydid_utils import YDIDType, get_ydid_type
 
@@ -231,6 +231,7 @@ def _find_id_by_name(
     )
 
 
+@lru_cache
 def find_compute_source_template_id_by_name(
     client: PlatformClient, name: str
 ) -> Optional[str]:
@@ -238,7 +239,12 @@ def find_compute_source_template_id_by_name(
     Find a Compute Source Template id by name.
     Compute Source Template names are unique within a namespace.
     """
-    return _find_id_by_name(name, client, get_compute_source_templates)
+    template_id = _find_id_by_name(name, client, get_compute_source_templates)
+    if template_id is not None:
+        print_log(
+            f"Replaced Compute Source Template name '{name}' with ID {template_id}"
+        )
+    return template_id
 
 
 @lru_cache
@@ -277,8 +283,10 @@ def get_work_requirement_summaries(
 def clear_compute_source_template_cache():
     """
     Clear the cache of Compute Source Templates.
+    Clear name -> CST lookups.
     """
     get_compute_source_templates.cache_clear()
+    find_compute_source_template_id_by_name.cache_clear()
 
 
 def find_compute_requirement_template_id_by_name(
@@ -414,7 +422,7 @@ def find_image_name_or_id(
         return return_val
 
     split_name = image_name_or_id.split("/")
-    image_family_summaries = get_image_family_summaries(client)
+    image_family_summaries = get_image_family_summaries(client)  # All namespaces
 
     # Search for image name (only) matches
     if len(split_name) == 1:
@@ -442,6 +450,12 @@ def find_image_name_or_id(
     # Search for namespace/family_name matches, *or* family_name/group_name matches
     if len(split_name) == 2:
         # namespace/family-name match
+
+        # This will be tidied up when the Application can
+        # query its properties
+        if len(image_family_summaries) == 0:  # Global search didn't work
+            image_family_summaries = get_image_family_summaries(client, split_name[0])
+
         matching_image_families = [
             ifs
             for ifs in image_family_summaries
@@ -487,6 +501,12 @@ def find_image_name_or_id(
     # Search for names of form 'namespace/image-family-name/image-group-name'
     # (the platform prevents duplicates)
     if len(split_name) == 3:
+
+        # This will be tidied up when the Application can
+        # query its properties
+        if len(image_family_summaries) == 0:  # Global search didn't work
+            image_family_summaries = get_image_family_summaries(client, split_name[0])
+
         for ifs in image_family_summaries:
             if ifs.namespace == split_name[0] and ifs.name == split_name[1]:
                 for ig in get_image_family_groups(client, ifs.id):
@@ -501,7 +521,7 @@ def find_image_name_or_id(
                         f"group for '{original_image_name_or_id}'"
                     )
 
-    # Finally, fall through and return the original ID string
+    # Finally, fall through and return the unchanged, original ID string
     return original_image_name_or_id
 
 
@@ -514,7 +534,16 @@ def remove_allowances_matching_description(
     """
     allowances = client.allowances_client.get_allowances(
         AllowanceSearch(description=description)
-    ).list_all()
+    ).list_all()  # Can return partial matches
+
+    # Ensure exact match
+    allowances = [
+        allowance for allowance in allowances if description == allowance.description
+    ]
+
+    if len(allowances) == 0:
+        print_log(f"Cannot find Allowance matching description '{description}'")
+        return 0
 
     if len(allowances) > 1:
         print_log(f"Multiple Allowances match the description '{description}'")
@@ -979,17 +1008,31 @@ def get_compute_requirement_summaries(
 @lru_cache
 def get_image_family_summaries(
     client: PlatformClient,
+    namespace: Optional[str] = None,
 ) -> List[MachineImageFamilySummary]:
     """
     Obtain and cache the list of image families.
     """
-    if_search = MachineImageFamilySearch(
-        familyName=None,
-        namespaces=None,
-        includePublic=True,
-    )
-    search_client: SearchClient = client.images_client.get_image_families(if_search)
-    return search_client.list_all()
+    # Temporarily suppress most permission errors: will be improved
+    # once the application can be queried for its admissible
+    # IMAGE_READ namespaces
+    try:
+        if_search = MachineImageFamilySearch(
+            familyName=None,
+            namespaces=None if namespace is None else [namespace],
+            includePublic=True,
+        )
+        search_client: SearchClient = client.images_client.get_image_families(if_search)
+        return search_client.list_all()
+    except Exception as e:
+        if namespace is not None and "MissingPermissionException" in str(e):
+            # Caching will prevent this warning appearing multiple times
+            print_log(
+                "Warning: Possible 'IMAGE_READ' permission missing if "
+                f"'{namespace}' is meant as an Image namespace?"
+            )
+
+    return []
 
 
 @lru_cache

{yellowdog_python_examples-8.1.4 → yellowdog_python_examples-8.1.6}/yellowdog_cli/utils/printing.py

@@ -16,6 +16,7 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 
 from rich.console import Console, Theme
 from rich.highlighter import JSONHighlighter, RegexHighlighter
+from rich.markup import escape
 from tabulate import tabulate
 from yellowdog_client import PlatformClient
 from yellowdog_client.common.json import Json
@@ -192,7 +193,7 @@ def print_simple(
     if ARGS_PARSER.quiet and override_quiet is False:
         return
 
-    CONSOLE.print(log_message)
+    CONSOLE.print(escape(log_message))
 
 
 def print_log(
@@ -211,7 +212,7 @@ def print_log(
         print(print_string(log_message, no_fill=no_fill), flush=True)
         return
 
-    CONSOLE.print(print_string(log_message, no_fill=no_fill))
+    CONSOLE.print(escape(print_string(log_message, no_fill=no_fill)))
 
 
 def print_error(error_obj: Union[Exception, str]):
@@ -222,7 +223,7 @@ def print_error(error_obj: Union[Exception, str]):
         print(print_string(f"Error: {error_obj}"), flush=True)
         return
 
-    CONSOLE_ERR.print(print_string(f"Error: {error_obj}"), style=ERROR_STYLE)
+    CONSOLE_ERR.print(escape(print_string(f"Error: {error_obj}")), style=ERROR_STYLE)
 
 
 def print_warning(
@@ -241,7 +242,8 @@ def print_warning(
         return
 
     CONSOLE.print(
-        print_string(f"Warning: {warning}", no_fill=no_fill), style=WARNING_STYLE
+        escape(print_string(f"Warning: {warning}", no_fill=no_fill)),
+        style=WARNING_STYLE,
     )
 
 
@@ -280,7 +282,7 @@ def print_table_core(table: str):
     if ARGS_PARSER.no_format or table.count("\n") > MAX_LINES_COLOURED_FORMATTING:
         print(table, flush=True)
     else:
-        CONSOLE_TABLE.print(table)
+        CONSOLE_TABLE.print(escape(table))
 
 
 def get_type_name(obj: Item) -> str:
@@ -1098,9 +1100,9 @@ def print_json(
 
     else:
         if with_final_comma:
-            CONSOLE_JSON.print(json_string, end=",\n", soft_wrap=True)
+            CONSOLE_JSON.print(escape(json_string), end=",\n", soft_wrap=True)
         else:
-            CONSOLE_JSON.print(json_string, soft_wrap=True)
+            CONSOLE_JSON.print(escape(json_string), soft_wrap=True)
 
     if ARGS_PARSER.output_file is not None:  # Also output to a nominated file
         print_to_file(

{yellowdog_python_examples-8.1.4 → yellowdog_python_examples-8.1.6/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.1.4
+Version: 8.1.6
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0

yellowdog_python_examples-8.1.4/yellowdog_cli/__init__.py

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