cortexapps-cli 0.26.1__tar.gz → 0.26.3__tar.gz

{cortexapps_cli-0.26.1 → cortexapps_cli-0.26.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cortexapps-cli
-Version: 0.26.1
+Version: 0.26.3
 Summary: Command Line Interface for cortexapps
 License: MIT
 Author: Cortex Apps

{cortexapps_cli-0.26.1 → cortexapps_cli-0.26.3}/cortexapps_cli/cortex.py

@@ -73,11 +73,12 @@ def read_file(args):
 def read_json_from_yaml(args):
     if str(type(args.file)) == "<class '_io.TextIOWrapper'>":
         data = yaml.safe_load(args.file.read())
+
     else:
         with open(args.file.name, 'rb') as f:
             data = yaml.safe_load(f)
 
-    return '{ "spec": "' + str(data) + '" }'
+    return json.dumps({ "spec": "" + str(data) + "" })
 
 def check_config_file(config_file, replace_string):
     if not os.path.isfile(config_file):
@@ -294,6 +295,15 @@ def add_argument_groups(subparser):
             metavar=''
     )
 
+def add_argument_hierarchyDepth(subparser):
+    subparser.add_argument(
+            '-d',
+            '--hierarchy-depth',
+            help='Depth of the parent / children hierarchy nodes. Can be \'full\' or a valid integer',
+            default='full',
+            metavar=''
+    )
+
 def add_argument_id(subparser, help_text='The id of the CQL query'):
     subparser.add_argument(
             '-i',
@@ -324,6 +334,16 @@ def add_argument_includeDrafts(subparser, help_text='Include plugin drafts.'):
             action='store_true'
     )
 
+def add_argument_includeHierarchyFields(subparser):
+    subparser.add_argument(
+            '-i',
+            '--includeHierarchyFields',
+            help='List of sub fields to include for hierarchies. Only supports \'groups\'',
+            required=False,
+            default=argparse.SUPPRESS,
+            metavar=''
+    )
+
 def add_argument_includeIncoming(subparser, help_text='Including incoming dependencies.'):
     subparser.add_argument(
             '-i',
@@ -1025,22 +1045,9 @@ def subparser_catalog_list(subparser):
             action='store_true',
             required=False
     )
-    sp.add_argument(
-            '-d',
-            '--hierarchy-depth',
-            help='Depth of the parent / children hierarchy nodes. Can be \'full\' or a valid integer',
-            default='full',
-            metavar=''
-    )
+    add_argument_hierarchyDepth(sp)
     add_argument_groups(sp)
-    sp.add_argument(
-            '-i',
-            '--includeHierarchyFields',
-            help='List of sub fields to include for hierarchies. Only supports \'groups\'',
-            default=False,
-            action='store_true',
-            required=False
-    )
+    add_argument_includeHierarchyFields(sp)
     sp.add_argument(
             '-in',
             '--includeNestedFields',
@@ -1123,14 +1130,8 @@ def catalog_descriptor(args):
 
 def subparser_catalog_details(subparser):
     sp = subparser.add_parser('details', help='Retrieve entity details')
-    sp.add_argument(
-            '-i',
-            '--includeHierarchyFields',
-            help='List of sub fields to include for hierarchies. Only supports \'groups\'',
-            default=argparse.SUPPRESS,
-            metavar=''
-    )
-    add_argument_groups(sp)
+    add_argument_includeHierarchyFields(sp)
+    add_argument_hierarchyDepth(sp)
     add_argument_tag(sp)
     sp.set_defaults(func=catalog_details)
 

{cortexapps_cli-0.26.1 → cortexapps_cli-0.26.3}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "cortexapps-cli"
 # version will be incremented via command line as part of github actions build
-version = "0.26.1"
+version = "0.26.3"
 description = "Command Line Interface for cortexapps"
 license = "MIT"
 authors = [