semantic-link-labs 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

sempy_labs/report/_reportwrapper.py

@@ -1,4 +1,3 @@
-import sempy.fabric as fabric
 from sempy_labs._helper_functions import (
     resolve_report_id,
     format_dax_object_name,
@@ -6,9 +5,11 @@ from sempy_labs._helper_functions import (
     _conv_b64,
     _extract_json,
     _add_part,
-    lro,
     _decode_b64,
     resolve_workspace_name_and_id,
+    _update_dataframe_datatypes,
+    _base_api,
+    _create_dataframe,
 )
 from typing import Optional, List
 import pandas as pd
@@ -21,6 +22,7 @@ import sempy_labs.report._report_helper as helper
 from sempy_labs._model_dependencies import get_measure_dependencies
 from jsonpath_ng.ext import parse
 import warnings
+import requests
 
 
 class ReportWrapper:
@@ -144,14 +146,14 @@ class ReportWrapper:
 
     def update_report(self, request_body: dict):
 
-        client = fabric.FabricRestClient()
-        response = client.post(
-            f"/v1/workspaces/{self._workspace_id}/reports/{self._report_id}/updateDefinition",
-            json=request_body,
+        _base_api(
+            request=f"/v1/workspaces/{self._workspace_id}/reports/{self._report_id}/updateDefinition",
+            method="post",
+            payload=request_body,
+            lro_return_status_code=True,
+            status_codes=None,
         )
 
-        lro(client, response, return_status_code=True)
-
     def resolve_page_name(self, page_display_name: str) -> UUID:
         """
         Obtains the page name, page display name, and the file path for a given page in a report.
@@ -253,7 +255,13 @@ class ReportWrapper:
 
         helper.populate_custom_visual_display_names()
 
-        df = pd.DataFrame(columns=["Custom Visual Name", "Custom Visual Display Name"])
+        columns = {
+            "Custom Visual Name": "str",
+            "Custom Visual Display Name": "str",
+            "Used in Report": "bool",
+        }
+
+        df = _create_dataframe(columns=columns)
         rd = self.rdef
         rd_filt = rd[rd["path"] == "definition/report.json"]
         rptJson = _extract_json(rd_filt)
@@ -266,8 +274,7 @@ class ReportWrapper:
             self.list_visuals()["Type"]
         )
 
-        bool_cols = ["Used in Report"]
-        df[bool_cols] = df[bool_cols].astype(bool)
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         return df
 
@@ -289,19 +296,18 @@ class ReportWrapper:
 
         rd_filt = self.rdef[self.rdef["path"] == "definition/report.json"]
 
-        df = pd.DataFrame(
-            columns=[
-                "Filter Name",
-                "Type",
-                "Table Name",
-                "Object Name",
-                "Object Type",
-                "Hidden",
-                "Locked",
-                "How Created",
-                "Used",
-            ]
-        )
+        columns = {
+            "Filter Name": "str",
+            "Type": "str",
+            "Table Name": "str",
+            "Object Name": "str",
+            "Object Type": "str",
+            "Hidden": "bool",
+            "Locked": "bool",
+            "How Created": "str",
+            "Used": "bool",
+        }
+        df = _create_dataframe(columns=columns)
 
         if len(rd_filt) == 1:
             rpt_json = _extract_json(rd_filt)
@@ -333,8 +339,7 @@ class ReportWrapper:
                             [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
                         )
 
-        bool_cols = ["Hidden", "Locked", "Used"]
-        df[bool_cols] = df[bool_cols].astype(bool)
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         if extended:
             df = self._add_extended(dataframe=df)
@@ -357,24 +362,22 @@ class ReportWrapper:
             A pandas dataframe containing a list of all the page filters used in the report.
         """
 
-        rd = self.rdef
-        df = pd.DataFrame(
-            columns=[
-                "Page Name",
-                "Page Display Name",
-                "Filter Name",
-                "Type",
-                "Table Name",
-                "Object Name",
-                "Object Type",
-                "Hidden",
-                "Locked",
-                "How Created",
-                "Used",
-            ]
-        )
+        columns = {
+            "Page Name": "str",
+            "Page Display Name": "str",
+            "Filter Name": "str",
+            "Type": "str",
+            "Table Name": "str",
+            "Object Name": "str",
+            "Object Type": "str",
+            "Hidden": "bool",
+            "Locked": "bool",
+            "How Created": "str",
+            "Used": "bool",
+        }
+        df = _create_dataframe(columns=columns)
 
-        for _, r in rd.iterrows():
+        for _, r in self.rdef.iterrows():
             path = r["path"]
             payload = r["payload"]
             if path.endswith("/page.json"):
@@ -420,14 +423,12 @@ class ReportWrapper:
             lambda page_name: f"{helper.get_web_url(report=self._report, workspace=self._workspace_id)}/{page_name}"
         )
 
-        bool_cols = ["Hidden", "Locked", "Used"]
-        df[bool_cols] = df[bool_cols].astype(bool)
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         if extended:
             df = self._add_extended(dataframe=df)
 
         return df
-        # return df.style.format({"Page URL": _make_clickable})
 
     def list_visual_filters(self, extended: bool = False) -> pd.DataFrame:
         """
@@ -445,26 +446,25 @@ class ReportWrapper:
             A pandas dataframe containing a list of all the visual filters used in the report.
         """
 
-        rd = self.rdef
-        df = pd.DataFrame(
-            columns=[
-                "Page Name",
-                "Page Display Name",
-                "Visual Name",
-                "Filter Name",
-                "Type",
-                "Table Name",
-                "Object Name",
-                "Object Type",
-                "Hidden",
-                "Locked",
-                "How Created",
-                "Used",
-            ]
-        )
+        columns = {
+            "Page Name": "str",
+            "Page Display Name": "str",
+            "Visual Name": "str",
+            "Filter Name": "str",
+            "Type": "str",
+            "Table Name": "str",
+            "Object Name": "str",
+            "Object Type": "str",
+            "Hidden": "bool",
+            "Locked": "bool",
+            "How Created": "str",
+            "Used": "bool",
+        }
+        df = _create_dataframe(columns=columns)
+
         page_mapping, visual_mapping = helper.visual_page_mapping(self)
 
-        for _, r in rd.iterrows():
+        for _, r in self.rdef.iterrows():
             path = r["path"]
             payload = r["payload"]
             if path.endswith("/visual.json"):
@@ -508,8 +508,7 @@ class ReportWrapper:
                                 ignore_index=True,
                             )
 
-        bool_cols = ["Hidden", "Locked", "Used"]
-        df[bool_cols] = df[bool_cols].astype(bool)
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         if extended:
             df = self._add_extended(dataframe=df)
@@ -529,18 +528,16 @@ class ReportWrapper:
             A pandas dataframe containing a list of all modified visual interactions used in the report.
         """
 
-        rd = self.rdef
-        df = pd.DataFrame(
-            columns=[
-                "Page Name",
-                "Page Display Name",
-                "Source Visual Name",
-                "Target Visual Name",
-                "Type",
-            ]
-        )
+        columns = {
+            "Page Name": "str",
+            "Page Display Name": "str",
+            "Source Visual Name": "str",
+            "Target Visual Name": "str",
+            "Type": "str",
+        }
+        df = _create_dataframe(columns=columns)
 
-        for _, r in rd.iterrows():
+        for _, r in self.rdef.iterrows():
             file_path = r["path"]
             payload = r["payload"]
             if file_path.endswith("/page.json"):
@@ -577,31 +574,30 @@ class ReportWrapper:
             A pandas dataframe containing a list of all pages in the report.
         """
 
-        rd = self.rdef
-        df = pd.DataFrame(
-            columns=[
-                "File Path",
-                "Page Name",
-                "Page Display Name",
-                "Hidden",
-                "Active",
-                "Width",
-                "Height",
-                "Display Option",
-                "Type",
-                "Alignment",
-                "Drillthrough Target Page",
-                "Visual Count",
-                "Data Visual Count",
-                "Visible Visual Count",
-                "Page Filter Count",
-            ]
-        )
+        columns = {
+            "File Path": "str",
+            "Page Name": "str",
+            "Page Display Name": "str",
+            "Hidden": "bool",
+            "Active": "bool",
+            "Width": "int",
+            "Height": "int",
+            "Display Option": "str",
+            "Type": "str",
+            "Alignment": "str",
+            "Drillthrough Target Page": "bool",
+            "Visual Count": "int",
+            "Data Visual Count": "int",
+            "Visible Visual Count": "int",
+            "Page Filter Count": "int",
+            "Page URL": "str",
+        }
+        df = _create_dataframe(columns=columns)
 
         dfV = self.list_visuals()
 
-        page_rows = rd[rd["path"].str.endswith("/page.json")]
-        pages_row = rd[rd["path"] == "definition/pages/pages.json"]
+        page_rows = self.rdef[self.rdef["path"].str.endswith("/page.json")]
+        pages_row = self.rdef[self.rdef["path"] == "definition/pages/pages.json"]
 
         for _, r in page_rows.iterrows():
             file_path = r["path"]
@@ -633,9 +629,9 @@ class ReportWrapper:
             # )
 
             visual_count = len(
-                rd[
-                    rd["path"].str.endswith("/visual.json")
-                    & (rd["path"].str.startswith(page_prefix))
+                self.rdef[
+                    self.rdef["path"].str.endswith("/visual.json")
+                    & (self.rdef["path"].str.startswith(page_prefix))
                 ]
             )
             data_visual_count = len(
@@ -681,23 +677,12 @@ class ReportWrapper:
 
         df.loc[df["Page Name"] == activePage, "Active"] = True
 
-        int_cols = [
-            "Width",
-            "Height",
-            "Page Filter Count",
-            "Visual Count",
-            "Visible Visual Count",
-            "Data Visual Count",
-        ]
-        df[int_cols] = df[int_cols].astype(int)
-
-        bool_cols = ["Hidden", "Active", "Drillthrough Target Page"]
-        df[bool_cols] = df[bool_cols].astype(bool)
-
         df["Page URL"] = df["Page Name"].apply(
             lambda page_name: f"{helper.get_web_url(report=self._report, workspace=self._workspace_id)}/{page_name}"
         )
 
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
+
         return df
         # return df.style.format({"Page URL": _make_clickable})
 
@@ -711,39 +696,37 @@ class ReportWrapper:
             A pandas dataframe containing a list of all visuals in the report.
         """
 
-        rd = self.rdef
-        df = pd.DataFrame(
-            columns=[
-                "File Path",
-                "Page Name",
-                "Page Display Name",
-                "Visual Name",
-                "Type",
-                "Display Type",
-                "X",
-                "Y",
-                "Z",
-                "Width",
-                "Height",
-                "Tab Order",
-                "Hidden",
-                "Title",
-                "SubTitle",
-                "Custom Visual",
-                "Alt Text",
-                "Show Items With No Data",
-                "Divider",
-                "Slicer Type",
-                "Row SubTotals",
-                "Column SubTotals",
-                "Data Visual",
-                "Has Sparkline",
-                "Visual Filter Count",
-                "Data Limit",
-            ]
-        )
+        columns = {
+            "File Path": "str",
+            "Page Name": "str",
+            "Page Display Name": "str",
+            "Visual Name": "str",
+            "Type": "str",
+            "Display Type": "str",
+            "X": "float",
+            "Y": "float",
+            "Z": "int",
+            "Width": "float",
+            "Height": "float",
+            "Tab Order": "str",
+            "Hidden": "bool",
+            "Title": "str",
+            "SubTitle": "str",
+            "Custom Visual": "bool",
+            "Alt Text": "str",
+            "Show Items With No Data": "bool",
+            "Divider": "str",
+            "Slicer Type": "str",
+            "Row SubTotals": "bool",
+            "Column SubTotals": "bool",
+            "Data Visual": "bool",
+            "Has Sparkline": "bool",
+            "Visual Filter Count": "int",
+            "Data Limit": "int",
+        }
+        df = _create_dataframe(columns=columns)
 
-        rd_filt = rd[rd["path"] == "definition/report.json"]
+        rd_filt = self.rdef[self.rdef["path"] == "definition/report.json"]
         payload = rd_filt["payload"].iloc[0]
         rptJson = _extract_json(rd_filt)
         custom_visuals = rptJson.get("publicCustomVisuals", [])
@@ -765,7 +748,7 @@ class ReportWrapper:
 
             return any(key in all_keys for key in keys_to_check)
 
-        for _, r in rd.iterrows():
+        for _, r in self.rdef.iterrows():
             file_path = r["path"]
             payload = r["payload"]
             if file_path.endswith("/visual.json"):
@@ -910,16 +893,6 @@ class ReportWrapper:
                     [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
                 )
 
-        bool_cols = [
-            "Hidden",
-            "Show Items With No Data",
-            "Custom Visual",
-            "Data Visual",
-            "Has Sparkline",
-            "Row SubTotals",
-            "Column SubTotals",
-        ]
-
         grouped_df = (
             self.list_visual_objects()
             .groupby(["Page Name", "Visual Name"])
@@ -936,11 +909,7 @@ class ReportWrapper:
         )
         df["Visual Object Count"] = df["Visual Object Count"].fillna(0).astype(int)
 
-        float_cols = ["X", "Y", "Width", "Height"]
-        int_cols = ["Z", "Visual Filter Count", "Data Limit", "Visual Object Count"]
-        df[bool_cols] = df[bool_cols].astype(bool)
-        df[int_cols] = df[int_cols].astype(int)
-        df[float_cols] = df[float_cols].astype(float)
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         return df
 
@@ -960,23 +929,22 @@ class ReportWrapper:
             A pandas dataframe containing a list of all semantic model objects used in each visual in the report.
         """
 
-        rd = self.rdef
         page_mapping, visual_mapping = helper.visual_page_mapping(self)
-        df = pd.DataFrame(
-            columns=[
-                "Page Name",
-                "Page Display Name",
-                "Visual Name",
-                "Table Name",
-                "Object Name",
-                "Object Type",
-                "Implicit Measure",
-                "Sparkline",
-                "Visual Calc",
-                "Format",
-                "Object Display Name",
-            ]
-        )
+
+        columns = {
+            "Page Name": "str",
+            "Page Display Name": "str",
+            "Visual Name": "str",
+            "Table Name": "str",
+            "Object Name": "str",
+            "Object Type": "str",
+            "Implicit Measure": "bool",
+            "Sparkline": "bool",
+            "Visual Calc": "bool",
+            "Format": "str",
+            "Object Display Name": "str",
+        }
+        df = _create_dataframe(columns=columns)
 
         def contains_key(data, keys_to_check):
             if isinstance(data, dict):
@@ -1032,7 +1000,7 @@ class ReportWrapper:
 
             return result
 
-        for _, r in rd.iterrows():
+        for _, r in self.rdef.iterrows():
             file_path = r["path"]
             payload = r["payload"]
             if file_path.endswith("/visual.json"):
@@ -1089,8 +1057,7 @@ class ReportWrapper:
         if extended:
             df = self._add_extended(dataframe=df)
 
-        bool_cols = ["Implicit Measure", "Sparkline", "Visual Calc"]
-        df[bool_cols] = df[bool_cols].astype(bool)
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         return df
 
@@ -1113,16 +1080,15 @@ class ReportWrapper:
 
         from sempy_labs.tom import connect_semantic_model
 
-        df = pd.DataFrame(
-            columns=[
-                "Table Name",
-                "Object Name",
-                "Object Type",
-                "Report Source",
-                "Report Source Object",
-            ]
-        )
+        columns = {
+            "Table Name": "str",
+            "Object Name": "str",
+            "Object Type": "str",
+            "Report Source": "str",
+            "Report Source Object": "str",
+        }
 
+        df = _create_dataframe(columns=columns)
         rf = self.list_report_filters()
         pf = self.list_page_filters()
         vf = self.list_visual_filters()
@@ -1257,17 +1223,17 @@ class ReportWrapper:
         """
 
         rd = self.rdef
-        df = pd.DataFrame(
-            columns=[
-                "File Path",
-                "Bookmark Name",
-                "Bookmark Display Name",
-                "Page Name",
-                "Page Display Name",
-                "Visual Name",
-                "Visual Hidden",
-            ]
-        )
+
+        columns = {
+            "File Path": "str",
+            "Bookmark Name": "str",
+            "Bookmark Display Name": "str",
+            "Page Name": "str",
+            "Page Display Name": "str",
+            "Visual Name": "str",
+            "Visual Hidden": "bool",
+        }
+        df = _create_dataframe(columns=columns)
 
         bookmark_rows = rd[rd["path"].str.endswith(".bookmark.json")]
 
@@ -1320,8 +1286,7 @@ class ReportWrapper:
                         [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
                     )
 
-        bool_cols = ["Visual Hidden"]
-        df[bool_cols] = df[bool_cols].astype(bool)
+        _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         return df
 
@@ -1338,17 +1303,17 @@ class ReportWrapper:
             A pandas dataframe containing a list of all report-level measures in the report.
         """
 
-        df = pd.DataFrame(
-            columns=[
-                "Measure Name",
-                "Table Name",
-                "Expression",
-                "Data Type",
-                "Format String",
-            ]
-        )
-        rd = self.rdef
-        rd_filt = rd[rd["path"] == "definition/reportExtensions.json"]
+        columns = {
+            "Measure Name": "str",
+            "Table Name": "str",
+            "Expression": "str",
+            "Data Type": "str",
+            "Format String": "str",
+        }
+
+        df = _create_dataframe(columns=columns)
+
+        rd_filt = self.rdef[self.rdef["path"] == "definition/reportExtensions.json"]
 
         if len(rd_filt) == 1:
             payload = rd_filt["payload"].iloc[0]
@@ -1386,9 +1351,13 @@ class ReportWrapper:
             A pandas dataframe showing a list of report, page and visual annotations in the report.
         """
 
-        df = pd.DataFrame(
-            columns=["Type", "Object Name", "Annotation Name", "Annotation Value"]
-        )
+        columns = {
+            "Type": "str",
+            "Object Name": "str",
+            "Annotation Name": "str",
+            "Annotation Value": "str",
+        }
+        df = _create_dataframe(columns=columns)
 
         page_mapping, visual_mapping = helper.visual_page_mapping(self)
         for _, r in self.rdef.iterrows():
@@ -1454,8 +1423,6 @@ class ReportWrapper:
             Example for web url: file_path = 'https://raw.githubusercontent.com/PowerBiDevCamp/FabricUserApiDemo/main/FabricUserApiDemo/DefinitionTemplates/Shared/Reports/StaticResources/SharedResources/BaseThemes/CY23SU08.json'
         """
 
-        import requests
-
         report_path = "definition/report.json"
         theme_version = "5.5.4"
         request_body = {"definition": {"parts": []}}

sempy_labs/tom/_model.py

@@ -9,6 +9,7 @@ from sempy_labs._helper_functions import (
     _make_list_unique,
     resolve_dataset_name_and_id,
     resolve_workspace_name_and_id,
+    _base_api,
 )
 from sempy_labs._list_functions import list_relationships
 from sempy_labs._refresh_semantic_model import refresh_semantic_model
@@ -17,7 +18,6 @@ from contextlib import contextmanager
 from typing import List, Iterator, Optional, Union, TYPE_CHECKING
 from sempy._utils._log import log
 import sempy_labs._icons as icons
-from sempy.fabric.exceptions import FabricHTTPException
 import ast
 from uuid import UUID
 import sempy_labs._authentication as auth
@@ -2965,6 +2965,8 @@ class TOMWrapper:
 
         from sempy_labs._list_functions import list_tables
 
+        fabric.refresh_tom_cache(workspace=self._workspace_id)
+
         dfT = list_tables(
             dataset=self._dataset_id, workspace=self._workspace_id, extended=True
         )
@@ -4518,10 +4520,11 @@ class TOMWrapper:
                     "modelItems"
                 ].append(new_item)
 
-            client = fabric.FabricRestClient()
-            response = client.post("/explore/v202304/nl2nl/completions", json=payload)
-            if response.status_code != 200:
-                raise FabricHTTPException(response)
+            response = _base_api(
+                request="/explore/v202304/nl2nl/completions",
+                method="post",
+                payload=payload,
+            )
 
             for item in response.json().get("modelItems", []):
                 ms_name = item["urn"]