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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.19.2
+Version: 7.19.4
 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
@@ -15,12 +15,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyPAC>=0.16.4
 Requires-Dist: dateparser
-Requires-Dist: dotenv
+Requires-Dist: python-dotenv
 Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml
-Requires-Dist: yellowdog-sdk>=9.5.0
+Requires-Dist: yellowdog-sdk>=10.0.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-7.19.2 → yellowdog_python_examples-7.19.4}/requirements.txt

@@ -1,8 +1,8 @@
 PyPAC >= 0.16.4
 dateparser
-dotenv
+python-dotenv
 requests
 rich == 13.9.4
 tabulate >= 0.9.0
 toml
-yellowdog-sdk >= 9.5.0
+yellowdog-sdk >= 10.0.0

yellowdog_python_examples-7.19.4/yellowdog_cli/__init__.py

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

{yellowdog_python_examples-7.19.2 → yellowdog_python_examples-7.19.4}/yellowdog_cli/create.py

@@ -34,6 +34,7 @@ from yellowdog_client.model import (
     NamespacePolicy,
     NamespaceStorageConfiguration,
     RequirementsAllowance,
+    RoleScope,
     SourceAllowance,
     SourcesAllowance,
     User,
@@ -981,7 +982,9 @@ def create_group(resource: Dict):
 
         role_ids_to_add = new_role_ids - current_role_ids
         for role_id in role_ids_to_add:
-            CLIENT.account_client.add_role_to_group(group.id, role_id)
+            CLIENT.account_client.add_role_to_group(
+                group.id, role_id, RoleScope(global_=True)
+            )
             print_log(
                 f"Added Role '{get_role_name_by_id(CLIENT, role_id)}' "
                 f"to Group ({role_id})"

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

@@ -697,7 +697,9 @@ def list_image_families():
     """
     image_search = MachineImageFamilySearch(
         includePublic=True,
-        namespace=CONFIG_COMMON.namespace,  # Supports partial match
+        namespace=(
+            None if CONFIG_COMMON.namespace is "" else CONFIG_COMMON.namespace
+        ),  # Supports partial match
         familyName=CONFIG_COMMON.name_tag,  # Supports partial match
     )
     search_client: SearchClient = CLIENT.images_client.get_image_families(image_search)

{yellowdog_python_examples-7.19.2 → yellowdog_python_examples-7.19.4}/yellowdog_cli/utils/misc_utils.py

@@ -7,7 +7,7 @@ import re
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from os.path import join, normpath, relpath
-from typing import List, Optional
+from typing import List, Optional, Tuple
 from urllib.parse import urlparse
 
 from dotenv import dotenv_values, find_dotenv, load_dotenv
@@ -25,17 +25,20 @@ from yellowdog_cli.utils.settings import NAMESPACE_OBJECT_STORE_PREFIX_SEPARATOR
 UTCNOW = datetime.now(timezone.utc)
 
 
-def unpack_namespace_in_prefix(namespace: str, prefix: str) -> (str, str):
+def unpack_namespace_in_prefix(namespace: str, prefix: str) -> Tuple[str, str]:
     """
     Allow the prefix to include the namespace, which can override the supplied
     namespace. Return the unpacked (namespace, prefix) tuple.
     """
     elems = prefix.split(NAMESPACE_OBJECT_STORE_PREFIX_SEPARATOR)
+
     if len(elems) == 1:
         return namespace, prefix.lstrip("/")
     if len(elems) == 2:
         return elems[0] if elems[0] != "" else namespace, elems[1].lstrip("/")
 
+    raise Exception(f"Cannot unpack '{namespace}/{prefix}")
+
 
 def pathname_relative_to_config_file(config_file_dir: str, file: str) -> str:
     """

{yellowdog_python_examples-7.19.2 → yellowdog_python_examples-7.19.4}/yellowdog_cli/utils/printing.py

@@ -632,7 +632,7 @@ def workers_table(
         "Worker Tag",
         "Status",
         "Claims",
-        "Exclusive?",
+        "Exclusive",
         "Worker ID",
     ]
     table = []
@@ -645,7 +645,7 @@ def workers_table(
                 worker.workerTag,
                 worker.status,
                 worker.claimCount,
-                worker.exclusive,
+                _yes_or_no(worker.exclusive),
                 worker.id,
             ]
         )
@@ -748,7 +748,7 @@ def namespaces_table(
                 index + 1,
                 namespace.namespace,
                 namespace.id,
-                "Yes" if namespace.deletable else "No",
+                _yes_or_no(namespace.deletable),
             ]
         )
     return headers, table
