refactor: remove click context usage in favor of direct parameter passing

Author: mdesmet

src/datapilot/cli/decorators.py

@@ -54,7 +54,7 @@ def auth_options(f):
     @click.option("--instance-name", required=False, help="Your tenant ID.")
     @click.option("--backend-url", required=False, help="Altimate's Backend URL", default="https://api.myaltimate.com")
     @wraps(f)
-    def wrapper(ctx, token, instance_name, backend_url, *args, **kwargs):
+    def wrapper(token, instance_name, backend_url, *args, **kwargs):
         # Load .env file from current directory if it exists
         load_dotenv()
 
@@ -65,27 +65,27 @@ def wrapper(ctx, token, instance_name, backend_url, *args, **kwargs):
         # Map config file keys to CLI option names
         config_mapping = {"altimateApiKey": "token", "altimateInstanceName": "instance_name", "altimateUrl": "backend_url"}
 
-        # Store common options in context
-        ctx.ensure_object(dict)
+        # Apply file config first, then override with CLI arguments if provided
+        final_token = token
+        final_instance_name = instance_name
+        final_backend_url = backend_url
 
-        # 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
-        if instance_name is not None:
-            ctx.obj["instance_name"] = instance_name
-        if backend_url != "https://api.myaltimate.com":  # Only override if not default
-            ctx.obj["backend_url"] = backend_url
+        # Use file config if CLI argument not provided
+        if final_token is None and "altimateApiKey" in file_config:
+            final_token = file_config["altimateApiKey"]
+        if final_instance_name is None and "altimateInstanceName" in file_config:
+            final_instance_name = file_config["altimateInstanceName"]
+        if final_backend_url == "https://api.myaltimate.com" and "altimateUrl" in file_config:
+            final_backend_url = file_config["altimateUrl"]
 
         # 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")
-
-        return f(ctx, *args, **kwargs)
+        if final_token is None:
+            final_token = None
+        if final_instance_name is None:
+            final_instance_name = None
+        if final_backend_url is None:
+            final_backend_url = "https://api.myaltimate.com"
+
+        return f(final_token, final_instance_name, final_backend_url, *args, **kwargs)
 
     return wrapper

src/datapilot/cli/main.py

@@ -8,11 +8,8 @@
 
 @click.group()
 @click.version_option(version=__version__, prog_name="datapilot")
-@click.pass_context
-def datapilot(ctx):
+def datapilot():
     """Altimate CLI for DBT project management."""
-    # Ensure context object exists
-    ctx.ensure_object(dict)
 
 
 datapilot.add_command(dbt)

src/datapilot/core/knowledge/cli.py

@@ -15,19 +15,13 @@ def cli():
 @cli.command()
 @auth_options
 @click.option("--port", default=4000, help="Port to run the server on")
-@click.pass_context
-def serve(ctx, port):
+def serve(token, instance_name, backend_url, port):
     """Serve knowledge bases via HTTP server."""
-    # Get configuration from context
-    token = ctx.obj.get("token")
-    instance_name = ctx.obj.get("instance_name")
-    backend_url = ctx.obj.get("backend_url")
-
     if not token or not instance_name:
         click.echo(
             "Error: API token and instance name are required. Use --token and --instance-name options or set them in config.", err=True
         )
-        ctx.exit(1)
+        raise click.Abort()
 
     # Set context data for the handler
     KnowledgeBaseHandler.token = token

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

@@ -57,9 +57,10 @@ def dbt():
     default=None,
     help="Selective model testing. Specify one or more models to run tests on.",
 )
-@click.pass_context
 def project_health(
-    ctx,
+    token,
+    instance_name,
+    backend_url,
     manifest_path,
     catalog_path,
     config_path=None,
@@ -70,10 +71,6 @@ def project_health(
     Validate the DBT project's configuration and structure.
     :param manifest_path: Path to the DBT manifest file.
     """
-    # Get common options from context
-    token = ctx.obj.get("token")
-    instance_name = ctx.obj.get("instance_name")
-    backend_url = ctx.obj.get("backend_url")
 
     config = None
     if config_path:
@@ -141,19 +138,16 @@ def project_health(
 )
 @click.option("--manifest-path", required=True, prompt="Manifest Path", help="Path to the manifest file.")
 @click.option("--catalog-path", required=False, prompt=False, help="Path to the catalog file.")
-@click.pass_context
 def onboard(
-    ctx,
+    token,
+    instance_name,
+    backend_url,
     dbt_core_integration_id,
     dbt_core_integration_environment,
     manifest_path,
     catalog_path,
 ):
     """Onboard a manifest file to DBT."""
-    # Get common options from context
-    token = ctx.obj.get("token")
-    instance_name = ctx.obj.get("instance_name")
-    backend_url = ctx.obj.get("backend_url")
 
     # For onboard command, token and instance_name are required
     if not token: