pvw-cli 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

purviewcli/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.0.4"
+__version__ = "1.0.6"
 
 # Import main client modules
 from .client import *

purviewcli/cli/account.py

@@ -45,7 +45,7 @@ def get_account(ctx):
 
         from purviewcli.client._account import Account
         account_client = Account()
-        result = account_client.getAccount(args)
+        result = account_client.accountRead(args)
 
         if result:
             console.print("[green]✓ Account information retrieved successfully[/green]")
@@ -71,7 +71,7 @@ def get_access_keys(ctx):
 
         from purviewcli.client._account import Account
         account_client = Account()
-        result = account_client.getAccessKeys(args)
+        result = account_client.accountReadAccessKeys(args)
 
         if result:
             console.print("[green]✓ Access keys retrieved successfully[/green]")
@@ -101,7 +101,7 @@ def regenerate_access_keys(ctx, key_type):
 
         from purviewcli.client._account import Account
         account_client = Account()
-        result = account_client.regenerateAccessKeys(args)
+        result = account_client.accountRegenerateAccessKey(args)
 
         if result:
             console.print("[green]✓ Access keys regenerated successfully[/green]")
@@ -129,7 +129,7 @@ def update_account(ctx, friendly_name):
 
         from purviewcli.client._account import Account
         account_client = Account()
-        result = account_client.updateAccount(args)
+        result = account_client.accountUpdate(args)
 
         if result:
             console.print("[green]✓ Account updated successfully[/green]")
@@ -153,9 +153,9 @@ def get_collections(ctx):
 
         args = {}
 
-        from purviewcli.client._account import Account
-        account_client = Account()
-        result = account_client.getCollections(args)
+        from purviewcli.client._collections import Collections
+        account_client = Collections()
+        result = account_client.collectionsRead(args)
 
         if result:
             console.print("[green]✓ Collections retrieved successfully[/green]")
@@ -181,9 +181,9 @@ def get_collection(ctx, collection_name):
 
         args = {"--collectionName": collection_name}
 
-        from purviewcli.client._account import Account
-        account_client = Account()
-        result = account_client.getCollection(args)
+        from purviewcli.client._collections import Collections
+        account_client = Collections()
+        result = account_client.collectionsRead(args)
 
         if result:
             console.print("[green]✓ Collection information retrieved successfully[/green]")

purviewcli/cli/collections.py

@@ -48,7 +48,7 @@ def create(collection_name, friendly_name, description, parent_collection, paylo
             "--payloadFile": payload_file,
         }
         client = Collections()
-        result = client.collectionsCreateCollection(args)
+        result = client.collectionsCreate(args)
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")
@@ -61,7 +61,7 @@ def delete(collection_name):
     try:
         args = {"--collectionName": collection_name}
         client = Collections()
-        result = client.collectionsDeleteCollection(args)
+        result = client.collectionsDelete(args)
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")
@@ -74,7 +74,7 @@ def get(collection_name):
     try:
         args = {"--collectionName": collection_name}
         client = Collections()
-        result = client.collectionsGetCollection(args)
+        result = client.collectionsRead(args)
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")
@@ -85,7 +85,7 @@ def list():
     """List all collections"""
     try:
         client = Collections()
-        result = client.collectionsGetCollections({})
+        result = client.collectionsRead({})
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")
@@ -104,7 +104,7 @@ def import_csv(csv_file):
         args = {"--csv-file": csv_file}
         client = Collections()
         # You may need to implement this method in your client
-        result = client.importCollectionsFromCSV(args)
+        result = client.collectionsImport(args)
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")
@@ -130,7 +130,7 @@ def export_csv(output_file, include_hierarchy, include_metadata):
         }
         client = Collections()
         # You may need to implement this method in your client
-        result = client.exportCollectionsToCSV(args)
+        result = client.collectionsExport(args)
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")

purviewcli/cli/entity.py

@@ -1799,16 +1799,18 @@ def list(type_name, limit):
         from purviewcli.client._search import Search
         search_client = Search()
         
-        # Create search query payload
+        # Create search query payload with proper filter structure
         search_payload = {
             "keywords": "*",
             "limit": limit,
-            "filter": {}
         }
         
-        # Add type filter if specified
+        # Only add filter if type_name is specified
         if type_name:
