yellowdog-python-examples 8.4.1__tar.gz → 8.4.3__tar.gz

{yellowdog_python_examples-8.4.1 → yellowdog_python_examples-8.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.4.1
+Version: 8.4.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0

yellowdog_python_examples-8.4.3/yellowdog_cli/__init__.py

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

{yellowdog_python_examples-8.4.1 → yellowdog_python_examples-8.4.3}/yellowdog_cli/show.py

@@ -4,6 +4,8 @@
 Command to show the JSON details of YellowDog entities via their IDs.
 """
 
+from typing import List
+
 from yellowdog_client.model import ConfiguredWorkerPool
 
 from yellowdog_cli.list import get_keyring
@@ -33,35 +35,16 @@ from yellowdog_cli.utils.settings import (
     RN_ROLE,
     RN_SOURCE_TEMPLATE,
 )
-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.variables import get_all_user_variables, get_user_variable
+from yellowdog_cli.utils.wrapper import ARGS_PARSER, CLIENT, main_wrapper
 from yellowdog_cli.utils.ydid_utils import YDIDType, get_ydid_type
 
 
 @main_wrapper
 def main():
 
-    if ARGS_PARSER.parse_config:
-        username = get_user_variable("username")
-        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.report_variables is not None:  # Report selected variables and return
+        _report_variables(ARGS_PARSER.report_variables)
         return
 
     # Generate a JSON list of resources if there are multiple YDIDs
@@ -300,6 +283,34 @@ 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(variable_names: List[str]):
+    """
+    Convenience function to report the processed values of user variables.
+    """
+    if "all" in variable_names:
+        variables = get_all_user_variables()
+    else:
+        variables = {
+            variable_name: get_user_variable(variable_name)
+            for variable_name in ARGS_PARSER.report_variables
+        }
+    variables_sorted = dict(sorted(variables.items()))
+
+    if ARGS_PARSER.quiet:
+        print_json(variables_sorted)
+        return
+
+    print_info("Reporting selected variable values:")
+    max_var_name = max(len(name) for name in variables_sorted)
+    for name, value in variables_sorted.items():
+        print(
+            f"                      {name}"
+            f"{' '* (max_var_name - len(name))} "
+            f"= {value}"
+        )
+    return
+
+
 # Entry point
 if __name__ == "__main__":
     main()

{yellowdog_python_examples-8.4.1 → yellowdog_python_examples-8.4.3}/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,20 @@ class CLIParser:
                     "configured worker pool"
                 ),
             )
+            parser.add_argument(
+                "--report-variable",
+                "-r",
+                type=str,
+                required=False,
+                action="append",
+                help=(
+                    "report the processed value of the specified variable and exit; "
+                    "the option can be supplied multiple times, one per variable, "
+                    "or use 'all' to report all variables; use with '--quiet' for "
+                    "output in JSON"
+                ),
+                metavar="<var>",
+            )
 
         if any(module in sys.argv[0] for module in ["list", "show"]):
             parser.add_argument(
@@ -1319,11 +1325,6 @@ class CLIParser:
     def print_pid(self) -> Optional[bool]:
         return self.args.print_pid
 
-    @property
-    @allow_missing_attribute
-    def parse_config(self) -> Optional[bool]:
-        return self.args.parse_config
-
     @property
     @allow_missing_attribute
     def no_config(self) -> Optional[bool]:
@@ -1842,6 +1843,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.1 → yellowdog_python_examples-8.4.3}/yellowdog_cli/utils/variables.py

@@ -137,6 +137,13 @@ def get_user_variable(variable_name: str) -> Optional[str]:
     return VARIABLE_SUBSTITUTIONS.get(variable_name)
 
 
+def get_all_user_variables() -> Dict:
+    """
+    Return all the user variables.
+    """
+    return VARIABLE_SUBSTITUTIONS
+
+
 def process_variable_substitutions_insitu(
     data: Union[Dict, List], prefix: str = "", postfix: str = ""
 ) -> Union[Dict, List]:

{yellowdog_python_examples-8.4.1 → yellowdog_python_examples-8.4.3}/yellowdog_python_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.4.1
+Version: 8.4.3
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0

yellowdog_python_examples-8.4.1/yellowdog_cli/__init__.py

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