yellowdog-python-examples 8.1.5__py3-none-any.whl → 8.1.7__py3-none-any.whl

yellowdog_cli/__init__.py

@@ -1 +1 @@
-__version__ = "8.1.5"
+__version__ = "8.1.7"

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_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_cli/shutdown.py

@@ -16,11 +16,12 @@ from yellowdog_client.model import (
 from yellowdog_cli.utils.entity_utils import (
     get_worker_pool_by_id,
     get_worker_pool_id_by_name,
+    get_worker_pools,
 )
 from yellowdog_cli.utils.follow_utils import follow_ids
 from yellowdog_cli.utils.interactive import confirmed, select
 from yellowdog_cli.utils.misc_utils import link_entity
-from yellowdog_cli.utils.printing import print_error, print_log
+from yellowdog_cli.utils.printing import print_error, print_log, print_warning
 from yellowdog_cli.utils.wrapper import ARGS_PARSER, CLIENT, CONFIG_COMMON, main_wrapper
 from yellowdog_cli.utils.ydid_utils import YDIDType, get_ydid_type
 
@@ -37,9 +38,10 @@ def main():
         f"names including '{CONFIG_COMMON.name_tag}'"
     )
 
-    worker_pool_summaries: List[WorkerPoolSummary] = (
-        CLIENT.worker_pool_client.find_all_worker_pools()
+    worker_pool_summaries: List[WorkerPoolSummary] = get_worker_pools(
+        CLIENT, CONFIG_COMMON.namespace, CONFIG_COMMON.name_tag
     )
+
     shutdown_count = 0
 
     selected_worker_pool_summaries: List[WorkerPoolSummary] = []
@@ -73,7 +75,7 @@ def main():
                 print_log(f"Shut down {link_entity(CONFIG_COMMON.url, worker_pool)}")
                 optionally_terminate_compute_requirement(worker_pool_summary.id)
             except Exception as e:
-                print_error(f"Unable to shut down '{worker_pool_summary.name}': {e}")
+                print_error(f"Failed to shut down '{worker_pool_summary.name}': {e}")
 
     if shutdown_count > 0:
         print_log(f"Shut down {shutdown_count} Worker Pool(s)")
@@ -101,7 +103,7 @@ def shutdown_by_names_or_ids(names_or_ids: List[str]):
         else:
             worker_pool_id = get_worker_pool_id_by_name(CLIENT, name_or_id)
             if worker_pool_id is None:
-                print_error(f"Worker Pool '{name_or_id}' not found")
+                print_warning(f"Worker Pool '{name_or_id}' not found")
                 continue
         worker_pool_ids.append(worker_pool_id)
 
@@ -120,14 +122,14 @@ def shutdown_by_names_or_ids(names_or_ids: List[str]):
             print_log(f"Shut down Worker Pool '{worker_pool_id}'")
             optionally_terminate_compute_requirement(worker_pool_id)
         except Exception as e:
-            print_error(f"Unable to shut down Worker Pool '{worker_pool_id}': ({e})")
+            print_error(f"Failed to shut down Worker Pool '{worker_pool_id}': ({e})")
 
     for node_id in node_ids:
         try:
             CLIENT.worker_pool_client.shutdown_node_by_id(node_id)
             print_log(f"Shut down Node '{node_id}'")
         except Exception as e:
-            print_error(f"Unable to shut down Node '{node_id}': ({e})")
+            print_error(f"Failed to to shut down Node '{node_id}': ({e})")
 
     if ARGS_PARSER.follow:
         follow_ids(worker_pool_ids, auto_cr=ARGS_PARSER.auto_cr)
@@ -151,7 +153,7 @@ def optionally_terminate_compute_requirement(worker_pool_id: str):
             f"Terminated associated Compute Requirement '{worker_pool.computeRequirementId}'"
         )
     except Exception as e:
-        print_error(f"Error terminating Compute Requirement: ({e})")
+        print_error(f"Failed to terminate Compute Requirement: ({e})")
 
 
 # Entry point

yellowdog_cli/terminate.py

@@ -77,7 +77,7 @@ def main():
                 )
             except Exception as e:
                 print_error(
-                    f"Unable to terminate '{compute_requirement_summary.name}': {e}"
+                    f"Failed to terminate '{compute_requirement_summary.name}': {e}"
                 )
 
     if terminated_count > 0:
@@ -125,7 +125,7 @@ def terminate_cr_by_name_or_id(names_or_ids: List[str]):
             )
             print_log(f"Terminated '{compute_requirement_id}'")
         except Exception as e:
