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

sempy_labs/_sqldatabase.py

@@ -1,70 +1,69 @@
-import sempy.fabric as fabric
 from sempy_labs._helper_functions import (
     resolve_workspace_name_and_id,
     _base_api,
     _create_dataframe,
     _update_dataframe_datatypes,
+    create_item,
+    delete_item,
 )
 import pandas as pd
 from typing import Optional
-import sempy_labs._icons as icons
 from uuid import UUID
 
-## Still debugging the creation of an sql database
-# def create_warehouse(
-#     warehouse: str,
-#     description: Optional[str] = None,
-#     case_insensitive_collation: bool = False,
-#     workspace: Optional[str | UUID] = None,
-# ):
-#     """
-#     Creates a Fabric warehouse.
-
-#     This is a wrapper function for the following API: `Items - Create Warehouse <https://learn.microsoft.com/rest/api/fabric/warehouse/items/create-warehouse>`_.
-
-#     Parameters
-#     ----------
-#     warehouse: str
-#         Name of the warehouse.
-#     description : str, default=None
-#         A description of the warehouse.
-#     case_insensitive_collation: bool, default=False
-#         If True, creates the warehouse with case-insensitive collation.
-#     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)
-
-#     payload = {"displayName": warehouse}
-
-#     if description:
-#         payload["description"] = description
-#     if case_insensitive_collation:
-#         payload.setdefault("creationPayload", {})
-#         payload["creationPayload"][
-#             "defaultCollation"
-#         ] = "Latin1_General_100_CI_AS_KS_WS_SC_UTF8"
-
-#     _base_api(
-#         request=f"/v1/workspaces/{workspace_id}/warehouses",
-#         payload=payload,
-#         method="post",
-#         lro_return_status_code=True,
-#         status_codes=[201, 202],
-#     )
-
-#     print(
-#         f"{icons.green_dot} The '{warehouse}' warehouse has been created within the '{workspace_name}' workspace."
-#     )
-
-
-def _list_sql_databases(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
+
+def create_sql_database(
+    name: str, description: Optional[str] = None, workspace: Optional[str | UUID] = None
+):
+    """
+    Creates a SQL database.
+
+    This is a wrapper function for the following API: `Items - Create SQL Database <https://learn.microsoft.com/rest/api/fabric/sqldatabase/items/create-sql-database>`_.
+
+    Parameters
+    ----------
+    name: str
+        Name of the SQL database.
+    description : str, default=None
+        A description of the SQL database.
+    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.
+    """
+
+    create_item(
+        name=name, description=description, type="SQLDatabase", workspace=workspace
+    )
+
+
+def delete_sql_database(
+    sql_database: str | UUID, workspace: Optional[str | UUID] = None
+):
+    """
+    Deletes a SQL Database.
+
+    This is a wrapper function for the following API: `Items - Delete SQL Database <https://learn.microsoft.com/rest/api/fabric/sqldatabase/items/delete-sql-database>`_.
+
+    Parameters
+    ----------
+    sql_database: str | uuid.UUID
+        Name of the SQL database.
+    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.
     """
-    Shows the databses within a workspace.
 
+    delete_item(item=sql_database, type="SQLDatabase", workspace=workspace)
+
+
+def list_sql_databases(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
+    """
+    Lists all SQL databases in the Fabric workspace.
+
+    This is a wrapper function for the following API: `Items - List SQL Databases <https://learn.microsoft.com/rest/api/fabric/sqldatabase/items/list-sql-databases>`_.
+
+    Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
 
     Parameters
     ----------
@@ -76,45 +75,39 @@ def _list_sql_databases(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
     Returns
     -------
     pandas.DataFrame
-        A pandas dataframe showing the SQLDabatases within a workspace.
+        A pandas dataframe showing a list of SQL databases in the Fabric workspace.
     """
 
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
+
     columns = {
         "SQL Database Name": "string",
         "SQL Database Id": "string",
         "Description": "string",
-        "Connection Type": "string",
         "Connection Info": "string",
         "Database Name": "string",
         "Server FQDN": "string",
-        "Provisioning Status": "string",
-        "Created Date": "datetime",
-        "Last Updated Time UTC": "datetime",
     }
     df = _create_dataframe(columns=columns)
 
-    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
-
     responses = _base_api(
-        request=f"/v1/workspaces/{workspace_id}/sqldatabases", uses_pagination=True
+        request=f"/v1/workspaces/{workspace_id}/SQLDatabases",
+        uses_pagination=True,
+        client="fabric_sp",
     )
 
     for r in responses:
         for v in r.get("value", []):
             prop = v.get("properties", {})
-
             new_data = {
                 "SQL Database Name": v.get("displayName"),
                 "SQL Database Id": v.get("id"),
                 "Description": v.get("description"),
-                "Connection Type": v.get("type"),
                 "Connection Info": prop.get("connectionInfo"),
                 "Database Name": prop.get("databaseName"),
                 "Server FQDN": prop.get("serverFqdn"),
-                "Provisioning Status": prop.get("provisioningState"),
-                "Created Date": prop.get("createdDate"),
-                "Last Updated Time UTC": prop.get("lastUpdatedTimeUtc"),
             }
+
             df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
 
     _update_dataframe_datatypes(dataframe=df, column_map=columns)
@@ -122,38 +115,6 @@ def _list_sql_databases(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
     return df
 
 
-## Still debugging the deletion of an sql database
-# def delete_warehouse(name: str, workspace: Optional[str | UUID] = None):
-#     """
-#     Deletes a Fabric warehouse.
-
-#     This is a wrapper function for the following API: `Items - Delete Warehouse <https://learn.microsoft.com/rest/api/fabric/warehouse/items/delete-warehouse>`_.
-
-#     Parameters
-#     ----------
-#     name: str
-#         Name of the warehouse.
-#     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)
-
-#     item_id = fabric.resolve_item_id(
-#         item_name=name, type="Warehouse", workspace=workspace_id
-#     )
-
-#     _base_api(
-#         request=f"/v1/workspaces/{workspace_id}/warehouses/{item_id}", method="delete"
-#     )
-
-#     print(
-#         f"{icons.green_dot} The '{name}' warehouse within the '{workspace_name}' workspace has been deleted."
-#     )
-
-
 def get_sql_database_tables(
     sql_database: str | UUID, workspace: Optional[str | UUID] = None
 ) -> pd.DataFrame:

sempy_labs/_vertipaq.py

@@ -15,6 +15,8 @@ from sempy_labs._helper_functions import (
     resolve_workspace_name_and_id,
     resolve_dataset_name_and_id,
     _create_spark_session,
+    resolve_workspace_id,
+    resolve_workspace_name,
 )
 from sempy_labs._list_functions import list_relationships, list_tables
 from sempy_labs.lakehouse import lakehouse_attached, get_lakehouse_tables
@@ -196,8 +198,10 @@ def vertipaq_analyzer(
                 & (~dfC["Column Name"].str.startswith("RowNumber-"))
             ]
 
-            object_workspace = fabric.resolve_workspace_name(lakehouse_workspace_id)
-            current_workspace_id = fabric.get_workspace_id()
+            object_workspace = resolve_workspace_name(
+                workspace_id=lakehouse_workspace_id
+            )
+            current_workspace_id = resolve_workspace_id()
             if current_workspace_id != lakehouse_workspace_id:
                 lakeTables = get_lakehouse_tables(
                     lakehouse=lakehouse_name, workspace=object_workspace
@@ -526,22 +530,15 @@ def vertipaq_analyzer(
             )
 
     if export == "table":
-        lakehouse_id = fabric.get_lakehouse_id()
-        lake_workspace = fabric.resolve_workspace_name()
-        lakehouse = resolve_lakehouse_name(
-            lakehouse_id=lakehouse_id, workspace=lake_workspace
-        )
         lakeTName = "vertipaqanalyzer_model"
 
-        lakeT = get_lakehouse_tables(lakehouse=lakehouse, workspace=lake_workspace)
+        lakeT = get_lakehouse_tables()
         lakeT_filt = lakeT[lakeT["Table Name"] == lakeTName]
 
         if len(lakeT_filt) == 0:
             runId = 1
         else:
-            max_run_id = _get_column_aggregate(
-                lakehouse=lakehouse, table_name=lakeTName
-            )
+            max_run_id = _get_column_aggregate(table_name=lakeTName)
             runId = max_run_id + 1
 
         dfMap = {

sempy_labs/_warehouses.py

@@ -16,7 +16,7 @@ def create_warehouse(
     description: Optional[str] = None,
     case_insensitive_collation: bool = False,
     workspace: Optional[str | UUID] = None,
-):
+) -> UUID:
     """
     Creates a Fabric warehouse.
 
@@ -34,6 +34,11 @@ def create_warehouse(
         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.
+
+    Returns
+    -------
+    uuid.UUID
+        The ID of the created warehouse.
     """
 
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
@@ -48,7 +53,7 @@ def create_warehouse(
             "defaultCollation"
         ] = "Latin1_General_100_CI_AS_KS_WS_SC_UTF8"
 
-    _base_api(
+    response = _base_api(
         request=f"/v1/workspaces/{workspace_id}/warehouses",
         payload=payload,
         method="post",
@@ -60,6 +65,8 @@ def create_warehouse(
         f"{icons.green_dot} The '{warehouse}' warehouse has been created within the '{workspace_name}' workspace."
     )
 
+    return response.get("id")
+
 
 def list_warehouses(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
     """
@@ -67,6 +74,8 @@ def list_warehouses(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
 
     This is a wrapper function for the following API: `Items - List Warehouses <https://learn.microsoft.com/rest/api/fabric/warehouse/items/list-warehouses>`_.
 
+    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
@@ -93,7 +102,9 @@ def list_warehouses(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
     (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     responses = _base_api(
-        request=f"/v1/workspaces/{workspace_id}/warehouses", uses_pagination=True
+        request=f"/v1/workspaces/{workspace_id}/warehouses",
+        uses_pagination=True,
+        client="fabric_sp",
     )
 
     for r in responses:

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

@@ -350,13 +350,40 @@ def list_workspace_access_details(
     return df
 
 
+def _resolve_workspace_name(workspace_id: Optional[UUID] = None) -> str:
+    from sempy_labs._helper_functions import _get_fabric_context_setting
+    from sempy.fabric.exceptions import FabricHTTPException
+
+    if workspace_id is None:
+        workspace_id = _get_fabric_context_setting(name="trident.workspace.id")
+
+    try:
+        workspace_name = (
+            _base_api(
+                request=f"/v1/admin/workspaces/{workspace_id}", client="fabric_sp"
+            )
+            .json()
+            .get("name")
+        )
+    except FabricHTTPException:
+        raise ValueError(
+            f"{icons.red_dot} The '{workspace_id}' workspace was not found."
+        )
+    return workspace_name
+
+
 def _resolve_workspace_name_and_id(
     workspace: str | UUID,
 ) -> Tuple[str, UUID]:
 
+    from sempy_labs._helper_functions import _get_fabric_context_setting
+
     if workspace is None:
-        workspace_id = fabric.get_workspace_id()
-        workspace_name = fabric.resolve_workspace_name(workspace_id)
+        workspace_id = _get_fabric_context_setting(name="trident.workspace.id")
+        workspace_name = _resolve_workspace_name(workspace_id)
+    elif _is_valid_uuid(workspace):
+        workspace_id = workspace
+        workspace_name = _resolve_workspace_name(workspace_id)
     else:
         dfW = list_workspaces(workspace=workspace)
         if not dfW.empty:

sempy_labs/admin/_reports.py

@@ -113,7 +113,7 @@ def list_report_users(report: str | UUID) -> pd.DataFrame:
     """
     Shows a list of users that have access to the specified report.
 
-    This is a wrapper function for the following API: `Admin - Reports GetDatasetUsersAsAdmin <https://learn.microsoft.com/rest/api/power-bi/admin/datasets-get-report-users-as-admin>`_.
+    This is a wrapper function for the following API: `Admin - Reports GetDatasetUsersAsAdmin <https://learn.microsoft.com/rest/api/power-bi/admin/reports-get-report-users-as-admin>`_.
 
     Service Principal Authentication is supported (see `here <https://github.com/microsoft/semantic-link-labs/blob/main/notebooks/Service%20Principal.ipynb>`_ for examples).
 

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]
@@ -115,6 +115,4 @@ def scan_workspaces(
         client="fabric_sp",
     )
 
-    print(f"{icons.green_dot} Status: {scan_status}")
-
     return response.json()

sempy_labs/admin/_tenant.py

@@ -126,11 +126,10 @@ def list_capacity_tenant_settings_overrides(
             if capacity_id is None:
                 # If capacity_id is None, we access 'Overrides' -> 'tenantSettings'
                 for override in r.get("overrides", []):
+                    capacity_id = override.get("id")
                     tenant_settings = override.get("tenantSettings", [])
                     for setting in tenant_settings:
-                        data.append(
-                            create_new_data(setting)
-                        )  # No capacity_id needed here
+                        data.append(create_new_data(setting, capacity_id))
             else:
                 # If capacity_id is provided, we access 'value' directly for tenantSettings
                 for setting in r.get("value", []):
@@ -391,6 +390,7 @@ def list_workspaces_tenant_settings_overrides() -> pd.DataFrame:
     """
 
     columns = {
+        "Workspace Id": "string",
         "Setting Name": "string",
         "Title": "string",
         "Enabled": "bool",
@@ -409,8 +409,10 @@ def list_workspaces_tenant_settings_overrides() -> pd.DataFrame:
 
     for r in responses:
         for v in r.get("value", []):
+            workspace_id = v.get("id")
             for setting in v.get("tenantSettings", []):
                 new_data = {
+                    "Workspace Id": workspace_id,
                     "Setting Name": setting.get("settingName"),
                     "Title": setting.get("title"),
                     "Enabled": setting.get("enabled"),
@@ -447,6 +449,7 @@ def list_domain_tenant_settings_overrides() -> pd.DataFrame:
     """
 
     columns = {
+        "Domain Id": "string",
         "Setting Name": "string",
         "Title": "string",
         "Enabled": "bool",
@@ -466,8 +469,10 @@ def list_domain_tenant_settings_overrides() -> pd.DataFrame:
 
     for r in responses:
         for v in r.get("value", []):
+            domain_id = v.get("id")
             for setting in v.get("tenantSettings", []):
                 new_data = {
+                    "Domain Id": domain_id,
                     "Setting Name": setting.get("settingName"),
                     "Title": setting.get("title"),
                     "Enabled": setting.get("enabled"),

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)