databar 2.0.1__tar.gz → 2.0.3__tar.gz

{databar-2.0.1/src/databar.egg-info → databar-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databar
-Version: 2.0.1
+Version: 2.0.3
 Summary: Official Databar.ai Python SDK and CLI — connect to enrichments, waterfalls, and tables via api.databar.ai
 Author-email: "Databar.ai Team" <info@databar.ai>
 License: MIT License

{databar-2.0.1 → databar-2.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "databar"
-version = "2.0.1"
+version = "2.0.3"
 description = "Official Databar.ai Python SDK and CLI — connect to enrichments, waterfalls, and tables via api.databar.ai"
 readme = "README.md"
 license = { file = "LICENSE" }

{databar-2.0.1 → databar-2.0.3}/src/databar/__init__.py

@@ -57,7 +57,7 @@ from .models import (
     WaterfallEnrichment,
 )
 
-__version__ = "2.0.1"
+__version__ = "2.0.3"
 __all__ = [
     "DatabarClient",
     # exceptions

{databar-2.0.1 → databar-2.0.3}/src/databar/cli/_auth.py

@@ -10,6 +10,7 @@ Key resolution order (same as MCP server):
 from __future__ import annotations
 
 import os
+import shutil
 from pathlib import Path
 
 import typer
@@ -87,10 +88,23 @@ def login(
     success(f"API key saved to {CONFIG_FILE}")
     console.print("[dim]Tip: You can also set DATABAR_API_KEY as an environment variable.[/dim]")
 
+    # Check if the databar binary is on PATH and print a hint if not
+    if shutil.which("databar") is None:
+        import sys
+        bin_dir = Path(sys.executable).parent
+        console.print(
+            f"\n[yellow]Note:[/yellow] The [bold]databar[/bold] command is not on your PATH.\n"
+            f"Add this to your shell profile ([dim]~/.zshrc[/dim] or [dim]~/.bashrc[/dim]):\n\n"
+            f"  [bold]export PATH=\"{bin_dir}:$PATH\"[/bold]\n\n"
+            f"Then restart your terminal, or run:\n\n"
+            f"  [bold]source ~/.zshrc[/bold]\n\n"
+            f"Until then, use the full path: [bold]{bin_dir}/databar[/bold]"
+        )
+
 
 @app.command("whoami")
 def whoami(
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f", help="Output format.")
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f", help="Output format.")
 ) -> None:
     """Show current user info and credit balance."""
     client = get_client()

{databar-2.0.1 → databar-2.0.3}/src/databar/cli/enrichments.py

@@ -28,7 +28,7 @@ app = typer.Typer(help="Search and run data enrichments.")
 @app.command("list")
 def list_enrichments(
     query: Optional[str] = typer.Option(None, "--query", "-q", help="Search query."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """List available enrichments."""
     client = get_client()
@@ -59,7 +59,7 @@ def list_enrichments(
 @app.command("get")
 def get_enrichment(
     enrichment_id: int = typer.Argument(..., help="Enrichment ID."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """Get full details for an enrichment including parameters."""
     client = get_client()
@@ -99,11 +99,20 @@ def get_enrichment(
         output(rows, OutputFormat.TABLE, table_columns=["name", "type"])
 
 
+@app.command("info", hidden=True)
+def info_enrichment(
+    enrichment_id: int = typer.Argument(..., help="Enrichment ID."),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
+) -> None:
+    """Alias for 'get'. Get full details for an enrichment including parameters."""
+    get_enrichment(enrichment_id, fmt)
+
+
 @app.command("run")
 def run_enrichment(
     enrichment_id: int = typer.Argument(..., help="Enrichment ID."),
     params_json: str = typer.Option(..., "--params", "-p", help='JSON params, e.g. \'{"email":"alice@example.com"}\''),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
     raw: bool = typer.Option(False, "--raw", help="Print raw result without formatting."),
 ) -> None:
     """Run a single enrichment and wait for results."""
@@ -132,7 +141,7 @@ def run_enrichment(
 def bulk_enrichment(
     enrichment_id: int = typer.Argument(..., help="Enrichment ID."),
     input_file: Path = typer.Option(..., "--input", "-i", help="CSV file with one row per input.", exists=True),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
     out: Optional[Path] = typer.Option(None, "--out", "-o", help="Output file (for CSV format)."),
 ) -> None:
     """Run a bulk enrichment from a CSV input file."""
@@ -159,7 +168,7 @@ def param_choices(
     query: Optional[str] = typer.Option(None, "--query", "-q", help="Filter choices."),
     page: int = typer.Option(1, "--page", help="Page number."),
     limit: int = typer.Option(50, "--limit", help="Results per page."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """List available choices for a select/mselect enrichment parameter."""
     client = get_client()

{databar-2.0.1 → databar-2.0.3}/src/databar/cli/tables.py

@@ -33,7 +33,7 @@ app = typer.Typer(help="Manage tables and rows.")
 
 @app.command("list")
 def list_tables(
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """List all tables in your workspace."""
     client = get_client()
@@ -59,7 +59,7 @@ def list_tables(
 def create_table(
     name: Optional[str] = typer.Option(None, "--name", "-n", help="Table name."),
     columns: Optional[str] = typer.Option(None, "--columns", "-c", help="Comma-separated column names."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """Create a new empty table."""
     col_list = [c.strip() for c in columns.split(",")] if columns else None
@@ -79,7 +79,7 @@ def create_table(
 @app.command("columns")
 def get_columns(
     table_uuid: str = typer.Argument(..., help="Table UUID."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """List columns defined on a table."""
     client = get_client()
@@ -106,7 +106,7 @@ def get_rows(
     table_uuid: str = typer.Argument(..., help="Table UUID."),
     page: int = typer.Option(1, "--page", help="Page number."),
     per_page: int = typer.Option(1000, "--per-page", help="Rows per page (max 1000)."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
     out: Optional[Path] = typer.Option(None, "--out", "-o", help="Output file (for CSV format)."),
 ) -> None:
     """Get rows from a table."""
@@ -143,7 +143,7 @@ def insert_rows(
     input_file: Optional[Path] = typer.Option(None, "--input", "-i", help="CSV file.", exists=True),
     allow_new_columns: bool = typer.Option(False, "--allow-new-columns", help="Auto-create unknown columns."),
     dedupe_keys: Optional[str] = typer.Option(None, "--dedupe-keys", help="Comma-separated column names for deduplication."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """Insert rows into a table."""
     raw_rows = _load_rows(data_json, input_file)
@@ -183,7 +183,7 @@ def patch_rows(
     data_json: Optional[str] = typer.Option(None, "--data", "-d", help='JSON array: [{"id":"<uuid>","fields":{...}}]'),
     input_file: Optional[Path] = typer.Option(None, "--input", "-i", help="CSV file (must have an 'id' column).", exists=True),
     no_overwrite: bool = typer.Option(False, "--no-overwrite", help="Only fill empty cells; keep existing values."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """Update existing rows by row UUID."""
     raw_rows = _load_rows(data_json, input_file)
@@ -219,7 +219,7 @@ def upsert_rows(
     key_col: str = typer.Option(..., "--key-col", "-k", help="Column name to match on (e.g. 'email')."),
     data_json: Optional[str] = typer.Option(None, "--data", "-d", help="JSON array of row objects."),
     input_file: Optional[Path] = typer.Option(None, "--input", "-i", help="CSV file.", exists=True),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """Insert or update rows matched by a key column."""
     raw_rows = _load_rows(data_json, input_file)
@@ -253,7 +253,7 @@ def upsert_rows(
 @app.command("enrichments")
 def table_enrichments(
     table_uuid: str = typer.Argument(..., help="Table UUID."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """List enrichments configured on a table."""
     client = get_client()
@@ -277,7 +277,7 @@ def add_enrichment(
     table_uuid: str = typer.Argument(..., help="Table UUID."),
     enrichment_id: int = typer.Option(..., "--enrichment-id", "-e", help="Enrichment ID to add."),
     mapping_json: str = typer.Option(..., "--mapping", "-m", help='JSON mapping of param → column, e.g. \'{"email": "email_col"}\''),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """Add an enrichment to a table with a column mapping."""
     try:

{databar-2.0.1 → databar-2.0.3}/src/databar/cli/tasks.py

@@ -19,7 +19,7 @@ app = typer.Typer(help="Check the status of async tasks.")
 @app.command("get")
 def get_task(
     task_id: str = typer.Argument(..., help="Task ID returned by a run or bulk-run call."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
     poll: bool = typer.Option(
         False,
         "--poll",

{databar-2.0.1 → databar-2.0.3}/src/databar/cli/waterfalls.py

@@ -27,7 +27,7 @@ app = typer.Typer(help="Search and run waterfall enrichments.")
 @app.command("list")
 def list_waterfalls(
     query: Optional[str] = typer.Option(None, "--query", "-q", help="Filter by name/description."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """List available waterfall enrichments."""
     client = get_client()
@@ -64,7 +64,7 @@ def list_waterfalls(
 @app.command("get")
 def get_waterfall(
     identifier: str = typer.Argument(..., help="Waterfall identifier."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
 ) -> None:
     """Get details for a specific waterfall."""
     client = get_client()
@@ -103,13 +103,22 @@ def get_waterfall(
         output(rows, OutputFormat.TABLE, table_columns=["id", "name", "price"])
 
 
+@app.command("info", hidden=True)
+def info_waterfall(
+    identifier: str = typer.Argument(..., help="Waterfall identifier."),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
+) -> None:
+    """Alias for 'get'. Get details for a specific waterfall."""
+    get_waterfall(identifier, fmt)
+
+
 @app.command("run")
 def run_waterfall(
     identifier: str = typer.Argument(..., help="Waterfall identifier."),
     params_json: str = typer.Option(..., "--params", "-p", help='JSON params, e.g. \'{"linkedin_url":"https://..."}\''),
     providers: Optional[str] = typer.Option(None, "--providers", help="Comma-separated provider IDs (default: all)."),
     email_verifier: Optional[int] = typer.Option(None, "--email-verifier", help="Email verifier enrichment ID."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
     raw: bool = typer.Option(False, "--raw", help="Print raw result without formatting."),
 ) -> None:
     """Run a waterfall enrichment and wait for results."""
@@ -151,7 +160,7 @@ def bulk_waterfall(
     input_file: Path = typer.Option(..., "--input", "-i", help="CSV file with one row per input.", exists=True),
     providers: Optional[str] = typer.Option(None, "--providers", help="Comma-separated provider IDs (default: all)."),
     email_verifier: Optional[int] = typer.Option(None, "--email-verifier", help="Email verifier enrichment ID."),
-    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "-f"),
+    fmt: OutputFormat = typer.Option(OutputFormat.TABLE, "--format", "--output", "-f"),
     out: Optional[Path] = typer.Option(None, "--out", "-o", help="Output file (for CSV format)."),
 ) -> None:
     """Run a waterfall enrichment in bulk from a CSV input file."""

{databar-2.0.1 → databar-2.0.3}/src/databar/client.py

@@ -16,6 +16,7 @@ in databar_mcp/src/databar-client.ts.
 from __future__ import annotations
 
 import os
+import re
 import time
 from typing import Any, Dict, List, Optional
 
@@ -438,10 +439,65 @@ class DatabarClient:
         table_uuid: str,
         enrichment_id: int,
         mapping: Dict[str, Any],
-    ) -> Any:
-        """Add an enrichment to a table with a parameter-to-column mapping."""
-        payload = {"enrichment": enrichment_id, "mapping": mapping}
-        return self._request("POST", f"/table/{table_uuid}/add-enrichment", json=payload)
+    ) -> TableEnrichment:
+        """
+        Add an enrichment to a table with a parameter-to-column mapping.
+
+        ``mapping`` keys are enrichment parameter names. Values are dicts with:
+          - ``{"type": "mapping", "value": "<column-name-or-uuid>"}``
+            — reads the value from a table column per row.
+            You may pass a human-readable column name; the SDK will automatically
+            resolve it to the required column UUID via GET /table/{uuid}/columns.
+          - ``{"type": "simple", "value": "<static-value>"}``
+            — uses the same hardcoded value for every row.
+
+        Returns the newly added :class:`TableEnrichment` (with ``id`` and ``name``),
+        resolved by diffing enrichments before and after the add.
+        """
+        # Auto-resolve column names → UUIDs for mapping-type entries
+        resolved_mapping: Dict[str, Any] = {}
+        column_map: Optional[Dict[str, str]] = None  # name → uuid, built lazily
+
+        for param, entry in mapping.items():
+            if not isinstance(entry, dict) or entry.get("type") != "mapping":
+                resolved_mapping[param] = entry
+                continue
+
+            value = entry.get("value", "")
+            # Looks like a UUID already — 8-4-4-4-12 hex pattern
+            if re.fullmatch(r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", str(value), re.IGNORECASE):
+                resolved_mapping[param] = entry
+                continue
+
+            # Build the column name→uuid map once
+            if column_map is None:
+                columns = self.get_columns(table_uuid)
+                column_map = {c.name: c.identifier for c in columns}
+
+            uuid = column_map.get(value)
+            if uuid is None:
+                # Not a known column name — pass through and let the API surface the error
+                resolved_mapping[param] = entry
+            else:
+                resolved_mapping[param] = {**entry, "value": uuid}
+
+        # Snapshot existing enrichment IDs so we can detect the new one
+        before_ids = {e.id for e in self.get_table_enrichments(table_uuid)}
+
+        payload = {"enrichment": enrichment_id, "mapping": resolved_mapping}
+        self._request("POST", f"/table/{table_uuid}/add-enrichment", json=payload)
+
+        # Fetch updated list and return the newly created TableEnrichment
+        after = self.get_table_enrichments(table_uuid)
+        new_enrichments = [e for e in after if e.id not in before_ids]
+        if new_enrichments:
+            return new_enrichments[-1]
+
+        # Fallback: return the last enrichment in the list if we can't detect which is new
+        if after:
+            return after[-1]
+
+        raise DatabarError("Enrichment was added but could not be retrieved. Use get_table_enrichments() to fetch it manually.")
 
     def run_table_enrichment(
         self,

{databar-2.0.1 → databar-2.0.3/src/databar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databar
-Version: 2.0.1
+Version: 2.0.3
 Summary: Official Databar.ai Python SDK and CLI — connect to enrichments, waterfalls, and tables via api.databar.ai
 Author-email: "Databar.ai Team" <info@databar.ai>
 License: MIT License

{databar-2.0.1 → databar-2.0.3}/tests/test_cli.py

@@ -329,4 +329,4 @@ def test_task_get_poll(monkeypatch):
 def test_version_flag():
     result = runner.invoke(app, ["--version"])
     assert result.exit_code == 0
-    assert "2.0.1" in result.output
+    assert "2.0.2" in result.output