semantic-link-labs 0.12.4__py3-none-any.whl → 0.12.5__py3-none-any.whl

sempy_labs/graph/_groups.py

@@ -236,6 +236,69 @@ def list_group_members(group: str | UUID) -> pd.DataFrame:
     return df
 
 
+@log
+def list_group_transitive_members(group: str | UUID) -> pd.DataFrame:
+    """
+    Shows a list of the members of a group. This operation is transitive and returns a flat list of all nested members.
+
+    This is a wrapper function for the following API: `List group transitive members <https://learn.microsoft.com/graph/api/group-list-transitivemembers>`_.
+
+    Service Principal Authentication is required (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
+    Parameters
+    ----------
+    group : str | uuid.UUID
+        The group name or ID.
+
+    Returns
+    -------
+    pandas.DataFrame
+        A pandas dataframe showing a list of the members of a group.
+    """
+
+    group_id = resolve_group_id(group)
+
+    result = _base_api(
+        request=f"groups/{group_id}/transitiveMembers",
+        client="graph",
+        uses_pagination=True,
+    )
+
+    columns = {
+        "Member Id": "string",
+        "Organization Id": "string",
+        "Description": "string",
+        "Member Name": "string",
+        "Group Types": "list",
+        "Mail": "string",
+        "Mail Enabled": "bool",
+        "Mail Nickname": "string",
+    }
+
+    df = _create_dataframe(columns=columns)
+
+    rows = []
+    for r in result:
+        for v in r.get("value", []):
+            rows.append(
+                {
+                    "Member Id": v.get("id"),
+                    "Organization Id": v.get("organizationId"),
+                    "Description": v.get("description"),
+                    "Member Name": v.get("displayName"),
+                    "Group Types": v.get("groupTypes"),
+                    "Mail": v.get("mail"),
+                    "Mail Enabled": v.get("mailEnabled"),
+                    "Mail Nickname": v.get("mailNickname"),
+                }
+            )
+
+    if rows:
+        df = pd.DataFrame(rows, columns=list(columns.keys()))
+
+    return df
+
+
 @log
 def list_group_owners(group: str | UUID) -> pd.DataFrame:
     """

sempy_labs/graph/_users.py

@@ -40,7 +40,7 @@ def resolve_user_id(user: str | UUID) -> UUID:
 
 
 @log
-def get_user(user: str | UUID) -> pd.DataFrame:
+def get_user(user: str | UUID, show_manager: bool = False) -> pd.DataFrame:
     """
     Shows properties of a given user.
 
@@ -52,6 +52,8 @@ def get_user(user: str | UUID) -> pd.DataFrame:
     ----------
     user : str | uuid.UUID
         The user ID or user principal name.
+    show_manager : bool, default=False
+        Whether to include the user's manager information.
 
     Returns
     -------
@@ -59,7 +61,11 @@ def get_user(user: str | UUID) -> pd.DataFrame:
         A pandas dataframe showing properties of a given user.
     """
 
-    result = _base_api(request=f"users/{user}", client="graph").json()
+    url = f"users/{user}?$select=id,userPrincipalName,displayName,mail,jobTitle,officeLocation,mobilePhone,businessPhones,preferredLanguage,surname,department"
+    if show_manager:
+        url += "&$expand=manager($select=displayName,id,mail,jobTitle)"
+
+    result = _base_api(request=url, client="graph").json()
 
     new_data = {
         "User Id": result.get("id"),
@@ -72,13 +78,22 @@ def get_user(user: str | UUID) -> pd.DataFrame:
         "Business Phones": str(result.get("businessPhones")),
         "Preferred Language": result.get("preferredLanguage"),
         "Surname": result.get("surname"),
+        "Department": result.get("department"),
     }
+    if show_manager:
+        manager = result.get("manager", {})
+        new_data |= {
+            "Manager Id": manager.get("id"),
+            "Manager Name": manager.get("displayName"),
+            "Manager Mail": manager.get("mail"),
+            "Manager Job Title": manager.get("jobTitle"),
+        }
 
     return pd.DataFrame([new_data])
 
 
 @log
-def list_users() -> pd.DataFrame:
+def list_users(show_manager: bool = False) -> pd.DataFrame:
     """
     Shows a list of users and their properties.
 
