msdev-kit 0.1.4__tar.gz → 0.1.6__tar.gz

{msdev_kit-0.1.4 → msdev_kit-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msdev-kit
-Version: 0.1.4
+Version: 0.1.6
 Summary: Microsoft developer toolkit: Fabric, MS Graph, and SharePoint
 License: MIT
 Author: Bernardo Rufino

{msdev_kit-0.1.4 → msdev_kit-0.1.6}/msdev_kit/__init__.py

@@ -1,3 +1,3 @@
 from .auth import Auth
 
-__version__ = "0.1.4"
+__version__ = "0.1.6"

{msdev_kit-0.1.4 → msdev_kit-0.1.6}/msdev_kit/fabric/report.py

@@ -252,11 +252,17 @@ class Report:
             visual_containers = section.get('visualContainers', [])
 
             for vc in visual_containers:
-                # The 'name' property inside 'config' is the unique Visual ID
-                visual_id = self._get_nested_value(vc, ['config', 'name'], 'No ID')
                 visual_type = 'Unknown'
                 visual_title = 'No Title'
                 vc_config = vc.get('config', {})
+                if isinstance(vc_config, str):
+                    try:
+                        vc_config = json.loads(vc_config)
+                    except json.JSONDecodeError:
+                        vc_config = {}
+
+                # The 'name' property inside 'config' is the unique Visual ID
+                visual_id = vc_config.get('name', 'No ID')
 
                 # --- 1. Handle Visual Groups (e.g., Filter Pane) ---
                 single_visual_group = vc_config.get('singleVisualGroup')
@@ -327,9 +333,11 @@ class Report:
 
         # Convert the list of records into a Pandas DataFrame
         report_name = self.get_report_name(workspace_id, report_id).replace(' ', '').replace('(', '').replace(')', '').strip()
+        folder_path = f'{self.data_dir}/pages_and_visuals'
+        os.makedirs(folder_path, exist_ok=True)
         df = pd.DataFrame(report_records)
         df.sort_values(by=['pageIndex', 'title'], inplace=True)
-        df.to_excel(f'{self.data_dir}/pages_and_visuals/{report_name}.xlsx', index=False)
+        df.to_excel(f'{folder_path}/{report_name}.xlsx', index=False)
 
         return df
 
@@ -440,29 +448,40 @@ class Report:
 
     def get_report_pages_and_visuals(
             self,
-            report_definition: Dict,
             workspace_id: str,
-            report_id: str) -> pd.DataFrame:
+            report_id: str,
+            operations: Operations) -> pd.DataFrame:
         """
-        Dispatcher. Detects the report format and delegates to the appropriate
-        pages-and-visuals parser.
+        Fetches report metadata and definition, then delegates to the appropriate
+        pages-and-visuals parser based on the report format.
 
         Args:
-            report_definition (dict): dict with 'format' and 'parts' keys, as
-                returned by report_content['definition'] from the Fabric API.
             workspace_id (str): workspace id.
             report_id (str): report id.
+            operations (Operations): Operations class instance.
 
         Returns:
-            pd.DataFrame: one row per visual. Empty DataFrame for unknown formats.
+            pd.DataFrame: one row per visual. Empty DataFrame on failure or unknown format.
         """
-        fmt = report_definition.get('format', '').lower()
-        parts = report_definition.get('parts', [])
+        metadata_result = self.get_report_metadata(workspace_id, report_id)
+        if metadata_result.get('message') != 'Success':
+            print('get_report_pages_and_visuals: failed to get report metadata.')
+            return pd.DataFrame()
+
+        metadata_format = metadata_result['content'].get('format', '')
+
+        definition_result = self.get_report_definition(workspace_id, report_id, operations)
+        if definition_result.get('message') != 'Success':
+            print('get_report_pages_and_visuals: failed to get report definition.')
+            return pd.DataFrame()
+
+        parts = definition_result['content'].get('parts', [])
+        fmt = metadata_format.lower()
 
         if fmt == 'pbir':
             return self.get_pbir_report_pages_and_visuals(parts, workspace_id, report_id)
 
-        elif fmt == 'pbir-legacy':
+        elif fmt == 'pbirlegacy':
             report_payload = None
             for part in parts:
                 if part.get('path') == 'report.json':
@@ -482,7 +501,7 @@ class Report:
             return self.get_legacy_report_pages_and_visuals(json_data, workspace_id, report_id)
 
         else:
-            print(f'get_report_pages_and_visuals: unsupported format "{fmt}".')
+            print(f'get_report_pages_and_visuals: unsupported format "{metadata_format}".')
             return pd.DataFrame()
 
 

{msdev_kit-0.1.4 → msdev_kit-0.1.6}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "msdev-kit"
 description = "Microsoft developer toolkit: Fabric, MS Graph, and SharePoint"
-version = "0.1.4"
+version = "0.1.6"
 requires-python = ">=3.10"
 readme = "README.md"
 license = {text = "MIT"}