semantic-link-labs 0.11.3__py3-none-any.whl → 0.12.1__py3-none-any.whl

sempy_labs/report/_generate_report.py

@@ -3,7 +3,7 @@ import pandas as pd
 import json
 import os
 from typing import Optional
-from .._helper_functions import (
+from sempy_labs._helper_functions import (
     resolve_workspace_name_and_id,
     _conv_b64,
     resolve_dataset_name_and_id,
@@ -11,7 +11,7 @@ from .._helper_functions import (
     _update_dataframe_datatypes,
     _base_api,
     resolve_item_id,
-    get_item_definition,
+    _get_item_definition,
 )
 import sempy_labs._icons as icons
 from sempy._utils._log import log
@@ -31,6 +31,8 @@ def create_report_from_reportjson(
 
     This is a wrapper function for the following API: `Items - Create Report <https://learn.microsoft.com/rest/api/fabric/report/items/create-report>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     report : str
@@ -113,6 +115,7 @@ def create_report_from_reportjson(
         payload=request_body,
         lro_return_status_code=True,
         status_codes=[201, 202],
+        client="fabric_sp",
     )
 
     print(
@@ -129,6 +132,8 @@ def update_report_from_reportjson(
 
     This is a wrapper function for the following API: `Items - Update Report Definition <https://learn.microsoft.com/rest/api/fabric/report/items/update-report-definition>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     report : str | uuid.UUID
@@ -173,6 +178,7 @@ def update_report_from_reportjson(
         payload=payload,
         lro_return_status_code=True,
         status_codes=None,
+        client="fabric_sp",
     )
 
     print(
@@ -191,6 +197,8 @@ def get_report_definition(
 
     This is a wrapper function for the following API: `Items - Get Report Definition <https://learn.microsoft.com/rest/api/fabric/report/items/get-report-definition>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     report : str | uuid.UUID
@@ -208,7 +216,7 @@ def get_report_definition(
         The collection of report definition files within a pandas dataframe.
     """
 
-    return get_item_definition(
+    return _get_item_definition(
         item=report,
         type="Report",
         workspace=workspace,

sempy_labs/report/_paginated.py

@@ -1,8 +1,8 @@
 from typing import Optional
 import pandas as pd
 from uuid import UUID
-from .._helper_functions import (
-    resolve_workspace_name_and_id,
+from sempy_labs._helper_functions import (
+    resolve_workspace_id,
     _base_api,
     resolve_item_id,
     _create_dataframe,
@@ -18,6 +18,8 @@ def get_report_datasources(
     """
     Returns a list of data sources for the specified paginated report (RDL) from the specified workspace.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     report : str | uuid.UUID
@@ -44,27 +46,31 @@ def get_report_datasources(
     }
     df = _create_dataframe(columns=columns)
 
-    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
+    workspace_id = resolve_workspace_id(workspace)
     report_id = resolve_item_id(
         item=report, type="PaginatedReport", workspace=workspace
     )
 
     response = _base_api(
-        request=f"v1.0/myorg/groups/{workspace_id}/reports/{report_id}/datasources"
+        request=f"v1.0/myorg/groups/{workspace_id}/reports/{report_id}/datasources",
+        client="fabric_sp",
     )
 
+    rows = []
     for i in response.json().get("value", []):
         conn = i.get("connectionDetails", {})
-        new_data = {
-            "Report Name": report,
-            "Report Id": report_id,
-            "Datasource Id": i.get("datasourceId"),
-            "Datasource Type": i.get("datasourceType"),
-            "Gateway Id": i.get("gatewayId"),
-            "Server": conn.get("server") if conn else None,
-            "Database": conn.get("database") if conn else None,
-        }
-
-        df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
+        rows.append(
+            {
+                "Report Name": report,
+                "Report Id": report_id,
+                "Datasource Id": i.get("datasourceId"),
+                "Datasource Type": i.get("datasourceType"),
+                "Gateway Id": i.get("gatewayId"),
+                "Server": conn.get("server") if conn else None,
+                "Database": conn.get("database") if conn else None,
+            }
+        )
+    if rows:
+        df = pd.DataFrame(rows, columns=list(columns.keys()))
 
     return df

sempy_labs/report/_report_functions.py

@@ -19,6 +19,7 @@ from .._helper_functions import (
     _create_spark_session,
     _mount,
     resolve_workspace_id,
+    resolve_item_name_and_id,
 )
 from typing import List, Optional, Union
 from sempy._utils._log import log
@@ -33,14 +34,14 @@ def get_report_json(
     save_to_file_name: Optional[str] = None,
 ) -> dict:
     """
-    Gets the report.json file content of a Power BI report.
+    Gets the report.json file content of a Power BI report. This function only supports reports in the PBIR-Legacy format.
 
     This is a wrapper function for the following API: `Items - Get Report Definition <https://learn.microsoft.com/rest/api/fabric/report/items/get-report-definition>`_.
 
     Parameters
     ----------
-    report : str
-        Name of the Power BI report.
+    report : str | uuid.UUID
+        Name or ID of the Power BI report.
     workspace : str | uuid.UUID, default=None
         The Fabric workspace name or ID in which the report exists.
         Defaults to None which resolves to the workspace of the attached lakehouse
@@ -55,20 +56,27 @@ def get_report_json(
     """
 
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
-    report_id = resolve_report_id(report=report, workspace=workspace_id)
-    fmt = "PBIR-Legacy"
+    (report_name, report_id) = resolve_item_name_and_id(
+        item=report, type="Report", workspace=workspace_id
+    )
 
     result = _base_api(
-        request=f"/v1/workspaces/{workspace_id}/reports/{report_id}/getDefinition?format={fmt}",
+        request=f"/v1/workspaces/{workspace_id}/reports/{report_id}/getDefinition",
         method="post",
         lro_return_json=True,
         status_codes=None,
     )
-    df_items = pd.json_normalize(result["definition"]["parts"])
-    df_items_filt = df_items[df_items["path"] == "report.json"]
-    payload = df_items_filt["payload"].iloc[0]
-    report_file = _decode_b64(payload)
-    report_json = json.loads(report_file)
+    report_json = None
+    for part in result.get("definition", {}).get("parts", {}):
+        if part.get("path") == "report.json":
+            payload = part.get("payload")
+            report_file = _decode_b64(payload)
+            report_json = json.loads(report_file)
+
+    if not report_json:
+        raise ValueError(
+            f"{icons.red_dot} Unable to retrieve report.json for the '{report_name}' report within the '{workspace_name}' workspace. This function only supports reports in the PBIR-Legacy format."
+        )
 
     if save_to_file_name is not None:
         if not lakehouse_attached():

sempy_labs/report/_report_rebind.py

@@ -1,7 +1,6 @@
-from .._helper_functions import (
-    resolve_dataset_id,
+from sempy_labs._helper_functions import (
     resolve_workspace_name_and_id,
-    resolve_report_id,
+    resolve_item_name_and_id,
     _base_api,
     resolve_dataset_name_and_id,
 )
@@ -13,8 +12,8 @@ from uuid import UUID
 
 @log
 def report_rebind(
-    report: str | List[str],
-    dataset: str,
+    report: str | UUID | List[str | UUID],
+    dataset: str | UUID,
     report_workspace: Optional[str | UUID] = None,
     dataset_workspace: Optional[str | UUID] = None,
 ):
@@ -23,12 +22,14 @@ def report_rebind(
 
     This is a wrapper function for the following API: `Reports - Rebind Report In Group <https://learn.microsoft.com/rest/api/power-bi/reports/rebind-report-in-group>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
-    report : str | List[str]
-        Name(s) of the Power BI report(s).
-    dataset : str
-        Name of the semantic model.
+    report : str | uuid.UUID | List[str | uuid.UUID]
+        Name(s) or ID(s) of the Power BI report(s).
+    dataset : str | uuid.UUID
+        Name or ID of the semantic model.
     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
@@ -46,12 +47,19 @@ def report_rebind(
     if dataset_workspace is None:
         dataset_workspace = report_workspace_name
 
+    (dataset_workspace_name, dataset_workspace_id) = resolve_workspace_name_and_id(
+        dataset_workspace
+    )
     if isinstance(report, str):
         report = [report]
 
     for rpt in report:
-        report_id = resolve_report_id(report=rpt, workspace=report_workspace_id)
-        dataset_id = resolve_dataset_id(dataset=dataset, workspace=dataset_workspace)
+        (report_name, report_id) = resolve_item_name_and_id(
+            item=rpt, type="Report", workspace=report_workspace_id
+        )
+        (dataset_name, dataset_id) = resolve_item_name_and_id(
+            item=dataset, type="SemanticModel", workspace=dataset_workspace
+        )
 
         payload = {"datasetId": dataset_id}
 
@@ -59,54 +67,60 @@ def report_rebind(
             request=f"v1.0/myorg/groups/{report_workspace_id}/reports/{report_id}/Rebind",
             method="post",
             payload=payload,
+            client="fabric_sp",
         )
 
         print(
-            f"{icons.green_dot} The '{rpt}' report has been successfully rebinded to the '{dataset}' semantic model."
+            f"{icons.green_dot} The '{report_name}' report within the '{report_workspace_name}' workspace has been successfully rebinded to the '{dataset_name}' semantic model within the '{dataset_workspace_name}' workspace."
         )
 
 
 @log
 def report_rebind_all(
-    dataset: str,
-    new_dataset: str,
-    dataset_workspace: Optional[str] = None,
-    new_dataset_workpace: Optional[str] = None,
-    report_workspace: Optional[str | List[str]] = None,
+    dataset: str | UUID,
+    new_dataset: str | UUID,
+    dataset_workspace: Optional[str | UUID] = None,
+    new_dataset_workspace: Optional[str | UUID] = None,
+    report_workspace: Optional[str | UUID | List[str | UUID]] = None,
 ):
     """
-    Rebinds all reports across all workspaces which are bound to a specific semantic model to a new semantic model.
+    Rebinds all reports across the provided report workspaces which are bound to a specific semantic model to a new semantic model.
+
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
 
     Parameters
     ----------
-    dataset : str
+    dataset : str | uuid.UUID
         Name of the semantic model currently binded to the reports.
-    new_dataset : str
+    new_dataset : str | uuid.UUID
         Name of the semantic model to rebind to the reports.
-    dataset_workspace : str, default=None
+    dataset_workspace : str | uuid.UUID, default=None
         The name of the Fabric workspace in which the original 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.
-    new_dataset_workspace : str, default=None
+    new_dataset_workspace : str | uuid.UUID, default=None
         The name of the Fabric workspace in which the new 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.
-    report_workspace : str | List[str], default=None
-        The name(s) of the Fabric workspace(s) in which the report(s) reside(s).
+    report_workspace : str | uuid.UUID | List[str | uuid.UUID], default=None
+        The name(s) or IDs of the Fabric workspace(s) in which the report(s) reside(s).
         Defaults to None which finds all reports in all workspaces which use the semantic model and rebinds them to
         the new semantic model.
     """
 
     from sempy_labs._list_functions import list_reports_using_semantic_model
 
-    if dataset == new_dataset:
-        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."
-        )
-
     (dataset_name, dataset_id) = resolve_dataset_name_and_id(
         dataset=dataset, workspace=dataset_workspace
     )
+    (new_dataset_name, new_dataset_id) = resolve_dataset_name_and_id(
+        dataset=new_dataset, 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."
+        )
     (dataset_workspace_name, dataset_workspace_id) = resolve_workspace_name_and_id(
         workspace=dataset_workspace
     )
@@ -118,7 +132,7 @@ def report_rebind_all(
         dataset=dataset, workspace=dataset_workspace
     )
 
-    if len(dfR) == 0:
+    if dfR.empty:
         print(
             f"{icons.info} The '{dataset_name}' semantic model within the '{dataset_workspace_name}' workspace has no dependent reports."
         )
@@ -127,9 +141,18 @@ def report_rebind_all(
     if report_workspace is None:
         dfR_filt = dfR.copy()
     else:
-        dfR_filt = dfR[dfR["Report Workspace Name"].isin(report_workspace)]
+        dfR_filt = dfR[
+            (dfR["Report Workspace Name"].isin(report_workspace))
+            | (dfR["Report Workspace ID"].isin(report_workspace))
+        ]
+
+    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 i, r in dfR_filt.iterrows():
+    for _, r in dfR_filt.iterrows():
         rpt_name = r["Report Name"]
         rpt_wksp = r["Report Workspace Name"]
 
@@ -137,5 +160,5 @@ def report_rebind_all(
             report=rpt_name,
             dataset=new_dataset,
             report_workspace=rpt_wksp,
-            dataset_workspace=new_dataset_workpace,
+            dataset_workspace=new_dataset_workspace,
         )

sempy_labs/theme/_org_themes.py

@@ -1,6 +1,6 @@
 import pandas as pd
 from uuid import UUID
-from .._helper_functions import (
+from sempy_labs._helper_functions import (
     _is_valid_uuid,
     _base_api,
     _update_dataframe_datatypes,
@@ -9,6 +9,7 @@ from .._helper_functions import (
 
 
 _pbi_url_prefix = None
+_theme_url_prefix = "metadata/v202409/organization/themes"
 
 
 def init_pbi_url_prefix():
@@ -44,7 +45,7 @@ def list_org_themes() -> pd.DataFrame:
 
     df = _create_dataframe(columns=columns)
 
-    response = _base_api(request=f"{_pbi_url_prefix}/metadata/organization/themes")
+    response = _base_api(request=f"{_pbi_url_prefix}/{_theme_url_prefix}")
 
     result = response.json().get("orgThemes")
     if result:
@@ -110,9 +111,7 @@ def get_org_theme_json(theme: str | UUID) -> dict:
     init_pbi_url_prefix()
 
     theme_id = resolve_theme_id(theme)
-    response = _base_api(
-        request=f"{_pbi_url_prefix}/metadata/organization/themes/{theme_id}"
-    )
+    response = _base_api(request=f"{_pbi_url_prefix}/{_theme_url_prefix}/{theme_id}")
     return response.json().get("themeJson", {})
 
 
@@ -124,7 +123,7 @@ def delete_org_theme(theme: str | UUID) -> None:
 
     theme_id = resolve_theme_id(theme)
     _base_api(
-        request=f"{_pbi_url_prefix}/metadata/organization/themes/{theme_id}",
+        request=f"{_pbi_url_prefix}/{_theme_url_prefix}/{theme_id}",
         method="delete",
         status_codes=204,
     )

sempy_labs/tom/_model.py

@@ -5127,25 +5127,14 @@ class TOMWrapper:
             Generates the M expression for the import partition.
             """
 
-            if artifact_type == "Lakehouse":
-                type_id = "lakehouseId"
-            elif artifact_type == "Warehouse":
-                type_id = "warehouseId"
-            else:
-                raise NotImplementedError
-
             full_table_name = (
-                f"{schema_name}.{table_name}" if schema_name else table_name
+                f"{schema_name}/{table_name}" if schema_name else table_name
             )
 
-            return f"""let
-                Source = {artifact_type}.Contents(null),
-                #"Workspace" = Source{{[workspaceId="{workspace_id}"]}}[Data],
-                #"Artifact" = #"Workspace"{{[{type_id}="{artifact_id}"]}}[Data],
-                result = #"Artifact"{{[Id="{full_table_name}",ItemKind="Table"]}}[Data]
-            in
-                result
-            """
+            return f"""let\n\tSource = AzureStorage.DataLake("https://onelake.dfs.fabric.microsoft.com/{workspace_id}/{artifact_id}", [HierarchicalNavigation=true]),
+        Tables = Source{{[Name = "Tables"]}}[Content],
+        ExpressionTable = Tables{{[Name = "{full_table_name}"]}}[Content],
+        ToDelta = DeltaLake.Table(ExpressionTable)\nin\n\tToDelta"""
 
         m_expression = _generate_m_expression(
             source_workspace_id,