catocli 2.1.2__py3-none-any.whl → 2.1.3__py3-none-any.whl

catocli/Utils/clidriver.py

@@ -59,8 +59,8 @@ 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_groups import mutation_groups_parse
 from ..parsers.mutation_hardware import mutation_hardware_parse
+from ..parsers.mutation_groups import mutation_groups_parse
 from ..parsers.mutation_enterpriseDirectory import mutation_enterpriseDirectory_parse
 
 def show_version_info(args, configuration=None):
@@ -85,15 +85,6 @@ def show_version_info(args, configuration=None):
         else:
             print("Unable to check for updates (check your internet connection)")
     return [{"success": True, "current_version": catocli.__version__, "latest_version": latest_version if not args.current_only else None}]
-
-def load_private_settings():
-    # Load private settings from ~/.cato/settings.json
-    settings_file = os.path.expanduser("~/.cato/settings.json")
-    try:
-        with open(settings_file, 'r') as f:
-            return json.load(f)
-    except (FileNotFoundError, json.JSONDecodeError):
-        return {}
         
 def get_configuration(skip_api_key=False):
     configuration = Configuration()
@@ -200,8 +191,8 @@ 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_groups_parser = mutation_groups_parse(mutation_subparsers)
 mutation_hardware_parser = mutation_hardware_parse(mutation_subparsers)
+mutation_groups_parser = mutation_groups_parse(mutation_subparsers)
 mutation_enterpriseDirectory_parser = mutation_enterpriseDirectory_parse(mutation_subparsers)
 
 

catocli/Utils/cliutils.py

@@ -0,0 +1,178 @@
+#!/usr/bin/env python3
+"""
+General CLI utilities for catocli
+
+This module contains general-purpose utility functions used across the catocli
+package, including settings loading and configuration management.
+"""
+
+import os
+import json
+
+
+# Import for resource handling
+try:
+    # Python 3.9+
+    from importlib.resources import files
+    def get_package_resource(package, filename):
+        return files(package).joinpath(filename).read_text(encoding='utf-8')
+except ImportError:
+    try:
+        # Python 3.7-3.8
+        from importlib.resources import read_text
+        def get_package_resource(package, filename):
+            return read_text(package, filename, encoding='utf-8')
+    except ImportError:
+        try:
+            # Fallback to pkg_resources
+            import pkg_resources
+            def get_package_resource(package, filename):
+                return pkg_resources.resource_string(package, filename).decode('utf-8')
+        except ImportError:
+            # Final fallback - no package resources available
+            def get_package_resource(package, filename):
+                raise ImportError("No resource handling module available")
+
+
+def load_cli_settings():
+    """
+    Load clisettings.json from multiple possible locations:
+    1. Package resource (for installed packages)
+    2. Repository location (for development)
+    
+    Returns:
+        dict: The loaded settings or default settings if loading fails
+    """
+    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'))
+    ]
+    
+    for i, load_func in enumerate(settings_locations):
+        try:
+            settings = load_func()
+            if settings:
+                return settings
+        except (FileNotFoundError, json.JSONDecodeError, ImportError, OSError, ModuleNotFoundError) as e:
+            # 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"
+        }
+    }
+
+
+def get_cli_settings_path():
+    """
+    Get the path to the CLI settings file, trying different locations.
+    
+    Returns:
+        str or None: Path to the settings file if found, None otherwise
+    """
+    possible_paths = [
+        # Repository location (for development)
+        os.path.join(os.path.dirname(__file__), '../../clisettings.json'),
+        # Current directory
+        os.path.join(os.getcwd(), 'clisettings.json'),
+    ]
+    
+    for path in possible_paths:
+        if os.path.exists(path):
+            return path
+    
+    return None
+
+
+def load_json_file(file_path, encoding='utf-8'):
+    """
+    Load a JSON file with error handling.
+    
+    Args:
+        file_path (str): Path to the JSON file
+        encoding (str): File encoding (default: utf-8)
+    
+    Returns:
+        dict or None: The loaded JSON data, or None if loading fails
+    """
+    try:
+        with open(file_path, 'r', encoding=encoding) as f:
+            return json.load(f)
+    except (FileNotFoundError, json.JSONDecodeError, OSError) as e:
+        return None
+
+
+def save_json_file(data, file_path, encoding='utf-8', indent=2):
+    """
+    Save data to a JSON file with error handling.
+    
+    Args:
+        data: Data to save
+        file_path (str): Path to save the JSON file
+        encoding (str): File encoding (default: utf-8)
+        indent (int): JSON indentation (default: 2)
+    
+    Returns:
+        bool: True if successful, False otherwise
+    """
+    try:
+        # Ensure the directory exists
+        os.makedirs(os.path.dirname(file_path), exist_ok=True)
+        
+        with open(file_path, 'w', encoding=encoding) as f:
+            json.dump(data, f, indent=indent, ensure_ascii=False)
+        return True
+    except (OSError, TypeError, ValueError) as e:
+        return False
+
+
+def load_private_settings():
+    """
+    Load private settings from ~/.cato/settings.json in an OS-compatible way.
+    
+    This function constructs the path to ~/.cato/settings.json using os.path methods
+    for cross-platform compatibility (Windows, Mac, Linux).
+    
+    Returns:
+        dict: The privateCommands section from the settings file, or empty dict if not found
+    """
+    # Use os.path.join for OS-compatible path construction
+    cato_dir = os.path.join(os.path.expanduser("~"), ".cato")
+    settings_file = os.path.join(cato_dir, "settings.json")
+    
+    try:
+        with open(settings_file, 'r', encoding='utf-8') as f:
+            settings = json.load(f)
+            return settings.get('privateCommands', {})
+    except (FileNotFoundError, json.JSONDecodeError, KeyError, OSError):
+        return {}
+
+
+def ensure_directory_exists(directory_path):
+    """
+    Ensure a directory exists, creating it if necessary.
+    
+    Args:
+        directory_path (str): Path to the directory
+        
+    Returns:
+        bool: True if directory exists or was created successfully
+    """
+    try:
+        os.makedirs(directory_path, exist_ok=True)
+        return True
+    except OSError:
+        return False

