pvw-cli 1.0.4__tar.gz → 1.0.6__tar.gz

{pvw-cli-1.0.4 → pvw-cli-1.0.6}/PKG-INFO

@@ -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 → pvw-cli-1.0.6}/purviewcli/__init__.py

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

{pvw-cli-1.0.4 → pvw-cli-1.0.6}/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]")

{pvw-cli-1.0.4 → pvw-cli-1.0.6}/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}")

{pvw-cli-1.0.4 → pvw-cli-1.0.6}/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 = {

{pvw-cli-1.0.4 → pvw-cli-1.0.6}/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}")

{pvw-cli-1.0.4 → pvw-cli-1.0.6}/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 → pvw-cli-1.0.6}/pvw_cli.egg-info/PKG-INFO

@@ -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 → pvw-cli-1.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pvw-cli"
-version = "1.0.4"
+version = "1.0.6"
 description = " Microsoft Purview CLI with comprehensive automation capabilities"
 readme = "README.md"
 license = {text = "MIT"}