yellowdog-python-examples 8.5.2__tar.gz → 8.5.4__tar.gz

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.5.2
+Version: 8.5.4
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Dist: rclone-api
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: tomli>=2.4.0
-Requires-Dist: yellowdog-sdk>=13.2.0
+Requires-Dist: yellowdog-sdk>=13.3.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/README.md

@@ -1279,7 +1279,7 @@ JSON:
 ],
 ```
 
-The specified local file will be uploaded to the rclone target specified by the `source` property. The local file can be specified using an absolute or relative pathname; the base directory can be optionally adjusted using the `--content-path <directory>` option supplied to `yd-submit`.
+The specified local file will be uploaded to the rclone target specified by the `source` property. The local file can be specified using an absolute or relative pathname, and the base files directory can be adjusted using the `--content-path <directory>`/`-F` option supplied to `yd-submit`.
 
 If `yd-submit` fails for any reason, the uploaded objects will be deleted automatically.
 

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/requirements.txt

@@ -6,4 +6,4 @@ rclone-api
 rich == 13.9.4
 tabulate >= 0.9.0
 tomli >= 2.4.0
-yellowdog-sdk >= 13.2.0
+yellowdog-sdk >= 13.3.0

yellowdog_python_examples-8.5.4/yellowdog_cli/__init__.py

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

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/yellowdog_cli/show.py

@@ -177,11 +177,7 @@ def show_details(ydid: str, initial_indent: int = 0, with_final_comma: bool = Fa
 
         elif ydid_type == YDIDType.TASK:
             print_info(f"Showing details of Task ID '{ydid}'")
-            try:
-                print_yd_object(CLIENT.work_client.get_task_by_id(ydid))
-            except Exception as e:
-                if "404" in str(e):
-                    print_error(f"Task ID '{ydid}' not found")
+            print_yd_object(CLIENT.work_client.get_task_by_id(ydid))
 
         elif ydid_type == YDIDType.IMAGE_FAMILY:
             print_info(f"Showing details of Image Family ID '{ydid}'")
@@ -276,9 +272,13 @@ def show_details(ydid: str, initial_indent: int = 0, with_final_comma: bool = Fa
 
         else:
             print_error(f"Unknown (or unsupported) YellowDog ID type for '{ydid}'")
+            return
 
     except Exception as e:
-        print_error(f"Unable to show details for '{ydid}': {e}")
+        if "404" in str(e):
+            print_error(f"{ydid_type.value} ID '{ydid}' not found")
+        else:
+            print_error(f"Unable to show details for '{ydid}': {e}")
 
 
 def _report_variables(variable_names: list[str]):

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/yellowdog_cli/utils/entity_utils.py

@@ -243,9 +243,7 @@ def find_compute_source_template_id_by_name(
     """
     template_id = _find_id_by_name(name, client, get_compute_source_templates)
     if template_id is not None:
-        print_info(
-            f"Replaced Compute Source Template name '{name}' with ID {template_id}"
-        )
+        print_info(f"Compute Source Template name '{name}' -> ID {template_id}")
     return template_id
 
 
@@ -420,7 +418,7 @@ def find_image_name_or_id(
         """
         if report_substitutions and return_val != original_image_name_or_id:
             msg = f"{return_val}" if is_ydid else f"'{return_val}'"
-            print_info(f"Replaced Images ID '{original_image_name_or_id}' with {msg}")
+            print_info(f"Images ID '{original_image_name_or_id}' -> {msg}")
         return return_val
 
     split_name = image_name_or_id.split("/")

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/yellowdog_cli/utils/printing.py

@@ -77,13 +77,17 @@ from yellowdog_cli.utils.settings import (
     NAMESPACE_OBJECT_STORE_PREFIX_SEPARATOR,
     PROP_ACCESS_DELEGATES,
     PROP_ADMIN_GROUP,
+    PROP_BULK_INSERT_SINGLE_REQUEST_MAX,
     PROP_CREATED_BY_ID,
     PROP_CREATED_BY_USER_ID,
     PROP_CREATED_TIME,
+    PROP_DEFAULT_ASSIGN_PUBLIC_IP,
     PROP_DELETABLE,
     PROP_ID,
     PROP_INSTANCE_PRICING,
+    PROP_PROVIDER,
     PROP_REMAINING_HOURS,
+    PROP_SOURCE,
     PROP_SUPPORTING_RESOURCE_CREATED,
     PROP_TRAITS,
     WARNING_STYLE,
@@ -1162,9 +1166,11 @@ def print_yd_object(
                     PROP_ID,
                     PROP_ACCESS_DELEGATES,
                     PROP_ADMIN_GROUP,
+                    PROP_BULK_INSERT_SINGLE_REQUEST_MAX,
                     PROP_CREATED_BY_ID,
                     PROP_CREATED_BY_USER_ID,
                     PROP_CREATED_TIME,
+                    PROP_DEFAULT_ASSIGN_PUBLIC_IP,
                     PROP_DELETABLE,
                     PROP_INSTANCE_PRICING,
                     PROP_REMAINING_HOURS,
@@ -1181,6 +1187,12 @@ def print_yd_object(
 
     if ARGS_PARSER.strip_ids:
         object_data = remove_unused_props(object_data)
+        # Remove the 'provider' property from CST/source data only
+        # 'object_data' is always a dict in practice
+        try:
+            object_data.get(PROP_SOURCE).pop(PROP_PROVIDER)
+        except (AttributeError, KeyError):
+            pass
 
     if add_fields is not None:
         # Requires a copy of the 'object' datatype to be made,

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/yellowdog_cli/utils/rclone_utils.py

@@ -6,7 +6,7 @@ import re
 from dataclasses import dataclass
 from functools import cache
 from os import chdir, getcwd
-from os.path import exists
+from os.path import abspath, exists
 from pathlib import Path
 
 from rclone_api import Config, Rclone
@@ -38,10 +38,10 @@ class RcloneUploadedFiles:
 
     def __init__(
         self,
-        files_directory: str = "",
+        files_directory: str = ".",
     ):
         self._rcloned_files: list[RcloneUploadedFile] = []
-        self._files_directory = files_directory
+        self._files_directory = abspath(files_directory)
         self._working_directory = getcwd()
         self._reported_duplicates: list[RcloneUploadedFile] = []
 
@@ -64,12 +64,12 @@ class RcloneUploadedFiles:
         Rclone a DataClient inputs file if it hasn't already been uploaded to
         the same location.
         """
-        if self._files_directory != "":
-            chdir(self._files_directory)
+        chdir(self._files_directory)
 
         if not exists(local_file):
             raise Exception(
-                f"File '{local_file}' does not exist and cannot be uploaded"
+                f"File '{Path(self._files_directory)/local_file}' does not exist "
+                "and cannot be uploaded"
             )
 
         rclone_uploaded_file = RcloneUploadedFile(local_file, rclone_source)
@@ -97,8 +97,7 @@ class RcloneUploadedFiles:
 
         self._rcloned_files.append(rclone_uploaded_file)
 
-        if self._files_directory != "":
-            chdir(self._working_directory)
+        chdir(self._working_directory)
 
     def _upload_rclone_file_core(self, rclone_upload_file: RcloneUploadedFile):
         """

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/yellowdog_cli/utils/settings.py

@@ -147,11 +147,13 @@ RN_UPDATE_GROUP_REQUEST = "UpdateGroupRequest"
 PROP_ACCESS_DELEGATES = "accessDelegates"
 PROP_ADMIN_GROUP = "adminGroup"
 PROP_AUTOSCALING_MAX_NODES = "autoscalingMaxNodes"
+PROP_BULK_INSERT_SINGLE_REQUEST_MAX = "BULK_INSERT_SINGLE_REQUEST_MAX"
 PROP_CREATED_BY_ID = "createdById"
 PROP_CREATED_BY_USER_ID = "createdByUserId"
 PROP_CREATED_TIME = "createdTime"
 PROP_CREDENTIAL = "credential"
 PROP_CST_ID = "sourceTemplateId"
+PROP_DEFAULT_ASSIGN_PUBLIC_IP = "DEFAULT_ASSIGN_PUBLIC_IP"
 PROP_DEFAULT_RANK_ORDER = "defaultRankOrder"
 PROP_DELETABLE = "deletable"
 PROP_DESCRIPTION = "description"
@@ -171,6 +173,7 @@ PROP_NAMESPACE = "namespace"
 PROP_NAMESPACES = "namespaces"
 PROP_OPTIONS = "options"
 PROP_OS_TYPE = "osType"
+PROP_PROVIDER = "provider"
 PROP_RANGE = "range"
 PROP_REMAINING_HOURS = "remainingHours"
 PROP_REQUIREMENT_CREATED_FROM = "requirementCreatedFromId"

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/yellowdog_python_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.5.2
+Version: 8.5.4
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Dist: rclone-api
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: tomli>=2.4.0
-Requires-Dist: yellowdog-sdk>=13.2.0
+Requires-Dist: yellowdog-sdk>=13.3.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-8.5.2 → yellowdog_python_examples-8.5.4}/yellowdog_python_examples.egg-info/requires.txt

@@ -6,7 +6,7 @@ rclone-api
 rich==13.9.4
 tabulate>=0.9.0
 tomli>=2.4.0
-yellowdog-sdk>=13.2.0
+yellowdog-sdk>=13.3.0
 
 [cloudwizard]
 boto3

yellowdog_python_examples-8.5.2/yellowdog_cli/__init__.py

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