entropy-data 0.3.6__tar.gz → 0.3.7__tar.gz

{entropy_data-0.3.6 → entropy_data-0.3.7}/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [0.3.7]
+
+- Add `yaml` as a third value for `--output` / `-o` alongside `table` and `json`. Useful when piping results into editors or files that expect YAML (e.g. data contracts).
+- `entropy-data access list` now supports `--provider-dataproduct`, `--consumer-dataproduct`, and `--consumer-type` filters, passed through to the existing `providerDataProductId`, `consumerDataProductId`, and `consumerType` query parameters of `GET /api/access`.
+
 ## [0.3.6]
 
 - `entropy-data connection add` now sets the newly added connection as the default, overriding any previously set default.

{entropy_data-0.3.6 → entropy_data-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entropy-data
-Version: 0.3.6
+Version: 0.3.7
 Summary: CLI for Entropy Data
 Project-URL: Homepage, https://entropy-data.com
 Project-URL: Documentation, https://docs.entropy-data.com

{entropy_data-0.3.6 → entropy_data-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "entropy-data"
-version = "0.3.6"
+version = "0.3.7"
 description = "CLI for Entropy Data"
 requires-python = ">=3.11"
 license = "MIT"

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/access.py

@@ -17,6 +17,18 @@ RESOURCE_TYPE = "access"
 @access_app.command("list")
 def list_access(
     page: Annotated[int, typer.Option("--page", "-p", help="Page number (0-indexed).")] = 0,
+    provider_dataproduct: Annotated[
+        Optional[str],
+        typer.Option("--provider-dataproduct", help="Filter by provider data product ID."),
+    ] = None,
+    consumer_dataproduct: Annotated[
+        Optional[str],
+        typer.Option("--consumer-dataproduct", help="Filter by consumer data product ID."),
+    ] = None,
+    consumer_type: Annotated[
+        Optional[str],
+        typer.Option("--consumer-type", help="Filter by consumer type (e.g. team, user, dataProduct)."),
+    ] = None,
     output: Annotated[Optional[OutputFormat], typer.Option("--output", "-o", help="Output format.")] = None,
 ) -> None:
     """List all access agreements."""
@@ -25,7 +37,14 @@ def list_access(
     fmt = output or get_output_format()
     try:
         client = get_client()
-        data, has_next = client.list_resources(RESOURCE_PATH, params={"p": page})
+        params: dict = {"p": page}
+        if provider_dataproduct:
+            params["providerDataProductId"] = provider_dataproduct
+        if consumer_dataproduct:
+            params["consumerDataProductId"] = consumer_dataproduct
+        if consumer_type:
+            params["consumerType"] = consumer_type
+        data, has_next = client.list_resources(RESOURCE_PATH, params=params)
         print_resource_list(data, RESOURCE_TYPE, fmt, has_next_page=has_next, page=page)
     except Exception as e:
         handle_error(e)
@@ -166,8 +185,7 @@ def request_access(
     consumer_count = sum(c is not None for c in (consumer_team, consumer_user, consumer_dataproduct))
     if consumer_count != 1:
         error_console.print(
-            "[red]Error: provide exactly one of --consumer-team, --consumer-user, "
-            "or --consumer-dataproduct.[/red]"
+            "[red]Error: provide exactly one of --consumer-team, --consumer-user, or --consumer-dataproduct.[/red]"
         )
         raise SystemExit(2)
 

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/api_keys.py

@@ -1,11 +1,10 @@
 """API Keys commands."""
 
-import json
 from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, console, print_success
+from entropy_data.output import OutputFormat, console, print_data, print_success
 
 api_keys_app = typer.Typer(no_args_is_help=True)
 RESOURCE_PATH = "api-keys"
@@ -38,8 +37,8 @@ def create_api_key(
 
         _raise_for_status(response)
         data = response.json()
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
+        if fmt != OutputFormat.table:
+            print_data(data, fmt)
         else:
             print_success(f"API key created: {data.get('organizationApiKeyId')}")
             key = data.get("key")

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/assets.py

@@ -1,12 +1,19 @@
 """Assets commands."""
 
-import json
 from pathlib import Path
 from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, console, print_link, print_resource, print_resource_list, print_success
+from entropy_data.output import (
+    OutputFormat,
+    console,
+    print_data,
+    print_link,
+    print_resource,
+    print_resource_list,
+    print_success,
+)
 from entropy_data.util import read_body
 
 assets_app = typer.Typer(no_args_is_help=True)
@@ -101,8 +108,8 @@ def list_asset_tags(
         )
         _raise_for_status(response)
         data = response.json()
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
+        if fmt != OutputFormat.table:
+            print_data(data, fmt)
         else:
             for tag in data:
                 console.print(tag)

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/connection.py

@@ -1,13 +1,12 @@
 """Connection management commands."""
 
-import json
 from typing import Annotated, Optional
 
 import typer
 from rich.table import Table
 
 from entropy_data import config as cfg
-from entropy_data.output import OutputFormat, console, print_error, print_success
+from entropy_data.output import OutputFormat, console, print_data, print_error, print_success
 
 connection_app = typer.Typer(no_args_is_help=True)
 
@@ -102,7 +101,7 @@ def get_connection(
     is_default = config.get("default_connection_name") == resolved_name
 
     fmt = output or get_output_format()
-    if fmt == OutputFormat.json:
+    if fmt != OutputFormat.table:
         payload = {
             "name": resolved_name,
             "host": conn.get("host", cfg.DEFAULT_HOST),
@@ -110,7 +109,7 @@ def get_connection(
             "api_key": displayed_key,
             "default": is_default,
         }
-        console.print_json(json.dumps(payload))
+        print_data(payload, fmt)
         return
 
     table = Table(show_header=False)

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/events.py

@@ -1,11 +1,10 @@
 """Events commands."""
 
-import json
 from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, console, print_resource_list
+from entropy_data.output import OutputFormat, print_data, print_resource_list
 
 events_app = typer.Typer(no_args_is_help=True)
 
@@ -24,8 +23,8 @@ def poll_events(
     try:
         client = get_client()
         data = client.get_events(last_event_id=last_event_id)
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
+        if fmt != OutputFormat.table:
+            print_data(data, fmt)
         else:
             print_resource_list(data, "events", fmt)
     except Exception as e:

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/gitconnections.py

@@ -1,11 +1,10 @@
 """Git connection subcommands. Used as a sub-typer of dataproducts and datacontracts."""
 
-import json
 from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, print_link, print_success
+from entropy_data.output import OutputFormat, print_data, print_link, print_success
 
 GIT_CONNECTION_TYPES = ("github", "gitlab", "bitbucket", "azuredevops")
 
@@ -31,10 +30,7 @@ def make_gitconnection_app(resource_path: str, resource_label: str) -> typer.Typ
         try:
             client = get_client()
             data = client.get_gitconnection(resource_path, id)
-            if fmt == OutputFormat.json:
-                print(json.dumps(data, indent=2))
-            else:
-                print(json.dumps(data, indent=2))
+            print_data(data, fmt)
         except Exception as e:
             handle_error(e)
 

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/lineage.py

@@ -1,12 +1,11 @@
 """Lineage commands (OpenLineage events)."""
 
-import json
 from pathlib import Path
 from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, console, print_resource_list, print_success
+from entropy_data.output import OutputFormat, print_resource_list, print_success
 from entropy_data.util import read_body
 
 lineage_app = typer.Typer(no_args_is_help=True)
@@ -46,10 +45,7 @@ def list_lineage(
             params["dataProductId"] = data_product_id
         client = get_client()
         data, _ = client.list_resources(RESOURCE_PATH, params=params)
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
-        else:
-            print_resource_list(data, RESOURCE_TYPE, fmt)
+        print_resource_list(data, RESOURCE_TYPE, fmt)
     except Exception as e:
         handle_error(e)
 

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/notification_channels.py

@@ -1,12 +1,11 @@
 """Team notification channel subcommands."""
 
-import json
 from pathlib import Path
 from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, console, print_success
+from entropy_data.output import OutputFormat, print_data, print_success
 from entropy_data.util import read_body
 
 notifications_app = typer.Typer(no_args_is_help=True)
@@ -34,10 +33,7 @@ def get_channel(
         response = client.session.get(_channel_url(client, team_id, channel_id), timeout=REQUEST_TIMEOUT)
         _raise_for_status(response)
         data = response.json()
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
-        else:
-            console.print_json(json.dumps(data))
+        print_data(data, fmt)
     except Exception as e:
         handle_error(e)
 

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/organization.py

@@ -1,12 +1,11 @@
 """Organization commands."""
 
-import json
 from typing import Annotated, Optional
 
 import typer
 from rich.table import Table
 
-from entropy_data.output import OutputFormat, console, print_resource, print_resource_list
+from entropy_data.output import OutputFormat, console, print_data, print_resource, print_resource_list
 
 organization_app = typer.Typer(no_args_is_help=True)
 members_app = typer.Typer(no_args_is_help=True)
@@ -29,8 +28,8 @@ def get_organization(
         )
         _raise_for_status(response)
         data = response.json()
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
+        if fmt != OutputFormat.table:
+            print_data(data, fmt)
             return
 
         table = Table(show_header=False)

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/search.py

@@ -5,7 +5,7 @@ from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, console
+from entropy_data.output import OutputFormat, console, print_data
 
 search_app = typer.Typer(no_args_is_help=True)
 
@@ -29,8 +29,8 @@ def search_query(
             params["resourceType"] = resource_type
         data = client.search(query, **params)
 
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
+        if fmt != OutputFormat.table:
+            print_data(data, fmt)
             return
 
         # Table output for search results

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/commands/usage.py

@@ -1,12 +1,11 @@
 """Usage commands (OpenTelemetry traces)."""
 
-import json
 from pathlib import Path
 from typing import Annotated, Optional
 
 import typer
 
-from entropy_data.output import OutputFormat, console, print_resource_list, print_success
+from entropy_data.output import OutputFormat, print_resource_list, print_success
 from entropy_data.util import read_body
 
 usage_app = typer.Typer(no_args_is_help=True)
@@ -41,10 +40,7 @@ def list_usage(
             params["dataContractId"] = data_contract_id
         client = get_client()
         data, _ = client.list_resources(RESOURCE_PATH, params=params)
-        if fmt == OutputFormat.json:
-            console.print_json(json.dumps(data))
-        else:
-            print_resource_list(data, RESOURCE_TYPE, fmt)
+        print_resource_list(data, RESOURCE_TYPE, fmt)
     except Exception as e:
         handle_error(e)
 

{entropy_data-0.3.6 → entropy_data-0.3.7}/src/entropy_data/output.py

@@ -3,6 +3,7 @@
 import json
 from enum import Enum
 
+import yaml
 from rich.console import Console
 from rich.table import Table
 
@@ -13,6 +14,15 @@ error_console = Console(stderr=True)
 class OutputFormat(str, Enum):
     table = "table"
     json = "json"
+    yaml = "yaml"
+
+
+def print_data(data, fmt: OutputFormat) -> None:
+    """Print data structured as JSON or YAML."""
+    if fmt == OutputFormat.yaml:
+        console.print(yaml.safe_dump(data, sort_keys=False, default_flow_style=False), end="")
+    else:
+        console.print_json(json.dumps(data))
 
 
 # Column definitions per resource type: list of (header, dict_key)
@@ -96,8 +106,8 @@ def _get_nested(data: dict, key: str) -> str:
 
 def print_resource(data: dict, resource_type: str, fmt: OutputFormat) -> None:
     """Print a single resource."""
-    if fmt == OutputFormat.json:
-        console.print_json(json.dumps(data))
+    if fmt != OutputFormat.table:
+        print_data(data, fmt)
         return
 
     columns = RESOURCE_COLUMNS.get(resource_type, [])
@@ -120,8 +130,8 @@ def print_resource_list(
     title: str | None = None,
 ) -> None:
     """Print a list of resources."""
-    if fmt == OutputFormat.json:
-        console.print_json(json.dumps(data))
+    if fmt != OutputFormat.table:
+        print_data(data, fmt)
         return
 
     columns = RESOURCE_COLUMNS.get(resource_type, [])

{entropy_data-0.3.6 → entropy_data-0.3.7}/tests/commands/test_access_request.py

@@ -116,3 +116,39 @@ def test_request_multiple_consumers(monkeypatch, tmp_path):
         ],
     )
     assert result.exit_code == 2
+
+
+@responses.activate
+def test_list_with_filters(monkeypatch, tmp_path):
+    _setup(monkeypatch, tmp_path)
+    responses.add(responses.GET, f"{BASE_URL}/api/access", json=[], status=200)
+    result = runner.invoke(
+        app,
+        [
+            "access",
+            "list",
+            "--provider-dataproduct",
+            "dp_provider",
+            "--consumer-dataproduct",
+            "dp_consumer",
+            "--consumer-type",
+            "team",
+        ],
+    )
+    assert result.exit_code == 0
+    qs = responses.calls[0].request.url.split("?", 1)[1]
+    assert "providerDataProductId=dp_provider" in qs
+    assert "consumerDataProductId=dp_consumer" in qs
+    assert "consumerType=team" in qs
+
+
+@responses.activate
+def test_list_without_filters(monkeypatch, tmp_path):
+    _setup(monkeypatch, tmp_path)
+    responses.add(responses.GET, f"{BASE_URL}/api/access", json=[], status=200)
+    result = runner.invoke(app, ["access", "list"])
+    assert result.exit_code == 0
+    qs = responses.calls[0].request.url.split("?", 1)[1]
+    assert "providerDataProductId" not in qs
+    assert "consumerDataProductId" not in qs
+    assert "consumerType" not in qs