Merge branch 'm-kovalsky/789'

Author: m-kovalsky

src/sempy_labs/lakehouse/_helper.py

@@ -1,7 +1,7 @@
 from uuid import UUID
 from typing import Optional, Literal
 import pyarrow.dataset as ds
-from .._helper_functions import (
+from sempy_labs._helper_functions import (
     _mount,
     delete_item,
     _base_api,
@@ -68,14 +68,16 @@ def read_vorder_tag(delta_log_path):
         latest_file = os.path.join(delta_log_path, json_files[0])
 
         with open(latest_file, "r") as f:
-            for line in f:
-                try:
-                    data = json.loads(line)
-                    if "commitInfo" in data:
-                        tags = data["commitInfo"].get("tags", {})
-                        return tags.get("VORDER", "false").lower() == "true"
-                except json.JSONDecodeError:
-                    continue  # Skip malformed lines
+            all_data = [json.loads(line) for line in f if line.strip()]  # one dict per line
+            for data in all_data:
+                if 'metaData' in data:
+                    return data.get('metaData', {}).get('configuration', {}).get('delta.parquet.vorder.enabled', 'false') == 'true'
+
+            # If no metaData, fall back to commitInfo
+            for data in all_data:
+                if "commitInfo" in data:
+                    tags = data["commitInfo"].get("tags", {})
+                    return tags.get("VORDER", "false").lower() == "true"
 
         return False  # Default if not found
 

src/sempy_labs/lakehouse/_lakehouse.py

@@ -2,7 +2,7 @@
 from typing import List, Optional, Union
 from sempy._utils._log import log
 from uuid import UUID
-from .._helper_functions import (
+from sempy_labs._helper_functions import (
     _base_api,
     resolve_lakehouse_name_and_id,
     resolve_workspace_name_and_id,
@@ -13,7 +13,7 @@
 import re
 import time
 import pandas as pd
-from .._job_scheduler import (
+from sempy_labs._job_scheduler import (
     _get_item_job_instance,
 )
 
@@ -231,7 +231,7 @@ def is_valid_format(time_string):
     if optimize:
         payload["executionData"]["optimizeSettings"] = {}
     if v_order:
-        payload["executionData"]["optimizeSettings"] = {"vorder": True}
+        payload["executionData"]["optimizeSettings"] = {"vOrder": True}
     if vacuum:
         payload["executionData"]["vacuumSettings"] = {}
     if vacuum and retention_period is not None:
@@ -242,16 +242,17 @@ def is_valid_format(time_string):
         method="post",
         payload=payload,
         status_codes=202,
+        client="fabric_sp",
     )
 
-    f"{icons.in_progress} The table maintenance job for the '{table_name}' table in the '{lakehouse_name}' lakehouse within the '{workspace_name}' workspace has been initiated."
+    print(f"{icons.in_progress} The table maintenance job for the '{table_name}' table in the '{lakehouse_name}' lakehouse within the '{workspace_name}' workspace has been initiated.")
 
     status_url = response.headers.get("Location").split("fabric.microsoft.com")[1]
     status = None
     while status not in ["Completed", "Failed"]:
         response = _base_api(request=status_url)
         status = response.json().get("status")
-        time.sleep(10)
+        time.sleep(3)
 
     df = _get_item_job_instance(url=status_url)