yellowdog-python-examples 8.1.1__tar.gz → 8.1.3__tar.gz

{yellowdog_python_examples-8.1.1/yellowdog_python_examples.egg-info → yellowdog_python_examples-8.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.1.1
+Version: 8.1.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -26,7 +26,7 @@ Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml
-Requires-Dist: yellowdog-sdk>=11.3.0
+Requires-Dist: yellowdog-sdk>=11.5.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/README.md

@@ -417,9 +417,9 @@ Variable substitutions are discussed in more detail below.
 
 # Variable Substitutions
 
-Variable substitutions provide a powerful mechanism for introducing variable values into TOML configuration files, and JSON/Jsonnet definitions of Work Requirements and Worker Pools. They can be included in the value of any property in any of these objects, including in values within arrays (lists), e.g., for the `arguments` property, and tables (dictionaries), e.g., the `environment` property.
+Variable substitutions provide a powerful mechanism for introducing variable values into TOML configuration files, and JSON/Jsonnet definitions. They can be included in the value of any property in any of these objects, including in values within arrays (lists), e.g., for the `arguments` property, and tables (dictionaries), e.g., the `environment` property.
 
-Variable substitutions are expressed using the `{{variable}}` notation, where the expression is replaced by the value of `variable`.
+Variable substitutions are expressed using the `{{variable}}` notation (note: no spaces between the double brackets and the variable name), where the expression is replaced by the value of `variable`.
 
 Substitutions can also be performed for non-string (number, boolean, array, and table) values using the `num:`, `bool:`, `array:`, and `table:` prefixes within the variable substitution:
 
@@ -493,7 +493,7 @@ The precedence order for setting variables is:
 4. General environment variables
 5. Variables in a `.env` file
 
-This method can also be used to override the default variables, e.g., setting `-v username="other-user"` will override the default `{{username}}` variable.
+This method can also be used to override some default variables, e.g., setting `-v username="other-user"` will override the default `{{username}}` variable.
 
 ### Nested Variables
 
@@ -547,7 +547,7 @@ name = "{{name_var:={{tag}}-{{datetime}}}}"
 
 ## Variable Substitutions in Worker Pool and Compute Requirement Specifications, and in User Data
 
-In JSON specifications for Worker Pools and Compute Requirements, variable substitutions can be used, but **they must be prefixed and postfixed by double underscores** `__`, e.g., `__{{username}}__`. This is to disambiguate client-side variable substitutions from server-side Mustache variable processing.
+In JSON/Jsonnet specifications for Worker Pools and Compute Requirements, variable substitutions **must be prefixed and postfixed by double underscores** `__`, e.g., `__{{username}}__`. This is to disambiguate client-side variable substitutions from server-side Mustache variable processing.
 
 Variable substitutions can also be used within **User Data** to be supplied to instances, for which the same prefix/postfix requirement applies, **including** for User Data supplied directly using the `userData` property in the `workerPool` section of the TOML file.
 
@@ -710,6 +710,7 @@ In addition to the environment variables above, when a Task is executed by a Wor
 - `YD_TASK_ID`
 - `YD_AGENT_DATA`
 - `YD_AGENT_HOME`
+- `YD_WORKER_SLOT`
 
 ### Task Types
 
@@ -1692,7 +1693,7 @@ The following properties are available:
 |:------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------|:------------------------|
 | `idleNodeTimeout`       | The timeout in minutes after which an idle node will be shut down. Set this to `0` to disable the timeout.                                 | `5.0`                   |
 | `idlePoolTimeout`       | The timeout in minutes after which an idle Worker Pool will be shut down. Set this to `0` to disable the timeout.                          | `30.0`                  |
-| `imagesId`              | The image ID, Image Family ID, or Image Family name to use when booting instances.                                                         |                         |
+| `imagesId`              | The image ID, Image Family ID, Image Family name, or Image Group name to use when booting instances.                                       |                         |
 | `instanceTags`          | The dictionary of instance tags to apply to the instances. Tag names must be lower case.                                                   |                         |
 | `maintainInstanceCount` | Only used when instantiating Compute Requirements; attempt to maintain the requested number of instances.                                  | `False`                 |
 | `maxNodes`              | The maximum number of nodes to which the Worker Pool can be scaled up.                                                                     | `1`                     |
@@ -1716,7 +1717,7 @@ The following properties are available:
 
 The `templateId` property can be directly populated with the YellowDog ID (YDID), or it can be populated with the textual name of the template, in the form `namespace/template_name`.
 
-Similarly, the `imagesId` property can be populated with the YDID of an Image Family, Image Group, Image, or a string representing the native name of a cloud provider image (e.g., an AWS AMI). It can also be populated with the textual name of an Image Family, in the form `namespace/image_family_name`.
+Similarly, the `imagesId` property can be populated with the YDID of an Image Family, Image Group, Image, or a string representing the native name of a cloud provider image (e.g., an AWS AMI). It can also be populated with an Image Family name in the form `namespace/image_family_name`, or an Image Group name in the form `namespace/image_family_name/image_group_name`.
 
 ## Automatic Properties
 
@@ -1892,7 +1893,7 @@ When a JSON Worker Pool specification is used, the following properties from the
 - `userDataFile`
 - `userDataFiles`
 
-Note that the `templateId` property can use either the YellowDog ID ('YDID') for the Compute Requirement Template, or its name. Similarly, the `imagesId` property can use either a YDID or the Image Family Name (e.g, `"yd-agent-docker"`).
+Note that the `templateId` property can use either the YellowDog ID ('YDID') for the Compute Requirement Template, or its name. Similarly, the `imagesId` property can use either a YDID or the Image Family or Image Group name (e.g, `"yd-agent-docker"`).
 
 **Properties Inherited within the `provisionedProperties` Property**
 
@@ -1989,7 +1990,7 @@ yd-remove --ids ydid:crt:D9C548:2a09093d-c74c-4bde-95d1-c576c6f03b13 ydid:imgfam
 
 ### Resource Matching
 
-Resources match on **resource names** and (where applicable) **resource namespaces** rather than on YellowDog IDs. This is done for flexibility and to allow the `yd-create` and `yd-remove` commands to be essentially stateless (i.e., we don't need to keep a local record of the YellowDog IDs of the resources created). 
+Resources match on **resource names** and (where applicable) **resource namespaces** rather than on YellowDog IDs. This is done for flexibility and to allow the `yd-create` and `yd-remove` commands to be stateless (i.e., we don't need to keep a local record of the YellowDog IDs of the resources created).
 
 However, this means that **caution is required** when updating or removing resources, since resource matching is done using **only** the **namespace/name** of the resource -- i.e., the system-generated `ydid` IDs are not used. This means that a resource with a given name could have been removed and replaced in Platform by some other means, and the resource specification(s) would still match it.
 
@@ -1997,7 +1998,7 @@ However, this means that **caution is required** when updating or removing resou
 
 The JSON specification used to define each type of resource can be found by inspecting the YellowDog Platform REST API documentation at https://docs.yellowdog.co/api.
 
-For example, to obtain the JSON schema for creating a Compute Source Template, take a look at the REST API call for adding a new Compute Source template: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/templates/sources.
+For example, to obtain the JSON schema for creating a Compute Source Template, take a look at the REST API models for the Compute API: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 When using the `yd-create` and `yd-remove` commands, note that an additional property `resource` must be supplied, to identify the type of resource being specified. The `"resource"` property can take the following values:
 
@@ -2042,7 +2043,7 @@ yd-show -q ydid:cst:000000:cde265f8-0b17-4e0e-be1c-505174a620e4 --substitute-ids
 
 would generate a JSON file that can be used with `yd-create` without alteration, or which could be edited.
 
-As illustrated above, both `yd-list` and `yd-show` support the `--substitute-ids`/`-U` option. For Compute Requirement Template detailed output, this will substitute Compute Source Template IDs and Image Family IDs with their names, to make it easier to reuse the outputs. For Compute Source Templates, Image Family IDs will be substituted. (Only Image Family IDs are substituted, not Image Group or Image IDs; if these are used in CRTs/CSTs, the JSON resource output may not be reusable.)
+As illustrated above, both `yd-list` and `yd-show` support the `--substitute-ids`/`-U` option. For Compute Requirement Template detailed output, this will substitute Compute Source Template IDs and Image Family and Group IDs with their names, to make it easier to reuse the outputs. For Compute Source Templates, Image Family and Group IDs will be substituted.
 
 The `--strip-ids` option will remove any YellowDog IDs ('ydids') from the JSON output, as well as any other properties that are not required in order to use the output with `yd-create`.
 
@@ -2087,7 +2088,7 @@ Below, we'll discuss each item type with example specifications.
 
 ## Keyrings
 
-The Keyring example and schema can be found at: https://docs.yellowdog.co/api/?spec=Account%20API#tag/keyring/post/keyrings.
+The Keyring models can be found in the Account API at: https://docs.yellowdog.ai/api?spec=Account%20API.
 
 An example Keyring specification is shown below:
 
@@ -2115,7 +2116,7 @@ Note that Keyrings **cannot be updated**; they must instead be removed and recre
 
 ## Credentials
 
-The Credential example and schema can be found at: https://docs.yellowdog.co/api/?spec=Account%20API#tag/keyring/put/keyrings/%7BkeyringName%7D/credentials.
+The Credential models can be found in the Account API at: https://docs.yellowdog.ai/api?spec=Account%20API.
 
 For example, to add a single AWS credential to a Keyring, the following resource specification might be used:
 
@@ -2136,7 +2137,7 @@ To **update** a Credential, make the modifications to the resource specification
 
 ## Compute Source Templates
 
-The Compute Source Template example and schema can be found at: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/templates/sources.
+The Compute Source Template models can be found in the Compute API at: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 An example Compute Source resource specification is found below:
 
@@ -2170,11 +2171,11 @@ An example Compute Source resource specification is found below:
 }
 ```
 
-In the Compute Source Template `imageId` property, an Image Family **namespace/name** may be used instead of an ID. For example: `"imageId": "yellowdog/yd-agent-docker"`. The `yd-create` command will look up the Image Family name and substitute its ID. 
+In the Compute Source Template `imageId` property, an Image Family name **namespace/family-name** or Image Group name **namespace/family-name/group-name** may be used instead of an ID. For example: `"imageId": "yellowdog/yd-agent-docker"`. The `yd-create` command will look up the Image Family name and substitute its ID. A **`yd/`** prefix may also optionally be used.
 
 ## Compute Requirement Templates
 
-The Compute Requirement Template example and schema can be found at: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/templates/requirements.
+The Compute Requirement Template models can be found in the Compute API at: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 An example Compute Requirement resource specification is found below, for a **static** tempate:
 
@@ -2196,7 +2197,7 @@ An example Compute Requirement resource specification is found below, for a **st
 
 Note that Compute Source Template **namespace/names** in the form `namespace/compute_source_template_name` can be used instead of their IDs: the **yd-create** command will look up the IDs and make the substitutions. The Compute Source Templates must already exist.
 
-Also, In the `imagesId` property, an Image Family **namespace/name** may be used instead of an ID. For example: `"imagesId": "yellowdog/yd-agent-docker"`. The `yd-create` command will look up the Image Family name and substitute its ID.
+Also, In the `imagesId` property, an Image Family name **namespace/family-name** or an Image Group name **namespace/family-name/group-name** may be used instead of an ID. For example: `"imagesId": "yellowdog/yd-agent-docker/latest"`. The `yd-create` command will look up the Image Family name and substitute its ID. A **`yd/`** prefix may also optionally be used.
 
 A **dynamic** template example is:
 
@@ -2251,7 +2252,7 @@ A **dynamic** template example is:
 
 ## Image Families
 
-The Image Family example and schema can be found at: https://docs.yellowdog.co/api/?spec=Images%20API#tag/images/post/images/families.
+The Image Family models can be found in the Image API: https://docs.yellowdog.ai/api?spec=Images%20API.
 
 An example specification, illustrating a containment hierarchy of Image Family -> Image Group -> Image, is shown below:
 
@@ -2297,7 +2298,7 @@ Note that if the name of an Image Group or an Image is changed in the resource s
 
 ## Namespace Storage Configurations
 
-The Namespace Storage Configuration example and schema can be found at: https://docs.yellowdog.co/api/?spec=Object%20Store%20API#tag/object-store/put/objectstore/configurations.
+The Namespace Storage Configuration models can be found in the Object Store API at: https://docs.yellowdog.ai/api?spec=Object%20Store%20API.
 
 Example:
 
@@ -2314,7 +2315,7 @@ Example:
 
 ## Configured Worker Pools
 
-The Configured Worker Pool example and schema can be found at: https://docs.yellowdog.co/api/?spec=Scheduler%20API#tag/worker-pools/post/workerPools/configured.
+The Configured Worker Pool models can be found in the  Scheduler API at: https://docs.yellowdog.ai/api?spec=Scheduler%20API.
 
 Example:
 
@@ -2345,7 +2346,7 @@ Example:
 
 ## Allowances
 
-The Allowances example and schema can be found at: https://docs.yellowdog.co/api/?spec=Usage%20API#tag/allowances/post/allowances.
+The Allowance models can be found in the Usage API at: https://docs.yellowdog.ai/api?spec=Usage%20API.
 
 Example:
 ```json
@@ -2377,7 +2378,7 @@ Allowances can be **boosted** (have extra hours added to the Allowance) using th
 
 ## Attribute Definitions
 
-The Attribute Definition example and schema can be found at: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/attributes/user.
+The Attribute Definition models can be found in the Compute API at: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 ### String Attribute Definitions
 
@@ -2415,7 +2416,7 @@ The `name`, `title` and `defaultRankOrder` properties are required, while the re
 
 ## Namespace Policies
 
-The Namespace Policies example and schema can be found at: (TBD).
+Example:
 
 ```json
 {
@@ -2474,7 +2475,7 @@ Example:
 
 ### Creating and Regenerating Application Keys
 
-When an Application is created its Application Key ID and Secret will be displayed (even if the `--quiet` option is used).
+When an Application is created, its Application Key ID and Secret will be displayed (even if the `--quiet` option is used).
 
 When an Application is updated, the `--regenerate-app-keys` option can be used. This will invalidate the current Application key and secret, revoke any Keyring access, and generate a new key and secret which will be displayed.
 
@@ -2538,11 +2539,11 @@ A simple usage example might be:
 yd-submit my_work_req.jsonnet
 ```
 
-The use of the filename extension `.jsonnet` will invoke Jsonnet evaluation. (Note that a temporary JSON file is created as part of Jsonnet processing, which you may see referred to in error messages: this file will have been deleted before the command exits.)
+The use of the filename extension `.jsonnet` will activate Jsonnet evaluation. (Note that a temporary JSON file is created as part of Jsonnet processing, which you may see referred to in error messages: this file will have been deleted before the command exits.)
 
 ## Jsonnet Installation
 
-Jsonnet is **not** installed by default when `yellowdog-python-examples` is installed, because the package has binary components that are not available on PyPI for all platforms. If you try to use a Jsonnet file in the absence of Jsonnet, the scripts will print an error message, and suggest an installation mechanism.
+Jsonnet is **not** installed by default when `yellowdog-python-examples` because the package has binary components that are not available on PyPI for all platforms. If you try to use a Jsonnet file in the absence of Jsonnet, the scripts will print an error message, and suggest an installation mechanism.
 
 To install Jsonnet at the same time as installing or updating the Python Examples scripts, modify the installation as follows to include the `jsonnet` option:
 
@@ -2550,7 +2551,7 @@ To install Jsonnet at the same time as installing or updating the Python Example
 pip install -U "yellowdog-python-examples[jsonnet]"
 ```
 
-To install Jsonnet separately from `yellowdog-python-examples`, try:
+To install Jsonnet separately from `yellowdog-python-examples`, use:
 
 ```shell
 pip install -U jsonnet

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/requirements.txt

@@ -5,4 +5,4 @@ requests
 rich == 13.9.4
 tabulate >= 0.9.0
 toml
-yellowdog-sdk >= 11.3.0
+yellowdog-sdk >= 11.5.0

yellowdog_python_examples-8.1.3/yellowdog_cli/__init__.py

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

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/yellowdog_cli/cancel.py

@@ -132,15 +132,13 @@ def _cancel_work_requirements_by_name_or_id(names_or_ids: List[str]):
             )
         )
         if work_requirement_summary is None:
-            print_error(
-                f"Work Requirement '{name_or_id}' not found in "
-                f"namespace '{CONFIG_COMMON.namespace}'"
-            )
+            print_error(f"Work Requirement '{name_or_id}' not found")
             continue
 
         if work_requirement_summary.status not in [
             WorkRequirementStatus.RUNNING,
             WorkRequirementStatus.HELD,
+            WorkRequirementStatus.FINISHING,
         ]:
             print_warning(
                 f"Work Requirement '{name_or_id}' is not in a valid state"

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/yellowdog_cli/create.py

@@ -53,7 +53,7 @@ from yellowdog_cli.utils.entity_utils import (
     clear_image_family_search_cache,
     find_compute_requirement_template_id_by_name,
     find_compute_source_template_id_by_name,
-    find_image_family_reference_by_name,
+    find_image_family_or_group_id_by_name,
     get_application_groups,
     get_application_id_by_name,
     get_group_id_by_name,
@@ -250,7 +250,7 @@ def create_compute_source_template(resource: Dict):
         YDIDType.IMAGE_GROUP,
         YDIDType.IMAGE,
     ]:
-        image_family_id = find_image_family_reference_by_name(
+        image_family_id = find_image_family_or_group_id_by_name(
             client=CLIENT, image_family_name=image_id
         )
         if image_family_id is not None:
@@ -334,7 +334,7 @@ def create_compute_requirement_template(resource: Dict):
             YDIDType.IMAGE_GROUP,
             YDIDType.IMAGE,
         ]:
-            image_family_id = find_image_family_reference_by_name(
+            image_family_id = find_image_family_or_group_id_by_name(
                 client=CLIENT, image_family_name=image_str
             )
             if image_family_id is not None:

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/yellowdog_cli/finish.py

@@ -114,10 +114,7 @@ def _finish_work_requirements_by_name_or_id(names_or_ids: List[str]):
             )
         )
         if work_requirement_summary is None:
-            print_error(
-                f"Work Requirement '{name_or_id}' not found in "
-                f"namespace '{CONFIG_COMMON.namespace}'"
-            )
+            print_error(f"Work Requirement '{name_or_id}' not found")
             continue
 
         if work_requirement_summary.status not in [

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/yellowdog_cli/utils/entity_utils.py

@@ -28,6 +28,7 @@ from yellowdog_client.model import (
     MachineImageFamily,
     MachineImageFamilySearch,
     MachineImageFamilySummary,
+    MachineImageGroup,
     NamespaceSearch,
     ObjectPath,
     ObjectPathsRequest,
@@ -348,12 +349,13 @@ def get_worker_pools(
 
 
 @lru_cache
-def find_image_family_reference_by_name(
+def find_image_family_or_group_id_by_name(
     client: PlatformClient, image_family_name
 ) -> Optional[str]:
     """
     Resolve image family references. Complicated logic.
     Fully qualified name is used for non-ambiguous PRIVATE image families.
+    Return None if mapping can't be done, to be handled by the caller.
     """
 
     if image_family_name.startswith("ami-") or image_family_name.startswith(
@@ -370,8 +372,21 @@ def find_image_family_reference_by_name(
         if image_family_name.startswith("yd/")
         else image_family_name
     )
-    namespace, name = split_namespace_and_name(image_family_name)
 
+    # Handle image group names of form namespace/image-family-name/image-group-name
+    split_name = image_family_name.split("/")
+    if len(split_name) == 3:
+        try:
+            namespace, name = split_namespace_and_name(
+                f"{split_name[0]}/{split_name[1]}"
+            )
+            return client.images_client.get_image_group_by_name(
+                namespace=namespace, family_name=name, group_name=split_name[2]
+            ).id
+        except:
+            return
+
+    namespace, name = split_namespace_and_name(image_family_name)
     if_search = MachineImageFamilySearch(
         familyName=name,
         namespaces=None if namespace in [None, ""] else [namespace],
@@ -473,7 +488,7 @@ def clear_image_family_search_cache():
     """
     Clear the cache of Image Family name searches.
     """
-    find_image_family_reference_by_name.cache_clear()
+    find_image_family_or_group_id_by_name.cache_clear()
 
 
 def remove_allowances_matching_description(
@@ -590,7 +605,7 @@ def substitute_ids_for_names_in_crt(
 
     # Image family
     try:
-        crt.imagesId = _get_image_family_name_from_id(client, crt.imagesId)
+        crt.imagesId = _get_image_family_or_group_name_from_id(client, crt.imagesId)
     except:
         pass
 
@@ -600,7 +615,9 @@ def substitute_ids_for_names_in_crt(
             source.sourceTemplateId = _get_source_template_name_from_id(
                 client, source.sourceTemplateId
             )
-            source.imageId = _get_image_family_name_from_id(client, source.imageId)
+            source.imageId = _get_image_family_or_group_name_from_id(
+                client, source.imageId
+            )
     except:
         pass
 
@@ -619,14 +636,18 @@ def substitute_image_family_id_for_name_in_cst(
         return cst
 
     try:
-        cst.source.imageId = _get_image_family_name_from_id(client, cst.source.imageId)
+        cst.source.imageId = _get_image_family_or_group_name_from_id(
+            client, cst.source.imageId
+        )
         return cst
     except:
         pass
 
     try:
         # Google uses a different property name
-        cst.source.image = _get_image_family_name_from_id(client, cst.source.image)
+        cst.source.image = _get_image_family_or_group_name_from_id(
+            client, cst.source.image
+        )
         return cst
     except:
         pass
@@ -701,22 +722,40 @@ def _get_requirement_template_name_from_id(
 
 
 @lru_cache
-def _get_image_family_name_from_id(
-    client: PlatformClient, image_family_id: Optional[str]
+def _get_image_family_or_group_name_from_id(
+    client: PlatformClient, image_family_or_group_id: Optional[str]
 ) -> Optional[str]:
     """
-    Obtain the namespace/name of an image family.
+    Obtain the namespace/name of an image family or image group.
     Otherwise, return the original value.
     """
-    if get_ydid_type(image_family_id) != YDIDType.IMAGE_FAMILY:
-        return image_family_id
-    try:
-        image_family: MachineImageFamily = client.images_client.get_image_family_by_id(
-            image_family_id
-        )
-        return f"yd/{image_family.namespace}/{image_family.name}"
-    except:
-        return image_family_id
+    if get_ydid_type(image_family_or_group_id) == YDIDType.IMAGE_FAMILY:
+        try:
+            image_family: MachineImageFamily = (
+                client.images_client.get_image_family_by_id(image_family_or_group_id)
+            )
+            return f"yd/{image_family.namespace}/{image_family.name}"
+        except:
+            return image_family_or_group_id
+
+    elif get_ydid_type(image_family_or_group_id) == YDIDType.IMAGE_GROUP:
+        try:
+            image_group: MachineImageGroup = client.images_client.get_image_group_by_id(
+                image_family_or_group_id
+            )
+            image_family: MachineImageFamily = (
+                client.images_client.get_image_family_by_id(
+                    # The image family ID can be derived from the group ID
+                    image_family_or_group_id.replace("imggrp", "imgfam").rsplit(":", 1)[
+                        0
+                    ]
+                )
+            )
+            return f"yd/{image_family.namespace}/{image_family.name}/{image_group.name}"
+        except:
+            return image_family_or_group_id
+
+    return image_family_or_group_id
 
 
 @lru_cache

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/yellowdog_cli/utils/printing.py

@@ -895,6 +895,7 @@ def permissions_table(
     headers = [
         "#",
         "Name",
+        "Scope",
         "Description",
         "Includes",
     ]
@@ -905,6 +906,7 @@ def permissions_table(
             [
                 index + 1,
                 permission.name,
+                permission.scope,
                 permission.title,
                 includes,
             ]

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/yellowdog_cli/utils/provision_utils.py

@@ -10,7 +10,7 @@ from yellowdog_client import PlatformClient
 from yellowdog_cli.utils.config_types import ConfigWorkerPool
 from yellowdog_cli.utils.entity_utils import (
     find_compute_requirement_template_id_by_name,
-    find_image_family_reference_by_name,
+    find_image_family_or_group_id_by_name,
     split_namespace_and_name,
 )
 from yellowdog_cli.utils.load_config import CONFIG_FILE_DIR
@@ -115,7 +115,7 @@ def get_image_family_id(client: PlatformClient, image_family_id_or_name: str) ->
     ]:
         return image_family_id_or_name
 
-    image_family_id = find_image_family_reference_by_name(
+    image_family_id = find_image_family_or_group_id_by_name(
         client=client, image_family_name=image_family_id_or_name
     )
 

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.1.1
+Version: 8.1.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -26,7 +26,7 @@ Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml
-Requires-Dist: yellowdog-sdk>=11.3.0
+Requires-Dist: yellowdog-sdk>=11.5.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-8.1.1 → yellowdog_python_examples-8.1.3}/yellowdog_python_examples.egg-info/requires.txt

@@ -5,7 +5,7 @@ requests
 rich==13.9.4
 tabulate>=0.9.0
 toml
-yellowdog-sdk>=11.3.0
+yellowdog-sdk>=11.5.0
 
 [cloudwizard]
 boto3

yellowdog_python_examples-8.1.1/yellowdog_cli/__init__.py

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