@@ -840,7 +840,7 @@ def groups_table(
     headers = [
         "#",
         "Name",
-        "Admin Group?",
+        "Admin Group",
         "Description",
         "Roles",
         "ID",
@@ -851,7 +851,7 @@ def groups_table(
             [
                 index + 1,
                 group.name,
-                group.adminGroup,
+                _yes_or_no(group.adminGroup),
                 _truncate_text(group.description),
                 ", ".join([x.role.name for x in group.roles]),
                 group.id,
@@ -1575,3 +1575,10 @@ def _truncate_text(description: Union[str, None]):
         return ""
 
     return f"{description[:MAX_TABLE_DESCRIPTION - 3] + '...' if len(description) > MAX_TABLE_DESCRIPTION else description}"
+
+
+def _yes_or_no(true_: bool) -> str:
+    """
+    Swap bools into strings.
+    """
+    return "Yes" if true_ else "No"

{yellowdog_python_examples-7.19.2 → yellowdog_python_examples-7.19.4}/yellowdog_cli/utils/ydid_utils.py

@@ -30,7 +30,7 @@ class YDIDType(Enum):
 
 def get_ydid_type(ydid: Optional[str]) -> Optional[YDIDType]:
     """
-    Find the type of a YellowDog ID.
+    Find the type of YellowDog ID.
     """
     if ydid is None or not ydid.startswith("ydid:"):
         return None

yellowdog_python_examples-7.19.4/yellowdog_cli/version.py

@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+
+"""
+Report version numbers, etc.
+"""
+
+from os.path import abspath
+from sys import argv, executable, path
+from sys import version as py_version
+
+from yellowdog_client._version import __version__ as yd_sdk_version
+
+from yellowdog_cli.__init__ import __version__
+
+DOCS_URL = f"https://github.com/yellowdog/python-examples/blob/v{__version__}/README.md"
+
+
+def _jsonnet_version() -> str:
+    try:
+        from _jsonnet import evaluate_file, version
+
+        # Strip the initial 'v' if present
+        return version[1:] if version.startswith("v") else version
+    except ImportError:
+        return "Not installed"
+
+
+def main():
+    print(f"  YellowDog CLI Version:   {__version__} (Docs: {DOCS_URL})")
+    print(f"  YellowDog SDK Version:   {yd_sdk_version}")
+    print(f"  Jsonnet Version:         {_jsonnet_version()}")
+    print(f"  Python Version:          {py_version.split()[0]} ")
+    if "--debug" in argv:
+        print(f"  Command:                {abspath(__file__)}")
+        print(f"  Python Executable:      {executable}")
+        for i, p in enumerate(path, start=1):
+            print(f"    Path-{str(i).zfill(2)}:              {p}")
+
+
+if __name__ == "__main__":
+    main()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 7.19.2
+Version: 7.19.4
 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
@@ -15,12 +15,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyPAC>=0.16.4
 Requires-Dist: dateparser
-Requires-Dist: dotenv
+Requires-Dist: python-dotenv
 Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml
-Requires-Dist: yellowdog-sdk>=9.5.0
+Requires-Dist: yellowdog-sdk>=10.0.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-7.19.2 → yellowdog_python_examples-7.19.4}/yellowdog_python_examples.egg-info/requires.txt

@@ -1,11 +1,11 @@
 PyPAC>=0.16.4
 dateparser
-dotenv
+python-dotenv
 requests
 rich==13.9.4
 tabulate>=0.9.0
 toml
-yellowdog-sdk>=9.5.0
+yellowdog-sdk>=10.0.0
 
 [cloudwizard]
 boto3

yellowdog_python_examples-7.19.2/yellowdog_cli/__init__.py

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

yellowdog_python_examples-7.19.2/yellowdog_cli/version.py

@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Report version numbers, etc.
-"""
-
-from os.path import abspath
-from sys import argv, executable, path
-from sys import version as py_version
-
-from yellowdog_client._version import __version__ as yd_sdk_version
-
-from yellowdog_cli.__init__ import __version__
-
-DOCS_URL = f"https://github.com/yellowdog/python-examples/blob/v{__version__}/README.md"
-
-
-def check_for_jsonnet() -> str:
-    try:
-        from _jsonnet import evaluate_file, version
-
-        return f"Jsonnet is installed ({version})"
-    except ImportError:
-        return "Jsonnet is not installed"
-
-
-def main():
-    print(f"  YellowDog Python Examples Version:   {__version__} (Docs: {DOCS_URL})")
-    print(f"  Python Jsonnet Support:              {check_for_jsonnet()}")
-    print(f"  YellowDog SDK Version:               {yd_sdk_version}")
-    print(f"  Python Version:                      {py_version.split()[0]} ")
-    if "--debug" in argv:
-        print(f"  Command:                             {abspath(__file__)}")
-        print(f"  Python Executable:                   {executable}")
-        for i, p in enumerate(path, start=1):
-            print(f"    Path-{str(i).zfill(2)}:                           {p}")
-
-
-if __name__ == "__main__":
-    main()