semantic-link-labs 0.9.5__py3-none-any.whl → 0.9.6__py3-none-any.whl

sempy_labs/_workspace_identity.py

@@ -13,6 +13,8 @@ def provision_workspace_identity(workspace: Optional[str | UUID] = None):
 
     This is a wrapper function for the following API: `Workspaces - Provision Identity <https://learn.microsoft.com/rest/api/fabric/core/workspaces/provision-identity>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     workspace : str | uuid.UUID, default=None
@@ -28,6 +30,7 @@ def provision_workspace_identity(workspace: Optional[str | UUID] = None):
         method="post",
         lro_return_status_code=True,
         status_codes=None,
+        client="fabric_sp",
     )
 
     print(
@@ -41,6 +44,8 @@ def deprovision_workspace_identity(workspace: Optional[str | UUID] = None):
 
     This is a wrapper function for the following API: `Workspaces - Derovision Identity <https://learn.microsoft.com/rest/api/fabric/core/workspaces/deprovision-identity>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     workspace : str | uuid.UUID, default=None
@@ -56,6 +61,7 @@ def deprovision_workspace_identity(workspace: Optional[str | UUID] = None):
         method="post",
         lro_return_status_code=True,
         status_codes=None,
+        client="fabric_sp",
     )
 
     print(

sempy_labs/_workspaces.py

@@ -18,6 +18,8 @@ def delete_user_from_workspace(
 
     This is a wrapper function for the following API: `Groups - Delete User In Group <https://learn.microsoft.com/rest/api/power-bi/groups/delete-user-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
     ----------
     email_address : str
@@ -33,6 +35,7 @@ def delete_user_from_workspace(
     _base_api(
         request=f"/v1.0/myorg/groups/{workspace_id}/users/{email_address}",
         method="delete",
+        client="fabric_sp",
     )
     print(
         f"{icons.green_dot} The '{email_address}' user has been removed from accessing the '{workspace_name}' workspace."
@@ -50,6 +53,8 @@ def update_workspace_user(
 
     This is a wrapper function for the following API: `Groups - Update Group User <https://learn.microsoft.com/rest/api/power-bi/groups/update-group-user>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     email_address : str
@@ -90,6 +95,7 @@ def update_workspace_user(
         request=f"/v1.0/myorg/groups/{workspace_id}/users",
         method="put",
         payload=payload,
+        client="fabric_sp",
     )
     print(
         f"{icons.green_dot} The '{email_address}' user has been updated to a '{role_name}' within the '{workspace_name}' workspace."
@@ -102,6 +108,8 @@ def list_workspace_users(workspace: Optional[str | UUID] = None) -> pd.DataFrame
 
     This is a wrapper function for the following API: `Workspaces - List Workspace Role Assignments <https://learn.microsoft.com/rest/api/fabric/core/workspaces/list-workspace-role-assignments>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     workspace : str | uuid.UUID, default=None
@@ -127,7 +135,9 @@ def list_workspace_users(workspace: Optional[str | UUID] = None) -> pd.DataFrame
     df = _create_dataframe(columns=columns)
 
     responses = _base_api(
-        request=f"v1/workspaces/{workspace_id}/roleAssignments", uses_pagination=True
+        request=f"v1/workspaces/{workspace_id}/roleAssignments",
+        uses_pagination=True,
+        client="fabric_sp",
     )
 
     for r in responses:
@@ -251,6 +261,8 @@ def unassign_workspace_from_capacity(workspace: Optional[str | UUID] = None):
 
     This is a wrapper function for the following API: `Workspaces - Unassign From Capacity <https://learn.microsoft.com/rest/api/fabric/core/workspaces/unassign-from-capacity>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     workspace : str | uuid.UUID, default=None
@@ -265,6 +277,7 @@ def unassign_workspace_from_capacity(workspace: Optional[str | UUID] = None):
         request=f"/v1/workspaces/{workspace_id}/unassignFromCapacity",
         method="post",
         status_codes=[200, 202],
+        client="fabric_sp",
     )
     print(
         f"{icons.green_dot} The '{workspace_name}' workspace has been unassigned from its capacity."
@@ -279,6 +292,8 @@ def list_workspace_role_assignments(
 
     This is a wrapper function for the following API: `Workspaces - List Workspace Role Assignments <https://learn.microsoft.com/rest/api/fabric/core/workspaces/list-workspace-role-assignments>`_.
 
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
+
     Parameters
     ----------
     workspace : str | uuid.UUID, default=None
@@ -303,7 +318,9 @@ def list_workspace_role_assignments(
     df = _create_dataframe(columns=columns)
 
     responses = _base_api(
-        request=f"v1/workspaces/{workspace_id}/roleAssignments", uses_pagination=True
+        request=f"v1/workspaces/{workspace_id}/roleAssignments",
+        uses_pagination=True,
+        client="fabric_sp",
     )
 
     for r in responses:
@@ -318,3 +335,26 @@ def list_workspace_role_assignments(
             df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
 
     return df
+
+
+def delete_workspace(workspace: Optional[str | UUID] = None):
+    """
+    Deletes a workspace.
+
+    This is a wrapper function for the following API: `Workspaces - Delete Workspace <https://learn.microsoft.com/rest/api/fabric/core/workspaces/delete-workspace>`_.
+
+    Parameters
+    ----------
+    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.
+    """
+
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
+
+    _base_api(
+        request=f"v1/workspaces/{workspace_id}", method="delete", client="fabric_sp"
+    )
+
+    print(f"{icons.green_dot} The '{workspace_name}' workspace has been deleted.")

sempy_labs/admin/_basic_functions.py

@@ -354,9 +354,10 @@ def _resolve_workspace_name_and_id(
     workspace: str | UUID,
 ) -> Tuple[str, UUID]:
 
+    from sempy_labs._helper_functions import resolve_workspace_name_and_id
+
     if workspace is None:
-        workspace_id = fabric.get_workspace_id()
-        workspace_name = fabric.resolve_workspace_name(workspace_id)
+        (workspace_name, workspace_id) = resolve_workspace_name_and_id()
     else:
         dfW = list_workspaces(workspace=workspace)
         if not dfW.empty:

sempy_labs/admin/_scanner.py

@@ -1,4 +1,3 @@
-import sempy.fabric as fabric
 from typing import Optional, List
 from uuid import UUID
 from sempy.fabric.exceptions import FabricHTTPException
@@ -10,6 +9,7 @@ from sempy_labs._helper_functions import (
     _base_api,
     _is_valid_uuid,
     _build_url,
+    resolve_workspace_name,
 )
 
 
@@ -54,7 +54,7 @@ def scan_workspaces(
     """
 
     if workspace is None:
-        workspace = fabric.resolve_workspace_name()
+        workspace = resolve_workspace_name()
 
     if isinstance(workspace, str):
         workspace = [workspace]

sempy_labs/directlake/_directlake_schema_compare.py

@@ -4,6 +4,7 @@ from sempy_labs._helper_functions import (
     format_dax_object_name,
     resolve_workspace_name_and_id,
     resolve_dataset_name_and_id,
+    resolve_workspace_name,
 )
 from IPython.display import display
 from sempy_labs.lakehouse import get_lakehouse_columns
@@ -70,7 +71,7 @@ def direct_lake_schema_compare(
             f"{icons.red_dot} This function only supports Direct Lake semantic models where the source lakehouse resides in the same workpace as the semantic model."
         )
 
-    lakehouse_workspace = fabric.resolve_workspace_name(lakehouse_workspace_id)
+    lakehouse_workspace = resolve_workspace_name(workspace_id=lakehouse_workspace_id)
     dfT = fabric.list_tables(dataset=dataset_id, workspace=workspace_id)
     dfC = fabric.list_columns(dataset=dataset_id, workspace=workspace_id)
     lc = get_lakehouse_columns(lakehouse_name, lakehouse_workspace)

sempy_labs/directlake/_directlake_schema_sync.py

@@ -1,5 +1,5 @@
 import sempy
-import sempy.fabric as fabric
+import pandas as pd
 from sempy_labs.lakehouse import get_lakehouse_columns
 from sempy_labs.directlake._dl_helper import get_direct_lake_source
 from sempy_labs.tom import connect_semantic_model
@@ -19,8 +19,8 @@ def direct_lake_schema_sync(
     dataset: str | UUID,
     workspace: Optional[str | UUID] = None,
     add_to_model: bool = False,
-    **kwargs,
-):
+    remove_from_model: bool = False,
+) -> pd.DataFrame:
     """
     Shows/adds columns which exist in the lakehouse but do not exist in the semantic model (only for tables in the semantic model).
 
@@ -34,22 +34,18 @@ def direct_lake_schema_sync(
         or if no lakehouse attached, resolves to the workspace of the notebook.
     add_to_model : bool, default=False
         If set to True, columns which exist in the lakehouse but do not exist in the semantic model are added to the semantic model. No new tables are added.
+    remove_from_model : bool, default=False
+        If set to True, columns which exist in the semantic model but do not exist in the lakehouse are removed from the semantic model. No new tables are removed.
+
+    Returns
+    -------
+    pandas.DataFrame
+        A pandas dataframe showing the status of columns in the semantic model and lakehouse (prior to adding/removing them from the model using this function).
     """
 
     sempy.fabric._client._utils._init_analysis_services()
     import Microsoft.AnalysisServices.Tabular as TOM
 
-    if "lakehouse" in kwargs:
-        print(
-            "The 'lakehouse' parameter has been deprecated as it is no longer necessary. Please remove this parameter from the function going forward."
-        )
-        del kwargs["lakehouse"]
-    if "lakehouse_workspace" in kwargs:
-        print(
-            "The 'lakehouse_workspace' parameter has been deprecated as it is no longer necessary. Please remove this parameter from the function going forward."
-        )
-        del kwargs["lakehouse_workspace"]
-
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
     (dataset_name, dataset_id) = resolve_dataset_name_and_id(dataset, workspace_id)
 
@@ -67,14 +63,54 @@ def direct_lake_schema_sync(
             f"{icons.red_dot} This function only supports Direct Lake semantic models where the source lakehouse resides in the same workpace as the semantic model."
         )
 
-    lakehouse_workspace = fabric.resolve_workspace_name(lakehouse_workspace_id)
+    lc = get_lakehouse_columns(lakehouse_id, lakehouse_workspace_id)
 
-    lc = get_lakehouse_columns(lakehouse_name, lakehouse_workspace)
+    readonly = True
+    if add_to_model or remove_from_model:
+        readonly = False
+    df = pd.DataFrame(
+        columns=[
+            "TableName",
+            "ColumnName",
+            "SourceTableName",
+            "SourceColumnName",
+            "Status",
+        ]
+    )
 
     with connect_semantic_model(
-        dataset=dataset_id, readonly=False, workspace=workspace_id
+        dataset=dataset_id, readonly=readonly, workspace=workspace_id
     ) as tom:
+        # Check if the columns in the semantic model exist in the lakehouse
+        for c in tom.all_columns():
+            partition_name = next(p.Name for p in c.Table.Partitions)
+            p = c.Table.Partitions[partition_name]
+            if p.SourceType == TOM.PartitionSourceType.Entity:
+                entity_name = p.Source.EntityName
+                source_column = c.SourceColumn
+                lc_filt = lc[
+                    (lc["Table Name"] == entity_name)
+                    & (lc["Column Name"] == source_column)
+                ]
+                # Remove column from model if it doesn't exist in the lakehouse
+                if lc_filt.empty:
+                    new_data = {
+                        "TableName": c.Parent.Name,
+                        "ColumnName": c.Name,
+                        "SourceTableName": entity_name,
+                        "SourceColumnName": source_column,
+                        "Status": "Not in lakehouse",
+                    }
+                    df = pd.concat(
+                        [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
+                    )
+                    if remove_from_model:
+                        tom.remove_object(object=c)
+                        print(
+                            f"{icons.green_dot} The '{c.Parent.Name}'[{c.Name}] column has been removed from the '{dataset_name}' semantic model within the '{workspace_name}' workspace."
+                        )
 
+        # Check if the lakehouse columns exist in the semantic model
         for i, r in lc.iterrows():
             lakeTName = r["Table Name"]
             lakeCName = r["Column Name"]
@@ -97,9 +133,17 @@ def direct_lake_schema_sync(
                     c.SourceColumn == lakeCName and c.Parent.Name == table_name
                     for c in tom.all_columns()
                 ):
-                    print(
-                        f"{icons.yellow_dot} The '{lakeCName}' column exists in the '{lakeTName}' lakehouse table but not in the '{dataset_name}' semantic model within the '{workspace_name}' workspace."
+                    new_data = {
+                        "TableName": table_name,
+                        "ColumnName": None,
+                        "SourceTableName": lakeTName,
+                        "SourceColumnName": lakeCName,
+                        "Status": "Not in semantic model",
+                    }
+                    df = pd.concat(
+                        [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
                     )
+
                     if add_to_model:
                         dt = _convert_data_type(dType)
                         tom.add_data_column(
@@ -111,3 +155,5 @@ def direct_lake_schema_sync(
                         print(
                             f"{icons.green_dot} The '{lakeCName}' column in the '{lakeTName}' lakehouse table was added to the '{dataset_name}' semantic model within the '{workspace_name}' workspace."
                         )
+
+        return df

sempy_labs/directlake/_dl_helper.py

@@ -7,7 +7,6 @@ import sempy_labs._icons as icons
 from sempy._utils._log import log
 from sempy_labs._helper_functions import (
     retry,
-    resolve_lakehouse_name,
     _convert_data_type,
     resolve_dataset_name_and_id,
     resolve_workspace_name_and_id,
@@ -129,11 +128,6 @@ def generate_direct_lake_semantic_model(
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
     if lakehouse_workspace is None:
         lakehouse_workspace = workspace
-    if lakehouse is None:
-        lakehouse_id = fabric.get_lakehouse_id()
-        lakehouse_workspace_id = fabric.get_workspace_id()
-        lakehouse_workspace = fabric.resolve_workspace_name(lakehouse_workspace_id)
-        lakehouse = resolve_lakehouse_name(lakehouse_id, lakehouse_workspace)
 
     dfLT = get_lakehouse_tables(lakehouse=lakehouse, workspace=lakehouse_workspace)
 

sempy_labs/directlake/_generate_shared_expression.py

@@ -1,10 +1,8 @@
-import sempy.fabric as fabric
 from sempy_labs._helper_functions import (
-    resolve_lakehouse_name,
-    resolve_lakehouse_id,
-    resolve_warehouse_id,
     resolve_workspace_name_and_id,
     _base_api,
+    resolve_lakehouse_name_and_id,
+    resolve_item_name_and_id,
 )
 from typing import Optional
 import sempy_labs._icons as icons
@@ -45,13 +43,14 @@ def generate_shared_expression(
             f"{icons.red_dot} Invalid item type. Valid options: {item_types}."
         )
 
-    if item_name is None:
-        item_id = fabric.get_lakehouse_id()
-        item_name = resolve_lakehouse_name(item_id, workspace_id)
-    elif item_name is not None and item_type == "Lakehouse":
-        item_id = resolve_lakehouse_id(lakehouse=item_name, workspace=workspace_id)
-    elif item_type == "Warehouse":
-        item_id = resolve_warehouse_id(warehouse=item_name, workspace=workspace_id)
+    if item_type == "Lakehouse":
+        (item_name, item_id) = resolve_lakehouse_name_and_id(
+            lakehouse=item_name, workspace=workspace_id
+        )
+    else:
+        (item_name, item_id) = resolve_item_name_and_id(
+            item=item_name, type=item_type, workspace=workspace_id
+        )
 
     item_type_rest = f"{item_type.lower()}s"
     response = _base_api(

sempy_labs/directlake/_guardrails.py

@@ -48,6 +48,7 @@ def get_sku_size(workspace: Optional[str | UUID] = None) -> str:
     str
         The SKU size for a workspace.
     """
+    from sempy_labs._capacities import list_capacities
 
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
@@ -59,7 +60,7 @@ def get_sku_size(workspace: Optional[str | UUID] = None) -> str:
         )
 
     capacity_id = dfW["Capacity Id"].iloc[0]
-    dfC = fabric.list_capacities()
+    dfC = list_capacities()
     dfC_filt = dfC[dfC["Id"] == capacity_id]
 
     if len(dfC_filt) == 0:

sempy_labs/directlake/_update_directlake_model_lakehouse_connection.py

@@ -4,6 +4,8 @@ from sempy_labs._helper_functions import (
     resolve_lakehouse_name,
     resolve_dataset_name_and_id,
     resolve_workspace_name_and_id,
+    resolve_item_name_and_id,
+    resolve_lakehouse_name_and_id,
 )
 from sempy_labs.tom import connect_semantic_model
 from typing import Optional
@@ -40,22 +42,9 @@ def update_direct_lake_model_lakehouse_connection(
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
     (dataset_name, dataset_id) = resolve_dataset_name_and_id(dataset, workspace_id)
 
-    if lakehouse_workspace is None:
-        lakehouse_workspace = workspace_name
-
-    if lakehouse is None:
-        lakehouse_id = fabric.get_lakehouse_id()
-        lakehouse = resolve_lakehouse_name(lakehouse_id, lakehouse_workspace)
-
-    # Check if lakehouse is valid
-    dfI = fabric.list_items(workspace=lakehouse_workspace, type="Lakehouse")
-    dfI_filt = dfI[(dfI["Display Name"] == lakehouse)]
-
-    if len(dfI_filt) == 0:
-        raise ValueError(
-            f"{icons.red_dot} The '{lakehouse}' lakehouse does not exist within the '{lakehouse_workspace}' workspace. "
-            f"Therefore it cannot be used to support the '{dataset_name}' semantic model within the '{workspace_name}' workspace."
-        )
+    (lakehouse_name, lakehouse_id) = resolve_lakehouse_name_and_id(
+        lakehouse=lakehouse, workspace=lakehouse_workspace
+    )
 
     icons.sll_tags.append("UpdateDLConnection")
 
@@ -121,21 +110,19 @@ def update_direct_lake_model_connection(
     if source_workspace is None:
         source_workspace = workspace_name
 
-    if source is None:
-        source_id = fabric.get_lakehouse_id()
-        source = resolve_lakehouse_name(source_id, source_workspace)
-    else:
-        source_id = fabric.resolve_item_id(
-            item_name=source, type=source_type, workspace=source_workspace
+    if source_type == "Lakehouse":
+        (source_name, source_id) = resolve_lakehouse_name_and_id(
+            lakehouse=source, workspace=source_workspace
         )
-        source = fabric.resolve_item_name(
-            item_id=source_id, workspace=source_workspace, type=source_type
+    else:
+        (source_name, source_id) = resolve_item_name_and_id(
+            item=source, type=source_type, workspace=source_workspace
         )
 
     icons.sll_tags.append("UpdateDLConnection")
 
     shEx = generate_shared_expression(
-        item_name=source, item_type=source_type, workspace=source_workspace
+        item_name=source_name, item_type=source_type, workspace=source_workspace
     )
 
     with connect_semantic_model(

sempy_labs/directlake/_update_directlake_partition_entity.py

@@ -1,5 +1,4 @@
 import sempy
-import sempy.fabric as fabric
 from sempy_labs.tom import connect_semantic_model
 from sempy_labs._refresh_semantic_model import refresh_semantic_model
 from sempy_labs.directlake._dl_helper import get_direct_lake_source
@@ -7,6 +6,7 @@ from sempy_labs._helper_functions import (
     _convert_data_type,
     resolve_dataset_name_and_id,
     resolve_workspace_name_and_id,
+    resolve_workspace_name,
 )
 from typing import List, Optional, Union
 import sempy_labs._icons as icons
@@ -144,7 +144,7 @@ def add_table_to_direct_lake_semantic_model(
             f"{icons.red_dot} This function only supports Direct Lake semantic models where the source lakehouse resides in the same workpace as the semantic model."
         )
 
-    lakehouse_workspace = fabric.resolve_workspace_name(lakehouse_workspace_id)
+    lakehouse_workspace = resolve_workspace_name(workspace_id=lakehouse_workspace_id)
 
     with connect_semantic_model(
         dataset=dataset_id, readonly=False, workspace=workspace_id

sempy_labs/lakehouse/_shortcuts.py

@@ -5,6 +5,7 @@ from sempy_labs._helper_functions import (
     resolve_workspace_name_and_id,
     _base_api,
     _create_dataframe,
+    resolve_workspace_name,
 )
 from sempy._utils._log import log
 from typing import Optional
@@ -16,9 +17,9 @@ from sempy.fabric.exceptions import FabricHTTPException
 @log
 def create_shortcut_onelake(
     table_name: str,
-    source_lakehouse: str,
+    source_lakehouse: str | UUID,
     source_workspace: str | UUID,
-    destination_lakehouse: str,
+    destination_lakehouse: Optional[str | UUID] = None,
     destination_workspace: Optional[str | UUID] = None,
     shortcut_name: Optional[str] = None,
     source_path: str = "Tables",
@@ -33,12 +34,13 @@ def create_shortcut_onelake(
     ----------
     table_name : str
         The table name for which a shortcut will be created.
-    source_lakehouse : str
+    source_lakehouse : str | uuid.UUID
         The Fabric lakehouse in which the table resides.
     source_workspace : str | uuid.UUID
         The name or ID of the Fabric workspace in which the source lakehouse exists.
-    destination_lakehouse : str
+    destination_lakehouse : str | uuid.UUID, default=None
         The Fabric lakehouse in which the shortcut will be created.
+        Defaults to None which resolves to the lakehouse attached to the notebook.
     destination_workspace : str | uuid.UUID, default=None
         The name or ID of the Fabric workspace in which the shortcut will be created.
         Defaults to None which resolves to the workspace of the attached lakehouse
@@ -359,7 +361,7 @@ def list_shortcuts(
             source_item_id = tgt.get(sources.get(tgt_type), {}).get("itemId")
             bucket = tgt.get(sources.get(tgt_type), {}).get("bucket")
             source_workspace_name = (
-                fabric.resolve_workspace_name(source_workspace_id)
+                resolve_workspace_name(workspace_id=source_workspace_id)
                 if source_workspace_id is not None
                 else None
             )

sempy_labs/migration/_migration_validation.py

@@ -42,10 +42,6 @@ def migration_validation(
             f"{icons.red_dot} The 'dataset' and 'new_dataset' parameters are both set to '{dataset}'. These parameters must be set to different values."
         )
 
-    workspace = fabric.resolve_workspace_name(workspace)
-    if new_dataset_workspace is None:
-        new_dataset_workspace = workspace
-
     icons.sll_tags.append("DirectLakeMigration")
 
     dfA = list_semantic_model_objects(dataset=dataset, workspace=workspace)

sempy_labs/report/_download_report.py

@@ -3,10 +3,11 @@ import sempy_labs._icons as icons
 from typing import Optional
 from sempy_labs._helper_functions import (
     resolve_workspace_name_and_id,
-    resolve_lakehouse_name,
+    resolve_lakehouse_name_and_id,
     _base_api,
     resolve_item_id,
     _mount,
+    resolve_workspace_name,
 )
 from sempy_labs.lakehouse._lakehouse import lakehouse_attached
 from uuid import UUID
@@ -44,11 +45,8 @@ def download_report(
         )
 
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
-    lakehouse_id = fabric.get_lakehouse_id()
-    lakehouse_workspace = fabric.resolve_workspace_name()
-    lakehouse_name = resolve_lakehouse_name(
-        lakehouse_id=lakehouse_id, workspace=lakehouse_workspace
-    )
+    (lakehouse_name, lakehouse_id) = resolve_lakehouse_name_and_id()
+    lakehouse_workspace = resolve_workspace_name()
 
     download_types = ["LiveConnect", "IncludeModel"]
     if download_type not in download_types:

sempy_labs/report/_generate_report.py

@@ -319,9 +319,9 @@ def _create_report(
 
     from sempy_labs.report import report_rebind
 
-    report_workspace = fabric.resolve_workspace_name(report_workspace)
-    report_workspace_id = fabric.resolve_workspace_id(report_workspace)
-    dataset_workspace = fabric.resolve_workspace_name(dataset_workspace)
+    (report_workspace_name, report_workspace_id) = resolve_workspace_name_and_id(
+        workspace=report_workspace
+    )
 
     dfR = fabric.list_reports(workspace=report_workspace)
     dfR_filt = dfR[dfR["Name"] == report]
@@ -338,7 +338,7 @@ def _create_report(
         )
 
         print(
-            f"{icons.green_dot} The '{report}' report has been created within the '{report_workspace}'"
+            f"{icons.green_dot} The '{report}' report has been created within the '{report_workspace_name}'"
         )
         updated_report = True
     # Update the report if it exists
@@ -352,12 +352,12 @@ def _create_report(
             status_codes=None,
         )
         print(
-            f"{icons.green_dot} The '{report}' report has been updated within the '{report_workspace}'"
+            f"{icons.green_dot} The '{report}' report has been updated within the '{report_workspace_name}'"
         )
         updated_report = True
     else:
         raise ValueError(
-            f"{icons.red_dot} The '{report}' report within the '{report_workspace}' workspace already exists and the 'overwrite' parameter was set to False."
+            f"{icons.red_dot} The '{report}' report within the '{report_workspace_name}' workspace already exists and the 'overwrite' parameter was set to False."
         )
 
     # Rebind the report to the semantic model to make sure it is pointed at the correct semantic model

sempy_labs/report/_report_functions.py

@@ -18,6 +18,7 @@ from sempy_labs._helper_functions import (
     _base_api,
     _create_spark_session,
     _mount,
+    resolve_workspace_id,
 )
 from typing import List, Optional, Union
 from sempy._utils._log import log
@@ -192,7 +193,7 @@ def clone_report(
         target_workspace = workspace_name
         target_workspace_id = workspace_id
     else:
-        target_workspace_id = fabric.resolve_workspace_id(target_workspace)
+        target_workspace_id = resolve_workspace_id(workspace=target_workspace)
 
     if target_dataset is not None:
         if target_dataset_workspace is None: