altimate-datapilot-cli 0.0.20__py3-none-any.whl → 0.0.21__py3-none-any.whl

{altimate_datapilot_cli-0.0.20.dist-info → altimate_datapilot_cli-0.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: altimate-datapilot-cli
-Version: 0.0.20
+Version: 0.0.21
 Summary: Assistant for Data Teams
 Home-page: https://github.com/AltimateAI/datapilot-cli
 Author: Altimate Inc
@@ -9,7 +9,6 @@ License: MIT
 Project-URL: Documentation, https://datapilot.readthedocs.io/
 Project-URL: Changelog, https://datapilot.readthedocs.io/en/latest/changelog.html
 Project-URL: Issue Tracker, https://github.com/AltimateAI/datapilot-cli/issues
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -39,6 +38,17 @@ Requires-Dist: sqlglot~=25.30.0
 Requires-Dist: mcp~=1.9.0
 Requires-Dist: pyperclip~=1.8.2
 Requires-Dist: python-dotenv~=1.0.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ========
 Overview
@@ -101,5 +111,3 @@ Changelog
 ------------------
 
 * First release on PyPI.
-
-

{altimate_datapilot_cli-0.0.20.dist-info → altimate_datapilot_cli-0.0.21.dist-info}/RECORD

@@ -1,7 +1,10 @@
-datapilot/__init__.py,sha256=wQP0zPwrPeGkZ12uVa4mTM7oYoqji6PECSRd7QD_QXE,23
+altimate_datapilot_cli-0.0.21.dist-info/licenses/AUTHORS.rst,sha256=S4H4zw_v3GVyz5_55jF5Gf_YNG3s5Y0VgbQaEov9PFk,50
+altimate_datapilot_cli-0.0.21.dist-info/licenses/LICENSE,sha256=Mf7VqpsmU2QR5_s2Cb_ZeeMB2Q9KW7YXJENZPFZRK1k,1100
+datapilot/__init__.py,sha256=PsqtE_T084MVsMv47JyTQ3DK2CRZJ3Kd9Q_vnw02oZk,23
 datapilot/__main__.py,sha256=I9USmeNnK-cAHb6LZfydJC0LeNSE8enieeY55wpR6uw,380
 datapilot/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datapilot/cli/main.py,sha256=rRSysEUFFPXTIm9JxSL-JqLD73i1QvJMtgscnAGV6Is,3170
+datapilot/cli/decorators.py,sha256=TYO_q-AMsq-86T3i9zI0fVLAhfwu87qAHmvZAJgt3xQ,2842
+datapilot/cli/main.py,sha256=pf3Thf5zX3s4SmgB8fYVn00WnQKYJ1ARqSjJ3q-M4xo,444
 datapilot/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapilot/clients/altimate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapilot/clients/altimate/client.py,sha256=00TRe_ck8UgbhFMAnrLBmug3fAWxAggNl2do5Um_4oU,4083
@@ -22,7 +25,7 @@ datapilot/core/insights/sql/base/insight.py,sha256=k8UUn0qrN-QG6NCunPl7Hd6L6kd1X
 datapilot/core/insights/sql/runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapilot/core/insights/sql/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapilot/core/knowledge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datapilot/core/knowledge/cli.py,sha256=-bxf6kNVnIqaFtCTS0k7XZ07O21P5YGg9Nh3Bj5mOkQ,1415
+datapilot/core/knowledge/cli.py,sha256=f9cmHTJW1Ts5slUgk7TqM2zqhjmEx5axRcnZPQgbO5s,1524
 datapilot/core/knowledge/server.py,sha256=hO6WyMUKBkukx_7JSBDvLztoFIKqEezNl4flQdtmNwQ,3191
 datapilot/core/mcp_utils/__init__.py,sha256=39zN2cGQCsEjRFeExv2bX4MoqVv4H14o_SYp_QG2jHU,18
 datapilot/core/mcp_utils/mcp.py,sha256=e-FbHmpEr673hxVBFHv996qnHCuqKqiCrMMy_g5tMjg,6027
@@ -35,7 +38,7 @@ datapilot/core/platforms/dbt/factory.py,sha256=YIQtb-FQQAJsifJ3KiLjjk0WIKTHtEPTN
 datapilot/core/platforms/dbt/formatting.py,sha256=bpfa7XmVghTq4WnGDGYC6DruwOwH8YmjFHghoo5cPD8,1638
 datapilot/core/platforms/dbt/utils.py,sha256=ozFHprR6LTLXQdrGyaRoyIBTua4P1NkP8T7LGgN-9c0,18577
 datapilot/core/platforms/dbt/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datapilot/core/platforms/dbt/cli/cli.py,sha256=kS19eIGf6iBRZtSw0stFW108jW1wM9lSU1BzBabhg3k,7263
+datapilot/core/platforms/dbt/cli/cli.py,sha256=JAEH3PSXKK8qhKxPd4pAFf_LB-FSqVVXOD9iG1Kuv20,7098
 datapilot/core/platforms/dbt/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapilot/core/platforms/dbt/hooks/executor_hook.py,sha256=gSM50vAO7C-f1rdnHogWbqc87aCXPXysZepjp5L2qzw,2966
 datapilot/core/platforms/dbt/insights/__init__.py,sha256=hk7BAzCTDkY8WNV6L0v-CPn9mrsDyJJusoQxNxGyzAY,7634
@@ -144,10 +147,8 @@ datapilot/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapilot/utils/utils.py,sha256=MY8q6ZBJ0hkrTuH7gWMxAlEAQGrajXFMabEhtGtT7sc,11524
 datapilot/utils/formatting/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapilot/utils/formatting/utils.py,sha256=rAVmIYuldvw9VvCSwG2kMTEgiT7cEconp_F1sAWVyCo,1377
-altimate_datapilot_cli-0.0.20.dist-info/AUTHORS.rst,sha256=S4H4zw_v3GVyz5_55jF5Gf_YNG3s5Y0VgbQaEov9PFk,50
-altimate_datapilot_cli-0.0.20.dist-info/LICENSE,sha256=Mf7VqpsmU2QR5_s2Cb_ZeeMB2Q9KW7YXJENZPFZRK1k,1100
-altimate_datapilot_cli-0.0.20.dist-info/METADATA,sha256=N3AphCCJ77dpuI1JkMbqQxth2lKRaxnpwjKB1THvIp0,2474
-altimate_datapilot_cli-0.0.20.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-altimate_datapilot_cli-0.0.20.dist-info/entry_points.txt,sha256=0zwgKxN40RLVB5jSmlJz7IH_FBqRtpFdbrdZn-xuQIY,141
-altimate_datapilot_cli-0.0.20.dist-info/top_level.txt,sha256=gAOFOdwB00vcxv74y4M1J-nQtPvEatU8-mYViEBcToo,10
-altimate_datapilot_cli-0.0.20.dist-info/RECORD,,
+altimate_datapilot_cli-0.0.21.dist-info/METADATA,sha256=tWGs7r6Ovf6fCsGbs7sUw01fNFFfGVqD3Hi1_obKeng,2677
+altimate_datapilot_cli-0.0.21.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+altimate_datapilot_cli-0.0.21.dist-info/entry_points.txt,sha256=5fKdw1Xm1RPJ6EZkBWvjNgLP6z3OU6iUvgDARe29pN8,140
+altimate_datapilot_cli-0.0.21.dist-info/top_level.txt,sha256=gAOFOdwB00vcxv74y4M1J-nQtPvEatU8-mYViEBcToo,10
+altimate_datapilot_cli-0.0.21.dist-info/RECORD,,

{altimate_datapilot_cli-0.0.20.dist-info → altimate_datapilot_cli-0.0.21.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{altimate_datapilot_cli-0.0.20.dist-info → altimate_datapilot_cli-0.0.21.dist-info}/entry_points.txt

@@ -1,4 +1,3 @@
 [console_scripts]
 datapilot = datapilot.cli.main:datapilot
 datapilot_run_dbt_checks = datapilot.core.platforms.dbt.hooks.executor_hook:main
-

datapilot/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.20"
+__version__ = "0.0.21"

datapilot/cli/decorators.py

@@ -0,0 +1,82 @@
+import json
+import os
+import re
+from functools import wraps
+from pathlib import Path
+from typing import Dict
+from typing import Optional
+
+import click
+from dotenv import load_dotenv
+
+
+def load_config_from_file() -> Optional[Dict]:
+    """Load configuration from ~/.altimate/altimate.json if it exists."""
+    config_path = Path.home() / ".altimate" / "altimate.json"
+
+    if not config_path.exists():
+        return None
+
+    try:
+        with config_path.open() as f:
+            config = json.load(f)
+        return config
+    except (OSError, json.JSONDecodeError) as e:
+        click.echo(f"Warning: Failed to load config from {config_path}: {e}", err=True)
+        return None
+
+
+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:([^}]+)\}"
+
+    def replacer(match):
+        env_var = match.group(1)
+        return os.environ.get(env_var, match.group(0))
+
+    return re.sub(pattern, replacer, value)
+
+
+def process_config(config):
+    """Process configuration dictionary to substitute environment variables."""
+    processed = {}
+    for key, value in config.items():
+        processed[key] = substitute_env_vars(value)
+    return processed
+
+
+def auth_options(f):
+    """Decorator to add authentication options to commands."""
+
+    @click.option("--token", required=False, help="Your API token for authentication.", hide_input=True)
+    @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(token, instance_name, backend_url, *args, **kwargs):
+        # Load .env file from current directory if it exists
+        load_dotenv()
+
+        final_token = token
+        final_instance_name = instance_name
+        final_backend_url = backend_url
+
+        if final_token is None and final_instance_name is None:
+            # Try to Load configuration from file if no CLI arguments are provided
+            file_config = load_config_from_file()
+            if file_config is not None:
+                # File config is provided
+                file_config = process_config(file_config)
+                if "altimateApiKey" in file_config:
+                    final_token = file_config["altimateApiKey"]
+                if "altimateInstanceName" in file_config:
+                    final_instance_name = file_config["altimateInstanceName"]
+                if "altimateUrl" in file_config:
+                    final_backend_url = file_config["altimateUrl"] or final_backend_url
+
+        return f(final_token, final_instance_name, final_backend_url, *args, **kwargs)
+
+    return wrapper