@@ -86,13 +101,21 @@ def list_users() -> pd.DataFrame:
 
     Service Principal Authentication is required (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
 
+    Parameters
+    ----------
+    show_manager : bool, default=False
+        Whether to include the user's manager information.
+
     Returns
     -------
     pandas.DataFrame
         A pandas dataframe showing a list of users and their properties.
     """
 
-    result = _base_api(request="users", client="graph", uses_pagination=True)
+    url = "users?$select=id,userPrincipalName,displayName,mail,jobTitle,officeLocation,mobilePhone,businessPhones,preferredLanguage,surname,department"
+    if show_manager:
+        url += "&$expand=manager($select=displayName,id,mail,jobTitle)"
+    result = _base_api(request=url, client="graph", uses_pagination=True)
 
     columns = {
         "User Id": "string",
@@ -105,27 +128,48 @@ def list_users() -> pd.DataFrame:
         "Business Phones": "string",
         "Preferred Language": "string",
         "Surname": "string",
+        "Department": "string",
     }
 
+    if show_manager:
+        columns.update(
+            {
+                "Manager Id": "string",
+                "Manager Name": "string",
+                "Manager Mail": "string",
+                "Manager Job Title": "string",
+            }
+        )
+
     df = _create_dataframe(columns=columns)
 
     rows = []
     for r in result:
         for v in r.get("value", []):
-            rows.append(
-                {
-                    "User Id": v.get("id"),
-                    "User Principal Name": v.get("userPrincipalName"),
-                    "User Name": v.get("displayName"),
-                    "Mail": v.get("mail"),
-                    "Job Title": v.get("jobTitle"),
-                    "Office Location": v.get("officeLocation"),
-                    "Mobile Phone": v.get("mobilePhone"),
-                    "Business Phones": str(v.get("businessPhones")),
-                    "Preferred Language": v.get("preferredLanguage"),
-                    "Surname": v.get("surname"),
+            user_data = {
+                "User Id": v.get("id"),
+                "User Principal Name": v.get("userPrincipalName"),
+                "User Name": v.get("displayName"),
+                "Mail": v.get("mail"),
+                "Job Title": v.get("jobTitle"),
+                "Office Location": v.get("officeLocation"),
+                "Mobile Phone": v.get("mobilePhone"),
+                "Business Phones": str(v.get("businessPhones")),
+                "Preferred Language": v.get("preferredLanguage"),
+                "Surname": v.get("surname"),
+                "Department": v.get("department"),
+            }
+
+            if show_manager:
+                manager = v.get("manager", {})
+                user_data |= {
+                    "Manager Id": manager.get("id"),
+                    "Manager Name": manager.get("displayName"),
+                    "Manager Mail": manager.get("mail"),
+                    "Manager Job Title": manager.get("jobTitle"),
                 }
-            )
+
+            rows.append(user_data)
 
     if rows:
         df = pd.DataFrame(rows, columns=list(columns.keys()))

sempy_labs/report/_export_report.py

@@ -12,10 +12,6 @@ from typing import Optional
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 from uuid import UUID
-from sempy_labs.report._report_functions import (
-    list_report_visuals,
-    list_report_pages,
-)
 
 
 @log
@@ -187,15 +183,7 @@ def export_report(
             request_body = {"format": export_format, "powerBIReportConfiguration": {}}
 
             request_body["powerBIReportConfiguration"]["pages"] = []
-            dfPage = list_report_pages(report=report, workspace=workspace_id)
-
             for page in page_name:
-                dfPage_filt = dfPage[dfPage["Page ID"] == page]
-                if len(dfPage_filt) == 0:
-                    raise ValueError(
-                        f"{icons.red_dot} The '{page}' page does not exist in the '{report}' report within the '{workspace_name}' workspace."
-                    )
-
                 page_dict = {"pageName": page}
                 request_body["powerBIReportConfiguration"]["pages"].append(page_dict)
 
@@ -209,19 +197,9 @@ def export_report(
             request_body = {"format": export_format, "powerBIReportConfiguration": {}}
 
             request_body["powerBIReportConfiguration"]["pages"] = []
-            dfVisual = list_report_visuals(report=report, workspace=workspace_id)
             a = 0
             for page in page_name:
                 visual = visual_name[a]
-
-                dfVisual_filt = dfVisual[
-                    (dfVisual["Page ID"] == page) & (dfVisual["Visual ID"] == visual)
-                ]
-                if len(dfVisual_filt) == 0:
-                    raise ValueError(
-                        f"{icons.red_dot} The '{visual}' visual does not exist on the '{page}' in the '{report}' report within the '{workspace_name}' workspace."
-                    )
-
                 page_dict = {"pageName": page, "visualName": visual}
                 request_body["powerBIReportConfiguration"]["pages"].append(page_dict)
                 a += 1

sempy_labs/report/_report_rebind.py

@@ -1,4 +1,6 @@
 from sempy_labs._helper_functions import (
+    resolve_item_id,
+    resolve_workspace_id,
     resolve_workspace_name_and_id,
     resolve_item_name_and_id,
     _base_api,
@@ -8,6 +10,7 @@ from typing import Optional, List
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 from uuid import UUID
+import sempy.fabric as fabric
 
 
 @log
@@ -108,57 +111,40 @@ def report_rebind_all(
         the new semantic model.
     """
 
-    from sempy_labs._list_functions import list_reports_using_semantic_model
-
-    (dataset_name, dataset_id) = resolve_dataset_name_and_id(
-        dataset=dataset, workspace=dataset_workspace
+    (dataset_name, dataset_id) = resolve_item_name_and_id(
+        item=dataset, type="SemanticModel", workspace=dataset_workspace
     )
-    (new_dataset_name, new_dataset_id) = resolve_dataset_name_and_id(
-        dataset=new_dataset, workspace=new_dataset_workspace
+    new_dataset_id = resolve_item_id(
+        item=new_dataset, type="SemanticModel", workspace=new_dataset_workspace
     )
 
     if dataset_id == new_dataset_id:
         raise ValueError(
-            f"{icons.red_dot} The 'dataset' and 'new_dataset' parameters are both set to '{dataset}'. These parameters must be set to different values."
+            f"{icons.red_dot} The 'dataset' and 'new_dataset' parameters are both set to the same semantic model within the same workspace. These parameters must be set to different values."
         )
-    (dataset_workspace_name, dataset_workspace_id) = resolve_workspace_name_and_id(
-        workspace=dataset_workspace
-    )
+    dataset_workspace_id = resolve_workspace_id(workspace=dataset_workspace)
 
-    if isinstance(report_workspace, str):
+    if isinstance(report_workspace, str) or report_workspace is None:
         report_workspace = [report_workspace]
 
-    dfR = list_reports_using_semantic_model(
-        dataset=dataset, workspace=dataset_workspace
-    )
-
-    if dfR.empty:
-        print(
-            f"{icons.info} The '{dataset_name}' semantic model within the '{dataset_workspace_name}' workspace has no dependent reports."
-        )
-        return
-
-    if report_workspace is None:
-        dfR_filt = dfR.copy()
-    else:
+    for w in report_workspace:
+        dfR = fabric.list_reports(workspace=w)
         dfR_filt = dfR[
-            (dfR["Report Workspace Name"].isin(report_workspace))
-            | (dfR["Report Workspace ID"].isin(report_workspace))
+            (dfR["Dataset ID"] == dataset_id)
+            & (dfR["Dataset Workspace Id"] == dataset_workspace_id)
         ]
-
-    if dfR_filt.empty:
-        print(
-            f"{icons.info} No reports found for the '{dataset_name}' semantic model within the '{dataset_workspace_name}' workspace."
-        )
-        return
-
-    for _, r in dfR_filt.iterrows():
-        rpt_name = r["Report Name"]
-        rpt_wksp = r["Report Workspace Name"]
-
-        report_rebind(
-            report=rpt_name,
-            dataset=new_dataset,
-            report_workspace=rpt_wksp,
-            dataset_workspace=new_dataset_workspace,
-        )
+        if dfR_filt.empty:
+            (wksp_name, _) = resolve_workspace_name_and_id(workspace=w)
+            print(
+                f"{icons.info} No reports found for the '{dataset_name}' semantic model within the '{wksp_name}' workspace."
+            )
+        else:
+            # Rebind reports to new dataset
+            for _, r in dfR_filt.iterrows():
+                rpt_name = r["Name"]
+                report_rebind(
+                    report=rpt_name,
+                    dataset=new_dataset,
+                    report_workspace=w,
+                    dataset_workspace=new_dataset_workspace,
+                )

sempy_labs/report/_reportwrapper.py

@@ -171,6 +171,7 @@ class ReportWrapper:
         self,
         file_path: str,
         json_path: Optional[str] = None,
+        verbose: bool = True,
     ) -> dict | List[Tuple[str, dict]]:
         """
         Get the json content of the specified report definition file.
@@ -181,6 +182,8 @@ class ReportWrapper:
             The path of the report definition file. For example: "definition/pages/pages.json". You may also use wildcards. For example: "definition/pages/*/page.json".
         json_path : str, default=None
             The json path to the specific part of the file to be retrieved. If None, the entire file content is returned.
+        verbose : bool, default=True
+            If True, prints messages about the retrieval process. If False, suppresses these messages.
 
         Returns
         -------
@@ -192,6 +195,7 @@ class ReportWrapper:
 
         # Find matching parts
         if "*" in file_path:
+            results = []
             matching_parts = [
                 (part.get("path"), part.get("payload"))
                 for part in parts
@@ -199,9 +203,11 @@ class ReportWrapper:
             ]
 
             if not matching_parts:
-                raise ValueError(
-                    f"{icons.red_dot} No files match the wildcard path '{file_path}'."
-                )
+                if verbose:
+                    print(
+                        f"{icons.red_dot} No files match the wildcard path '{file_path}'."
+                    )
+                return results
 
             results = []
             for path, payload in matching_parts:
@@ -220,8 +226,8 @@ class ReportWrapper:
                     #    raise ValueError(
                     #        f"{icons.red_dot} No match found for '{json_path}' in '{path}'."
                     #    )
-            if not results:
-                raise ValueError(
+            if not results and verbose:
+                print(
                     f"{icons.red_dot} No match found for '{json_path}' in any of the files matching the wildcard path '{file_path}'."
                 )
             return results
@@ -241,14 +247,11 @@ class ReportWrapper:
                     matches = jsonpath_expr.find(payload)
                     if matches:
                         return matches[0].value
-                    else:
-                        raise ValueError(
-                            f"{icons.red_dot} No match found for '{json_path}'."
-                        )
+                    elif verbose:
+                        print(f"{icons.red_dot} No match found for '{json_path}'.")
 
-        raise ValueError(
-            f"{icons.red_dot} File '{file_path}' not found in report definition."
-        )
+        if verbose:
+            print(f"{icons.red_dot} File '{file_path}' not found in report definition.")
 
     def add(self, file_path: str, payload: dict | bytes):
         """
@@ -674,33 +677,65 @@ class ReportWrapper:
         columns = {
             "Custom Visual Name": "str",
             "Custom Visual Display Name": "str",
+            "Is Public": "bool",
             "Used in Report": "bool",
         }
 
         df = _create_dataframe(columns=columns)
 
-        report_file = self.get(file_path=self._report_file_path)
+        visuals = []
+        rp = self.get(
+            file_path=self._report_file_path,
+            json_path="$.resourcePackages",
+            verbose=False,
+        )
+
+        if rp:
+            visuals += [
+                {"Custom Visual Name": item.get("name"), "Is Public": False}
+                for item in rp
+                if item.get("type") == "CustomVisual"
+            ]
 
-        df["Custom Visual Name"] = report_file.get("publicCustomVisuals")
-        df["Custom Visual Display Name"] = df["Custom Visual Name"].apply(
-            lambda x: helper.vis_type_mapping.get(x, x)
+        # Load public custom visuals
+        public_custom_visuals = (
+            self.get(
+                file_path=self._report_file_path,
+                json_path="$.publicCustomVisuals",
+                verbose=False,
+            )
+            or []
         )
 
-        visual_types = set()
-        for v in self.__all_visuals():
-            payload = v.get("payload", {})
-            visual = payload.get("visual", {})
-            visual_type = visual.get("visualType")
-            if visual_type:
-                visual_types.add(visual_type)
-
-        for _, r in df.iterrows():
-            if r["Custom Visual Name"] in visual_types:
-                df.at[_, "Used in Report"] = True
-            else:
-                df.at[_, "Used in Report"] = False
+        visuals += [
+            {
+                "Custom Visual Name": (
+                    item.get("name") if isinstance(item, dict) else item
+                ),
+                "Is Public": True,
+            }
+            for item in public_custom_visuals
+        ]
 
-        _update_dataframe_datatypes(dataframe=df, column_map=columns)
+        if visuals:
+            df = pd.DataFrame(visuals, columns=list(columns.keys()))
+
+            # df["Custom Visual Name"] = report_file.get("publicCustomVisuals")
+            df["Custom Visual Display Name"] = df["Custom Visual Name"].apply(
+                lambda x: helper.vis_type_mapping.get(x, x)
+            )
+
+            visual_types = set()
+            for v in self.__all_visuals():
+                payload = v.get("payload", {})
+                visual = payload.get("visual", {})
+                visual_type = visual.get("visualType")
+                if visual_type:
+                    visual_types.add(visual_type)
+
+            df["Used in Report"] = df["Custom Visual Name"].isin(visual_types)
+
+            _update_dataframe_datatypes(dataframe=df, column_map=columns)
 
         return df