catocli/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "2.1.2"
+__version__ = "2.1.3"
 __cato_host__ = "https://api.catonetworks.com/api/v1/graphql2"

catocli/parsers/custom/export_sites/export_sites.py

@@ -6,6 +6,7 @@ from datetime import datetime
 from graphql_client.api.call_api import ApiClient, CallApi
 from graphql_client.api_client import ApiException
 from ..customLib import writeDataToFile, makeCall, getAccountID
+from ....Utils.cliutils import load_cli_settings
 
 def export_socket_site_to_json(args, configuration):
     """
@@ -20,9 +21,8 @@ def export_socket_site_to_json(args, configuration):
     }
 
     try:
-        settings = {}
-        with open(os.path.join(os.path.dirname(__file__), '../../../../settings.json'), 'r', encoding='utf-8') as f:
-            settings = json.load(f)
+        # Load CLI settings using the robust function
+        settings = load_cli_settings()
 
         account_id = getAccountID(args, configuration)
         # Get account snapshot with siteIDs if provided

catocli/parsers/custom_private/__init__.py

@@ -4,21 +4,9 @@ Private commands parser for custom GraphQL payloads
 Dynamically loads commands from ~/.cato/settings.json
 """
 
-import os
-import json
 import argparse
 from ..customParserApiClient import createPrivateRequest, get_private_help
-
-
-def load_private_settings():
-    """Load private settings from ~/.cato/settings.json"""
-    settings_file = os.path.expanduser("~/.cato/settings.json")
-    try:
-        with open(settings_file, 'r') as f:
-            settings = json.load(f)
-            return settings.get('privateCommands', {})
-    except (FileNotFoundError, json.JSONDecodeError, KeyError):
-        return {}
+from ...Utils.cliutils import load_private_settings
 
 
 def private_parse(subparsers):

{catocli-2.1.2.dist-info → catocli-2.1.3.dist-info}/METADATA

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

{catocli-2.1.2.dist-info → catocli-2.1.3.dist-info}/RECORD

@@ -1,6 +1,7 @@
-catocli/__init__.py,sha256=nkeG61dZacf80zgL7kiI_S6xtj6mfFsjFdXgBQaOcNI,85
+catocli/__init__.py,sha256=SHWJi8J--jgEDRdBfW_GHi46aMM7q2x6f5m6yC9wL3s,85
 catocli/__main__.py,sha256=6Z0ns_k_kUcz1Qtrn1u7UyUnqB-3e85jM_nppOwFsv4,217
