catocli 2.1.3__tar.gz → 2.1.6__tar.gz

{catocli-2.1.3 → catocli-2.1.6}/MANIFEST.in

@@ -2,6 +2,6 @@ include catocli/*/README.md
 include catocli/parsers/*/README.md
 include models/*.json
 include vendor/*
-include clisettings.json
+include catocli/clisettings.json
 prune venv/
 prune test/

{catocli-2.1.3/catocli.egg-info → catocli-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: catocli
-Version: 2.1.3
+Version: 2.1.6
 Summary: Cato Networks cli wrapper for the GraphQL API.
 Home-page: https://github.com/Cato-Networks/cato-cli
 Author: Cato Networks

{catocli-2.1.3 → catocli-2.1.6}/catocli/Utils/clidriver.py

@@ -47,21 +47,22 @@ from ..parsers.query_hardware import query_hardware_parse
 from ..parsers.query_enterpriseDirectory import query_enterpriseDirectory_parse
 from ..parsers.query_devices import query_devices_parse
 from ..parsers.query_catalogs import query_catalogs_parse
-from ..parsers.query_site import query_site_parse
 from ..parsers.query_xdr import query_xdr_parse
-from ..parsers.query_policy import query_policy_parse
+from ..parsers.query_site import query_site_parse
 from ..parsers.query_groups import query_groups_parse
+from ..parsers.query_policy import query_policy_parse
 from ..parsers.mutation_xdr import mutation_xdr_parse
 from ..parsers.mutation_site import mutation_site_parse
 from ..parsers.mutation_sites import mutation_sites_parse
+from ..parsers.mutation_policy import mutation_policy_parse
 from ..parsers.mutation_container import mutation_container_parse
 from ..parsers.mutation_admin import mutation_admin_parse
-from ..parsers.mutation_policy import mutation_policy_parse
 from ..parsers.mutation_accountManagement import mutation_accountManagement_parse
 from ..parsers.mutation_sandbox import mutation_sandbox_parse
-from ..parsers.mutation_hardware import mutation_hardware_parse
+from ..parsers.mutation_licensing import mutation_licensing_parse
 from ..parsers.mutation_groups import mutation_groups_parse
 from ..parsers.mutation_enterpriseDirectory import mutation_enterpriseDirectory_parse
+from ..parsers.mutation_hardware import mutation_hardware_parse
 
 def show_version_info(args, configuration=None):
     print(f"catocli version {catocli.__version__}")
@@ -134,6 +135,8 @@ parser = argparse.ArgumentParser(prog='catocli', usage='%(prog)s <operationType>
 parser.add_argument('--version', action='version', version=catocli.__version__)
 parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
 parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
+parser.add_argument('-n', '--stream-events', dest='stream_events', help='Send events over network to host:port TCP')
+parser.add_argument('-z', '--sentinel', dest='sentinel', help='Send events to Sentinel customerid:sharedkey')
 subparsers = parser.add_subparsers()
 
 # Version command - enhanced with update checking
@@ -179,21 +182,22 @@ query_hardware_parser = query_hardware_parse(query_subparsers)
 query_enterpriseDirectory_parser = query_enterpriseDirectory_parse(query_subparsers)
 query_devices_parser = query_devices_parse(query_subparsers)
 query_catalogs_parser = query_catalogs_parse(query_subparsers)
-query_site_parser = query_site_parse(query_subparsers)
 query_xdr_parser = query_xdr_parse(query_subparsers)
-query_policy_parser = query_policy_parse(query_subparsers)
+query_site_parser = query_site_parse(query_subparsers)
 query_groups_parser = query_groups_parse(query_subparsers)
+query_policy_parser = query_policy_parse(query_subparsers)
 mutation_xdr_parser = mutation_xdr_parse(mutation_subparsers)
 mutation_site_parser = mutation_site_parse(mutation_subparsers)
 mutation_sites_parser = mutation_sites_parse(mutation_subparsers)
+mutation_policy_parser = mutation_policy_parse(mutation_subparsers)
 mutation_container_parser = mutation_container_parse(mutation_subparsers)
 mutation_admin_parser = mutation_admin_parse(mutation_subparsers)
-mutation_policy_parser = mutation_policy_parse(mutation_subparsers)
 mutation_accountManagement_parser = mutation_accountManagement_parse(mutation_subparsers)
 mutation_sandbox_parser = mutation_sandbox_parse(mutation_subparsers)
-mutation_hardware_parser = mutation_hardware_parse(mutation_subparsers)
+mutation_licensing_parser = mutation_licensing_parse(mutation_subparsers)
 mutation_groups_parser = mutation_groups_parse(mutation_subparsers)
 mutation_enterpriseDirectory_parser = mutation_enterpriseDirectory_parse(mutation_subparsers)
+mutation_hardware_parser = mutation_hardware_parse(mutation_subparsers)
 
 
 def parse_headers(header_strings):
@@ -276,7 +280,14 @@ def main(args=None):
             print(response)
         else:
             if response!=None:
-                print(json.dumps(response[0], sort_keys=True, indent=4))
+                # Check if this is CSV output
+                if (isinstance(response, list) and len(response) > 0 and 
+                    isinstance(response[0], dict) and "__csv_output__" in response[0]):
+                    # Print CSV output directly without JSON formatting
+                    print(response[0]["__csv_output__"], end='')
+                else:
+                    # Standard JSON output
+                    print(json.dumps(response[0], sort_keys=True, indent=4))
     except KeyboardInterrupt:
         print('Operation cancelled by user (Ctrl+C).')
         exit(130)  # Standard exit code for SIGINT

{catocli-2.1.3 → catocli-2.1.6}/catocli/Utils/cliutils.py

@@ -39,15 +39,56 @@ def load_cli_settings():
     Load clisettings.json from multiple possible locations:
     1. Package resource (for installed packages)
     2. Repository location (for development)
+    3. Adjacent file location (for development)
+    4. Embedded defaults as final fallback
     
     Returns:
-        dict: The loaded settings or default settings if loading fails
+        dict: The loaded settings or embedded default settings if all loading fails
     """
+    # Embedded default settings as final fallback
+    default_settings = {
+        "export_by_socket_type": {
+            "SOCKET_X1500": True,
+            "SOCKET_X1600": True,
+            "SOCKET_X1600_LTE": True,
+            "SOCKET_X1700": True
+        },
+        "default_socket_interface_map": {
+            "SOCKET_X1500": "LAN1",
+            "SOCKET_X1600": "INT_5",
+            "SOCKET_X1600_LTE": "INT_5",
+            "SOCKET_X1700": "INT_3"
+        },
+        "childOperationParent": {
+            "xdr": True,
+            "policy": True,
+            "groups": True,
+            "newGroups": True,
+            "site": True
+        },
+        "childOperationObjects": {
+            "ipAddressRange": True,
+            "fqdn": True,
+            "PolicyQueries": True,
+            "GroupsQueries": True,
+            "ContainerQueries": True,
+            "SiteQueries": True
+        },
+        "queryOperationCsvOutput": {
+            "query.appStats": "format_app_stats_to_csv",
+            "query.appStatsTimeSeries": "format_app_stats_timeseries_to_csv",
+            "query.accountMetrics": "format_account_metrics_to_csv",
+            "query.socketPortMetricsTimeSeries": "format_socket_port_metrics_timeseries_to_csv"
+        }
+    }
+    
     settings_locations = [
         # Try package resource first (for installed packages)
         lambda: json.loads(get_package_resource('catocli', 'clisettings.json')),
         # Try repository location (for development)
-        lambda: json.load(open(os.path.join(os.path.dirname(__file__), '../../clisettings.json'), 'r', encoding='utf-8'))
+        lambda: json.load(open(os.path.join(os.path.dirname(__file__), '../../clisettings.json'), 'r', encoding='utf-8')),
+        # Try adjacent file location (for development - new location)
+        lambda: json.load(open(os.path.join(os.path.dirname(__file__), '../clisettings.json'), 'r', encoding='utf-8'))
     ]
     
     for i, load_func in enumerate(settings_locations):
@@ -59,21 +100,8 @@ def load_cli_settings():
             # Continue to next location
             continue
     
-    # If all locations fail, return default settings for socket export
-    return {
-        "export_by_socket_type": {
-            "SOCKET_X1500": True,
-            "SOCKET_X1600": True,
-            "SOCKET_X1600_LTE": True,
-            "SOCKET_X1700": True
-        },
-        "default_socket_interface_map": {
-            "SOCKET_X1500": "LAN1",
-            "SOCKET_X1600": "INT_5",
-            "SOCKET_X1600_LTE": "INT_5",
-            "SOCKET_X1700": "INT_3"
-        }
-    }
+    # If all locations fail, return embedded default settings
+    return default_settings
 
 
 def get_cli_settings_path():