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

sempy_labs/_spark.py

@@ -6,9 +6,10 @@ from sempy_labs._helper_functions import (
     resolve_workspace_name_and_id,
 )
 from sempy.fabric.exceptions import FabricHTTPException
+from uuid import UUID
 
 
-def list_custom_pools(workspace: Optional[str] = None) -> pd.DataFrame:
+def list_custom_pools(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
     """
     Lists all `custom pools <https://learn.microsoft.com/fabric/data-engineering/create-custom-spark-pools>`_ within a workspace.
 
@@ -16,7 +17,7 @@ def list_custom_pools(workspace: Optional[str] = None) -> pd.DataFrame:
 
     Parameters
     ----------
-    workspace : str, default=None
+    workspace : str | uuid.UUID, default=None
         The name of the Fabric workspace.
         Defaults to None which resolves to the workspace of the attached lakehouse
         or if no lakehouse attached, resolves to the workspace of the notebook.
@@ -27,7 +28,7 @@ def list_custom_pools(workspace: Optional[str] = None) -> pd.DataFrame:
         A pandas dataframe showing all the custom pools within the Fabric workspace.
     """
 
-    (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     df = pd.DataFrame(
         columns=[
@@ -95,7 +96,7 @@ def create_custom_pool(
     node_family: str = "MemoryOptimized",
     auto_scale_enabled: bool = True,
     dynamic_executor_allocation_enabled: bool = True,
-    workspace: Optional[str] = None,
+    workspace: Optional[str | UUID] = None,
 ):
     """
     Creates a `custom pool <https://learn.microsoft.com/fabric/data-engineering/create-custom-spark-pools>`_ within a workspace.
@@ -122,13 +123,13 @@ def create_custom_pool(
         The status of `auto scale <https://learn.microsoft.com/rest/api/fabric/spark/custom-pools/create-workspace-custom-pool?tabs=HTTP#autoscaleproperties>`_.
     dynamic_executor_allocation_enabled : bool, default=True
         The status of the `dynamic executor allocation <https://learn.microsoft.com/en-us/rest/api/fabric/spark/custom-pools/create-workspace-custom-pool?tabs=HTTP#dynamicexecutorallocationproperties>`_.
-    workspace : str, default=None
-        The name of the Fabric workspace.
+    workspace : str | uuid.UUID, default=None
+        The name or ID of the Fabric workspace.
         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, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     request_body = {
         "name": pool_name,
@@ -154,7 +155,7 @@ def create_custom_pool(
     if response.status_code != 201:
         raise FabricHTTPException(response)
     print(
-        f"{icons.green_dot} The '{pool_name}' spark pool has been created within the '{workspace}' workspace."
+        f"{icons.green_dot} The '{pool_name}' spark pool has been created within the '{workspace_name}' workspace."
     )
 
 
@@ -168,7 +169,7 @@ def update_custom_pool(
     node_family: Optional[str] = None,
     auto_scale_enabled: Optional[bool] = None,
     dynamic_executor_allocation_enabled: Optional[bool] = None,
-    workspace: Optional[str] = None,
+    workspace: Optional[str | UUID] = None,
 ):
     """
     Updates the properties of a `custom pool <https://learn.microsoft.com/fabric/data-engineering/create-custom-spark-pools>`_ within a workspace.
@@ -203,20 +204,20 @@ def update_custom_pool(
     dynamic_executor_allocation_enabled : bool, default=None
         The status of the `dynamic executor allocation <https://learn.microsoft.com/en-us/rest/api/fabric/spark/custom-pools/create-workspace-custom-pool?tabs=HTTP#dynamicexecutorallocationproperties>`_.
         Defaults to None which keeps the existing property setting.
-    workspace : str, default=None
-        The name of the Fabric workspace.
+    workspace : str | uuid.UUID, default=None
+        The name or ID of the Fabric workspace.
         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, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     df = list_custom_pools(workspace=workspace)
     df_pool = df[df["Custom Pool Name"] == pool_name]
 
     if len(df_pool) == 0:
         raise ValueError(
-            f"{icons.red_dot} The '{pool_name}' custom pool does not exist within the '{workspace}'. Please choose a valid custom pool."
+            f"{icons.red_dot} The '{pool_name}' custom pool does not exist within the '{workspace_name}'. Please choose a valid custom pool."
         )
 
     if node_family is None:
@@ -262,11 +263,11 @@ def update_custom_pool(
     if response.status_code != 200:
         raise FabricHTTPException(response)
     print(
-        f"{icons.green_dot} The '{pool_name}' spark pool within the '{workspace}' workspace has been updated."
+        f"{icons.green_dot} The '{pool_name}' spark pool within the '{workspace_name}' workspace has been updated."
     )
 
 
-def delete_custom_pool(pool_name: str, workspace: Optional[str] = None):
+def delete_custom_pool(pool_name: str, workspace: Optional[str | UUID] = None):
     """
     Deletes a `custom pool <https://learn.microsoft.com/fabric/data-engineering/create-custom-spark-pools>`_ within a workspace.
 
@@ -276,35 +277,35 @@ def delete_custom_pool(pool_name: str, workspace: Optional[str] = None):
     ----------
     pool_name : str
         The custom pool name.
-    workspace : str, default=None
-        The name of the Fabric workspace.
+    workspace : str | uuid.UUID, default=None
+        The name or ID of the Fabric workspace.
         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, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
-    dfL = list_custom_pools(workspace=workspace)
+    dfL = list_custom_pools(workspace=workspace_id)
     dfL_filt = dfL[dfL["Custom Pool Name"] == pool_name]
 
     if len(dfL_filt) == 0:
         raise ValueError(
-            f"{icons.red_dot} The '{pool_name}' custom pool does not exist within the '{workspace}' workspace."
+            f"{icons.red_dot} The '{pool_name}' custom pool does not exist within the '{workspace_name}' workspace."
         )
-    poolId = dfL_filt["Custom Pool ID"].iloc[0]
+    pool_id = dfL_filt["Custom Pool ID"].iloc[0]
 
     client = fabric.FabricRestClient()
-    response = client.delete(f"/v1/workspaces/{workspace_id}/spark/pools/{poolId}")
+    response = client.delete(f"/v1/workspaces/{workspace_id}/spark/pools/{pool_id}")
 
     if response.status_code != 200:
         raise FabricHTTPException(response)
     print(
-        f"{icons.green_dot} The '{pool_name}' spark pool has been deleted from the '{workspace}' workspace."
+        f"{icons.green_dot} The '{pool_name}' spark pool has been deleted from the '{workspace_name}' workspace."
     )
 
 
 def get_spark_settings(
-    workspace: Optional[str] = None, return_dataframe: bool = True
+    workspace: Optional[str | UUID] = None, return_dataframe: bool = True
 ) -> pd.DataFrame | dict:
     """
     Shows the spark settings for a workspace.
@@ -313,8 +314,8 @@ def get_spark_settings(
 
     Parameters
     ----------
-    workspace : str, default=None
-        The name of the Fabric workspace.
+    workspace : str | uuid.UUID, default=None
+        The name or ID of the Fabric workspace.
         Defaults to None which resolves to the workspace of the attached lakehouse
         or if no lakehouse attached, resolves to the workspace of the notebook.
     return_dataframe : bool, default=True
@@ -326,7 +327,7 @@ def get_spark_settings(
         A pandas dataframe showing the spark settings for a workspace.
     """
 
-    (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     df = pd.DataFrame(
         columns=[
@@ -393,7 +394,7 @@ def update_spark_settings(
     max_executors: Optional[int] = None,
     environment_name: Optional[str] = None,
     runtime_version: Optional[str] = None,
-    workspace: Optional[str] = None,
+    workspace: Optional[str | UUID] = None,
 ):
     """
     Updates the spark settings for a workspace.
@@ -426,13 +427,13 @@ def update_spark_settings(
     runtime_version : str, default=None
         The `runtime version <https://learn.microsoft.com/rest/api/fabric/spark/workspace-settings/update-spark-settings?tabs=HTTP#environmentproperties>`_.
         Defaults to None which keeps the existing property setting.
-    workspace : str, default=None
-        The name of the Fabric workspace.
+    workspace : str | uuid.UUID, default=None
+        The name or ID of the Fabric workspace.
         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, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     request_body = get_spark_settings(workspace=workspace, return_dataframe=False)
 
@@ -463,5 +464,5 @@ def update_spark_settings(
     if response.status_code != 200:
         raise FabricHTTPException(response)
     print(
-        f"{icons.green_dot} The spark settings within the '{workspace}' workspace have been updated accordingly."
+        f"{icons.green_dot} The spark settings within the '{workspace_name}' workspace have been updated accordingly."
     )

sempy_labs/_sql.py

@@ -3,10 +3,14 @@ import pandas as pd
 from typing import Optional, Union, List
 from sempy._utils._log import log
 import struct
-import uuid
 from itertools import chain, repeat
 from sempy.fabric.exceptions import FabricHTTPException
-from sempy_labs._helper_functions import resolve_warehouse_id, resolve_lakehouse_id
+from sempy_labs._helper_functions import (
+    resolve_lakehouse_name_and_id,
+    resolve_item_name_and_id,
+    resolve_workspace_name_and_id,
+)
+from uuid import UUID
 
 
 def _bytes2mswin_bstr(value: bytes) -> bytes:
@@ -31,22 +35,25 @@ def _bytes2mswin_bstr(value: bytes) -> bytes:
 class ConnectBase:
     def __init__(
         self,
-        name: str,
-        workspace: Optional[Union[str, uuid.UUID]] = None,
+        item: str,
+        workspace: Optional[Union[str, UUID]] = None,
         timeout: Optional[int] = None,
         endpoint_type: str = "warehouse",
     ):
         from sempy.fabric._token_provider import SynapseTokenProvider
         import pyodbc
 
-        workspace = fabric.resolve_workspace_name(workspace)
-        workspace_id = fabric.resolve_workspace_id(workspace)
+        (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
-        # Resolve the appropriate ID (warehouse or lakehouse)
+        # Resolve the appropriate ID and name (warehouse or lakehouse)
         if endpoint_type == "warehouse":
-            resource_id = resolve_warehouse_id(warehouse=name, workspace=workspace)
+            (resource_id, resource_name) = resolve_item_name_and_id(
+                item=item, type=endpoint_type.capitalize(), workspace=workspace_id
+            )
         else:
-            resource_id = resolve_lakehouse_id(lakehouse=name, workspace=workspace)
+            (resource_id, resource_name) = resolve_lakehouse_name_and_id(
+                lakehouse=item, workspace=workspace_id
+            )
 
         # Get the TDS endpoint
         client = fabric.FabricRestClient()
@@ -69,7 +76,7 @@ class ConnectBase:
         # Set up the connection string
         access_token = SynapseTokenProvider()()
         tokenstruct = _bytes2mswin_bstr(access_token.encode())
-        conn_str = f"DRIVER={{ODBC Driver 18 for SQL Server}};SERVER={tds_endpoint};DATABASE={name};Encrypt=Yes;"
+        conn_str = f"DRIVER={{ODBC Driver 18 for SQL Server}};SERVER={tds_endpoint};DATABASE={resource_name};Encrypt=Yes;"
 
         if timeout is not None:
             conn_str += f"Connect Timeout={timeout};"
@@ -139,7 +146,7 @@ class ConnectWarehouse(ConnectBase):
     def __init__(
         self,
         warehouse: str,
-        workspace: Optional[Union[str, uuid.UUID]] = None,
+        workspace: Optional[Union[str, UUID]] = None,
         timeout: Optional[int] = None,
     ):
         super().__init__(
@@ -154,7 +161,7 @@ class ConnectLakehouse(ConnectBase):
     def __init__(
         self,
         lakehouse: str,
-        workspace: Optional[Union[str, uuid.UUID]] = None,
+        workspace: Optional[Union[str, UUID]] = None,
         timeout: Optional[int] = None,
     ):
         super().__init__(

sempy_labs/_translations.py

@@ -3,29 +3,32 @@ import pandas as pd
 from typing import List, Optional, Union
 from sempy._utils._log import log
 import sempy_labs._icons as icons
-from sempy_labs._helper_functions import get_language_codes
+from sempy_labs._helper_functions import (
+    get_language_codes,
+)
+from uuid import UUID
 
 
 @log
 def translate_semantic_model(
-    dataset: str,
+    dataset: str | UUID,
     languages: Union[str, List[str]],
     exclude_characters: Optional[str] = None,
-    workspace: Optional[str] = None,
+    workspace: Optional[str | UUID] = None,
 ) -> pd.DataFrame:
     """
     Translates names, descriptions, display folders for all objects in a semantic model.
 
     Parameters
     ----------
-    dataset : str
-        Name of the semantic model.
+    dataset : str | uuid.UUID
+        Name or ID of the semantic model.
     languages : str, List[str]
         The language code(s) in which to translate the semantic model.
     exclude_characters : str
         A string specifying characters which will be replaced by a space in the translation text when sent to the translation service.
-    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.
 

sempy_labs/_vertipaq.py

@@ -10,10 +10,11 @@ from pyspark.sql import SparkSession
 from sempy_labs._helper_functions import (
     format_dax_object_name,
     resolve_lakehouse_name,
-    resolve_dataset_id,
     save_as_delta_table,
     resolve_workspace_capacity,
-    _get_max_run_id,
+    _get_column_aggregate,
+    resolve_workspace_name_and_id,
+    resolve_dataset_name_and_id,
 )
 from sempy_labs._list_functions import list_relationships, list_tables
 from sempy_labs.lakehouse import lakehouse_attached, get_lakehouse_tables
@@ -22,12 +23,13 @@ from typing import Optional
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 from pathlib import Path
+from uuid import UUID
 
 
 @log
 def vertipaq_analyzer(
-    dataset: str,
-    workspace: Optional[str] = None,
+    dataset: str | UUID,
+    workspace: Optional[str | UUID] = None,
     export: Optional[str] = None,
     read_stats_from_data: bool = False,
     **kwargs,
@@ -37,10 +39,10 @@ def vertipaq_analyzer(
 
     Parameters
     ----------
-    dataset : str
-        Name of the semantic model.
-    workspace : str, default=None
-        The Fabric workspace name in which the semantic model exists.
+    dataset : str | uuid.UUID
+        Name or ID of the semantic model.
+    workspace : str| uuid.UUID, default=None
+        The Fabric workspace name or ID in which the semantic model exists.
         Defaults to None which resolves to the workspace of the attached lakehouse
         or if no lakehouse attached, resolves to the workspace of the notebook.
     export : str, default=None
@@ -49,10 +51,6 @@ def vertipaq_analyzer(
         Default value: None.
     read_stats_from_data : bool, default=False
         Setting this parameter to true has the function get Column Cardinality and Missing Rows using DAX (Direct Lake semantic models achieve this using a Spark query to the lakehouse).
-
-    Returns
-    -------
-
     """
 
     from sempy_labs.tom import connect_semantic_model
@@ -68,7 +66,8 @@ def vertipaq_analyzer(
         "ignore", message="createDataFrame attempted Arrow optimization*"
     )
 
-    workspace = fabric.resolve_workspace_name(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (dataset_name, dataset_id) = resolve_dataset_name_and_id(dataset, workspace_id)
 
     vertipaq_map = {
         "Model": {
@@ -135,7 +134,7 @@ def vertipaq_analyzer(
     }
 
     with connect_semantic_model(
-        dataset=dataset, workspace=workspace, readonly=True
+        dataset=dataset_id, workspace=workspace_id, readonly=True
     ) as tom:
         compat_level = tom.model.Model.Database.CompatibilityLevel
         is_direct_lake = tom.is_direct_lake()
@@ -144,24 +143,28 @@ def vertipaq_analyzer(
         column_count = len(list(tom.all_columns()))
         if table_count == 0:
             print(
-                f"{icons.warning} The '{dataset}' semantic model within the '{workspace}' workspace has no tables. Vertipaq Analyzer can only be run if the semantic model has tables."
+                f"{icons.warning} The '{dataset_name}' semantic model within the '{workspace_name}' workspace has no tables. Vertipaq Analyzer can only be run if the semantic model has tables."
             )
             return
 
-    dfT = list_tables(dataset=dataset, extended=True, workspace=workspace)
+    dfT = list_tables(dataset=dataset_id, extended=True, workspace=workspace_id)
 
     dfT.rename(columns={"Name": "Table Name"}, inplace=True)
     columns_to_keep = list(vertipaq_map["Tables"].keys())
     dfT = dfT[dfT.columns.intersection(columns_to_keep)]
 
-    dfC = fabric.list_columns(dataset=dataset, extended=True, workspace=workspace)
+    dfC = fabric.list_columns(dataset=dataset_id, extended=True, workspace=workspace_id)
     dfC["Column Object"] = format_dax_object_name(dfC["Table Name"], dfC["Column Name"])
     dfC.rename(columns={"Column Cardinality": "Cardinality"}, inplace=True)
-    dfH = fabric.list_hierarchies(dataset=dataset, extended=True, workspace=workspace)
-    dfR = list_relationships(dataset=dataset, extended=True, workspace=workspace)
-    dfP = fabric.list_partitions(dataset=dataset, extended=True, workspace=workspace)
+    dfH = fabric.list_hierarchies(
+        dataset=dataset_id, extended=True, workspace=workspace_id
+    )
+    dfR = list_relationships(dataset=dataset_id, extended=True, workspace=workspace_id)
+    dfP = fabric.list_partitions(
+        dataset=dataset_id, extended=True, workspace=workspace_id
+    )
     artifact_type, lakehouse_name, lakehouse_id, lakehouse_workspace_id = (
-        get_direct_lake_source(dataset=dataset, workspace=workspace)
+        get_direct_lake_source(dataset=dataset_id, workspace=workspace_id)
     )
 
     dfR["Missing Rows"] = 0
@@ -308,7 +311,7 @@ def vertipaq_analyzer(
                     query = f"evaluate\nsummarizecolumns(\n\"1\",calculate(countrows('{fromTable}'),userelationship({fromObject},{toObject}),isblank({toObject}))\n)"
 
                 result = fabric.evaluate_dax(
-                    dataset=dataset, dax_string=query, workspace=workspace
+                    dataset=dataset_id, dax_string=query, workspace=workspace_id
                 )
 
                 try:
@@ -407,7 +410,7 @@ def vertipaq_analyzer(
 
     dfModel = pd.DataFrame(
         {
-            "Dataset Name": dataset,
+            "Dataset Name": dataset_name,
             "Total Size": y,
             "Table Count": table_count,
             "Column Count": column_count,
@@ -516,7 +519,9 @@ def vertipaq_analyzer(
         if len(lakeT_filt) == 0:
             runId = 1
         else:
-            max_run_id = _get_max_run_id(lakehouse=lakehouse, table_name=lakeTName)
+            max_run_id = _get_column_aggregate(
+                lakehouse=lakehouse, table_name=lakeTName
+            )
             runId = max_run_id + 1
 
         dfMap = {
@@ -532,19 +537,19 @@ def vertipaq_analyzer(
             f"{icons.in_progress} Saving Vertipaq Analyzer to delta tables in the lakehouse...\n"
         )
         now = datetime.datetime.now()
-        dfD = fabric.list_datasets(workspace=workspace, mode="rest")
-        dfD_filt = dfD[dfD["Dataset Name"] == dataset]
+        dfD = fabric.list_datasets(workspace=workspace_id, mode="rest")
+        dfD_filt = dfD[dfD["Dataset Id"] == dataset_id]
         configured_by = dfD_filt["Configured By"].iloc[0]
-        capacity_id, capacity_name = resolve_workspace_capacity(workspace=workspace)
+        capacity_id, capacity_name = resolve_workspace_capacity(workspace=workspace_id)
 
         for key_name, (obj, df) in dfMap.items():
             df["Capacity Name"] = capacity_name
             df["Capacity Id"] = capacity_id
             df["Configured By"] = configured_by
-            df["Workspace Name"] = workspace
-            df["Workspace Id"] = fabric.resolve_workspace_id(workspace)
-            df["Dataset Name"] = dataset
-            df["Dataset Id"] = resolve_dataset_id(dataset, workspace)
+            df["Workspace Name"] = workspace_name
+            df["Workspace Id"] = workspace_id
+            df["Dataset Name"] = dataset_name
+            df["Dataset Id"] = dataset_id
             df["RunId"] = runId
             df["Timestamp"] = now
 
@@ -605,7 +610,7 @@ def vertipaq_analyzer(
             "dfH_filt": dfH_filt,
         }
 
-        zipFileName = f"{workspace}.{dataset}.zip"
+        zipFileName = f"{workspace_name}.{dataset_name}.zip"
 
         folderPath = "/lakehouse/default/Files"
         subFolderPath = os.path.join(folderPath, "VertipaqAnalyzer")
@@ -631,7 +636,7 @@ def vertipaq_analyzer(
             if os.path.exists(filePath):
                 os.remove(filePath)
         print(
-            f"{icons.green_dot} The Vertipaq Analyzer info for the '{dataset}' semantic model in the '{workspace}' workspace has been saved "
+            f"{icons.green_dot} The Vertipaq Analyzer info for the '{dataset_name}' semantic model in the '{workspace_name}' workspace has been saved "
             f"to the 'Vertipaq Analyzer/{zipFileName}' in the default lakehouse attached to this notebook."
         )
 

sempy_labs/_warehouses.py

@@ -8,13 +8,14 @@ import pandas as pd
 from typing import Optional
 import sempy_labs._icons as icons
 from sempy.fabric.exceptions import FabricHTTPException
+from uuid import UUID
 
 
 def create_warehouse(
     warehouse: str,
     description: Optional[str] = None,
     case_insensitive_collation: bool = False,
-    workspace: Optional[str] = None,
+    workspace: Optional[str | UUID] = None,
 ):
     """
     Creates a Fabric warehouse.
@@ -29,13 +30,13 @@ def create_warehouse(
         A description of the warehouse.
     case_insensitive_collation: bool, default=False
         If True, creates the warehouse with case-insensitive collation.
-    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.
     """
 
-    (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     request_body = {"displayName": warehouse}
 
@@ -55,11 +56,11 @@ def create_warehouse(
     lro(client, response, status_codes=[201, 202])
 
     print(
-        f"{icons.green_dot} The '{warehouse}' warehouse has been created within the '{workspace}' workspace."
+        f"{icons.green_dot} The '{warehouse}' warehouse has been created within the '{workspace_name}' workspace."
     )
 
 
-def list_warehouses(workspace: Optional[str] = None) -> pd.DataFrame:
+def list_warehouses(workspace: Optional[str | UUID] = None) -> pd.DataFrame:
     """
     Shows the warehouses within a workspace.
 
@@ -67,8 +68,8 @@ def list_warehouses(workspace: Optional[str] = None) -> pd.DataFrame:
 
     Parameters
     ----------
-    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.
 
@@ -89,7 +90,7 @@ def list_warehouses(workspace: Optional[str] = None) -> pd.DataFrame:
         ]
     )
 
-    (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     client = fabric.FabricRestClient()
     response = client.get(f"/v1/workspaces/{workspace_id}/warehouses")
@@ -115,7 +116,7 @@ def list_warehouses(workspace: Optional[str] = None) -> pd.DataFrame:
     return df
 
 
-def delete_warehouse(name: str, workspace: Optional[str] = None):
+def delete_warehouse(name: str, workspace: Optional[str | UUID] = None):
     """
     Deletes a Fabric warehouse.
 
@@ -125,16 +126,16 @@ def delete_warehouse(name: str, workspace: Optional[str] = None):
     ----------
     name: str
         Name of the warehouse.
-    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.
     """
 
-    (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
+    (workspace_name, workspace_id) = resolve_workspace_name_and_id(workspace)
 
     item_id = fabric.resolve_item_id(
-        item_name=name, type="Warehouse", workspace=workspace
+        item_name=name, type="Warehouse", workspace=workspace_id
     )
 
     client = fabric.FabricRestClient()
@@ -144,22 +145,22 @@ def delete_warehouse(name: str, workspace: Optional[str] = None):
         raise FabricHTTPException(response)
 
     print(
-        f"{icons.green_dot} The '{name}' warehouse within the '{workspace}' workspace has been deleted."
+        f"{icons.green_dot} The '{name}' warehouse within the '{workspace_name}' workspace has been deleted."
     )
 
 
 def get_warehouse_tables(
-    warehouse: str, workspace: Optional[str] = None
+    warehouse: str | UUID, workspace: Optional[str | UUID] = None
 ) -> pd.DataFrame:
     """
     Shows a list of the tables in the Fabric warehouse. This function is based on INFORMATION_SCHEMA.TABLES.
 
     Parameters
     ----------
-    warehouse : str
-        Name of the Fabric warehouse.
-    workspace : str, default=None
-        The Fabric workspace name.
+    warehouse : str | uuid.UUID
+        Name or ID of the Fabric 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.
 
@@ -184,17 +185,17 @@ def get_warehouse_tables(
 
 
 def get_warehouse_columns(
-    warehouse: str, workspace: Optional[str] = None
+    warehouse: str | UUID, workspace: Optional[str | UUID] = None
 ) -> pd.DataFrame:
     """
     Shows a list of the columns in each table within the Fabric warehouse. This function is based on INFORMATION_SCHEMA.COLUMNS.
 
     Parameters
     ----------
-    warehouse : str
-        Name of the Fabric warehouse.
-    workspace : str, default=None
-        The Fabric workspace name.
+    warehouse : str | uuid.UUID
+        Name or ID of the Fabric 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.