datapilot/cli/main.py

@@ -1,10 +1,4 @@
-import json
-import os
-import re
-from pathlib import Path
-
 import click
-from dotenv import load_dotenv
 
 from datapilot import __version__
 from datapilot.core.knowledge.cli import cli as knowledge
@@ -12,83 +6,10 @@ from datapilot.core.mcp_utils.mcp import mcp
 from datapilot.core.platforms.dbt.cli.cli import dbt
 
 
-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 config_path.open() as f:
-            config = json.load(f)
-        return config
-    except (OSError, json.JSONDecodeError) as e:
-        click.echo(f"Warning: Failed to load config from {config_path}: {e}", err=True)
-        return {}
-
-
-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:([^}]+)\}"
-
-    def replacer(match):
-        env_var = match.group(1)
-        return os.environ.get(env_var, match.group(0))
-
-    return re.sub(pattern, replacer, value)
-
-
-def process_config(config):
-    """Process configuration dictionary to substitute environment variables."""
-    processed = {}
-    for key, value in config.items():
-        processed[key] = substitute_env_vars(value)
-    return processed
-
-
 @click.group()
 @click.version_option(version=__version__, prog_name="datapilot")
-@click.option("--token", required=False, help="Your API token for authentication.", hide_input=True)
-@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")
-@click.pass_context
-def datapilot(ctx, token, instance_name, backend_url):
+def datapilot():
     """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"}
-
-    # 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
-    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
-
-    # 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")
 
 
 datapilot.add_command(dbt)

datapilot/core/knowledge/cli.py

@@ -2,6 +2,9 @@ from http.server import HTTPServer
 
 import click
 
+from datapilot.cli.decorators import auth_options
+from datapilot.clients.altimate.utils import validate_credentials
+
 from .server import KnowledgeBaseHandler
 
 
@@ -11,20 +14,19 @@ 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 parent context
-    token = ctx.parent.obj.get("token")
-    instance_name = ctx.parent.obj.get("instance_name")
-    backend_url = ctx.parent.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
+
+    if not validate_credentials(token, backend_url, instance_name):
+        click.echo("Error: Invalid credentials.", err=True)
+        raise click.Abort
 
     # Set context data for the handler
     KnowledgeBaseHandler.token = token

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

@@ -2,6 +2,7 @@ import logging
 
 import click
 
+from datapilot.cli.decorators import auth_options
 from datapilot.clients.altimate.utils import check_token_and_instance
 from datapilot.clients.altimate.utils import get_all_dbt_configs
 from datapilot.clients.altimate.utils import onboard_file
@@ -24,14 +25,12 @@ logging.basicConfig(level=logging.INFO)
 
 # New dbt group
 @click.group()
-@click.pass_context
-def dbt(ctx):
+def dbt():
     """DBT specific commands."""
-    # Ensure context object exists
-    ctx.ensure_object(dict)
 
 
 @dbt.command("project-health")
+@auth_options
 @click.option(
     "--manifest-path",
     required=True,
@@ -58,9 +57,10 @@ def dbt(ctx):
     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,
@@ -71,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 parent context
-    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:
@@ -135,25 +131,34 @@ def project_health(
 
 
 @dbt.command("onboard")
-@click.option("--dbt_core_integration_id", prompt="DBT Core Integration ID", help="DBT Core Integration ID")
+@auth_options
 @click.option(
-    "--dbt_core_integration_environment", default="PROD", prompt="DBT Core Integration Environment", help="DBT Core Integration Environment"
+    "--dbt_core_integration_id",
+    "--dbt_integration_id",
+    "dbt_integration_id",  # This is the parameter name that will be passed to the function
+    prompt="DBT Integration ID",
+    help="DBT Core Integration ID or DBT Integration ID",
+)
+@click.option(
+    "--dbt_core_integration_environment",
+    "--dbt_integration_environment",
+    "dbt_integration_environment",  # This is the parameter name that will be passed to the function
+    default="PROD",
+    prompt="DBT Integration Environment",
+    help="DBT Core Integration Environment or DBT Integration Environment",
 )
 @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,
-    dbt_core_integration_id,
-    dbt_core_integration_environment,
+    token,
+    instance_name,
+    backend_url,
+    dbt_integration_id,
+    dbt_integration_environment,
     manifest_path,
     catalog_path,
 ):
     """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")
 
     # For onboard command, token and instance_name are required
     if not token:
@@ -171,16 +176,13 @@ def onboard(
         click.echo("Error: You don't have permission to perform this action.")
         return
 
-    # This will throw error if manifest file is incorrect
     try:
         load_manifest(manifest_path)
     except Exception as e:
         click.echo(f"Error: {e}")
         return
 
-    response = onboard_file(
-        token, instance_name, dbt_core_integration_id, dbt_core_integration_environment, "manifest", manifest_path, backend_url
-    )
+    response = onboard_file(token, instance_name, dbt_integration_id, dbt_integration_environment, "manifest", manifest_path, backend_url)
     if response["ok"]:
         click.echo("Manifest onboarded successfully!")
     else:
@@ -189,21 +191,19 @@ def onboard(
     if not catalog_path:
         return
 
-    response = onboard_file(
-        token, instance_name, dbt_core_integration_id, dbt_core_integration_environment, "catalog", catalog_path, backend_url
-    )
+    response = onboard_file(token, instance_name, dbt_integration_id, dbt_integration_environment, "catalog", catalog_path, backend_url)
     if response["ok"]:
         click.echo("Catalog onboarded successfully!")
     else:
         click.echo(f"{response['message']}")
 
-    response = start_dbt_ingestion(token, instance_name, dbt_core_integration_id, dbt_core_integration_environment, backend_url)
+    response = start_dbt_ingestion(token, instance_name, dbt_integration_id, dbt_integration_environment, backend_url)
     if response["ok"]:
         url = map_url_to_instance(backend_url, instance_name)
         if not url:
             click.echo("Manifest and catalog ingestion has started.")
         else:
-            url = f"{url}/settings/integrations/{dbt_core_integration_id}/{dbt_core_integration_environment}"
+            url = f"{url}/settings/integrations/{dbt_integration_id}/{dbt_integration_environment}"
             click.echo(f"Manifest and catalog ingestion has started. You can check the status at {url}")
     else:
         click.echo(f"{response['message']}")