-catocli/Utils/clidriver.py,sha256=HvEGccIuWf6A0g4Gebcgd_XkMWoxA0ENmBrOumyJX4M,15490
+catocli/Utils/clidriver.py,sha256=U2lntPXwRpTlnktU_WABhXuTDX_uws8IrzpmgSCXDJc,15184
+catocli/Utils/cliutils.py,sha256=kj8huRnccTzjLaHYLQmNXQ2RivGlVPFcXqHAMiiJyqo,5626
 catocli/Utils/profile_manager.py,sha256=Stch-cU2rLA7r07hETIRsvG_JxpQx3Q42QwpfD7Qd2I,6379
 catocli/Utils/version_checker.py,sha256=tCtsCn7xxMIxOm6cWJSA_yPt0j4mNMK4iWSJej0yM6A,6696
 catocli/parsers/customParserApiClient.py,sha256=NHJhssY_0LrL8V9h7NucMztR95D44_NwKlpKLN9ACnU,49007
@@ -12,12 +13,12 @@ catocli/parsers/custom/customLib.py,sha256=Nv-agL_ewpe1x6GbwWCRb_Ey-NVW_w9L6qWwE
 catocli/parsers/custom/export_rules/__init__.py,sha256=Cci1LwMN9VzwPuHOXqUDFORujDI96dJuN-YSccGlQZU,2564
 catocli/parsers/custom/export_rules/export_rules.py,sha256=gXig4NC29yC5nW48ri-j0FEnaTz_kxKiuLF5y-5fZ_4,15646
 catocli/parsers/custom/export_sites/__init__.py,sha256=WnTRNA4z4IS0rKR9r_UfuGv3bxp8nlt4YNH1Sed4toU,1378
-catocli/parsers/custom/export_sites/export_sites.py,sha256=eGWW9swDB-wxFLxh7XNGJGCnW6ynwtD3HNIyyWYIdq8,24608
+catocli/parsers/custom/export_sites/export_sites.py,sha256=5dgrpWTVyWXa4sVhCJ2hOlvJOpyDssSBIFSdDo0OI1M,24575
 catocli/parsers/custom/import_rules_to_tf/__init__.py,sha256=jFCFceFv8zDW7nGLZOXkFE6NXAMPYRwKQwTbhSawYdM,3908
 catocli/parsers/custom/import_rules_to_tf/import_rules_to_tf.py,sha256=WlyTDxUtWchu9CDs73ILHDfNXCAh7jFARBEKk5WWhwM,18714
 catocli/parsers/custom/import_sites_to_tf/__init__.py,sha256=0EyCGY2qV4wxMoFfqBPs5FoMc0Ufr7J7Ciygb6Xx8Fc,2925
 catocli/parsers/custom/import_sites_to_tf/import_sites_to_tf.py,sha256=KND-eQOS_rFYVAX01Gm5ChxE8DtHZ1edS0SizoBqyx4,42880
-catocli/parsers/custom_private/__init__.py,sha256=0pvXnC9B9_hbMgN26urIk9BnO1jjjgQttKygPriYnfE,4176
+catocli/parsers/custom_private/__init__.py,sha256=rLhlAc8G7YvAyPmCXpUmLXIy4_N1gN0I5GWKX9srMxE,3826
 catocli/parsers/mutation_accountManagement/README.md,sha256=8ipbdTU8FAAfiH3IYlTZkTbLpPtO0fMblra7Zi8vwAI,249
 catocli/parsers/mutation_accountManagement/__init__.py,sha256=QChMssZKAnKrQ-xbXUYpgzmKa6OvtKw_jZXa2WufbJ8,5462
 catocli/parsers/mutation_accountManagement_addAccount/README.md,sha256=5PNnx2oY8JmoxEdJekUdmvsHnBccdaHeCYIVsAYXNBI,814
@@ -346,7 +347,7 @@ catocli/parsers/query_xdr_stories/README.md,sha256=eQJ81YiergQEhABkxi1yyzE_UXtS0
 catocli/parsers/query_xdr_story/README.md,sha256=_JYyMJ8GYOZ1dv61QqLyhVoEubXAm2p3QqFKdfohQOE,813
 catocli/parsers/raw/README.md,sha256=qvDLcg7U12yqacIQStOPtkqTsTLltJ06SSVmbqvlZhY,739
 catocli/parsers/raw/__init__.py,sha256=nub9Dth2s9WMXIlKA_BQKetooLjDYg9pREy01G6Rnb4,1107
-catocli-2.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+catocli-2.1.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 graphql_client/__init__.py,sha256=2nxD4YsWoOnALXi5cXbmtIN_i0NL_eyDTQRTxs52mkI,315
 graphql_client/api_client.py,sha256=2Rc1Zo1xH9Jnk1AO68kLSofTShkZwSVF-WkVtczfIc4,5786
 graphql_client/api_client_types.py,sha256=dM3zl6FA5SSp6nR6KmLfTL1BKaXX9uPMCZAm4v_FiUs,11569
