pvw-cli 1.2.4__py3-none-any.whl → 1.2.5__py3-none-any.whl

purviewcli/cli/unified_catalog.py

@@ -491,7 +491,7 @@ def delete(product_id, yes):
         if result is None or (isinstance(result, dict) and not result.get("error")):
             console.print(f"[green] SUCCESS:[/green] Deleted data product '{product_id}'")
         elif isinstance(result, dict) and "error" in result:
-            console.print(f"[red]ERROR:[/red] {result.get('error', 'Unknown error')}")
+                console.print(f"[red]ERROR:[/red] {result.get('error', 'Unknown error')}")
         else:
             console.print(f"[green] SUCCESS:[/green] Deleted data product '{product_id}'")
             if result:
@@ -501,11 +501,288 @@ def delete(product_id, yes):
         console.print(f"[red]ERROR:[/red] {str(e)}")
 
 
+@dataproduct.command(name="add-relationship")
+@click.option("--product-id", required=True, help="Data product ID (GUID)")
+@click.option("--entity-type", required=True, 
+              type=click.Choice(["CRITICALDATACOLUMN", "TERM", "DATAASSET", "CRITICALDATAELEMENT"], case_sensitive=False),
+              help="Type of entity to relate to")
+@click.option("--entity-id", required=True, help="Entity ID (GUID) to relate to")
+@click.option("--asset-id", help="Asset ID (GUID) - defaults to entity-id if not provided")
+@click.option("--relationship-type", default="Related", help="Relationship type (default: Related)")
+@click.option("--description", default="", help="Description of the relationship")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def add_relationship(product_id, entity_type, entity_id, asset_id, relationship_type, description, output):
+    """Create a relationship for a data product.
+    
+    Links a data product to another entity like a critical data column, term, or asset.
+    
+    Examples:
+        pvw uc dataproduct add-relationship --product-id <id> --entity-type CRITICALDATACOLUMN --entity-id <col-id>
+        pvw uc dataproduct add-relationship --product-id <id> --entity-type TERM --entity-id <term-id> --description "Primary term"
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {
+            "--product-id": [product_id],
+            "--entity-type": [entity_type],
+            "--entity-id": [entity_id],
+            "--relationship-type": [relationship_type],
+            "--description": [description]
+        }
+        
+        if asset_id:
+            args["--asset-id"] = [asset_id]
+        
+        result = client.create_data_product_relationship(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            if result and isinstance(result, dict):
+                console.print("[green]SUCCESS:[/green] Created relationship")
+                table = Table(title="Data Product Relationship", show_header=True)
+                table.add_column("Property", style="cyan")
+                table.add_column("Value", style="white")
+                
+                table.add_row("Entity ID", result.get("entityId", "N/A"))
+                table.add_row("Relationship Type", result.get("relationshipType", "N/A"))
+                table.add_row("Description", result.get("description", "N/A"))
+                
+                if "systemData" in result:
+                    sys_data = result["systemData"]
+                    table.add_row("Created By", sys_data.get("createdBy", "N/A"))
+                    table.add_row("Created At", sys_data.get("createdAt", "N/A"))
+                
+                console.print(table)
+            else:
+                console.print("[green]SUCCESS:[/green] Created relationship")
+                
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
+@dataproduct.command(name="list-relationships")
+@click.option("--product-id", required=True, help="Data product ID (GUID)")
+@click.option("--entity-type", 
+              type=click.Choice(["CRITICALDATACOLUMN", "TERM", "DATAASSET", "CRITICALDATAELEMENT"], case_sensitive=False),
+              help="Filter by entity type (optional)")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def list_relationships(product_id, entity_type, output):
+    """List relationships for a data product.
+    
+    Shows all entities linked to this data product, optionally filtered by type.
+    
+    Examples:
+        pvw uc dataproduct list-relationships --product-id <id>
+        pvw uc dataproduct list-relationships --product-id <id> --entity-type CRITICALDATACOLUMN
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {"--product-id": [product_id]}
+        
+        if entity_type:
+            args["--entity-type"] = [entity_type]
+        
+        result = client.get_data_product_relationships(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            relationships = result.get("value", []) if result else []
+            
+            if not relationships:
+                console.print(f"[yellow]No relationships found for data product '{product_id}'[/yellow]")
+                return
+            
+            table = Table(title=f"Data Product Relationships ({len(relationships)} found)", show_header=True)
+            table.add_column("Entity ID", style="cyan")
+            table.add_column("Relationship Type", style="white")
+            table.add_column("Description", style="white")
+            table.add_column("Created", style="dim")
+            
+            for rel in relationships:
+                table.add_row(
+                    rel.get("entityId", "N/A"),
+                    rel.get("relationshipType", "N/A"),
+                    rel.get("description", "")[:50] + ("..." if len(rel.get("description", "")) > 50 else ""),
+                    rel.get("systemData", {}).get("createdAt", "N/A")[:10]
+                )
+            
+            console.print(table)
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
+@dataproduct.command(name="remove-relationship")
+@click.option("--product-id", required=True, help="Data product ID (GUID)")
+@click.option("--entity-type", required=True,
+              type=click.Choice(["CRITICALDATACOLUMN", "TERM", "DATAASSET", "CRITICALDATAELEMENT"], case_sensitive=False),
+              help="Type of entity to unlink")
+@click.option("--entity-id", required=True, help="Entity ID (GUID) to unlink")
+@click.option("--confirm/--no-confirm", default=True, help="Ask for confirmation before deleting")
+def remove_relationship(product_id, entity_type, entity_id, confirm):
+    """Delete a relationship between a data product and an entity.
+    
+    Removes the link between a data product and a specific entity.
+    
+    Examples:
+        pvw uc dataproduct remove-relationship --product-id <id> --entity-type CRITICALDATACOLUMN --entity-id <col-id>
+        pvw uc dataproduct remove-relationship --product-id <id> --entity-type TERM --entity-id <term-id> --no-confirm
+    """
+    try:
+        if confirm:
+            confirm = click.confirm(
+                f"Are you sure you want to delete relationship to {entity_type} '{entity_id}'?",
+                default=False
+            )
+            if not confirm:
+                console.print("[yellow]Deletion cancelled.[/yellow]")
+                return
+        
+        client = UnifiedCatalogClient()
+        args = {
+            "--product-id": [product_id],
+            "--entity-type": [entity_type],
+            "--entity-id": [entity_id]
+        }
+        
+        result = client.delete_data_product_relationship(args)
+        
+        # DELETE returns 204 No Content on success
+        if result is None or (isinstance(result, dict) and not result.get("error")):
+            console.print(f"[green]SUCCESS:[/green] Deleted relationship to {entity_type} '{entity_id}'")
+        elif isinstance(result, dict) and "error" in result:
+            console.print(f"[red]ERROR:[/red] {result.get('error', 'Unknown error')}")
+        else:
+            console.print(f"[green]SUCCESS:[/green] Deleted relationship")
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
+@dataproduct.command(name="query")
+@click.option("--ids", multiple=True, help="Filter by specific product IDs (GUIDs)")
+@click.option("--domain-ids", multiple=True, help="Filter by domain IDs (GUIDs)")
+@click.option("--name-keyword", help="Filter by name keyword (partial match)")
+@click.option("--owners", multiple=True, help="Filter by owner IDs (GUIDs)")
+@click.option("--status", type=click.Choice(["Draft", "Published", "Expired"], case_sensitive=False),
+              help="Filter by status")
+@click.option("--multi-status", multiple=True,
+              type=click.Choice(["Draft", "Published", "Expired"], case_sensitive=False),
+              help="Filter by multiple statuses")
+@click.option("--type", help="Filter by data product type (e.g., Master, Operational)")
+@click.option("--types", multiple=True, help="Filter by multiple data product types")
+@click.option("--skip", type=int, default=0, help="Number of items to skip (pagination)")
+@click.option("--top", type=int, default=100, help="Number of items to return (max 1000)")
+@click.option("--order-by-field", help="Field to sort by (e.g., 'name', 'status')")
+@click.option("--order-by-direction", type=click.Choice(["asc", "desc"]), default="asc",
+              help="Sort direction")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def query_data_products(ids, domain_ids, name_keyword, owners, status, multi_status, type, types,
+                       skip, top, order_by_field, order_by_direction, output):
+    """Query data products with advanced filters.
+    
+    Perform complex searches across data products using multiple filter criteria.
+    Supports pagination and custom sorting.
+    
+    Examples:
+        # Find all data products in a specific domain
+        pvw uc dataproduct query --domain-ids <domain-guid>
+        
+        # Search by keyword
+        pvw uc dataproduct query --name-keyword "customer"
+        
+        # Filter by owner and status
+        pvw uc dataproduct query --owners <user-guid> --status Published
+        
+        # Pagination example
+        pvw uc dataproduct query --skip 0 --top 50 --order-by-field name
+        
+        # Multiple filters
+        pvw uc dataproduct query --domain-ids <guid1> <guid2> --status Published --type Master
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {}
+        
+        # Build args dict from parameters
+        if ids:
+            args["--ids"] = list(ids)
+        if domain_ids:
+            args["--domain-ids"] = list(domain_ids)
+        if name_keyword:
+            args["--name-keyword"] = [name_keyword]
+        if owners:
+            args["--owners"] = list(owners)
+        if status:
+            args["--status"] = [status]
+        if multi_status:
+            args["--multi-status"] = list(multi_status)
+        if type:
+            args["--type"] = [type]
+        if types:
+            args["--types"] = list(types)
+        if skip:
+            args["--skip"] = [str(skip)]
+        if top:
+            args["--top"] = [str(top)]
+        if order_by_field:
+            args["--order-by-field"] = [order_by_field]
+            args["--order-by-direction"] = [order_by_direction]
+        
+        result = client.query_data_products(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            products = result.get("value", []) if result else []
+            
+            if not products:
+                console.print("[yellow]No data products found matching the query.[/yellow]")
+                return
+            
+            # Check for pagination
+            next_link = result.get("nextLink")
+            if next_link:
+                console.print(f"[dim]Note: More results available (nextLink provided)[/dim]\n")
+            
+            table = Table(title=f"Query Results ({len(products)} found)", show_header=True)
+            table.add_column("Name", style="cyan")
+            table.add_column("ID", style="dim", no_wrap=True)
+            table.add_column("Domain", style="yellow", no_wrap=True)
+            table.add_column("Type", style="green")
+            table.add_column("Status", style="white")
+            table.add_column("Owner", style="magenta")
+            
+            for product in products:
+                # Extract owner info
+                contacts = product.get("contacts", {})
+                owners_list = contacts.get("owner", [])
+                owner_display = owners_list[0].get("id", "N/A")[:8] if owners_list else "N/A"
+                
+                table.add_row(
+                    product.get("name", "N/A"),
+                    product.get("id", "N/A")[:13] + "...",
+                    product.get("domain", "N/A")[:13] + "...",
+                    product.get("type", "N/A"),
+                    product.get("status", "N/A"),
+                    owner_display + "..."
+                )
+            
+            console.print(table)
+            
+            # Show pagination info
+            if skip > 0 or next_link:
+                console.print(f"\n[dim]Showing items {skip + 1} to {skip + len(products)}[/dim]")
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
 # ========================================
 # GLOSSARIES
 # ========================================
-
-
 @uc.group()
 def glossary():
     """Manage glossaries (for finding glossary GUIDs)."""
@@ -1657,6 +1934,119 @@ def update_terms_from_json(json_file, dry_run):
         console.print(f"[red]ERROR:[/red] {str(e)}")
 
 
+@term.command(name="query")
+@click.option("--ids", multiple=True, help="Filter by specific term IDs (GUIDs)")
+@click.option("--domain-ids", multiple=True, help="Filter by domain IDs (GUIDs)")
+@click.option("--name-keyword", help="Filter by name keyword (partial match)")
+@click.option("--acronyms", multiple=True, help="Filter by acronyms")
+@click.option("--owners", multiple=True, help="Filter by owner IDs (GUIDs)")
+@click.option("--status", type=click.Choice(["DRAFT", "PUBLISHED", "EXPIRED"], case_sensitive=False),
+              help="Filter by status")
+@click.option("--multi-status", multiple=True,
+              type=click.Choice(["DRAFT", "PUBLISHED", "EXPIRED"], case_sensitive=False),
+              help="Filter by multiple statuses")
+@click.option("--skip", type=int, default=0, help="Number of items to skip (pagination)")
+@click.option("--top", type=int, default=100, help="Number of items to return (max 1000)")
+@click.option("--order-by-field", help="Field to sort by (e.g., 'name', 'status')")
+@click.option("--order-by-direction", type=click.Choice(["asc", "desc"]), default="asc",
+              help="Sort direction")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def query_terms(ids, domain_ids, name_keyword, acronyms, owners, status, multi_status,
+               skip, top, order_by_field, order_by_direction, output):
+    """Query terms with advanced filters.
+    
+    Perform complex searches across glossary terms using multiple filter criteria.
+    Supports pagination and custom sorting.
+    
+    Examples:
+        # Find all terms in a specific domain
+        pvw uc term query --domain-ids <domain-guid>
+        
+        # Search by keyword
+        pvw uc term query --name-keyword "customer"
+        
+        # Filter by acronym
+        pvw uc term query --acronyms "PII" "GDPR"
+        
+        # Filter by owner and status
+        pvw uc term query --owners <user-guid> --status PUBLISHED
+        
+        # Pagination example
+        pvw uc term query --skip 0 --top 50 --order-by-field name --order-by-direction desc
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {}
+        
+        # Build args dict from parameters
+        if ids:
+            args["--ids"] = list(ids)
+        if domain_ids:
+            args["--domain-ids"] = list(domain_ids)
+        if name_keyword:
+            args["--name-keyword"] = [name_keyword]
+        if acronyms:
+            args["--acronyms"] = list(acronyms)
+        if owners:
+            args["--owners"] = list(owners)
+        if status:
+            args["--status"] = [status]
+        if multi_status:
+            args["--multi-status"] = list(multi_status)
+        if skip:
+            args["--skip"] = [str(skip)]
+        if top:
+            args["--top"] = [str(top)]
+        if order_by_field:
+            args["--order-by-field"] = [order_by_field]
+            args["--order-by-direction"] = [order_by_direction]
+        
+        result = client.query_terms(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            terms = result.get("value", []) if result else []
+            
+            if not terms:
+                console.print("[yellow]No terms found matching the query.[/yellow]")
+                return
+            
+            # Check for pagination
+            next_link = result.get("nextLink")
+            if next_link:
+                console.print(f"[dim]Note: More results available (nextLink provided)[/dim]\n")
+            
+            table = Table(title=f"Query Results ({len(terms)} found)", show_header=True)
+            table.add_column("Name", style="cyan")
+            table.add_column("ID", style="dim", no_wrap=True)
+            table.add_column("Domain", style="yellow", no_wrap=True)
+            table.add_column("Status", style="white")
+            table.add_column("Acronyms", style="green")
+            
+            for term in terms:
+                acronyms_list = term.get("acronyms", [])
+                acronyms_display = ", ".join(acronyms_list[:2]) if acronyms_list else "N/A"
+                if len(acronyms_list) > 2:
+                    acronyms_display += f" +{len(acronyms_list) - 2}"
+                
+                table.add_row(
+                    term.get("name", "N/A"),
+                    term.get("id", "N/A")[:13] + "...",
+                    term.get("domain", "N/A")[:13] + "...",
+                    term.get("status", "N/A"),
+                    acronyms_display
+                )
+            
+            console.print(table)
+            
+            # Show pagination info
+            if skip > 0 or next_link:
+                console.print(f"\n[dim]Showing items {skip + 1} to {skip + len(terms)}[/dim]")
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
 
 # ========================================
 # OBJECTIVES AND KEY RESULTS (OKRs)
@@ -1797,6 +2187,116 @@ def show(objective_id):
         console.print(f"[red]ERROR:[/red] {str(e)}")
 
 
+@objective.command(name="query")
+@click.option("--ids", multiple=True, help="Filter by specific objective IDs (GUIDs)")
+@click.option("--domain-ids", multiple=True, help="Filter by domain IDs (GUIDs)")
+@click.option("--definition", help="Filter by definition text (partial match)")
+@click.option("--owners", multiple=True, help="Filter by owner IDs (GUIDs)")
+@click.option("--status", type=click.Choice(["DRAFT", "ACTIVE", "COMPLETED", "ARCHIVED"], case_sensitive=False),
+              help="Filter by status")
+@click.option("--multi-status", multiple=True,
+              type=click.Choice(["DRAFT", "ACTIVE", "COMPLETED", "ARCHIVED"], case_sensitive=False),
+              help="Filter by multiple statuses")
+@click.option("--skip", type=int, default=0, help="Number of items to skip (pagination)")
+@click.option("--top", type=int, default=100, help="Number of items to return (max 1000)")
+@click.option("--order-by-field", help="Field to sort by (e.g., 'name', 'status')")
+@click.option("--order-by-direction", type=click.Choice(["asc", "desc"]), default="asc",
+              help="Sort direction")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def query_objectives(ids, domain_ids, definition, owners, status, multi_status,
+                    skip, top, order_by_field, order_by_direction, output):
+    """Query objectives with advanced filters.
+    
+    Perform complex searches across OKR objectives using multiple filter criteria.
+    Supports pagination and custom sorting.
+    
+    Examples:
+        # Find all objectives in a specific domain
+        pvw uc objective query --domain-ids <domain-guid>
+        
+        # Search by definition text
+        pvw uc objective query --definition "customer satisfaction"
+        
+        # Filter by owner and status
+        pvw uc objective query --owners <user-guid> --status ACTIVE
+        
+        # Find all completed objectives
+        pvw uc objective query --multi-status COMPLETED ARCHIVED
+        
+        # Pagination example
+        pvw uc objective query --skip 0 --top 50 --order-by-field name --order-by-direction asc
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {}
+        
+        # Build args dict from parameters
+        if ids:
+            args["--ids"] = list(ids)
+        if domain_ids:
+            args["--domain-ids"] = list(domain_ids)
+        if definition:
+            args["--definition"] = [definition]
+        if owners:
+            args["--owners"] = list(owners)
+        if status:
+            args["--status"] = [status]
+        if multi_status:
+            args["--multi-status"] = list(multi_status)
+        if skip:
+            args["--skip"] = [str(skip)]
+        if top:
+            args["--top"] = [str(top)]
+        if order_by_field:
+            args["--order-by-field"] = [order_by_field]
+            args["--order-by-direction"] = [order_by_direction]
+        
+        result = client.query_objectives(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            objectives = result.get("value", []) if result else []
+            
+            if not objectives:
+                console.print("[yellow]No objectives found matching the query.[/yellow]")
+                return
+            
+            # Check for pagination
+            next_link = result.get("nextLink")
+            if next_link:
+                console.print(f"[dim]Note: More results available (nextLink provided)[/dim]\n")
+            
+            table = Table(title=f"Query Results ({len(objectives)} found)", show_header=True)
+            table.add_column("Name", style="cyan")
+            table.add_column("ID", style="dim", no_wrap=True)
+            table.add_column("Domain", style="yellow", no_wrap=True)
+            table.add_column("Status", style="white")
+            table.add_column("Owner", style="green", no_wrap=True)
+            
+            for obj in objectives:
+                owner_display = "N/A"
+                if obj.get("owner"):
+                    owner_display = obj["owner"].get("id", "N/A")[:13] + "..."
+                
+                table.add_row(
+                    obj.get("name", "N/A"),
+                    obj.get("id", "N/A")[:13] + "...",
+                    obj.get("domain", "N/A")[:13] + "...",
+                    obj.get("status", "N/A"),
+                    owner_display
+                )
+            
+            console.print(table)
+            
+            # Show pagination info
+            if skip > 0 or next_link:
+                console.print(f"\n[dim]Showing items {skip + 1} to {skip + len(objectives)}[/dim]")
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
 # ========================================
 # CRITICAL DATA ELEMENTS (CDEs)
 # ========================================
@@ -1942,6 +2442,272 @@ def show(cde_id):
         console.print(f"[red]ERROR:[/red] {str(e)}")
 
 
+@cde.command(name="add-relationship")
+@click.option("--cde-id", required=True, help="Critical data element ID (GUID)")
+@click.option("--entity-type", required=True, 
+              type=click.Choice(["CRITICALDATACOLUMN", "TERM", "DATAASSET", "DATAPRODUCT"], case_sensitive=False),
+              help="Type of entity to relate to")
+@click.option("--entity-id", required=True, help="Entity ID (GUID) to relate to")
+@click.option("--asset-id", help="Asset ID (GUID) - defaults to entity-id if not provided")
+@click.option("--relationship-type", default="Related", help="Relationship type (default: Related)")
+@click.option("--description", default="", help="Description of the relationship")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def add_cde_relationship(cde_id, entity_type, entity_id, asset_id, relationship_type, description, output):
+    """Create a relationship for a critical data element.
+    
+    Links a CDE to another entity like a critical data column, term, or data product.
+    
+    Examples:
+        pvw uc cde add-relationship --cde-id <id> --entity-type CRITICALDATACOLUMN --entity-id <col-id>
+        pvw uc cde add-relationship --cde-id <id> --entity-type TERM --entity-id <term-id> --description "Primary term"
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {
+            "--cde-id": [cde_id],
+            "--entity-type": [entity_type],
+            "--entity-id": [entity_id],
+            "--relationship-type": [relationship_type],
+            "--description": [description]
+        }
+        
+        if asset_id:
+            args["--asset-id"] = [asset_id]
+        
+        result = client.create_cde_relationship(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            if result and isinstance(result, dict):
+                console.print("[green]SUCCESS:[/green] Created CDE relationship")
+                table = Table(title="CDE Relationship", show_header=True)
+                table.add_column("Property", style="cyan")
+                table.add_column("Value", style="white")
+                
+                table.add_row("Entity ID", result.get("entityId", "N/A"))
+                table.add_row("Relationship Type", result.get("relationshipType", "N/A"))
+                table.add_row("Description", result.get("description", "N/A"))
+                
+                if "systemData" in result:
+                    sys_data = result["systemData"]
+                    table.add_row("Created By", sys_data.get("createdBy", "N/A"))
+                    table.add_row("Created At", sys_data.get("createdAt", "N/A"))
+                
+                console.print(table)
+            else:
+                console.print("[green]SUCCESS:[/green] Created CDE relationship")
+                
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
+@cde.command(name="list-relationships")
+@click.option("--cde-id", required=True, help="Critical data element ID (GUID)")
+@click.option("--entity-type", 
+              type=click.Choice(["CRITICALDATACOLUMN", "TERM", "DATAASSET", "DATAPRODUCT"], case_sensitive=False),
+              help="Filter by entity type (optional)")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def list_cde_relationships(cde_id, entity_type, output):
+    """List relationships for a critical data element.
+    
+    Shows all entities linked to this CDE, optionally filtered by type.
+    
+    Examples:
+        pvw uc cde list-relationships --cde-id <id>
+        pvw uc cde list-relationships --cde-id <id> --entity-type CRITICALDATACOLUMN
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {"--cde-id": [cde_id]}
+        
+        if entity_type:
+            args["--entity-type"] = [entity_type]
+        
+        result = client.get_cde_relationships(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            relationships = result.get("value", []) if result else []
+            
+            if not relationships:
+                console.print(f"[yellow]No relationships found for CDE '{cde_id}'[/yellow]")
+                return
+            
+            table = Table(title=f"CDE Relationships ({len(relationships)} found)", show_header=True)
+            table.add_column("Entity ID", style="cyan")
+            table.add_column("Relationship Type", style="white")
+            table.add_column("Description", style="white")
+            table.add_column("Created", style="dim")
+            
+            for rel in relationships:
+                table.add_row(
+                    rel.get("entityId", "N/A"),
+                    rel.get("relationshipType", "N/A"),
+                    rel.get("description", "")[:50] + ("..." if len(rel.get("description", "")) > 50 else ""),
+                    rel.get("systemData", {}).get("createdAt", "N/A")[:10]
+                )
+            
+            console.print(table)
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
+@cde.command(name="remove-relationship")
+@click.option("--cde-id", required=True, help="Critical data element ID (GUID)")
+@click.option("--entity-type", required=True,
+              type=click.Choice(["CRITICALDATACOLUMN", "TERM", "DATAASSET", "DATAPRODUCT"], case_sensitive=False),
+              help="Type of entity to unlink")
+@click.option("--entity-id", required=True, help="Entity ID (GUID) to unlink")
+@click.option("--confirm/--no-confirm", default=True, help="Ask for confirmation before deleting")
+def remove_cde_relationship(cde_id, entity_type, entity_id, confirm):
+    """Delete a relationship between a CDE and an entity.
+    
+    Removes the link between a critical data element and a specific entity.
+    
+    Examples:
+        pvw uc cde remove-relationship --cde-id <id> --entity-type CRITICALDATACOLUMN --entity-id <col-id>
+        pvw uc cde remove-relationship --cde-id <id> --entity-type TERM --entity-id <term-id> --no-confirm
+    """
+    try:
+        if confirm:
+            confirm = click.confirm(
+                f"Are you sure you want to delete CDE relationship to {entity_type} '{entity_id}'?",
+                default=False
+            )
+            if not confirm:
+                console.print("[yellow]Deletion cancelled.[/yellow]")
+                return
+        
+        client = UnifiedCatalogClient()
+        args = {
+            "--cde-id": [cde_id],
+            "--entity-type": [entity_type],
+            "--entity-id": [entity_id]
+        }
+        
+        result = client.delete_cde_relationship(args)
+        
+        # DELETE returns 204 No Content on success
+        if result is None or (isinstance(result, dict) and not result.get("error")):
+            console.print(f"[green]SUCCESS:[/green] Deleted CDE relationship to {entity_type} '{entity_id}'")
+        elif isinstance(result, dict) and "error" in result:
+            console.print(f"[red]ERROR:[/red] {result.get('error', 'Unknown error')}")
+        else:
+            console.print(f"[green]SUCCESS:[/green] Deleted CDE relationship")
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
+@cde.command(name="query")
+@click.option("--ids", multiple=True, help="Filter by specific CDE IDs (GUIDs)")
+@click.option("--domain-ids", multiple=True, help="Filter by domain IDs (GUIDs)")
+@click.option("--name-keyword", help="Filter by name keyword (partial match)")
+@click.option("--owners", multiple=True, help="Filter by owner IDs (GUIDs)")
+@click.option("--status", type=click.Choice(["DRAFT", "PUBLISHED", "EXPIRED"], case_sensitive=False),
+              help="Filter by status")
+@click.option("--multi-status", multiple=True,
+              type=click.Choice(["DRAFT", "PUBLISHED", "EXPIRED"], case_sensitive=False),
+              help="Filter by multiple statuses")
+@click.option("--skip", type=int, default=0, help="Number of items to skip (pagination)")
+@click.option("--top", type=int, default=100, help="Number of items to return (max 1000)")
+@click.option("--order-by-field", help="Field to sort by (e.g., 'name', 'status')")
+@click.option("--order-by-direction", type=click.Choice(["asc", "desc"]), default="asc",
+              help="Sort direction")
+@click.option("--output", default="table", type=click.Choice(["json", "table"]), help="Output format")
+def query_cdes(ids, domain_ids, name_keyword, owners, status, multi_status,
+              skip, top, order_by_field, order_by_direction, output):
+    """Query critical data elements with advanced filters.
+    
+    Perform complex searches across CDEs using multiple filter criteria.
+    Supports pagination and custom sorting.
+    
+    Examples:
+        # Find all CDEs in a specific domain
+        pvw uc cde query --domain-ids <domain-guid>
+        
+        # Search by keyword
+        pvw uc cde query --name-keyword "customer"
+        
+        # Filter by owner and status
+        pvw uc cde query --owners <user-guid> --status PUBLISHED
+        
+        # Find all published or expired CDEs
+        pvw uc cde query --multi-status PUBLISHED EXPIRED
+        
+        # Pagination example
+        pvw uc cde query --skip 0 --top 50 --order-by-field name --order-by-direction desc
+    """
+    try:
+        client = UnifiedCatalogClient()
+        args = {}
+        
+        # Build args dict from parameters
+        if ids:
+            args["--ids"] = list(ids)
+        if domain_ids:
+            args["--domain-ids"] = list(domain_ids)
+        if name_keyword:
+            args["--name-keyword"] = [name_keyword]
+        if owners:
+            args["--owners"] = list(owners)
+        if status:
+            args["--status"] = [status]
+        if multi_status:
+            args["--multi-status"] = list(multi_status)
+        if skip:
+            args["--skip"] = [str(skip)]
+        if top:
+            args["--top"] = [str(top)]
+        if order_by_field:
+            args["--order-by-field"] = [order_by_field]
+            args["--order-by-direction"] = [order_by_direction]
+        
+        result = client.query_critical_data_elements(args)
+        
+        if output == "json":
+            console.print_json(data=result)
+        else:
+            cdes = result.get("value", []) if result else []
+            
+            if not cdes:
+                console.print("[yellow]No critical data elements found matching the query.[/yellow]")
+                return
+            
+            # Check for pagination
+            next_link = result.get("nextLink")
+            if next_link:
+                console.print(f"[dim]Note: More results available (nextLink provided)[/dim]\n")
+            
+            table = Table(title=f"Query Results ({len(cdes)} found)", show_header=True)
+            table.add_column("Name", style="cyan")
+            table.add_column("ID", style="dim", no_wrap=True)
+            table.add_column("Domain", style="yellow", no_wrap=True)
+            table.add_column("Status", style="white")
+            table.add_column("Data Type", style="green")
+            
+            for cde in cdes:
+                table.add_row(
+                    cde.get("name", "N/A"),
+                    cde.get("id", "N/A")[:13] + "...",
+                    cde.get("domain", "N/A")[:13] + "...",
+                    cde.get("status", "N/A"),
+                    cde.get("dataType", "N/A")
+                )
+            
+            console.print(table)
+            
+            # Show pagination info
+            if skip > 0 or next_link:
+                console.print(f"\n[dim]Showing items {skip + 1} to {skip + len(cdes)}[/dim]")
+            
+    except Exception as e:
+        console.print(f"[red]ERROR:[/red] {str(e)}")
+
+
 # ========================================
 # HEALTH MANAGEMENT - IMPLEMENTED! 
 # ========================================
@@ -1952,21 +2718,575 @@ uc.add_command(health_commands, name="health")
 
 
 # ========================================
-# CUSTOM ATTRIBUTES (Coming Soon)
+# DATA POLICIES (NEW)
+# ========================================
+
+
+@uc.group()
+def policy():
+    """Manage data governance policies."""
+    pass
+
+
+@policy.command(name="list")
+@click.option("--output", type=click.Choice(["table", "json"]), default="table", help="Output format")
+def list_policies(output):
+    """List all data governance policies."""
+    client = UnifiedCatalogClient()
+    response = client.list_policies({})
+    
+    if output == "json":
+        console.print_json(json.dumps(response))
+    else:
+        # API returns 'values' (plural), not 'value'
+        policies = response.get("values", response.get("value", []))
+        
+        if policies:
+            table = Table(title="[bold cyan]Data Governance Policies[/bold cyan]", show_header=True)
+            table.add_column("ID", style="cyan", no_wrap=True)
+            table.add_column("Name", style="green")
+            table.add_column("Entity Type", style="yellow")
+            table.add_column("Entity ID", style="magenta", no_wrap=True)
+            table.add_column("Rules", style="white")
+            
+            for item in policies:
+                props = item.get("properties", {})
+                entity = props.get("entity", {})
+                entity_type = entity.get("type", "N/A")
+                entity_ref = entity.get("referenceName", "N/A")
+                
+                # Count rules
+                decision_rules = len(props.get("decisionRules", []))
+                attribute_rules = len(props.get("attributeRules", []))
+                rules_summary = f"{decision_rules} decision, {attribute_rules} attribute"
+                
+                table.add_row(
+                    item.get("id", "N/A")[:36],  # Show only GUID
+                    item.get("name", "N/A"),
+                    entity_type.replace("Reference", ""),  # Clean up type name
+                    entity_ref[:36],  # Show only GUID
+                    rules_summary
+                )
+            
+            console.print(table)
+            console.print(f"\n[dim]Total: {len(policies)} policy/policies[/dim]")
+        else:
+            console.print("[yellow]No policies found[/yellow]")
+
+
+@policy.command(name="get")
+@click.option("--policy-id", required=True, help="Policy ID")
+@click.option("--output", type=click.Choice(["table", "json"]), default="json", help="Output format")
+def get_policy(policy_id, output):
+    """Get a specific data governance policy by ID."""
+    client = UnifiedCatalogClient()
+    
+    # Get all policies and filter (since GET by ID returns 404)
+    all_policies = client.list_policies({})
+    policies = all_policies.get("values", all_policies.get("value", []))
+    
+    # Find the requested policy
+    policy = next((p for p in policies if p.get("id") == policy_id), None)
+    
+    if not policy:
+        console.print(f"[red]ERROR:[/red] Policy with ID {policy_id} not found")
+        return
+    
+    if output == "json":
+        _format_json_output(policy)
+    else:
+        # Display policy in formatted view
+        props = policy.get("properties", {})
+        entity = props.get("entity", {})
+        
+        console.print(f"\n[bold cyan]Policy Details[/bold cyan]")
+        console.print(f"[bold]ID:[/bold] {policy.get('id')}")
+        console.print(f"[bold]Name:[/bold] {policy.get('name')}")
+        console.print(f"[bold]Version:[/bold] {policy.get('version', 0)}")
+        
+        console.print(f"\n[bold cyan]Entity[/bold cyan]")
+        console.print(f"[bold]Type:[/bold] {entity.get('type', 'N/A')}")
+        console.print(f"[bold]Reference:[/bold] {entity.get('referenceName', 'N/A')}")
+        console.print(f"[bold]Parent:[/bold] {props.get('parentEntityName', 'N/A')}")
+        
+        # Decision Rules
+        decision_rules = props.get("decisionRules", [])
+        if decision_rules:
+            console.print(f"\n[bold cyan]Decision Rules ({len(decision_rules)})[/bold cyan]")
+            for i, rule in enumerate(decision_rules, 1):
+                console.print(f"\n  [bold]Rule {i}:[/bold] {rule.get('kind', 'N/A')}")
+                console.print(f"  [bold]Effect:[/bold] {rule.get('effect', 'N/A')}")
+                if "dnfCondition" in rule:
+                    console.print(f"  [bold]Conditions:[/bold] {len(rule['dnfCondition'])} clause(s)")
+        
+        # Attribute Rules
+        attribute_rules = props.get("attributeRules", [])
+        if attribute_rules:
+            console.print(f"\n[bold cyan]Attribute Rules ({len(attribute_rules)})[/bold cyan]")
+            for i, rule in enumerate(attribute_rules, 1):
+                console.print(f"\n  [bold]Rule {i}:[/bold] {rule.get('name', rule.get('id', 'N/A'))}")
+                if "dnfCondition" in rule:
+                    conditions = rule.get("dnfCondition", [])
+                    console.print(f"  [bold]Conditions:[/bold] {len(conditions)} clause(s)")
+                    for j, clause in enumerate(conditions[:3], 1):  # Show first 3
+                        if clause:
+                            attr = clause[0] if isinstance(clause, list) else clause
+                            console.print(f"    {j}. {attr.get('attributeName', 'N/A')}")
+                    if len(conditions) > 3:
+                        console.print(f"    ... and {len(conditions) - 3} more")
+        
+        console.print()
+
+
+
+@policy.command(name="create")
+@click.option("--name", required=True, help="Policy name")
+@click.option("--policy-type", required=True, help="Policy type (e.g., access, retention)")
+@click.option("--description", default="", help="Policy description")
+@click.option("--status", default="active", help="Policy status (active, draft)")
+def create_policy(name, policy_type, description, status):
+    """Create a new data governance policy."""
+    client = UnifiedCatalogClient()
+    args = {
+        "--name": [name],
+        "--policy-type": [policy_type],
+        "--description": [description],
+        "--status": [status]
+    }
+    response = client.create_policy(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Policy created")
+    _format_json_output(response)
+
+
+@policy.command(name="update")
+@click.option("--policy-id", required=True, help="Policy ID")
+@click.option("--name", help="New policy name")
+@click.option("--description", help="New policy description")
+@click.option("--status", help="New policy status")
+def update_policy(policy_id, name, description, status):
+    """Update an existing data governance policy."""
+    client = UnifiedCatalogClient()
+    args = {"--policy-id": [policy_id]}
+    
+    if name:
+        args["--name"] = [name]
+    if description:
+        args["--description"] = [description]
+    if status:
+        args["--status"] = [status]
+    
+    response = client.update_policy(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Policy updated")
+    _format_json_output(response)
+
+
+@policy.command(name="delete")
+@click.option("--policy-id", required=True, help="Policy ID")
+@click.confirmation_option(prompt="Are you sure you want to delete this policy?")
+def delete_policy(policy_id):
+    """Delete a data governance policy."""
+    client = UnifiedCatalogClient()
+    args = {"--policy-id": [policy_id]}
+    response = client.delete_policy(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Policy '{policy_id}' deleted")
+
+
+# ========================================
+# CUSTOM METADATA (NEW)
+# ========================================
+
+
+@uc.group()
+def metadata():
+    """Manage custom metadata for assets."""
+    pass
+
+
+@metadata.command(name="list")
+@click.option("--output", type=click.Choice(["table", "json"]), default="table", help="Output format")
+@click.option("--fallback/--no-fallback", default=True, help="Fallback to Business Metadata if UC is empty")
+def list_custom_metadata(output, fallback):
+    """List all custom metadata definitions.
+    
+    Uses Atlas API to get Business Metadata definitions. 
+    With fallback enabled, shows user-friendly table format.
+    """
+    client = UnifiedCatalogClient()
+    response = client.list_custom_metadata({})
+    
+    # Check if UC API returned business metadata (Atlas returns businessMetadataDefs)
+    has_uc_data = (response and "businessMetadataDefs" in response 
+                   and response["businessMetadataDefs"])
+    
+    if output == "json":
+        if has_uc_data:
+            console.print_json(json.dumps(response))
+        elif fallback:
+            # Fallback message (though Atlas API should always return something)
+            console.print("[dim]No business metadata found.[/dim]\n")
+            console.print_json(json.dumps({"businessMetadataDefs": []}))
+        else:
+            console.print_json(json.dumps(response))
+    else:
+        # Table output
+        if has_uc_data:
+            biz_metadata = response.get('businessMetadataDefs', [])
+            
+            if biz_metadata:
+                table = Table(title="[bold green]Business Metadata Attributes[/bold green]", show_header=True)
+                table.add_column("Attribute Name", style="green", no_wrap=True)
+                table.add_column("Group", style="cyan")
+                table.add_column("Type", style="yellow")
+                table.add_column("Scope", style="magenta", max_width=25)
+                table.add_column("Description", style="white", max_width=30)
+                
+                total_attrs = 0
+                for group in biz_metadata:
+                    group_name = group.get('name', 'N/A')
+                    attributes = group.get('attributeDefs', [])
+                    
+                    # Parse group-level scope
+                    group_scope = "N/A"
+                    options = group.get('options', {})
+                    if 'dataGovernanceOptions' in options:
+                        try:
+                            dg_opts_str = options.get('dataGovernanceOptions', '{}')
+                            dg_opts = json.loads(dg_opts_str) if isinstance(dg_opts_str, str) else dg_opts_str
+                            applicable = dg_opts.get('applicableConstructs', [])
+                            if applicable:
+                                # Categorize scope
+                                has_business_concept = any('businessConcept' in c or 'domain' in c for c in applicable)
+                                has_dataset = any('dataset' in c.lower() for c in applicable)
+                                
+                                if has_business_concept and has_dataset:
+                                    group_scope = "Universal (Concept + Dataset)"
+                                elif has_business_concept:
+                                    group_scope = "Business Concept"
+                                elif has_dataset:
+                                    group_scope = "Data Asset"
+                                else:
+                                    # Show first 2 constructs
+                                    scope_parts = []
+                                    for construct in applicable[:2]:
+                                        if ':' in construct:
+                                            scope_parts.append(construct.split(':')[0])
+                                        else:
+                                            scope_parts.append(construct)
+                                    group_scope = ', '.join(scope_parts)
+                        except:
+                            pass
+                    
+                    for attr in attributes:
+                        total_attrs += 1
+                        attr_name = attr.get('name', 'N/A')
+                        attr_type = attr.get('typeName', 'N/A')
+                        
+                        # Simplify enum types
+                        if 'ATTRIBUTE_ENUM_' in attr_type:
+                            attr_type = 'Enum'
+                        
+                        attr_desc = attr.get('description', '')
+                        
+                        # Check if attribute has custom scope
+                        attr_scope = group_scope
+                        attr_opts = attr.get('options', {})
+                        
+                        # Check dataGovernanceOptions first
+                        if 'dataGovernanceOptions' in attr_opts:
+                            try:
+                                attr_dg_str = attr_opts.get('dataGovernanceOptions', '{}')
+                                attr_dg = json.loads(attr_dg_str) if isinstance(attr_dg_str, str) else attr_dg_str
+                                inherit = attr_dg.get('inheritApplicableConstructsFromGroup', True)
+                                if not inherit:
+                                    attr_applicable = attr_dg.get('applicableConstructs', [])
+                                    if attr_applicable:
+                                        # Categorize custom scope
+                                        has_business_concept = any('businessConcept' in c or 'domain' in c for c in attr_applicable)
+                                        has_dataset = any('dataset' in c.lower() for c in attr_applicable)
+                                        
+                                        if has_business_concept and has_dataset:
+                                            attr_scope = "Universal"
+                                        elif has_business_concept:
+                                            attr_scope = "Business Concept"
+                                        elif has_dataset:
+                                            attr_scope = "Data Asset"
+                                        else:
+                                            attr_scope = f"Custom ({len(attr_applicable)})"
+                            except:
+                                pass
+                        
+                        # Fallback: Check applicableEntityTypes (older format)
+                        if attr_scope == "N/A" and 'applicableEntityTypes' in attr_opts:
+                            try:
+                                entity_types_str = attr_opts.get('applicableEntityTypes', '[]')
+                                # Parse if string, otherwise use as-is
+                                if isinstance(entity_types_str, str):
+                                    entity_types = json.loads(entity_types_str)
+                                else:
+                                    entity_types = entity_types_str
+                                
+                                if entity_types and isinstance(entity_types, list):
+                                    # Check if entity types are data assets (tables, etc.)
+                                    if any('table' in et.lower() or 'database' in et.lower() or 'file' in et.lower() 
+                                           for et in entity_types):
+                                        attr_scope = "Data Asset"
+                                    else:
+                                        attr_scope = f"Assets ({len(entity_types)} types)"
+                            except Exception as e:
+                                # Silently fail but could log for debugging
+                                pass
+                        
+                        table.add_row(
+                            attr_name,
+                            group_name,
+                            attr_type,
+                            attr_scope,
+                            attr_desc[:30] + "..." if len(attr_desc) > 30 else attr_desc
+                        )
+                
+                console.print(table)
+                console.print(f"\n[cyan]Total:[/cyan] {total_attrs} business metadata attribute(s) in {len(biz_metadata)} group(s)")
+                console.print("\n[dim]Legend:[/dim]")
+                console.print("  [magenta]Business Concept[/magenta] = Applies to Terms, Domains, Business Rules")
+                console.print("  [magenta]Data Asset[/magenta] = Applies to Tables, Files, Databases")
+                console.print("  [magenta]Universal[/magenta] = Applies to both Concepts and Assets")
+            else:
+                console.print("[yellow]No business metadata found[/yellow]")
+        else:
+            console.print("[yellow]No business metadata found[/yellow]")
+
+
+@metadata.command(name="get")
+@click.option("--asset-id", required=True, help="Asset GUID")
+@click.option("--output", type=click.Choice(["table", "json"]), default="json", help="Output format")
+def get_custom_metadata(asset_id, output):
+    """Get custom metadata (business metadata) for a specific asset."""
+    client = UnifiedCatalogClient()
+    args = {"--asset-id": [asset_id]}
+    response = client.get_custom_metadata(args)
+    
+    if output == "json":
+        # Extract businessAttributes from entity response
+        # Note: API returns "businessAttributes" not "businessMetadata"
+        if response and "entity" in response:
+            business_metadata = response["entity"].get("businessAttributes", {})
+            _format_json_output(business_metadata)
+        elif response and isinstance(response, dict):
+            business_metadata = response.get("businessAttributes", {})
+            _format_json_output(business_metadata)
+        else:
+            _format_json_output({})
+    else:
+        table = Table(title=f"[bold cyan]Business Metadata for Asset: {asset_id}[/bold cyan]")
+        table.add_column("Group", style="cyan")
+        table.add_column("Attribute", style="green")
+        table.add_column("Value", style="white")
+        
+        if response and "entity" in response:
+            business_metadata = response["entity"].get("businessAttributes", {})
+            if business_metadata:
+                for group_name, attributes in business_metadata.items():
+                    if isinstance(attributes, dict):
+                        for attr_name, attr_value in attributes.items():
+                            table.add_row(group_name, attr_name, str(attr_value))
+        elif response and isinstance(response, dict):
+            business_metadata = response.get("businessAttributes", {})
+            if business_metadata:
+                for group_name, attributes in business_metadata.items():
+                    if isinstance(attributes, dict):
+                        for attr_name, attr_value in attributes.items():
+                            table.add_row(group_name, attr_name, str(attr_value))
+        
+        console.print(table)
+
+
+@metadata.command(name="add")
+@click.option("--asset-id", required=True, help="Asset GUID")
+@click.option("--group", required=True, help="Business metadata group name (e.g., 'Governance', 'Privacy')")
+@click.option("--key", required=True, help="Attribute name")
+@click.option("--value", required=True, help="Attribute value")
+def add_custom_metadata(asset_id, group, key, value):
+    """Add custom metadata (business metadata) to an asset.
+    
+    Example: pvw uc metadata add --asset-id <guid> --group Governance --key DataOwner --value "John Doe"
+    """
+    client = UnifiedCatalogClient()
+    args = {
+        "--asset-id": [asset_id],
+        "--group": [group],
+        "--key": [key],
+        "--value": [value]
+    }
+    response = client.add_custom_metadata(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Business metadata '{key}' added to group '{group}' on asset '{asset_id}'")
+    if response:
+        _format_json_output(response)
+
+
+@metadata.command(name="update")
+@click.option("--asset-id", required=True, help="Asset GUID")
+@click.option("--group", required=True, help="Business metadata group name")
+@click.option("--key", required=True, help="Attribute name to update")
+@click.option("--value", required=True, help="New attribute value")
+def update_custom_metadata(asset_id, group, key, value):
+    """Update custom metadata (business metadata) for an asset.
+    
+    Example: pvw uc metadata update --asset-id <guid> --group Governance --key DataOwner --value "Jane Smith"
+    """
+    client = UnifiedCatalogClient()
+    args = {
+        "--asset-id": [asset_id],
+        "--group": [group],
+        "--key": [key],
+        "--value": [value]
+    }
+    response = client.update_custom_metadata(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Business metadata '{key}' updated in group '{group}' on asset '{asset_id}'")
+    if response:
+        _format_json_output(response)
+
+
+@metadata.command(name="delete")
+@click.option("--asset-id", required=True, help="Asset GUID")
+@click.option("--group", required=True, help="Business metadata group name to delete")
+@click.confirmation_option(prompt="Are you sure you want to delete this business metadata group?")
+def delete_custom_metadata(asset_id, group):
+    """Delete custom metadata (business metadata) from an asset.
+    
+    This removes the entire business metadata group from the asset.
+    Example: pvw uc metadata delete --asset-id <guid> --group Governance
+    """
+    client = UnifiedCatalogClient()
+    args = {
+        "--asset-id": [asset_id],
+        "--group": [group]
+    }
+    response = client.delete_custom_metadata(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Business metadata group '{group}' deleted from asset '{asset_id}'")
+
+
+# ========================================
+# CUSTOM ATTRIBUTES (NEW)
 # ========================================
 
 
 @uc.group()
 def attribute():
-    """Manage custom attributes (coming soon)."""
+    """Manage custom attribute definitions."""
     pass
 
 
 @attribute.command(name="list")
-def list_attributes():
-    """List custom attributes (coming soon)."""
-    console.print("[yellow]🚧 Custom Attributes are coming soon[/yellow]")
-    console.print("This feature is under development in Microsoft Purview")
+@click.option("--output", type=click.Choice(["table", "json"]), default="table", help="Output format")
+def list_custom_attributes(output):
+    """List all custom attribute definitions."""
+    client = UnifiedCatalogClient()
+    response = client.list_custom_attributes({})
+    
+    if output == "json":
+        console.print_json(json.dumps(response))
+    else:
+        if "value" in response and response["value"]:
+            table = Table(title="[bold cyan]Custom Attribute Definitions[/bold cyan]", show_header=True)
+            table.add_column("ID", style="cyan")
+            table.add_column("Name", style="green")
+            table.add_column("Data Type", style="yellow")
+            table.add_column("Required", style="magenta")
+            table.add_column("Description", style="white")
+            
+            for item in response["value"]:
+                table.add_row(
+                    item.get("id", "N/A"),
+                    item.get("name", "N/A"),
+                    item.get("dataType", "N/A"),
+                    "Yes" if item.get("required") else "No",
+                    item.get("description", "")[:50] + "..." if len(item.get("description", "")) > 50 else item.get("description", "")
+                )
+            console.print(table)
+        else:
+            console.print("[yellow]No custom attributes found[/yellow]")
+
+
+@attribute.command(name="get")
+@click.option("--attribute-id", required=True, help="Attribute ID")
+@click.option("--output", type=click.Choice(["table", "json"]), default="json", help="Output format")
+def get_custom_attribute(attribute_id, output):
+    """Get a specific custom attribute definition."""
+    client = UnifiedCatalogClient()
+    args = {"--attribute-id": [attribute_id]}
+    response = client.get_custom_attribute(args)
+    
+    if output == "json":
+        _format_json_output(response)
+    else:
+        table = Table(title=f"[bold cyan]Attribute: {response.get('name', 'N/A')}[/bold cyan]")
+        table.add_column("Property", style="cyan")
+        table.add_column("Value", style="white")
+        
+        for key, value in response.items():
+            table.add_row(key, str(value))
+        console.print(table)
+
+
+@attribute.command(name="create")
+@click.option("--name", required=True, help="Attribute name")
+@click.option("--data-type", required=True, help="Data type (string, number, boolean, date)")
+@click.option("--description", default="", help="Attribute description")
+@click.option("--required", is_flag=True, help="Is this attribute required?")
+def create_custom_attribute(name, data_type, description, required):
+    """Create a new custom attribute definition."""
+    client = UnifiedCatalogClient()
+    args = {
+        "--name": [name],
+        "--data-type": [data_type],
+        "--description": [description],
+        "--required": ["true" if required else "false"]
+    }
+    response = client.create_custom_attribute(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Custom attribute created")
+    _format_json_output(response)
+
+
+@attribute.command(name="update")
+@click.option("--attribute-id", required=True, help="Attribute ID")
+@click.option("--name", help="New attribute name")
+@click.option("--description", help="New attribute description")
+@click.option("--required", type=bool, help="Is this attribute required? (true/false)")
+def update_custom_attribute(attribute_id, name, description, required):
+    """Update an existing custom attribute definition."""
+    client = UnifiedCatalogClient()
+    args = {"--attribute-id": [attribute_id]}
+    
+    if name:
+        args["--name"] = [name]
+    if description:
+        args["--description"] = [description]
+    if required is not None:
+        args["--required"] = ["true" if required else "false"]
+    
+    response = client.update_custom_attribute(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Custom attribute updated")
+    _format_json_output(response)
+
+
+@attribute.command(name="delete")
+@click.option("--attribute-id", required=True, help="Attribute ID")
+@click.confirmation_option(prompt="Are you sure you want to delete this attribute?")
+def delete_custom_attribute(attribute_id):
+    """Delete a custom attribute definition."""
+    client = UnifiedCatalogClient()
+    args = {"--attribute-id": [attribute_id]}
+    response = client.delete_custom_attribute(args)
+    
+    console.print(f"[green]SUCCESS:[/green] Custom attribute '{attribute_id}' deleted")
 
 
 # ========================================