refactor: standardize string quotes and improve code consistency

Author: mdesmet

src/datapilot/cli/main.py

@@ -13,15 +13,15 @@
 def load_config_from_file():
     """Load configuration from ~/.altimate/altimate.json if it exists."""
     config_path = Path.home() / ".altimate" / "altimate.json"
-    
+
     if not config_path.exists():
         return {}
-    
+
     try:
-        with open(config_path, 'r') as f:
+        with open(config_path) as f:
             config = json.load(f)
         return config
-    except (json.JSONDecodeError, IOError) as e:
+    except (OSError, json.JSONDecodeError) as e:
         click.echo(f"Warning: Failed to load config from {config_path}: {e}", err=True)
         return {}
 
@@ -30,14 +30,14 @@ def substitute_env_vars(value):
     """Replace ${env:ENV_VARIABLE} patterns with actual environment variable values."""
     if not isinstance(value, str):
         return value
-    
+
     # Pattern to match ${env:VARIABLE_NAME}
-    pattern = r'\$\{env:([^}]+)\}'
-    
+    pattern = r"\$\{env:([^}]+)\}"
+
     def replacer(match):
         env_var = match.group(1)
         return os.environ.get(env_var, match.group(0))
-    
+
     return re.sub(pattern, replacer, value)
 
 
@@ -58,38 +58,34 @@ def datapilot(ctx, token, instance_name, backend_url):
     """Altimate CLI for DBT project management."""
     # Load .env file from current directory if it exists
     load_dotenv()
-    
+
     # Load configuration from file
     file_config = load_config_from_file()
     file_config = process_config(file_config)
-    
+
     # Map config file keys to CLI option names
-    config_mapping = {
-        'altimateApiKey': 'token',
-        'altimateInstanceName': 'instance_name',
-        'altimateUrl': 'backend_url'
-    }
-    
+    config_mapping = {"altimateApiKey": "token", "altimateInstanceName": "instance_name", "altimateUrl": "backend_url"}
+
     # Store common options in context, with CLI args taking precedence
     ctx.ensure_object(dict)
-    
+
     # Apply file config first
     for file_key, cli_key in config_mapping.items():
         if file_key in file_config:
             ctx.obj[cli_key] = file_config[file_key]
-    
+
     # Override with CLI arguments if provided
     if token is not None:
-        ctx.obj['token'] = token
+        ctx.obj["token"] = token
     if instance_name is not None:
-        ctx.obj['instance_name'] = instance_name
+        ctx.obj["instance_name"] = instance_name
     if backend_url != "https://api.myaltimate.com":  # Only override if not default
-        ctx.obj['backend_url'] = backend_url
-    
+        ctx.obj["backend_url"] = backend_url
+
     # Set defaults if nothing was provided
-    ctx.obj.setdefault('token', None)
-    ctx.obj.setdefault('instance_name', None)
-    ctx.obj.setdefault('backend_url', 'https://api.myaltimate.com')
+    ctx.obj.setdefault("token", None)
+    ctx.obj.setdefault("instance_name", None)
+    ctx.obj.setdefault("backend_url", "https://api.myaltimate.com")
 
 
 datapilot.add_command(dbt)

src/datapilot/core/platforms/dbt/cli/cli.py

@@ -72,10 +72,10 @@ def project_health(
     :param manifest_path: Path to the DBT manifest file.
     """
     # Get common options from parent context
-    token = ctx.parent.obj.get('token')
-    instance_name = ctx.parent.obj.get('instance_name')
-    backend_url = ctx.parent.obj.get('backend_url')
-    
+    token = ctx.parent.obj.get("token")
+    instance_name = ctx.parent.obj.get("instance_name")
+    backend_url = ctx.parent.obj.get("backend_url")
+
     config = None
     if config_path:
         config = load_config(config_path)
@@ -151,16 +151,16 @@ def onboard(
 ):
     """Onboard a manifest file to DBT."""
     # Get common options from parent context
-    token = ctx.parent.obj.get('token')
-    instance_name = ctx.parent.obj.get('instance_name')
-    backend_url = ctx.parent.obj.get('backend_url')
-    
+    token = ctx.parent.obj.get("token")
+    instance_name = ctx.parent.obj.get("instance_name")
+    backend_url = ctx.parent.obj.get("backend_url")
+
     # For onboard command, token and instance_name are required
     if not token:
         token = click.prompt("API Token")
     if not instance_name:
         instance_name = click.prompt("Instance Name")
-    
+
     check_token_and_instance(token, instance_name)
 
     if not validate_credentials(token, backend_url, instance_name):

tests/core/platform/dbt/test_cli.py

@@ -1,7 +1,7 @@
 # test_app.py
 from click.testing import CliRunner
 
-from datapilot.core.platforms.dbt.cli.cli import project_health
+from datapilot.cli.main import datapilot
 
 
 def test_project_health_with_required_and_optional_args():
@@ -11,7 +11,9 @@ def test_project_health_with_required_and_optional_args():
     config_path = "tests/data/config.yml"
 
     # Simulate command invocation
-    result = runner.invoke(project_health, ["--manifest-path", manifest_path, "--catalog-path", catalog_path, "--config-path", config_path])
+    result = runner.invoke(
+        datapilot, ["project-health", "--manifest-path", manifest_path, "--catalog-path", catalog_path, "--config-path", config_path]
+    )
 
     assert result.exit_code == 0  # Ensure the command executed successfully
     # Add more assertions here to validate the behavior of your command,
@@ -25,8 +27,9 @@ def test_project_health_with_only_required_arg():
 
     # Simulate command invocation without optional arguments
     result = runner.invoke(
-        project_health,
+        datapilot,
         [
+            "project-health",
             "--manifest-path",
             manifest_path,
         ],
@@ -43,8 +46,9 @@ def test_project_health_with_only_required_arg_version1_6():
 
     # Simulate command invocation without optional arguments
     result = runner.invoke(
-        project_health,
+        datapilot,
         [
+            "project-health",
             "--manifest-path",
             manifest_path,
         ],
@@ -61,8 +65,9 @@ def test_project_health_with_macro_args():
 
     # Simulate command invocation without optional arguments
     result = runner.invoke(
-        project_health,
+        datapilot,
         [
+            "project-health",
             "--manifest-path",
             manifest_path,
         ],
@@ -76,8 +81,9 @@ def test_project_health_with_macro_args():
 
     # Simulate command invocation without optional arguments
     result = runner.invoke(
-        project_health,
+        datapilot,
         [
+            "project-health",
             "--manifest-path",
             manifest_path,
         ],
@@ -95,7 +101,9 @@ def test_project_health_with_required_and_optional_args_v12():
     config_path = "tests/data/config.yml"
 
     # Simulate command invocation
-    result = runner.invoke(project_health, ["--manifest-path", manifest_path, "--catalog-path", catalog_path, "--config-path", config_path])
+    result = runner.invoke(
+        datapilot, ["project-health", "--manifest-path", manifest_path, "--catalog-path", catalog_path, "--config-path", config_path]
+    )
 
     assert result.exit_code == 0  # Ensure the command executed successfully
     # Add more assertions here to validate the behavior of your command,