-            print_error(f"Unable to terminate '{compute_requirement_id}': ({e})")
+            print_error(f"Failed to terminate '{compute_requirement_id}': ({e})")
 
     if ARGS_PARSER.follow:
         follow_ids(compute_requirement_ids)

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
 
@@ -534,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}'")
@@ -1022,7 +1031,6 @@ def get_image_family_summaries(
                 "Warning: Possible 'IMAGE_READ' permission missing if "
                 f"'{namespace}' is meant as an Image namespace?"
             )
-        pass
 
     return []
 

{yellowdog_python_examples-8.1.5.dist-info → yellowdog_python_examples-8.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.1.5
+Version: 8.1.7
 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.5.dist-info → yellowdog_python_examples-8.1.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
-yellowdog_cli/__init__.py,sha256=UE2byv3TrjFSpmrlMMLljjtWoisXIAZ0MoNAF9Lc36k,22
+yellowdog_cli/__init__.py,sha256=DSjpcTXEMbKTSEhH-ChqB5reU3Hdp38wfe3HkEnrtRQ,22
 yellowdog_cli/abort.py,sha256=3mzTL8DH5InpJry4wPhwi3WJjC8_vCmPpkyf6jLDrBM,4302
 yellowdog_cli/admin.py,sha256=Iipc0_A-Rf997hSDjOOYTaPpB3dsuqekV8Slmm154GI,1010
 yellowdog_cli/boost.py,sha256=JOUkXpl7yvmVZCAS_iv8GJ6g2wF1siVjGGJ-EUDI0FI,1268
 yellowdog_cli/cancel.py,sha256=KWUOZbH4Nh6jcOKDXyHOHlgW-UdcW2BAdjfRHSJd2jk,6349
 yellowdog_cli/cloudwizard.py,sha256=UC1CDNPAsUMh_0C9ScLF4wGmvJ2Rbryravj67LHdFnI,2647
 yellowdog_cli/compare.py,sha256=yihgygtxedvRXz0mQV9hmvvMeKaNYIMfgBlTHetaa_s,24311
-yellowdog_cli/create.py,sha256=hgNrFjteAu87rje99I1YV7EybVEF2pjZbeU9m9bOWOQ,51919
+yellowdog_cli/create.py,sha256=Jrkf6IeIMnNpFdtiU19e60oMqIPVHvvnkWjoTXGBbpw,51954
 yellowdog_cli/delete.py,sha256=7YWGY8vI9ec3QP2y7VSEFFyAsY3IWcsZndDDXhlUNTY,3023
 yellowdog_cli/download.py,sha256=zYlfr7jCoJGzoayjhpoy3Ku9unmXnLu5XORRuUIuDlo,5479
 yellowdog_cli/finish.py,sha256=tPKophQty2aDUrnQ-A6zSrYk3W-ZRS7uQM3bAavGWXI,5227
@@ -16,13 +16,13 @@ yellowdog_cli/instantiate.py,sha256=TDwvUVwqWLY4m0updxbWPTgLX2J0SOmT-EqZRDHgOgI,
 yellowdog_cli/jsonnet2json.py,sha256=kv-AZSR-xwIbXnUdL3gYGjYdSiHq7cAvlEGPz4StdTE,765
 yellowdog_cli/list.py,sha256=WxaKGQ5Upou8wkTeRsgAGPGH5U1yLuWq-DM1ozsuvJc,33344
 yellowdog_cli/provision.py,sha256=-rbFJYzd3Kfq6zpFhbM_KM0VUSkJAa3mvY2YODTNc5Q,19667
-yellowdog_cli/remove.py,sha256=SxR2tut0ox-jnvFhefh66t1vCgZz3TR21109--YSOFo,20890
+yellowdog_cli/remove.py,sha256=yPZSVXY0shzcb_FN8MvW1friuixVzuVGmwqZAnFLDno,20904
 yellowdog_cli/resize.py,sha256=5oMqZmT1KXjnqEClCVzQbCDyZaEu-oc06mypy0TlTBo,4353
 yellowdog_cli/show.py,sha256=rOi6ROkG_o-c65XB84JvQgDHxV-h3zvTX9H09fIV2BE,11014
-yellowdog_cli/shutdown.py,sha256=eIvnmiPuJ8yZVFV2Sjbe14-Y8QWGZbd-EYTnGEKkWag,5538
+yellowdog_cli/shutdown.py,sha256=Coc4qljvpUzG1r3ZuOLSLzTglzXZVbWbh3GzUH7tpeU,5605
 yellowdog_cli/start.py,sha256=9PHUAbS6vSq9RbttKkymOBzltIlWssQvk4zHJ8R-bWw,314
 yellowdog_cli/submit.py,sha256=Q0qUul2WqswvuxCGkpsDEAIh0Ju-iYJWaVU76S6aV5g,61680
-yellowdog_cli/terminate.py,sha256=lY_3w9w9tkhd4imVAlOdrj3a9nlFJkzORAqtI4RUlPg,4685
+yellowdog_cli/terminate.py,sha256=G-4yeeF6eN_VHT9wkfMeyRmu0HYm2kZ_BxiseIBAwQ0,4685
 yellowdog_cli/upload.py,sha256=tCqspQ5xNqUFsAIqBxzvyVQ5Uhk5uZFTf1xM3JFSgBs,5389
 yellowdog_cli/version.py,sha256=IADl53F8zo2pe1FrgZqo3hKNQXmfz7GnynIbXZ7ryQo,1208
 yellowdog_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,7 +36,7 @@ yellowdog_cli/utils/cloudwizard_gcp.py,sha256=zb4WdNrkMgbWWgko3zOb8uTyeQ6BuWsdeV
 yellowdog_cli/utils/compact_json.py,sha256=l-tOoOaiS7Th8ravH66F_xam0dPX2CXLRq-gEBIcNl8,3757
 yellowdog_cli/utils/config_types.py,sha256=Oe2YIz9Vgms3C2CVuit5qVFWpiqdll2XFm7YmL27XpA,3919
 yellowdog_cli/utils/csv_data.py,sha256=vyLhb6ZRzQXzSjK9VWzoP6AP43SuHoWxbD5kEAzUwvM,14409
-yellowdog_cli/utils/entity_utils.py,sha256=KC67qd7YmhDa0Uxri6ma4WxeOa8fbYAzgxZuwkZA2Zg,32725
+yellowdog_cli/utils/entity_utils.py,sha256=hozm5RiI8Pg-XygCQ5TwjOBpQy3uc0YO0GybFAedVIc,33022
 yellowdog_cli/utils/follow_utils.py,sha256=Tiq6n86v1cEMBACVoz6IFj_GLW0Fp0qKB2EZINX8wKE,4320
 yellowdog_cli/utils/interactive.py,sha256=VQZKZ9GtA-bSsWGJgEoOQ0WrOeXbeALpkRhHENCJ8q0,5778
 yellowdog_cli/utils/items.py,sha256=AhSyhgi-p6EZpwozFIxwIxbjxRwKgR2_wt6QdZtORj8,1333
@@ -56,9 +56,9 @@ yellowdog_cli/utils/validate_properties.py,sha256=TsroKrf4jcAg_uQLRb9DpoSjRZ49XB
 yellowdog_cli/utils/variables.py,sha256=AHaolW682lkqm1P9MqWZnwvvK-Gd8hgV0HgzX76A1Ck,20542
 yellowdog_cli/utils/wrapper.py,sha256=TtvHmPKqKRk9meQw3LcsZcpkYNyuPSGcS0tC3fbQ4U4,3846
 yellowdog_cli/utils/ydid_utils.py,sha256=Gs98Pidkpd6v-cpL28t3z8mOW9JMB7ZY2MkGBX8EhMo,2360
-yellowdog_python_examples-8.1.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-yellowdog_python_examples-8.1.5.dist-info/METADATA,sha256=gLiHPqH0B3Fo5sAsmnaiSbdB_cQ6cLebiPXyrTAMbOk,3927
-yellowdog_python_examples-8.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yellowdog_python_examples-8.1.5.dist-info/entry_points.txt,sha256=KABYVOB3kO7kVqnUplNNoz4l36KUUVY05ynsZ9jSVL8,1016
-yellowdog_python_examples-8.1.5.dist-info/top_level.txt,sha256=RfffFF4rsBrBbPB1qRkJsRpUn_5icIZSdCqMDLO3hgA,14
-yellowdog_python_examples-8.1.5.dist-info/RECORD,,
+yellowdog_python_examples-8.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+yellowdog_python_examples-8.1.7.dist-info/METADATA,sha256=5W5dmjQmQeHcAMN0ISUtdkZAez8yiFqxHS_8zyJ40Qw,3927
+yellowdog_python_examples-8.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yellowdog_python_examples-8.1.7.dist-info/entry_points.txt,sha256=KABYVOB3kO7kVqnUplNNoz4l36KUUVY05ynsZ9jSVL8,1016
+yellowdog_python_examples-8.1.7.dist-info/top_level.txt,sha256=RfffFF4rsBrBbPB1qRkJsRpUn_5icIZSdCqMDLO3hgA,14
+yellowdog_python_examples-8.1.7.dist-info/RECORD,,