yellowdog-python-examples 8.4.0__tar.gz → 8.4.2__tar.gz

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.4.0
+Version: 8.4.2
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -25,7 +25,7 @@ Requires-Dist: python-dotenv
 Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
-Requires-Dist: tomli>=2.4.0; python_version < "3.11"
+Requires-Dist: tomli>=2.4.0
 Requires-Dist: yellowdog-sdk>=13.1.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/requirements.txt

@@ -4,5 +4,5 @@ python-dotenv
 requests
 rich == 13.9.4
 tabulate >= 0.9.0
-tomli >= 2.4.0; python_version < "3.11"
+tomli >= 2.4.0
 yellowdog-sdk >= 13.1.0

yellowdog_python_examples-8.4.2/yellowdog_cli/__init__.py

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

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_cli/show.py

@@ -33,7 +33,7 @@ from yellowdog_cli.utils.settings import (
     RN_ROLE,
     RN_SOURCE_TEMPLATE,
 )
-from yellowdog_cli.utils.variables import USERNAME
+from yellowdog_cli.utils.variables import get_user_variable
 from yellowdog_cli.utils.wrapper import ARGS_PARSER, CLIENT, CONFIG_COMMON, main_wrapper
 from yellowdog_cli.utils.ydid_utils import YDIDType, get_ydid_type
 
@@ -41,26 +41,8 @@ from yellowdog_cli.utils.ydid_utils import YDIDType, get_ydid_type
 @main_wrapper
 def main():
 
-    if ARGS_PARSER.parse_config:
-        if ARGS_PARSER.quiet:
-            # Output properties in JSON format
-            print_json(
-                {
-                    "namespace": CONFIG_COMMON.namespace,
-                    "tag": CONFIG_COMMON.name_tag,
-                    "username": USERNAME,
-                }
-            )
-        else:
-            # Print properties inline
-            print_info("Showing configuration values:")
-            print(f"                      namespace = {CONFIG_COMMON.namespace}")
-            print(f"                      tag       = {CONFIG_COMMON.name_tag}")
-            print(f"                      username  = {USERNAME}")
-        return
-
-    if len(ARGS_PARSER.yellowdog_ids) == 0:
-        print_info("No YellowDog IDs to show")
+    if ARGS_PARSER.parse_config:  # Report selected variables and return
+        _report_variables()
         return
 
     # Generate a JSON list of resources if there are multiple YDIDs
@@ -299,6 +281,36 @@ def show_details(ydid: str, initial_indent: int = 0, with_final_comma: bool = Fa
         print_error(f"Unable to show details for '{ydid}': {e}")
 
 
+def _report_variables():
+    """
+    Convenience function to report the processed values of user variables.
+    """
+    data = (
+        {}
+        if ARGS_PARSER.report_variables is None
+        else {
+            variable_name: get_user_variable(variable_name)
+            for variable_name in ARGS_PARSER.report_variables
+        }
+    )
+    if ARGS_PARSER.quiet:
+        print_json(data)
+        return
+
+    if ARGS_PARSER.report_variables is None:
+        print_info("No variables selected for reporting")
+        return
+
+    print_info("Reporting selected variable values:")
+    for name, value in data.items():
+        print(
+            f"                      {name}"
+            f"{' '* (20 - len(name)) if len(name) < 20 else ''} "
+            f"= {value}"
+        )
+    return
+
+
 # Entry point
 if __name__ == "__main__":
     main()

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_cli/submit.py

@@ -546,8 +546,8 @@ def create_task_group(
         ),
         disablePreallocation=check_bool(
             task_group_data.get(
-                DISABLE_PREALLOCTAION,
-                wr_data.get(DISABLE_PREALLOCTAION, config_wr.disable_prealloaction),
+                DISABLE_PREALLOCATION,
+                wr_data.get(DISABLE_PREALLOCATION, config_wr.disable_prealloaction),
             )
         ),
     )

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_cli/utils/args.py

@@ -1001,14 +1001,6 @@ class CLIParser:
                 help=f"the YellowDog ID(s) of the item(s) to {verb}",
             )
 
-        if any(module in sys.argv[0] for module in ["show"]):
-            parser.add_argument(
-                "--parse-config",
-                action="store_true",
-                required=False,
-                help="parse the config and return namespace, tag, username, then exit",
-            )
-
         if any(
             module in sys.argv[0]
             for module in ["upload", "submit", "provision", "instantiate"]
@@ -1210,6 +1202,25 @@ class CLIParser:
                     "configured worker pool"
                 ),
             )
