semantic-link-labs 0.8.10__py3-none-any.whl → 0.8.11__py3-none-any.whl

sempy_labs/report/_report_rebind.py

@@ -1,20 +1,22 @@
 import sempy.fabric as fabric
 from sempy_labs._helper_functions import (
     resolve_dataset_id,
+    resolve_workspace_name_and_id,
     resolve_report_id,
 )
 from typing import Optional, List
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 from sempy.fabric.exceptions import FabricHTTPException
+from uuid import UUID
 
 
 @log
 def report_rebind(
     report: str | List[str],
     dataset: str,
-    report_workspace: Optional[str] = None,
-    dataset_workspace: Optional[str] = None,
+    report_workspace: Optional[str | UUID] = None,
+    dataset_workspace: Optional[str | UUID] = None,
 ):
     """
     Rebinds a report to a semantic model.
@@ -27,23 +29,22 @@ def report_rebind(
         Name(s) of the Power BI report(s).
     dataset : str
         Name of the semantic model.
-    report_workspace : str, default=None
-        The name of the Fabric workspace in which the report resides.
+    report_workspace : str | uuid.UUID, default=None
+        The name or ID of the Fabric workspace in which the report resides.
         Defaults to None which resolves to the workspace of the attached lakehouse
         or if no lakehouse attached, resolves to the workspace of the notebook.
-    dataset_workspace : str, default=None
-        The name of the Fabric workspace in which the semantic model resides.
+    dataset_workspace : str | uuid.UUID, default=None
+        The name or ID of the Fabric workspace in which the semantic model resides.
         Defaults to None which resolves to the workspace of the attached lakehouse
         or if no lakehouse attached, resolves to the workspace of the notebook.
     """
 
-    if report_workspace is None:
-        report_workspace_id = fabric.get_workspace_id()
-        report_workspace = fabric.resolve_workspace_name(report_workspace_id)
-    else:
-        report_workspace_id = fabric.resolve_workspace_id(report_workspace)
+    (report_workspace_name, report_workspace_id) = resolve_workspace_name_and_id(
+        report_workspace
+    )
+
     if dataset_workspace is None:
-        dataset_workspace = report_workspace
+        dataset_workspace = report_workspace_name
 
     client = fabric.PowerBIRestClient()
 
@@ -51,14 +52,14 @@ def report_rebind(
         report = [report]
 
     for rpt in report:
-        reportId = resolve_report_id(report=rpt, workspace=report_workspace)
-        datasetId = resolve_dataset_id(dataset=dataset, workspace=dataset_workspace)
+        report_id = resolve_report_id(report=rpt, workspace=report_workspace_id)
+        dataset_id = resolve_dataset_id(dataset=dataset, workspace=dataset_workspace)
 
         # Prepare API
-        request_body = {"datasetId": datasetId}
+        request_body = {"datasetId": dataset_id}
 
         response = client.post(
-            f"/v1.0/myorg/groups/{report_workspace_id}/reports/{reportId}/Rebind",
+            f"/v1.0/myorg/groups/{report_workspace_id}/reports/{report_id}/Rebind",
             json=request_body,
         )
 

sempy_labs/report/_reportwrapper.py

@@ -8,6 +8,7 @@ from sempy_labs._helper_functions import (
     _add_part,
     lro,
     _decode_b64,
+    resolve_workspace_name_and_id,
 )
 from typing import Optional, List
 import pandas as pd
@@ -32,8 +33,8 @@ class ReportWrapper:
     ----------
     report : str
         The name of the report.
-    workspace : str
-        The name of the workspace in which the report resides.
+    workspace : str | uuid.UUID
+        The name or ID of the workspace in which the report resides.
         Defaults to None which resolves to the workspace of the attached lakehouse
         or if no lakehouse attached, resolves to the workspace of the notebook.
 
@@ -50,7 +51,7 @@ class ReportWrapper:
     def __init__(
         self,
         report: str,
-        workspace: Optional[str] = None,
+        workspace: Optional[str | UUID] = None,
     ):
         """
         Connects to a Power BI report and retrieves its definition.
@@ -61,8 +62,8 @@ class ReportWrapper:
         ----------
         report : str
             The name of the report.
-        workspace : str
-            The name of the workspace in which the report resides.
+        workspace : str | UUID
+            The name or ID of the workspace in which the report resides.
             Defaults to None which resolves to the workspace of the attached lakehouse
             or if no lakehouse attached, resolves to the workspace of the notebook.
 
@@ -77,11 +78,12 @@ class ReportWrapper:
         warnings.simplefilter(action="ignore", category=FutureWarning)
 
         self._report = report
-        self._workspace = workspace
-        self._workspace_id = fabric.resolve_workspace_id(workspace)
-        self._report_id = resolve_report_id(report, workspace)
+        (self._workspace_name, self._workspace_id) = resolve_workspace_name_and_id(
+            workspace
+        )
+        self._report_id = resolve_report_id(report, self._workspace_id)
         self.rdef = get_report_definition(
-            report=self._report, workspace=self._workspace
+            report=self._report, workspace=self._workspace_id
         )
 
         if len(self.rdef[self.rdef["path"] == "definition/report.json"]) == 0:
@@ -95,12 +97,14 @@ class ReportWrapper:
 
         from sempy_labs.tom import connect_semantic_model
 
-        dataset_id, dataset_name, dataset_workspace_id, dataset_workspace = (
-            resolve_dataset_from_report(report=self._report, workspace=self._workspace)
+        dataset_id, dataset_name, dataset_workspace_id, dataset_workspace_name = (
+            resolve_dataset_from_report(
+                report=self._report, workspace=self._workspace_id
+            )
         )
 
         with connect_semantic_model(
-            dataset=dataset_name, readonly=True, workspace=dataset_workspace
+            dataset=dataset_id, readonly=True, workspace=dataset_workspace_id
         ) as tom:
             for index, row in dataframe.iterrows():
                 obj_type = row["Object Type"]
@@ -218,7 +222,7 @@ class ReportWrapper:
         theme_collection = rptJson.get("themeCollection", {})
         if theme_type not in theme_collection:
             raise ValueError(
-                f"{icons.red_dot} The {self._report} report within the '{self._workspace} workspace has no custom theme."
+                f"{icons.red_dot} The {self._report} report within the '{self._workspace_name} workspace has no custom theme."
             )
         ct = theme_collection.get(theme_type)
         theme_name = ct["name"]
@@ -413,7 +417,7 @@ class ReportWrapper:
                             )
 
         df["Page URL"] = df["Page Name"].apply(
-            lambda page_name: f"{helper.get_web_url(report=self._report, workspace=self._workspace)}/{page_name}"
+            lambda page_name: f"{helper.get_web_url(report=self._report, workspace=self._workspace_id)}/{page_name}"
         )
 
         bool_cols = ["Hidden", "Locked", "Used"]
@@ -691,7 +695,7 @@ class ReportWrapper:
         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)}/{page_name}"
+            lambda page_name: f"{helper.get_web_url(report=self._report, workspace=self._workspace_id)}/{page_name}"
         )
 
         return df
@@ -1170,9 +1174,9 @@ class ReportWrapper:
         )
 
         if extended:
-            dataset_id, dataset_name, dataset_workspace_id, dataset_workspace = (
+            dataset_id, dataset_name, dataset_workspace_id, dataset_workspace_name = (
                 resolve_dataset_from_report(
-                    report=self._report, workspace=self._workspace
+                    report=self._report, workspace=self._workspace_id
                 )
             )
 
@@ -1195,7 +1199,7 @@ class ReportWrapper:
                 return object_validators.get(row["Object Type"], lambda: False)()
 
             with connect_semantic_model(
-                dataset=dataset_name, readonly=True, workspace=dataset_workspace
+                dataset=dataset_id, readonly=True, workspace=dataset_workspace_id
             ) as tom:
                 df["Valid Semantic Model Object"] = df.apply(
                     lambda row: check_validity(tom, row), axis=1
@@ -1214,11 +1218,13 @@ class ReportWrapper:
             .drop_duplicates()
             .reset_index(drop=True)
         )
-        dataset_id, dataset_name, dataset_workspace_id, dataset_workspace = (
-            resolve_dataset_from_report(report=self._report, workspace=self._workspace)
+        dataset_id, dataset_name, dataset_workspace_id, dataset_workspace_name = (
+            resolve_dataset_from_report(
+                report=self._report, workspace=self._workspace_id
+            )
         )
         dep = get_measure_dependencies(
-            dataset=dataset_name, workspace=dataset_workspace
+            dataset=dataset_id, workspace=dataset_workspace_id
         )
         rpt_measures = df[df["Object Type"] == "Measure"]["Object Name"].values
         new_rows = dep[dep["Object Name"].isin(rpt_measures)][
@@ -1232,7 +1238,7 @@ class ReportWrapper:
         )
 
         result_df["Dataset Name"] = dataset_name
-        result_df["Dataset Workspace Name"] = dataset_workspace
+        result_df["Dataset Workspace Name"] = dataset_workspace_name
         colName = "Dataset Name"
         result_df.insert(0, colName, result_df.pop(colName))
         colName = "Dataset Workspace Name"
@@ -1539,7 +1545,7 @@ class ReportWrapper:
 
         self.update_report(request_body=request_body)
         print(
-            f"{icons.green_dot} The '{theme_name}' theme has been set as the theme for the '{self._report}' report within the '{self._workspace}' workspace."
+            f"{icons.green_dot} The '{theme_name}' theme has been set as the theme for the '{self._report}' report within the '{self._workspace_name}' workspace."
         )
 
     def set_active_page(self, page_name: str):
@@ -1567,7 +1573,7 @@ class ReportWrapper:
         self._update_single_file(file_name=pages_file, new_payload=file_payload)
 
         print(
-            f"{icons.green_dot} The '{page_display_name}' page has been set as the active page in the '{self._report}' report within the '{self._workspace}' workspace."
+            f"{icons.green_dot} The '{page_display_name}' page has been set as the active page in the '{self._report}' report within the '{self._workspace_name}' workspace."
         )
 
     def set_page_type(self, page_name: str, page_type: str):
@@ -1640,7 +1646,7 @@ class ReportWrapper:
                 cv_remove_display.append(cv_display)
         if len(cv_remove) == 0:
             print(
-                f"{icons.green_dot} There are no unnecessary custom visuals in the '{self._report}' report within the '{self._workspace}' workspace."
+                f"{icons.green_dot} There are no unnecessary custom visuals in the '{self._report}' report within the '{self._workspace_name}' workspace."
             )
             return
 
@@ -1662,7 +1668,7 @@ class ReportWrapper:
 
         self.update_report(request_body=request_body)
         print(
-            f"{icons.green_dot} The {cv_remove_display} custom visuals have been removed from the '{self._report}' report within the '{self._workspace}' workspace."
+            f"{icons.green_dot} The {cv_remove_display} custom visuals have been removed from the '{self._report}' report within the '{self._workspace_name}' workspace."
         )
 
     def migrate_report_level_measures(self, measures: Optional[str | List[str]] = None):
@@ -1681,12 +1687,14 @@ class ReportWrapper:
         rlm = self.list_report_level_measures()
         if len(rlm) == 0:
             print(
-                f"{icons.green_dot} The '{self._report}' report within the '{self._workspace}' workspace has no report-level measures."
+                f"{icons.green_dot} The '{self._report}' report within the '{self._workspace_name}' workspace has no report-level measures."
             )
             return
 
-        dataset_id, dataset_name, dataset_workspace_id, dataset_workspace = (
-            resolve_dataset_from_report(report=self._report, workspace=self._workspace)
+        dataset_id, dataset_name, dataset_workspace_id, dataset_workspace_name = (
+            resolve_dataset_from_report(
+                report=self._report, workspace=self._workspace_id
+            )
         )
 
         if isinstance(measures, str):
@@ -1703,7 +1711,7 @@ class ReportWrapper:
 
         mCount = 0
         with connect_semantic_model(
-            dataset=dataset_name, readonly=False, workspace=dataset_workspace
+            dataset=dataset_id, readonly=False, workspace=dataset_workspace_id
         ) as tom:
             for _, r in rlm.iterrows():
                 tableName = r["Table Name"]
@@ -1748,7 +1756,7 @@ class ReportWrapper:
 
         self.update_report(request_body=request_body)
         print(
-            f"{icons.green_dot} The report-level measures have been migrated to the '{dataset_name}' semantic model within the '{dataset_workspace}' workspace."
+            f"{icons.green_dot} The report-level measures have been migrated to the '{dataset_name}' semantic model within the '{dataset_workspace_name}' workspace."
         )
 
     def set_page_visibility(self, page_name: str, hidden: bool):
@@ -1798,7 +1806,7 @@ class ReportWrapper:
 
         if len(dfP_filt) == 0:
             print(
-                f"{icons.green_dot} There are no Tooltip or Drillthrough pages in the '{self._report}' report within the '{self._workspace}' workspace."
+                f"{icons.green_dot} There are no Tooltip or Drillthrough pages in the '{self._report}' report within the '{self._workspace_name}' workspace."
             )
             return
 
@@ -1837,7 +1845,7 @@ class ReportWrapper:
 
         self.update_report(request_body=request_body)
         print(
-            f"{icons.green_dot} Show items with data has been disabled for all visuals in the '{self._report}' report within the '{self._workspace}' workspace."
+            f"{icons.green_dot} Show items with data has been disabled for all visuals in the '{self._report}' report within the '{self._workspace_name}' workspace."
         )
 
     # Set Annotations

sempy_labs/tom/_model.py

@@ -3287,6 +3287,10 @@ class TOMWrapper:
         """
         import Microsoft.AnalysisServices.Tabular as TOM
 
+        dependencies = dependencies[
+            dependencies["Object Name"] == dependencies["Parent Node"]
+        ]
+
         for obj in self.depends_on(object=object, dependencies=dependencies):
             if obj.ObjectType == TOM.ObjectType.Measure:
                 if (f"{obj.Parent.Name}[{obj.Name}]" in object.Expression) or (
@@ -3313,12 +3317,16 @@ class TOMWrapper:
         """
         import Microsoft.AnalysisServices.Tabular as TOM
 
+        dependencies = dependencies[
+            dependencies["Object Name"] == dependencies["Parent Node"]
+        ]
+
         def create_pattern(tableList, b):
             patterns = [
-                r"(?<!" + re.escape(table) + r"\[)(?<!" + re.escape(table) + r"'\[)"
+                r"(?<!" + re.escape(table) + r")(?<!'" + re.escape(table) + r"')"
                 for table in tableList
             ]
-            combined_pattern = "".join(patterns) + re.escape(b)
+            combined_pattern = "".join(patterns) + re.escape(f"[{b}]")
             return combined_pattern
 
         for obj in self.depends_on(object=object, dependencies=dependencies):
@@ -4529,7 +4537,7 @@ class TOMWrapper:
 
     def add_role_member(self, role_name: str, member: str | List[str]):
         """
-        Adds a external model role member (AzureAD) to a role.
+        Adds an external model role member (AzureAD) to a role.
 
         Parameters
         ----------
@@ -4561,6 +4569,35 @@ class TOMWrapper:
                     f"{icons.yellow_dot} '{m}' is already a member in the '{role_name}' role."
                 )
 
+    def remove_role_member(self, role_name: str, member: str | List[str]):
+        """
+        Removes an external model role member (AzureAD) from a role.
+
+        Parameters
+        ----------
+        role_name : str
+            The role name.
+        member : str | List[str]
+            The email address(es) of the member(s) to remove.
+        """
+
+        if isinstance(member, str):
+            member = [member]
+
+        role = self.model.Roles[role_name]
+        current_members = {m.MemberName: m.Name for m in role.Members}
+        for m in member:
+            name = current_members.get(m)
+            if name is not None:
+                role.Members.Remove(role.Members[name])
+                print(
+                    f"{icons.green_dot} The '{m}' member has been removed from the '{role_name}' role."
+                )
+            else:
+                print(
+                    f"{icons.yellow_dot} '{m}' is not a member of the '{role_name}' role."
+                )
+
     def close(self):
 
         if not self._readonly and self.model is not None:
@@ -4637,12 +4674,12 @@ def connect_semantic_model(
 
     Parameters
     ----------
-    dataset : str | UUID
+    dataset : str | uuid.UUID
         Name or ID of the semantic model.
     readonly: bool, default=True
         Whether the connection is read-only or read/write. Setting this to False enables read/write which saves the changes made back to the server.
-    workspace : str, default=None
-        The Fabric workspace name.
+    workspace : str | uuid.UUID, default=None
+        The Fabric workspace name or ID.
         Defaults to None which resolves to the workspace of the attached lakehouse
         or if no lakehouse attached, resolves to the workspace of the notebook.