yellowdog-python-examples 7.19.4__tar.gz → 7.19.6__tar.gz

{yellowdog_python_examples-7.19.4/yellowdog_python_examples.egg-info → yellowdog_python_examples-7.19.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.19.4
+Version: 7.19.6
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 Project-URL: Homepage, https://github.com/yellowdog/python-examples

yellowdog_python_examples-7.19.6/yellowdog_cli/__init__.py

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

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/abort.py

@@ -37,8 +37,8 @@ def main():
         return
 
     print_log(
-        "Finding active Work Requirements with "
-        f"'{CONFIG_COMMON.namespace}' in namespace and "
+        "Finding active Work Requirements in"
+        f"namespace '{CONFIG_COMMON.namespace}' with "
         f"'{CONFIG_COMMON.name_tag}' in tag"
     )
 

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/cancel.py

@@ -31,8 +31,8 @@ def main():
         return
 
     print_log(
-        "Cancelling Work Requirements with "
-        f"'{CONFIG_COMMON.namespace}' in namespace and "
+        "Cancelling Work Requirements in namespace "
+        f"'{CONFIG_COMMON.namespace}' with "
         f"'{CONFIG_COMMON.name_tag}' in tag"
     )
 

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/list.py

@@ -203,8 +203,8 @@ def list_work_requirements():
     options chosen.
     """
     print_log(
-        f"Listing Work Requirements with  '{CONFIG_COMMON.namespace}' in namespace "
-        f"and '{CONFIG_COMMON.name_tag}' in tag",
+        f"Listing Work Requirements in namespace  '{CONFIG_COMMON.namespace}' "
+        f"with '{CONFIG_COMMON.name_tag}' in tag",
     )
     if ARGS_PARSER.active_only:
         print_log("Listing active Work Requirements only")
@@ -326,7 +326,7 @@ def list_object_paths():
 
 
 def list_worker_pools():
-    print_log(f"Displaying Worker Pools with '{CONFIG_COMMON.namespace}' in namespace")
+    print_log(f"Displaying Worker Pools in namespace '{CONFIG_COMMON.namespace}'")
 
     worker_pool_summaries: List[WorkerPoolSummary] = (
         CLIENT.worker_pool_client.find_all_worker_pools()
@@ -385,8 +385,8 @@ def list_worker_pools():
 
 def list_compute_requirements():
     print_log(
-        "Listing Compute Requirements with "
-        f"namespace containing '{CONFIG_COMMON.namespace}' and "
+        "Listing Compute Requirements in "
+        f"namespace '{CONFIG_COMMON.namespace}' with "
         f" names containing '{CONFIG_COMMON.name_tag}'"
     )
 
@@ -394,7 +394,7 @@ def list_compute_requirements():
         print_log("Listing active Compute Requirements only")
 
     cr_search = ComputeRequirementSearch(
-        namespace=CONFIG_COMMON.namespace,
+        namespace=None if CONFIG_COMMON.namespace == "" else CONFIG_COMMON.namespace,
     )
     search_client: SearchClient = CLIENT.compute_client.get_compute_requirements(
         cr_search
@@ -560,9 +560,9 @@ def list_compute_requirement_templates():
         CLIENT.compute_client.find_all_compute_requirement_templates()
     )
     print_log(
-        "Listing Compute Requirement Templates with namespaces including"
-        f" '{CONFIG_COMMON.namespace}' and names including"
-        f" '{CONFIG_COMMON.name_tag}'"
+        "Listing Compute Requirement Templates in namespace "
+        f"'{CONFIG_COMMON.namespace}' with names including "
+        f"'{CONFIG_COMMON.name_tag}'"
     )
     cr_templates = [
         crt
@@ -613,9 +613,9 @@ def list_compute_source_templates():
         CLIENT.compute_client.find_all_compute_source_templates()
     )
     print_log(
-        "Listing Compute Source Templates with namespaces including"
-        f" '{CONFIG_COMMON.namespace}' and names including"
-        f" '{CONFIG_COMMON.name_tag}'"
+        "Listing Compute Source Templates in namespace "
+        f"'{CONFIG_COMMON.namespace}' with names including "
+        f"'{CONFIG_COMMON.name_tag}'"
     )
     cs_templates = [
         cst
@@ -697,17 +697,17 @@ def list_image_families():
     """
     image_search = MachineImageFamilySearch(
         includePublic=True,
-        namespace=(
-            None if CONFIG_COMMON.namespace is "" else CONFIG_COMMON.namespace
-        ),  # Supports partial match
+        namespaces=(
+            None if CONFIG_COMMON.namespace == "" else [CONFIG_COMMON.namespace]
+        ),
         familyName=CONFIG_COMMON.name_tag,  # Supports partial match
     )
     search_client: SearchClient = CLIENT.images_client.get_image_families(image_search)
     image_family_summaries: List[MachineImageFamilySummary] = search_client.list_all()
     if len(image_family_summaries) == 0:
         print_log(
-            f"No matching Machine Image Families found with namespace including "
-            f"'{CONFIG_COMMON.namespace}' and tag including '{CONFIG_COMMON.name_tag}'"
+            f"No matching Machine Image Families found in namespace "
+            f"'{CONFIG_COMMON.namespace}' with tag including '{CONFIG_COMMON.name_tag}'"
         )
         return
 

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/resize.py

@@ -77,7 +77,7 @@ def _resize_compute_requirement():
         f" Tag starting with '{CONFIG_COMMON.name_tag}'"
     )
     cr_search = ComputeRequirementSearch(
-        namespace=CONFIG_COMMON.namespace,
+        namespace=None if CONFIG_COMMON.namespace == "" else CONFIG_COMMON.namespace,
     )
     search_client: SearchClient = CLIENT.compute_client.get_compute_requirements(
         cr_search

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/terminate.py

@@ -43,7 +43,7 @@ def main():
     )
 
     cr_search = ComputeRequirementSearch(
-        namespace=CONFIG_COMMON.namespace,
+        namespace=None if CONFIG_COMMON.namespace == "" else CONFIG_COMMON.namespace,
         statuses=VALID_TERMINATION_STATUSES,
     )
     search_client: SearchClient = CLIENT.compute_client.get_compute_requirements(

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/utils/cloudwizard_common.py

@@ -75,7 +75,7 @@ class CommonCloudConfig(ABC):
         counter = 0
         for (
             compute_requirement_template_summary
-        ) in get_all_compute_requirement_templates(client):
+        ) in get_all_compute_requirement_templates(client, self._namespace):
             if (
                 compute_requirement_template_summary.name.startswith(name_prefix)
                 and compute_requirement_template_summary.namespace == self._namespace
@@ -91,7 +91,9 @@ class CommonCloudConfig(ABC):
         # Remove Compute Source Templates
         clear_compute_source_template_cache()
         counter = 0
-        for compute_source_template_summary in get_all_compute_source_templates(client):
+        for compute_source_template_summary in get_all_compute_source_templates(
+            client, self._namespace
+        ):
             if (
                 compute_source_template_summary.name.startswith(name_prefix)
                 and compute_source_template_summary.namespace == self._namespace

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/utils/entity_utils.py

@@ -3,7 +3,7 @@ Various utility functions for finding objects, etc.
 """
 
 from functools import lru_cache
-from typing import List, Optional
+from typing import Callable, List, Optional, Tuple
 
 from yellowdog_client import PlatformClient
 from yellowdog_client.common import SearchClient
@@ -15,8 +15,10 @@ from yellowdog_client.model import (
     ComputeRequirementSearch,
     ComputeRequirementStatus,
     ComputeRequirementTemplate,
+    ComputeRequirementTemplateSearch,
     ComputeRequirementTemplateSummary,
     ComputeSourceTemplate,
+    ComputeSourceTemplateSearch,
     ComputeSourceTemplateSummary,
     ExternalUser,
     GroupSearch,
@@ -37,7 +39,9 @@ from yellowdog_client.model import (
     User,
     UserSearch,
     WorkerPool,
+    WorkerPoolSearch,
     WorkerPoolSummary,
+    WorkRequirementSearch,
     WorkRequirementStatus,
     WorkRequirementSummary,
 )
@@ -87,8 +91,11 @@ def get_filtered_work_requirements(
     """
     filtered_work_summaries: List[WorkRequirementSummary] = []
 
+    wr_search = WorkRequirementSearch(namespaces=[namespace], tag=tag)
+    wr_search_client = client.work_client.get_work_requirements(wr_search)
+
     work_requirement_summaries: List[WorkRequirementSummary] = (
-        client.work_client.find_all_work_requirements()
+        wr_search_client.list_all()
     )
 
     for work_summary in work_requirement_summaries:
@@ -176,14 +183,14 @@ def get_work_requirement_summary_by_name_or_id(
 
 
 def _find_id_by_name(
-    name: str, client: PlatformClient, find_function: callable
+    name: str, client: PlatformClient, find_function: Callable
 ) -> Optional[str]:
     """
     Generic function to find the ID of an entity by namespace and name.
     """
     namespace, name = split_namespace_and_name(name)
 
-    entities = find_function(client)
+    entities = find_function(client, namespace)
 
     exact_matching_entities = []
     inexact_matching_entities = []
@@ -228,12 +235,18 @@ def find_compute_source_template_id_by_name(
 
 @lru_cache
 def get_all_compute_source_templates(
-    client: PlatformClient,
+    client: PlatformClient, namespace: Optional[str]
 ) -> List[ComputeSourceTemplateSummary]:
     """
-    Cache the list of Sources.
+    Cache the list of Compute Source Templates.
     """
-    return client.compute_client.find_all_compute_source_templates()
+    cst_search = ComputeSourceTemplateSearch(
+        namespaces=None if namespace in [None, ""] else [namespace]
+    )
+    cst_search_client: SearchClient = (
+        client.compute_client.get_compute_source_templates(cst_search)
+    )
+    return cst_search_client.list_all()
 
 
 def clear_compute_source_template_cache():
@@ -255,12 +268,18 @@ def find_compute_requirement_template_id_by_name(
 
 @lru_cache
 def get_all_compute_requirement_templates(
-    client: PlatformClient,
+    client: PlatformClient, namespace: Optional[str]
 ) -> List[ComputeRequirementTemplateSummary]:
     """
     Cache the list of Compute Requirement Templates.
     """
-    return client.compute_client.find_all_compute_requirement_templates()
+    crt_search = ComputeRequirementTemplateSearch(
+        namespaces=None if namespace in [None, ""] else [namespace]
+    )
+    crt_search_client: SearchClient = (
+        client.compute_client.get_compute_requirement_templates(crt_search)
+    )
+    return crt_search_client.list_all()
 
 
 def clear_compute_requirement_template_cache():
@@ -283,11 +302,19 @@ def get_compute_requirement_id_by_worker_pool_id(
         return worker_pool.computeRequirementId
 
 
-def get_all_worker_pools(client: PlatformClient) -> List[WorkerPoolSummary]:
+def get_all_worker_pools(
+    client: PlatformClient, namespace: Optional[str]
+) -> List[WorkerPoolSummary]:
     """
-    Return all Worker Pool summaries.
+    Return all Worker Pool summaries for a namespace.
     """
-    return client.worker_pool_client.find_all_worker_pools()
+    wp_search = WorkerPoolSearch(
+        namespaces=None if namespace in [None, ""] else [namespace]
+    )
+    wp_search_client: SearchClient = client.worker_pool_client.get_worker_pools(
+        wp_search
+    )
+    return wp_search_client.list_all()
 
 
 @lru_cache
@@ -299,6 +326,12 @@ def find_image_family_reference_by_name(
     Fully qualified name is used for non-ambiguous PRIVATE image families.
     """
 
+    if image_family_name.startswith("ami-") or image_family_name.startswith(
+        "ocid1.image."
+    ):
+        # We can identify AWS AMIs and OCI OCIDs, and return immediately
+        return image_family_name
+
     original_image_family_name = image_family_name
 
     # Remove leading 'yd/' prefix if necessary
@@ -310,10 +343,25 @@ def find_image_family_reference_by_name(
     namespace, name = split_namespace_and_name(image_family_name)
 
     if_search = MachineImageFamilySearch(
-        familyName=name, namespace=namespace, includePublic=True
+        familyName=name,
+        namespaces=None if namespace in [None, ""] else [namespace],
+        includePublic=True,
     )
     search_client: SearchClient = client.images_client.get_image_families(if_search)
-    image_families: List[MachineImageFamilySummary] = search_client.list_all()
+
+    try:
+        image_families: List[MachineImageFamilySummary] = search_client.list_all()
+    except Exception as e:
+        if "MissingPermissionException" in str(e) and "IMAGE_READ" in str(e):
+            # IMAGE_READ permission (globally, or for this namespace) is absent;
+            # abandon lookup and return the original image family name
+            print_log(
+                f"Note: failed to resolve image name '{original_image_family_name}' "
+                "due to lack of 'IMAGE_READ' permission; using original name"
+            )
+            return original_image_family_name
+        else:
+            raise
 
     # Partial names will match, so filter for exact matches only
     image_families = [
@@ -484,7 +532,7 @@ def get_non_exact_namespace_matches(
     return matching_namespaces
 
 
-def split_namespace_and_name(reference: str) -> (Optional[str], str):
+def split_namespace_and_name(reference: str) -> Tuple[Optional[str], str]:
     """
     Split a name into an (optional) namespace and a name.
     """

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/utils/start_hold_common.py

@@ -52,8 +52,8 @@ def _start_or_hold_work_requirements(
         )
 
     print_log(
-        f"{action}ing Work Requirements with "
-        f"'{CONFIG_COMMON.namespace}' in namespace and "
+        f"{action}ing Work Requirements in namespace "
+        f"'{CONFIG_COMMON.namespace}' with "
         f"'{CONFIG_COMMON.name_tag}' in tag"
     )
 

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6}/yellowdog_cli/utils/wrapper.py

@@ -94,7 +94,7 @@ def main_wrapper(func):
                         "Your Application does not have the required permissions to"
                         " perform the requested operation. Please check that the"
                         " Application belongs to the required group(s), e.g.,"
-                        f" 'admininistrators': {e}"
+                        f" 'administrators', with roles in the required namespace: {e}"
                     )
                 else:
                     print_error(e)

{yellowdog_python_examples-7.19.4 → yellowdog_python_examples-7.19.6/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.19.4
+Version: 7.19.6
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 Project-URL: Homepage, https://github.com/yellowdog/python-examples

yellowdog_python_examples-7.19.4/yellowdog_cli/__init__.py

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