+            parser.add_argument(
+                "--parse-config",
+                action="store_true",
+                required=False,
+                help="parse the config and return namespace, tag, username, then exit",
+            )
+            parser.add_argument(
+                "--report-variable",
+                "-r",
+                type=str,
+                required=False,
+                action="append",
+                help=(
+                    "report the processed value of the specified variable, "
+                    "when used with '--parse-config; the option can be supplied "
+                    "multiple times, one per variable"
+                ),
+                metavar="<var>",
+            )
 
         if any(module in sys.argv[0] for module in ["list", "show"]):
             parser.add_argument(
@@ -1842,6 +1853,11 @@ class CLIParser:
     def auto_select_all(self) -> Optional[bool]:
         return self.args.auto_select_all
 
+    @property
+    @allow_missing_attribute
+    def report_variables(self) -> Optional[List[str]]:
+        return self.args.report_variable
+
 
 def lookup_module_description(module_name: str) -> Optional[str]:
     """

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_cli/utils/csv_data.py

@@ -10,10 +10,7 @@ from json import load as json_load
 from os.path import relpath
 from typing import Dict, List, Optional, Tuple
 
-try:
-    from tomllib import load as toml_load  # Available in Python 3.11+
-except ImportError:
-    from tomli import load as toml_load  # Fallback for 3.9 and 3.10
+from tomli import load as toml_load
 
 from yellowdog_cli.utils.args import ARGS_PARSER
 from yellowdog_cli.utils.config_types import ConfigWorkRequirement

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_cli/utils/load_config.py

@@ -9,10 +9,7 @@ from pathlib import Path
 from sys import exit
 from typing import Dict
 
-try:
-    from tomllib import TOMLDecodeError  # Available in Python 3.11+
-except ImportError:
-    from tomli import TOMLDecodeError  # Fallback for 3.9 and 3.10
+from tomli import TOMLDecodeError
 
 from yellowdog_cli.utils.args import ARGS_PARSER
 from yellowdog_cli.utils.config_types import (
@@ -316,7 +313,7 @@ def load_config_work_requirement() -> ConfigWorkRequirement:
             upload_taskoutput=wr_section.get(UPLOAD_TASKOUTPUT, False),
             completed_task_ttl=wr_section.get(COMPLETED_TASK_TTL, None),
             csv_files=csv_files,
-            disable_prealloaction=wr_section.get(DISABLE_PREALLOCTAION, None),
+            disable_prealloaction=wr_section.get(DISABLE_PREALLOCATION, None),
             docker_env=wr_section.get(DOCKER_ENV, None),
             docker_options=wr_section.get(DOCKER_OPTIONS, None),
             docker_password=wr_section.get(DOCKER_PASSWORD, None),

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_cli/utils/property_names.py

@@ -15,7 +15,7 @@ COMPUTE_REQUIREMENT_SECTION = "computeRequirement"  # No value
 CR_TAG = "requirementTag"  # String
 CSV_FILE = "csvFile"  # String
 CSV_FILES = "csvFiles"  # List of Strings
-DISABLE_PREALLOCTAION = "disablePreallocation"
+DISABLE_PREALLOCATION = "disablePreallocation"
 DEPENDENCIES = "dependencies"  # List of Strings
 DEPENDENT_ON = "dependentOn"  # String (Deprecated)
 DIRECTORY_NAME = "directoryName"  # String
@@ -131,7 +131,7 @@ ALL_KEYS = [
     CR_TAG,
     CSV_FILE,
     CSV_FILES,
-    DISABLE_PREALLOCTAION,
+    DISABLE_PREALLOCATION,
     DEPENDENCIES,
     DEPENDENT_ON,
     DIRECTORY_NAME,

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_cli/utils/variables.py

@@ -12,10 +12,7 @@ from json import loads as json_loads
 from random import randint
 from typing import Dict, List, Optional, Union
 
-try:
-    from tomllib import load as toml_load  # Available in Python 3.11+
-except ImportError:
-    from tomli import load as toml_load  # Fallback for 3.9 and 3.10
+from tomli import load as toml_load
 
 from yellowdog_cli.utils.args import ARGS_PARSER
 from yellowdog_cli.utils.check_imports import check_jsonnet_import
@@ -133,6 +130,13 @@ def add_or_update_substitution(key: str, value: str):
     VARIABLE_SUBSTITUTIONS[key] = str(value)
 
 
+def get_user_variable(variable_name: str) -> Optional[str]:
+    """
+    Get the value of a variable.
+    """
+    return VARIABLE_SUBSTITUTIONS.get(variable_name)
+
+
 def process_variable_substitutions_insitu(
     data: Union[Dict, List], prefix: str = "", postfix: str = ""
 ) -> Union[Dict, List]:

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_python_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.4.0
+Version: 8.4.2
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -25,7 +25,7 @@ Requires-Dist: python-dotenv
 Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
-Requires-Dist: tomli>=2.4.0; python_version < "3.11"
+Requires-Dist: tomli>=2.4.0
 Requires-Dist: yellowdog-sdk>=13.1.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"

{yellowdog_python_examples-8.4.0 → yellowdog_python_examples-8.4.2}/yellowdog_python_examples.egg-info/requires.txt

@@ -4,10 +4,8 @@ python-dotenv
 requests
 rich==13.9.4
 tabulate>=0.9.0
-yellowdog-sdk>=13.1.0
-
-[:python_version < "3.11"]
 tomli>=2.4.0
+yellowdog-sdk>=13.1.0
 
 [cloudwizard]
 boto3

yellowdog_python_examples-8.4.0/yellowdog_cli/__init__.py

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