@@ -604,7 +605,7 @@ models/query.socketPortMetricsTimeSeries.json,sha256=PHT_x1YaP8NQpaHXA4VWsZ4kC7W
 models/query.subDomains.json,sha256=BkReQmylHZMv1iIakX984na9EKd_m0sPC0a-COsCxRI,7036
 models/query.xdr.stories.json,sha256=a3rQ9j8Ru-iidGztB1yFnYSTTlJpPcDkhoI3phMdByk,714509
 models/query.xdr.story.json,sha256=A3M-_cBIfup6vxG5nvAEH0EGRdEwkg_-G2lQR6eveB8,152375
-schema/catolib.py,sha256=0BYjM2_Bpg4klAc_uu0NrE27H3jYC8Xi_lplWb5dNSA,71518
+schema/catolib.py,sha256=uLDSVKF7No9JhWrxsiWMJ9vJZmc-9iKvDjDzIgyinXg,71215
 schema/importSchema.py,sha256=LvXjylxsOWDcdceDE8nazOG1xcstxLGwyoVWSzW2Eg4,2508
 scripts/catolib.py,sha256=6QaGZaHj1waZuta8gUFsfXmyoDiLabpU9gwnyq7pSXg,2145
 scripts/export_if_rules_to_json.py,sha256=sTYzUbAtiFTy9vKpnyO8Sljshvg0qKd2gadanpeRVAM,10076
@@ -652,8 +653,8 @@ vendor/urllib3/util/timeout.py,sha256=4eT1FVeZZU7h7mYD1Jq2OXNe4fxekdNvhoWUkZusRp
 vendor/urllib3/util/url.py,sha256=wHORhp80RAXyTlAIkTqLFzSrkU7J34ZDxX-tN65MBZk,15213
 vendor/urllib3/util/util.py,sha256=j3lbZK1jPyiwD34T8IgJzdWEZVT-4E-0vYIJi9UjeNA,1146
 vendor/urllib3/util/wait.py,sha256=_ph8IrUR3sqPqi0OopQgJUlH4wzkGeM5CiyA7XGGtmI,4423
-catocli-2.1.2.dist-info/METADATA,sha256=BjsH_7ulOhm7DQq-IavFWgGguc8_SOADiPm62lx4sUg,1286
-catocli-2.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-catocli-2.1.2.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
-catocli-2.1.2.dist-info/top_level.txt,sha256=F4qSgcjcW5wR9EFrO8Ud06F7ZQGFr04a9qALNQDyVxU,52
-catocli-2.1.2.dist-info/RECORD,,
+catocli-2.1.3.dist-info/METADATA,sha256=H6wiAK-yoJ97WgeMD_6cOI19d_WW5QvFY64Kk_aICrs,1286
+catocli-2.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+catocli-2.1.3.dist-info/entry_points.txt,sha256=p4k9Orre6aWcqVrNmBbckmCs39h-1naMxRo2AjWmWZ4,50
+catocli-2.1.3.dist-info/top_level.txt,sha256=F4qSgcjcW5wR9EFrO8Ud06F7ZQGFr04a9qALNQDyVxU,52
+catocli-2.1.3.dist-info/RECORD,,

schema/catolib.py

@@ -94,7 +94,7 @@ def parseSchema(schema):
     print("  - Loading settings and initializing...")
     
     # Load settings to get childOperationParent and childOperationObjects configuration
-    settings = loadJSON("../settings.json")
+    settings = loadJSON("../clisettings.json")
     childOperationParent = settings.get("childOperationParent", {})
     childOperationObjects = settings.get("childOperationObjects", {})
     
@@ -786,15 +786,6 @@ def show_version_info(args, configuration=None):
         else:
             print("Unable to check for updates (check your internet connection)")
     return [{"success": True, "current_version": catocli.__version__, "latest_version": latest_version if not args.current_only else None}]
-
-def load_private_settings():
-    # Load private settings from ~/.cato/settings.json
-    settings_file = os.path.expanduser("~/.cato/settings.json")
-    try:
-        with open(settings_file, 'r') as f:
-            return json.load(f)
-    except (FileNotFoundError, json.JSONDecodeError):
-        return {}
         
 def get_configuration(skip_api_key=False):
     configuration = Configuration()