-            search_payload["filter"]["entityType"] = [type_name]
+            search_payload["filter"] = {
+                "entityType": type_name  # Send as string, not array
+            }
+        # If no type specified, don't include filter at all
         
         # Convert to args format expected by searchQuery
         search_args = {

purviewcli/cli/types.py

@@ -275,7 +275,7 @@ def read_typedefs(include_term_template, type_):
     try:
         args = {'--includeTermTemplate': include_term_template, '--type': type_}
         client = Types()
-        result = client.typesReadTypeDefs(args)
+        result = client.typesRead(args)
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")
@@ -288,7 +288,7 @@ def read_typedefs_headers(include_term_template, type_):
     try:
         args = {'--includeTermTemplate': include_term_template, '--type': type_}
         client = Types()
-        result = client.typesReadTypeDefsHeaders(args)
+        result = client.typesReadHeaders(args)
         click.echo(json.dumps(result, indent=2))
     except Exception as e:
         click.echo(f"Error: {e}")

purviewcli/client/_search.py

@@ -33,27 +33,43 @@ class Search(Endpoint):
         self.endpoint = ENDPOINTS["discovery"]["query"]
         self.params = get_api_version_params("datamap")
         
-        # Build search payload
+        # Check if direct payload is provided
+        if args.get("--payload"):
+            import json
+            self.payload = json.loads(args["--payload"])
+            return
+        
+        # Check if payload file is provided
+        if args.get("--payloadFile"):
+            self.payload = get_json(args, "--payloadFile")
+            return
+        
+        # Build search payload from individual parameters
         search_request = {
             "keywords": args.get("--keywords", "*"),
             "limit": args.get("--limit", 50),
-            "offset": args.get("--offset", 0),
-            "filter": {},
-            "facets": []
+            "offset": args.get("--offset", 0)
         }
         
+        # Only add filter if there are actual filter values
+        filter_obj = {}
+        
         # Add filters if provided
         if args.get("--filter"):
-            search_request["filter"] = self._parse_filter(args["--filter"])
+            filter_obj.update(self._parse_filter(args["--filter"]))
         
         if args.get("--entityType"):
-            search_request["filter"]["entityType"] = args["--entityType"]
+            filter_obj["entityType"] = args["--entityType"]
             
         if args.get("--classification"):
-            search_request["filter"]["classification"] = args["--classification"]
+            filter_obj["classification"] = args["--classification"]
             
         if args.get("--term"):
-            search_request["filter"]["term"] = args["--term"]
+            filter_obj["term"] = args["--term"]
+        
+        # Only include filter if it has content
+        if filter_obj:
+            search_request["filter"] = filter_obj
         
         # Add facets if requested
         if args.get("--facets"):

{pvw_cli-1.0.4.dist-info → pvw_cli-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pvw-cli
-Version: 1.0.4
+Version: 1.0.6
 Summary: Microsoft Purview CLI with comprehensive automation capabilities
 Home-page: https://github.com/Keayoub/Purview_cli
 Author: Ayoub KEBAILI

{pvw_cli-1.0.4.dist-info → pvw_cli-1.0.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
-purviewcli/__init__.py,sha256=-LioA66byHYAaq4d7Guj4duZBvjABSNGO8Qzs0-ASxo,423
+purviewcli/__init__.py,sha256=4Em70RIQIEjQmZFrzWalQOgeNx_7jLGYVoevuxAjEwg,423
 purviewcli/__main__.py,sha256=n_PFo1PjW8L1OKCNLsW0vlVSo8tzac_saEYYLTu93iQ,372
 purviewcli/cli/__init__.py,sha256=vrqitIgq2VoisqaHifSpvfZ7DDRpskoF9YUUiPNOKBE,73
-purviewcli/cli/account.py,sha256=9Ru1SZri4BdyxqBNPF4sQ-AGPTVSZGiIRPfyp9SoIag,7038
+purviewcli/cli/account.py,sha256=YENHkBD0VREajDqtlkTJ-zUvq8aq7LF52HDSOSsgku8,7080
 purviewcli/cli/cli.py,sha256=imIuh8FoyT8OQGJAyoIYEP8ArAEtnF7GzRc-m1uQ3G8,5930
-purviewcli/cli/collections.py,sha256=WaVQyjg_1c4dIW9reB5o7426jB9mxjEJ45C25AWjuSI,4467
+purviewcli/cli/collections.py,sha256=eIhqdURUkc9SthZYJBbAAp6rYGUYylqPyUfjO0eaLhU,4416
 purviewcli/cli/data_product.py,sha256=WAoUlvugKAR0OHSDuzgtZ_3-QZVAtPzO4cmPWO6qgu0,11190
 purviewcli/cli/domain.py,sha256=zI7YPhcCa4u4MIwnWHQPngTUCKOs6C_rEkdpW-Kl6hM,20897
-purviewcli/cli/entity.py,sha256=XIaHSZXfsFQ1Yot6F4qxoaF1d6yZVG_DrQvBMJPcwVI,68977
+purviewcli/cli/entity.py,sha256=j3TCedQq9ELa-dz2BOLw_l1jhiwqrjpsGKPlS789Wr0,69113
 purviewcli/cli/glossary.py,sha256=Lt4ifyESuuaZLOzssv4GcQEO2AQKYS8Zy8L9UFfdglU,25696
 purviewcli/cli/insight.py,sha256=Kevqla6iZ7hPgb-gIWQiXSl2er-N0-Z7Q--IH1icWbs,3853
 purviewcli/cli/lineage.py,sha256=J7_KSwtdElWc2N5i5l1YBP6QzaWrqP6nnPrjDKzVEkE,21356
@@ -16,7 +16,7 @@ purviewcli/cli/relationship.py,sha256=Ky4klI-clKh6sRK7bsI7SwgtVrpo1ljegVyrbqjkeO
 purviewcli/cli/scan.py,sha256=91iKDH8iVNJKndJAisrKx3J4HRoPH2qfmxguLZH3xHY,13807
 purviewcli/cli/search.py,sha256=MQazyv_DumX6YJAWzQyN1PXwU5xiteoSgTcEwHHBxc8,5801
 purviewcli/cli/share.py,sha256=QRZhHM59RxdYqXOjSYLfVRZmjwMg4Y-bWxMSQVTQiIE,20197
-purviewcli/cli/types.py,sha256=2yngM9XYmwUIMbL0lDPpCSziKR-rQQ5C-bZEEvtQ-aE,23745
+purviewcli/cli/types.py,sha256=zo_8rAqDQ1vqi5y-dBh_sVY6i16UaJLLx_vBJBfZrrw,23729
 purviewcli/cli/workflow.py,sha256=DZLzVCZVp5k7gfBrh7YTARBHHEDgffQ8M0CBQh-h548,13260
 purviewcli/client/__init__.py,sha256=qjhTkXkgxlNUY3R1HkrT_Znt03-2d8JDolPVOeVv2xI,37
 purviewcli/client/_account.py,sha256=5lacA7vvjGBLHUDRjFR7B5E8eN6T07rctVDRXR9JFTY,12397
@@ -31,7 +31,7 @@ purviewcli/client/_management.py,sha256=2_ZXRSeEzGuHv1muUbn8mQb07enYYuHPI3NskIHI
 purviewcli/client/_policystore.py,sha256=wx9Yw6wcvj236ZmmitUKxW5u4YAtfJqAFNuxMpa7HIU,18078
 purviewcli/client/_relationship.py,sha256=KJZRltrzpTw7cfKjlZH2MuoTPS7eHxxp3cqU2etDSEA,9997
 purviewcli/client/_scan.py,sha256=2atEBD-kKWtFuBSWh2P0cwp42gfg7qgwWq-072QZMs4,15154
-purviewcli/client/_search.py,sha256=vrFvSOIIlneeD5G35qK35EFlGR740tGv6tIBoIYM46o,11172
+purviewcli/client/_search.py,sha256=IlqqBfDZ4dJqPh1PShMrkIm0_x_5wwMzIqkYZMUWMkQ,11678
 purviewcli/client/_share.py,sha256=vKENIhePuzi3WQazNfv5U9y-6yxRk222zrFA-SGh1pc,10494
 purviewcli/client/_types.py,sha256=ONa3wh1F02QOVy51UGq54121TkqRcWczdXIvNqPIFU0,15454
 purviewcli/client/_unified_catalog.py,sha256=ySIx2t5gfCGn4KDqNB2AvHQbfB4UC4e5DkujoyEZu2I,11814
@@ -52,8 +52,8 @@ purviewcli/client/settings.py,sha256=nYdnYurTZsgv9vcgljnzVxLPtYVl9q6IplqOzi1aRvI
 purviewcli/client/sync_client.py,sha256=IEuQVEud7bpBCwqfmAFGIj9c5Q_m2vb9uoK4ugGfa9c,5977
 purviewcli/plugins/__init__.py,sha256=rpt3OhFt_wSE_o8Ga8AXvw1pqkdBxLmjrhYtE_-LuJo,29
 purviewcli/plugins/plugin_system.py,sha256=C-_dL4FUj90o1JS7Saxkpov6fz0GIF5PFhZTYwqBkWE,26774
-pvw_cli-1.0.4.dist-info/METADATA,sha256=9hQ0urTPZgJj0IzllnFNW8cKct81F9-4sc7ulBQiKYc,12624
-pvw_cli-1.0.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-pvw_cli-1.0.4.dist-info/entry_points.txt,sha256=VI6AAbc6sWahOCX7sn_lhJIr9OiJM0pHF7rmw1YVGlE,82
-pvw_cli-1.0.4.dist-info/top_level.txt,sha256=LrADzPoKwF1xY0pGKpWauyOVruHCIWKCkT7cwIl6IuI,11
-pvw_cli-1.0.4.dist-info/RECORD,,
+pvw_cli-1.0.6.dist-info/METADATA,sha256=LNBPiYTOSi2u0zYiNFkptV6bfwyVCcYKCkKcaZfVppU,12624
+pvw_cli-1.0.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+pvw_cli-1.0.6.dist-info/entry_points.txt,sha256=VI6AAbc6sWahOCX7sn_lhJIr9OiJM0pHF7rmw1YVGlE,82
+pvw_cli-1.0.6.dist-info/top_level.txt,sha256=LrADzPoKwF1xY0pGKpWauyOVruHCIWKCkT7cwIl6IuI,11
+pvw_cli-1.0.6.dist-info/RECORD,,