semantic-link-labs 0.8.6__py3-none-any.whl → 0.8.8__py3-none-any.whl

sempy_labs/admin/_basic_functions.py

@@ -4,178 +4,150 @@ from uuid import UUID
 import sempy_labs._icons as icons
 from sempy.fabric.exceptions import FabricHTTPException
 from sempy_labs._helper_functions import (
-    resolve_workspace_name_and_id,
     pagination,
+    _is_valid_uuid,
+    _build_url,
 )
 import numpy as np
 import pandas as pd
-import time
+from dateutil.parser import parse as dtparser
 import urllib.parse
-from datetime import datetime
 
 
 def list_workspaces(
-    top: Optional[int] = 5000,
-    filter: Optional[str] = None,
-    skip: Optional[int] = None,
+    capacity: Optional[str | UUID] = None,
+    workspace: Optional[str | UUID] = None,
+    workspace_state: Optional[str] = None,
+    workspace_type: Optional[str] = None,
+    **kwargs,
 ) -> pd.DataFrame:
     """
     Lists workspaces for the organization. This function is the admin version of list_workspaces.
 
-    This is a wrapper function for the following API: `Admin - Groups GetGroupsAsAdmin <https://learn.microsoft.com/rest/api/power-bi/admin/groups-get-groups-as-admin>`_.
+    This is a wrapper function for the following API: `Workspaces - List Workspaces - REST API (Admin) <https://learn.microsoft.com/en-us/rest/api/fabric/admin/workspaces/list-workspaces>`_.
 
     Parameters
     ----------
-    top : int, default=5000
-        Returns only the first n results. This parameter is mandatory and must be in the range of 1-5000.
-    filter : str, default=None
-        Returns a subset of a results based on `Odata filter <https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_SystemQueryOptions>`_ query parameter condition.
-    skip : int, default=None
-        Skips the first n results. Use with top to fetch results beyond the first 5000.
+    capacity : str | UUID, default=None
+        Returns only the workspaces in the specified Capacity.
+    workspace : str | UUID, default=None
+        Returns the workspace with the specific name.
+    workspace_state : str, default=None
+        Return only the workspace with the requested state. You can find the possible states in `Workspace States <https://learn.microsoft.com/en-us/rest/api/fabric/admin/workspaces/list-workspaces?tabs=HTTP#workspacestate>`_.
+    workspace_type : str, default=None
+        Return only the workspace of the specific type. You can find the possible types in `Workspace Types <https://learn.microsoft.com/en-us/rest/api/fabric/admin/workspaces/list-workspaces?tabs=HTTP#workspacetype>`_.
 
     Returns
     -------
     pandas.DataFrame
         A pandas dataframe showing a list of workspaces for the organization.
     """
+    if "filter" in kwargs:
+        print(
+            "The 'filter' parameter has been deprecated. Please remove this parameter from the function going forward."
+        )
+        del kwargs["filter"]
+
+    if "top" in kwargs:
+        print(
+            "The 'top' parameter has been deprecated. Please remove this parameter from the function going forward."
+        )
+        del kwargs["top"]
+
+    if "skip" in kwargs:
+        print(
+            "The 'skip' parameter has been deprecated. Please remove this parameter from the function going forward."
+        )
+        del kwargs["skip"]
+
+    client = fabric.FabricRestClient()
 
     df = pd.DataFrame(
         columns=[
             "Id",
-            "Is Read Only",
-            "Is On Dedicated Capacity",
-            "Type",
             "Name",
+            "State",
+            "Type",
             "Capacity Id",
-            "Default Dataset Storage Format",
-            "Pipeline Id",
-            "Has Workspace Level Settings",
         ]
     )
 
-    url = f"/v1.0/myorg/admin/groups?$top={top}"
-    if skip is not None:
-        url = f"{url}&$skip={skip}"
-    if filter is not None:
-        url = f"{url}&$filter={filter}"
+    url = "/v1/admin/workspaces"
+    params = {}
 
-    client = fabric.PowerBIRestClient()
-    response = client.get(url)
+    if capacity is not None:
+        params["capacityId"] = _resolve_capacity_name_and_id(capacity)[1]
 
-    if response.status_code != 200:
-        raise FabricHTTPException(response)
+    if workspace is not None and not _is_valid_uuid(workspace):
+        params["name"] = workspace
 
-    for v in response.json().get("value", []):
-        capacity_id = v.get("capacityId")
-        if capacity_id:
-            capacity_id = capacity_id.lower()
-        new_data = {
-            "Id": v.get("id"),
-            "Is Read Only": v.get("isReadOnly"),
-            "Is On Dedicated Capacity": v.get("isOnDedicatedCapacity"),
-            "Capacity Id": capacity_id,
-            "Default Dataset Storage Format": v.get("defaultDatasetStorageFormat"),
-            "Type": v.get("type"),
-            "Name": v.get("name"),
-            "State": v.get("state"),
-            "Pipeline Id": v.get("pipelineId"),
-            "Has Workspace Level Settings": v.get("hasWorkspaceLevelSettings"),
-        }
-        df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
+    if workspace_state is not None:
+        params["state"] = workspace_state
 
-    bool_cols = [
-        "Is Read Only",
-        "Is On Dedicated Capacity",
-        "Has Workspace Level Settings",
-    ]
-    df[bool_cols] = df[bool_cols].astype(bool)
+    if workspace_type is not None:
+        params["type"] = workspace_type
 
-    return df
+    url = _build_url(url, params)
 
+    response = client.get(path_or_url=url)
 
-def assign_workspaces_to_capacity(
-    source_capacity: str,
-    target_capacity: str,
-    workspace: Optional[str | List[str]] = None,
-):
-    """
-    Assigns a workspace to a capacity. This function is the admin version.
+    if response.status_code != 200:
+        raise FabricHTTPException(response)
 
-    This is a wrapper function for the following API: `Admin - Capacities AssignWorkspacesToCapacity <https://learn.microsoft.com/rest/api/power-bi/admin/capacities-assign-workspaces-to-capacity>`_.
+    responsePaginated = pagination(client, response)
 
-    Parameters
-    ----------
-    source_capacity : str
-        The name of the source capacity.
-    target_capacity : str
-        The name of the target capacity.
-    workspace : str | List[str], default=None
-        The name of the workspace(s).
-        Defaults to None which resolves to migrating all workspaces within the source capacity to the target capacity.
-    """
+    workspaces = []
 
-    if isinstance(workspace, str):
-        workspace = [workspace]
+    for r in responsePaginated:
+        workspaces = workspaces + r.get("workspaces", [])
 
-    dfC = list_capacities()
-    dfC_filt = dfC[dfC["Capacity Name"] == source_capacity]
-    source_capacity_id = dfC_filt["Capacity Id"].iloc[0]
+    if len(workspaces) > 0:
+        df = pd.DataFrame(workspaces)
+        df.rename(
+            columns={
+                "id": "Id",
+                "name": "Name",
+                "state": "State",
+                "type": "Type",
+                "capacityId": "Capacity Id",
+            },
+            inplace=True,
+        )
 
-    dfC_filt = dfC[dfC["Capacity Name"] == target_capacity]
-    target_capacity_id = dfC_filt["Capacity Id"].iloc[0]
+        df["Capacity Id"] = df["Capacity Id"].str.lower()
 
-    if workspace is None:
-        dfW = list_workspaces()
-        dfW = dfW[dfW["Capacity Id"].str.upper() == source_capacity_id.upper()]
-        workspaces = dfW["Id"].tolist()
-    else:
-        dfW = list_workspaces()
-        workspaces = dfW[dfW["Name"].isin(workspace)]["Id"].tolist()
-
-    workspaces = np.array(workspaces)
-    batch_size = 999
-    for i in range(0, len(workspaces), batch_size):
-        batch = workspaces[i : i + batch_size].tolist()
-        request_body = {
-            "capacityMigrationAssignments": [
-                {
-                    "targetCapacityObjectId": target_capacity_id.upper(),
-                    "workspacesToAssign": batch,
-                }
-            ]
-        }
+        if workspace is not None and _is_valid_uuid(workspace):
+            df = df[df["Id"] == workspace.lower()]
 
-        client = fabric.PowerBIRestClient()
-        response = client.post(
-            "/v1.0/myorg/admin/capacities/AssignWorkspaces",
-            json=request_body,
-        )
-
-        if response.status_code != 200:
-            raise FabricHTTPException(response)
-    print(
-        f"{icons.green_dot} The workspaces have been assigned to the '{target_capacity}' capacity."
-    )
+    return df
 
 
-def list_capacities() -> pd.DataFrame:
+def list_capacities(
+    capacity: Optional[str | UUID] = None,
+) -> pd.DataFrame:
     """
     Shows the a list of capacities and their properties. This function is the admin version.
 
     This is a wrapper function for the following API: `Admin - Get Capacities As Admin <https://learn.microsoft.com/rest/api/power-bi/admin/get-capacities-as-admin>`_.
 
+    Parameters
+    ----------
+    capacity : str | UUID, default=None
+        Capacity name or id to filter.
+
     Returns
     -------
     pandas.DataFrame
         A pandas dataframe showing the capacities and their properties
     """
+    client = fabric.FabricRestClient()
 
     df = pd.DataFrame(
         columns=["Capacity Id", "Capacity Name", "Sku", "Region", "State", "Admins"]
     )
 
-    client = fabric.PowerBIRestClient()
     response = client.get("/v1.0/myorg/admin/capacities")
+
     if response.status_code != 200:
         raise FabricHTTPException(response)
 
@@ -193,85 +165,108 @@ def list_capacities() -> pd.DataFrame:
             }
             df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
 
+    if capacity is not None:
+        if _is_valid_uuid(capacity):
+            df = df[df["Capacity Id"] == capacity.lower()]
+        else:
+            df = df[df["Capacity Name"] == capacity]
+
     return df
 
 
-def list_tenant_settings() -> pd.DataFrame:
+def assign_workspaces_to_capacity(
+    source_capacity: Optional[str | UUID] = None,
+    target_capacity: Optional[str | UUID] = None,
+    workspace: Optional[str | List[str] | UUID | List[UUID]] = None,
+):
     """
-    Lists all tenant settings.
+    Assigns a workspace to a capacity. This function is the admin version.
 
-    This is a wrapper function for the following API: `Tenants - List Tenant Settings <https://learn.microsoft.com/rest/api/fabric/admin/tenants/list-tenant-settings>`_.
+    This is a wrapper function for the following API: `Admin - Capacities AssignWorkspacesToCapacity <https://learn.microsoft.com/rest/api/power-bi/admin/capacities-assign-workspaces-to-capacity>`_.
 
-    Returns
-    -------
-    pandas.DataFrame
-        A pandas dataframe showing the tenant settings.
+    Parameters
+    ----------
+    source_capacity : str | UUID, default=None
+        The name of the source capacity. If the Workspace is not specified, this is parameter mandatory.
+    target_capacity : str | UUID, default=None
+        The name of the target capacity.
+    workspace : str | List[str] | UUID | List[UUID], default=None
+        The name or id of the workspace(s).
+        Defaults to None which resolves to migrating all workspaces within the source capacity to the target capacity.
     """
+    if target_capacity is None:
+        raise ValueError(
+            f"{icons.red_dot} The parameter 'target_capacity' is mandatory."
+        )
 
-    client = fabric.FabricRestClient()
-    response = client.get("/v1/admin/tenantsettings")
-
-    if response.status_code != 200:
-        raise FabricHTTPException(response)
+    if source_capacity is None and workspace is None:
+        raise ValueError(
+            f"{icons.red_dot} The parameters 'source_capacity' or 'workspace' needs to be specified."
+        )
 
-    df = pd.DataFrame(
-        columns=[
-            "Setting Name",
-            "Title",
-            "Enabled",
-            "Can Specify Security Groups",
-            "Tenant Setting Group",
-            "Enabled Security Groups",
+    if workspace is None:
+        source_capacity_id = _resolve_capacity_name_and_id(source_capacity)[1]
+        dfW = list_workspaces(capacity=source_capacity_id)
+        workspaces = dfW["Id"].tolist()
+    else:
+        if isinstance(workspace, str) or isinstance(workspace, UUID):
+            workspace = [workspace]
+        if source_capacity is None:
+            dfW = list_workspaces()
+        else:
+            dfW = list_workspaces(capacity=source_capacity_id)
+
+        # Extract names and IDs that are mapped in dfW
+        workspaces_names = dfW[dfW["Name"].isin(workspace)]["Name"].tolist()
+        workspaces_ids = dfW[dfW["Id"].isin(workspace)]["Id"].tolist()
+
+        # Combine IDs into the final workspaces list
+        workspaces = workspaces_ids + dfW[dfW["Name"].isin(workspace)]["Id"].tolist()
+
+        # Identify unmapped workspaces
+        unmapped_workspaces = [
+            item
+            for item in workspace
+            if item not in workspaces_names and item not in workspaces_ids
         ]
-    )
 
-    for i in response.json().get("tenantSettings", []):
-        new_data = {
-            "Setting Name": i.get("settingName"),
-            "Title": i.get("title"),
-            "Enabled": i.get("enabled"),
-            "Can Specify Security Groups": i.get("canSpecifySecurityGroups"),
-            "Tenant Setting Group": i.get("tenantSettingGroup"),
-            "Enabled Security Groups": [i.get("enabledSecurityGroups", [])],
-        }
-        df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
-
-    bool_cols = ["Enabled", "Can Specify Security Groups"]
-    df[bool_cols] = df[bool_cols].astype(bool)
+    if len(workspace) != len(workspaces):
+        raise ValueError(
+            f"{icons.red_dot} The following workspaces are invalid: {unmapped_workspaces}."
+        )
 
-    return df
+    target_capacity_id = _resolve_capacity_name_and_id(target_capacity)[1]
 
+    workspaces = np.array(workspaces)
+    batch_size = 999
+    for i in range(0, len(workspaces), batch_size):
+        batch = workspaces[i : i + batch_size].tolist()
+        request_body = {
+            "capacityMigrationAssignments": [
+                {
+                    "targetCapacityObjectId": target_capacity_id.upper(),
+                    "workspacesToAssign": batch,
+                }
+            ]
+        }
 
-def _list_capacities_meta() -> pd.DataFrame:
+        client = fabric.FabricRestClient()
 
-    df = pd.DataFrame(
-        columns=["Capacity Id", "Capacity Name", "Sku", "Region", "State", "Admins"]
-    )
+        response = client.post(
+            "/v1.0/myorg/admin/capacities/AssignWorkspaces",
+            json=request_body,
+        )
 
-    client = fabric.PowerBIRestClient()
-    try:
-        response = client.get("/v1.0/myorg/admin/capacities")
-    except Exception as e:
-        if e.status_code not in [200, 401]:
+        if response.status_code != 200:
             raise FabricHTTPException(response)
-        elif e.status_code == 401:
-            response = client.get("/v1.0/myorg/capacities")
-
-    for i in response.json().get("value", []):
-        new_data = {
-            "Capacity Id": i.get("id").lower(),
-            "Capacity Name": i.get("displayName"),
-            "Sku": i.get("sku"),
-            "Region": i.get("region"),
-            "State": i.get("state"),
-            "Admins": [i.get("admins", [])],
-        }
-        df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
-
-    return df
+    print(
+        f"{icons.green_dot} The workspaces have been assigned to the '{target_capacity}' capacity. A total of {len(workspaces)} were moved."
+    )
 
 
-def unassign_workspaces_from_capacity(workspaces: str | List[str]):
+def unassign_workspaces_from_capacity(
+    workspaces: str | List[str] | UUID | List[UUID],
+):
     """
     Unassigns workspace(s) from their capacity.
 
@@ -279,14 +274,22 @@ def unassign_workspaces_from_capacity(workspaces: str | List[str]):
 
     Parameters
     ----------
-    workspaces : str | List[str]
-        The Fabric workspace name(s).
+    workspaces : str | List[str] | UUID | List[UUID]
+        The Fabric workspace name(s) or id(s).
     """
-
     if isinstance(workspaces, str):
         workspaces = [workspaces]
 
-    payload = {"workspacesToUnassign": workspaces}
+    dfW = list_workspaces()
+    workspacesIds = dfW[dfW["Name"].isin(workspaces)]["Id"].tolist()
+    workspacesIds = workspacesIds + dfW[dfW["Id"].isin(workspaces)]["Id"].tolist()
+
+    if len(workspacesIds) != len(workspaces):
+        raise ValueError(
+            f"{icons.red_dot} Some of the workspaces provided are not valid."
+        )
+
+    payload = {"workspacesToUnassign": workspacesIds}
 
     client = fabric.PowerBIRestClient()
     response = client.post(
@@ -297,102 +300,57 @@ def unassign_workspaces_from_capacity(workspaces: str | List[str]):
     if response.status_code != 200:
         raise FabricHTTPException(response)
 
-    print(f"{icons.green_dot} The workspaces have been unassigned.")
+    print(
+        f"{icons.green_dot} A total of {len(workspacesIds)} workspaces have been unassigned."
+    )
 
 
-def list_external_data_shares():
+def list_tenant_settings() -> pd.DataFrame:
     """
-    Lists external data shares in the tenant. This function is for admins.
+    Lists all tenant settings.
 
-    This is a wrapper function for the following API: `External Data Shares - List External Data Shares <https://learn.microsoft.com/rest/api/fabric/admin/external-data-shares/list-external-data-shares>`_.
+    This is a wrapper function for the following API: `Tenants - List Tenant Settings <https://learn.microsoft.com/rest/api/fabric/admin/tenants/list-tenant-settings>`_.
 
     Returns
     -------
     pandas.DataFrame
-        A pandas dataframe showing a list of external data shares in the tenant.
+        A pandas dataframe showing the tenant settings.
     """
+    client = fabric.FabricRestClient()
+
+    response = client.get("/v1/admin/tenantsettings")
+
+    if response.status_code != 200:
+        raise FabricHTTPException(response)
 
     df = pd.DataFrame(
         columns=[
-            "External Data Share Id",
-            "Paths",
-            "Creater Principal Id",
-            "Creater Principal Name",
-            "Creater Principal Type",
-            "Creater Principal UPN",
-            "Recipient UPN",
-            "Status",
-            "Expiration Time UTC",
-            "Workspace Id",
-            "Item Id",
-            "Invitation URL",
+            "Setting Name",
+            "Title",
+            "Enabled",
+            "Can Specify Security Groups",
+            "Tenant Setting Group",
+            "Enabled Security Groups",
         ]
     )
 
-    client = fabric.FabricRestClient()
-    response = client.get("/v1/admin/items/externalDataShares")
-
-    if response.status_code != 200:
-        raise FabricHTTPException(response)
-
-    for i in response.json().get("value", []):
-        cp = i.get("creatorPrincipal", {})
+    for i in response.json().get("tenantSettings", []):
         new_data = {
-            "External Data Share Id": i.get("id"),
-            "Paths": [i.get("paths", [])],
-            "Creater Principal Id": cp.get("id"),
-            "Creater Principal Name": cp.get("displayName"),
-            "Creater Principal Type": cp.get("type"),
-            "Creater Principal UPN": cp.get("userDetails", {}).get("userPrincipalName"),
-            "Recipient UPN": i.get("recipient", {}).get("userPrincipalName"),
-            "Status": i.get("status"),
-            "Expiration Time UTC": i.get("expirationTimeUtc"),
-            "Workspace Id": i.get("workspaceId"),
-            "Item Id": i.get("itemId"),
-            "Invitation URL": i.get("invitationUrl"),
+            "Setting Name": i.get("settingName"),
+            "Title": i.get("title"),
+            "Enabled": i.get("enabled"),
+            "Can Specify Security Groups": i.get("canSpecifySecurityGroups"),
+            "Tenant Setting Group": i.get("tenantSettingGroup"),
+            "Enabled Security Groups": [i.get("enabledSecurityGroups", [])],
         }
-
         df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
 
-    date_time_columns = ["Expiration Time UTC"]
-    df[date_time_columns] = pd.to_datetime(df[date_time_columns])
+    bool_cols = ["Enabled", "Can Specify Security Groups"]
+    df[bool_cols] = df[bool_cols].astype(bool)
 
     return df
 
 
-def revoke_external_data_share(
-    external_data_share_id: UUID, item_id: UUID, workspace: str
-):
-    """
-    Revokes the specified external data share. Note: This action cannot be undone.
-
-    This is a wrapper function for the following API: `External Data Shares - Revoke External Data Share <https://learn.microsoft.com/rest/api/fabric/admin/external-data-shares/revoke-external-data-share>`_.
-
-    Parameters
-    ----------
-    external_data_share_id : UUID
-        The external data share ID.
-    item_id : int, default=None
-        The Item ID
-    workspace : str
-        The Fabric workspace name.
-    """
-
-    (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
-
-    client = fabric.FabricRestClient()
-    response = client.post(
-        f"/v1/admin/workspaces/{workspace_id}/items/{item_id}/externalDataShares/{external_data_share_id}/revoke"
-    )
-
-    if response.status_code != 200:
-        raise FabricHTTPException(response)
-
-    print(
-        f"{icons.green_dot} The '{external_data_share_id}' external data share for the '{item_id}' item within the '{workspace}' workspace has been revoked."
-    )
-
-
 def list_capacities_delegated_tenant_settings(
     return_dataframe: bool = True,
 ) -> pd.DataFrame | dict:
@@ -411,7 +369,6 @@ def list_capacities_delegated_tenant_settings(
     pandas.DataFrame | dict
         A pandas dataframe showing a list of tenant setting overrides that override at the capacities.
     """
-
     df = pd.DataFrame(
         columns=[
             "Capacity Id",
@@ -476,68 +433,93 @@ def list_capacities_delegated_tenant_settings(
             "continuationToken": "",
         }
         for r in responses:
-            combined_response["overrides"].extend(r["overrides"])
+            combined_response["overrides"].extend(r["Overrides"])
             combined_response["continuationUri"] = r["continuationUri"]
             combined_response["continuationToken"] = r["continuationToken"]
 
         return combined_response
 
 
-def scan_workspaces(
-    data_source_details: bool = False,
-    dataset_schema: bool = False,
-    dataset_expressions: bool = False,
-    lineage: bool = False,
-    artifact_users: bool = False,
-    workspace: Optional[str | List[str]] = None,
-) -> dict:
+def list_modified_workspaces(
+    modified_since: Optional[str] = None,
+    exclude_inactive_workspaces: Optional[bool] = False,
+    exclude_personal_workspaces: Optional[bool] = False,
+) -> pd.DataFrame:
+    """
+    Gets a list of workspace IDs in the organization.
 
-    if workspace is None:
-        workspace = fabric.resolve_workspace_name()
+    This is a wrapper function for the following API: `Admin - WorkspaceInfo GetModifiedWorkspaces <https://learn.microsoft.com/rest/api/power-bi/admin/workspace-info-get-modified-workspaces>`_.
 
-    if isinstance(workspace, str):
-        workspace = [workspace]
+    Parameters
+    ----------
+    modified_since : str, default=None
+        Last modified date (must be in ISO compliant UTC format). Example: "2024-11-02T05:51:30" or "2024-11-02T05:51:30.0000000Z".
+    exclude_inactive_workspaces : bool, default=False
+        Whether to exclude inactive workspaces.
+    exclude_personal_workspaces : bool, default=False
+        Whether to exclude personal workspaces.
 
-    workspace_list = []
+    Returns
+    -------
+    pandas.DataFrame
+        A pandas dataframe showing a list of workspace IDs in the organization.
+    """
+    client = fabric.PowerBIRestClient()
 
-    for w in workspace:
-        workspace_list.append(fabric.resolve_workspace_id(w))
+    params = {}
 
-    client = fabric.PowerBIRestClient()
-    request_body = {"workspaces": workspace_list}
+    url = "/v1.0/myorg/admin/workspaces/modified"
+
+    if modified_since is not None:
+        modified_since_dt = dtparser(modified_since)
+        params["modifiedSince"] = (
+            f"{modified_since_dt.isoformat(timespec='microseconds')}0Z"
+        )
 
-    response_clause = f"/v1.0/myorg/admin/workspaces/getInfo?lineage={lineage}&datasourceDetails={data_source_details}&datasetSchema={dataset_schema}&datasetExpressions={dataset_expressions}&getArtifactUsers={artifact_users}"
-    response = client.post(response_clause, json=request_body)
+    if exclude_inactive_workspaces is not None:
+        params["excludeInActiveWorkspaces"] = exclude_inactive_workspaces
+
+    if exclude_personal_workspaces is not None:
+        params["excludePersonalWorkspaces"] = exclude_personal_workspaces
+
+    url = _build_url(url, params)
+
+    response = client.get(url)
 
-    if response.status_code != 202:
-        raise FabricHTTPException(response)
-    scan_id = response.json()["id"]
-    scan_status = response.json().get("status")
-    while scan_status not in ["Succeeded", "Failed"]:
-        time.sleep(1)
-        response = client.get(f"/v1.0/myorg/admin/workspaces/scanStatus/{scan_id}")
-        scan_status = response.json().get("status")
-    if scan_status == "Failed":
-        raise FabricHTTPException(response)
-    response = client.get(f"/v1.0/myorg/admin/workspaces/scanResult/{scan_id}")
     if response.status_code != 200:
         raise FabricHTTPException(response)
 
-    return response.json()
+    df = pd.DataFrame(response.json()).rename(columns={"id": "Workspace Id"})
+
+    return df
 
 
-def list_datasets() -> pd.DataFrame:
+def list_datasets(
+    top: Optional[int] = None,
+    filter: Optional[str] = None,
+    skip: Optional[int] = None,
+) -> pd.DataFrame:
     """
     Shows a list of datasets for the organization.
 
     This is a wrapper function for the following API: `Admin - Datasets GetDatasetsAsAdmin <https://learn.microsoft.com/rest/api/power-bi/admin/datasets-get-datasets-as-admin>`_.
 
+    Parameters
+    ----------
+    top : int, default=None
+        Returns only the first n results.
+    filter : str, default=None
+        Returns a subset of a results based on Odata filter query parameter condition.
+    skip : int, default=None
+        Skips the first n results.
+    token_provider : Optional[TokenProvider] = None,
+        Authentication provider used to be use in the request. Supports Service Principal.
+
     Returns
     -------
     pandas.DataFrame
         A pandas dataframe showing a list of datasets for the organization.
     """
-
     df = pd.DataFrame(
         columns=[
             "Dataset Id",
@@ -563,7 +545,22 @@ def list_datasets() -> pd.DataFrame:
     )
 
     client = fabric.PowerBIRestClient()
-    response = client.get("/v1.0/myorg/admin/datasets")
+
+    params = {}
+    url = "/v1.0/myorg/admin/datasets"
+
+    if top is not None:
+        params["$top"] = top
+
+    if filter is not None:
+        params["$filter"] = filter
+
+    if skip is not None:
+        params["$skip"] = skip
+
+    url = _build_url(url, params)
+
+    response = client.get(url)
 
     if response.status_code != 200:
         raise FabricHTTPException(response)
@@ -614,74 +611,6 @@ def list_datasets() -> pd.DataFrame:
     return df
 
 
-def list_item_access_details(
-    item_name: str, type: str, workspace: Optional[str] = None
-) -> pd.DataFrame:
-    """
-    Returns a list of users (including groups and service principals) and lists their workspace roles.
-
-    This is a wrapper function for the following API: `Items - List Item Access Details <https://learn.microsoft.com/rest/api/fabric/admin/items/list-item-access-details>`_.
-
-    Parameters
-    ----------
-    item_name : str
-        Name of the Fabric item.
-    type : str
-        Type of Fabric item.
-    workspace : str, default=None
-        The Fabric workspace name.
-        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
-    -------
-    pandas.DataFrame
-        A pandas dataframe showing a list of users (including groups and service principals) and lists their workspace roles.
-    """
-
-    workspace_name, workspace_id = _resolve_workspace_name_and_id(workspace)
-    item_id = _resolve_item_id(item_name=item_name, type=type, workspace=workspace_name)
-
-    df = pd.DataFrame(
-        columns=[
-            "User Id",
-            "User Name",
-            "User Type",
-            "User Principal Name",
-            "Item Name",
-            "Item Type",
-            "Item Id",
-            "Permissions",
-            "Additional Permissions",
-        ]
-    )
-    client = fabric.FabricRestClient()
-    response = client.get(f"/v1/admin/workspaces/{workspace_id}/items/{item_id}/users")
-
-    if response.status_code != 200:
-        raise FabricHTTPException(response)
-
-    for v in response.json().get("accessDetails", []):
-        new_data = {
-            "User Id": v.get("principal", {}).get("id"),
-            "User Name": v.get("principal", {}).get("displayName"),
-            "User Type": v.get("principal", {}).get("type"),
-            "User Principal Name": v.get("principal", {})
-            .get("userDetails", {})
-            .get("userPrincipalName"),
-            "Item Type": v.get("itemAccessDetails", {}).get("type"),
-            "Permissions": v.get("itemAccessDetails", {}).get("permissions"),
-            "Additional Permissions": v.get("itemAccessDetails", {}).get(
-                "additionalPermissions"
-            ),
-            "Item Name": item_name,
-            "Item Id": item_id,
-        }
-        df = pd.concat([df, pd.DataFrame([new_data])], ignore_index=True)
-
-    return df
-
-
 def list_access_entities(
     user_email_address: str,
 ) -> pd.DataFrame:
@@ -700,7 +629,6 @@ def list_access_entities(
     pandas.DataFrame
         A pandas dataframe showing a list of permission details for Fabric and Power BI items the specified user can access.
     """
-
     df = pd.DataFrame(
         columns=[
             "Item Id",
@@ -711,6 +639,7 @@ def list_access_entities(
         ]
     )
     client = fabric.FabricRestClient()
+
     response = client.get(f"/v1/admin/users/{user_email_address}/access")
 
     if response.status_code != 200:
@@ -744,8 +673,8 @@ def list_workspace_access_details(
 
     Parameters
     ----------
-    workspace : str, default=None
-        The Fabric workspace name.
+    workspace : str | 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.
 
@@ -754,7 +683,6 @@ def list_workspace_access_details(
     pandas.DataFrame
         A pandas dataframe showing a list of users (including groups and Service Principals) that have access to the specified workspace.
     """
-
     workspace_name, workspace_id = _resolve_workspace_name_and_id(workspace)
 
     df = pd.DataFrame(
@@ -767,7 +695,9 @@ def list_workspace_access_details(
             "Workspace Role",
         ]
     )
+
     client = fabric.FabricRestClient()
+
     response = client.get(f"/v1/admin/workspaces/{workspace_id}/users")
     if response.status_code != 200:
         raise FabricHTTPException(response)
@@ -786,140 +716,13 @@ def list_workspace_access_details(
     return df
 
 
-def _resolve_item_id(
-    item_name: str, type: str, workspace: Optional[str] = None
-) -> UUID:
-
-    workspace_name, workspace_id = _resolve_workspace_name_and_id(workspace)
-    dfI = list_items(workspace=workspace_name, type=type)
-    dfI_filt = dfI[dfI["Item Name"] == item_name]
-
-    if len(dfI_filt) == 0:
-        raise ValueError(
-            f"The '{item_name}' {type} does not exist within the '{workspace_name}' workspace."
-        )
-
-    return dfI_filt["Item Id"].iloc[0]
-
-
-def _resolve_workspace_name_and_id(workspace: str) -> Tuple[str, UUID]:
-
-    filter_condition = urllib.parse.quote(workspace)
-    dfW_filt = list_workspaces(filter=f"name eq '{filter_condition}'")
-    workspace_name = dfW_filt["Name"].iloc[0]
-    workspace_id = dfW_filt["Id"].iloc[0]
-
-    return workspace_name, workspace_id
-
-
-def list_items(
-    capacity_name: Optional[str] = None,
-    workspace: Optional[str] = None,
-    state: Optional[str] = None,
-    type: Optional[str] = None,
-) -> pd.DataFrame:
-    """
-    Shows a list of active Fabric and Power BI items.
-
-    This is a wrapper function for the following API: `Items - List Items <https://learn.microsoft.com/rest/api/fabric/admin/items/list-items>`_.
-
-    Parameters
-    ----------
-    capacity_name : str, default=None
-        The capacity name.
-    workspace : str, default=None
-        The Fabric workspace name.
-        Defaults to None which resolves to the workspace of the attached lakehouse
-        or if no lakehouse attached, resolves to the workspace of the notebook.
-    state : str, default=None
-        The item state.
-    type : str, default=None
-        The item type.
-
-    Returns
-    -------
-    pandas.DataFrame
-        A pandas dataframe showing a list of active Fabric and Power BI items.
-    """
-
-    url = "/v1/admin/items?"
-
-    df = pd.DataFrame(
-        columns=[
-            "Item Id",
-            "Item Name",
-            "Type",
-            "Description",
-            "State",
-            "Last Updated Date",
-            "Creator Principal Id",
-            "Creator Principal Display Name",
-            "Creator Principal Type",
-            "Creator User Principal Name",
-            "Workspace Id",
-            "Capacity Id",
-        ]
-    )
-
-    if workspace is not None:
-        workspace_name, workspace_id = _resolve_workspace_name_and_id(workspace)
-        url += f"workspaceId={workspace_id}&"
-    if capacity_name is not None:
-        dfC = list_capacities()
-        dfC_filt = dfC[dfC["Capacity Name"] == capacity_name]
-        if len(dfC_filt) == 0:
-            raise ValueError(
-                f"{icons.red_dot} The '{capacity_name}' capacity does not exist."
-            )
-        capacity_id = dfC_filt["Capacity Id"].iloc[0]
-        url += f"capacityId={capacity_id}&"
-    if state is not None:
-        url += f"state={state}&"
-    if type is not None:
-        url += f"type={type}&"
-
-    if url.endswith("?") or url.endswith("&"):
-        url = url[:-1]
-
-    client = fabric.FabricRestClient()
-    response = client.get(url)
-
-    if response.status_code != 200:
-        raise FabricHTTPException(response)
-
-    responses = pagination(client, response)
-
-    for r in responses:
-        for v in r.get("itemEntities", []):
-            new_data = {
-                "Item Id": v.get("id"),
-                "Type": v.get("type"),
-                "Item Name": v.get("name"),
-                "Description": v.get("description"),
-                "State": v.get("state"),
-                "Last Updated Date": v.get("lastUpdatedDate"),
-                "Creator Principal Id": v.get("creatorPrincipal", {}).get("id"),
-                "Creator Principal Display Name": v.get("creatorPrincipal", {}).get(
-                    "displayName"
-                ),
-                "Creator Principal Type": v.get("creatorPrincipal", {}).get("type"),
-                "Creator User Principal Name": v.get("creatorPrincipal", {})
-                .get("userDetails", {})
-                .get("userPrincipalName"),
-                "Workspace Id": v.get("workspaceId"),
-                "Capacity Id": v.get("capacityId"),
-            }
-            df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
-
-    return df
-
-
 def list_activity_events(
     start_time: str,
     end_time: str,
     activity_filter: Optional[str] = None,
     user_id_filter: Optional[str] = None,
-):
+    return_dataframe: Optional[bool] = True,
+) -> pd.DataFrame | dict:
     """
     Shows a list of audit activity events for a tenant.
 
@@ -935,15 +738,16 @@ def list_activity_events(
         Filter value for activities. Example: 'viewreport'.
     user_id_filter : str, default=None
         Email address of the user.
+    return_dataframe : bool, default=True
+        If True the response is a pandas.DataFrame. If False returns the original Json. Default True
 
     Returns
     -------
-    pandas.DataFrame
-        A pandas dataframe showing a list of audit activity events for a tenant.
+    pandas.DataFrame | dict
+        A pandas dataframe or json showing a list of audit activity events for a tenant.
     """
-
-    start_dt = datetime.strptime(start_time, "%Y-%m-%dT%H:%M:%S")
-    end_dt = datetime.strptime(end_time, "%Y-%m-%dT%H:%M:%S")
+    start_dt = dtparser(start_time)
+    end_dt = dtparser(end_time)
 
     if not start_dt.date() == end_dt.date():
         raise ValueError(
@@ -976,104 +780,227 @@ def list_activity_events(
         ]
     )
 
+    resposeJson = {"activityEventEntities": []}
+
     tic = "%27"
     space = "%20"
     client = fabric.PowerBIRestClient()
-    base_url = "/v1.0/myorg/admin/activityevents"
+
+    params = {}
+    url = "/v1.0/myorg/admin/activityevents"
+
+    if start_dt is not None:
+        params["startDateTime"] = f"'{start_dt.isoformat(timespec='milliseconds')}'"
+
+    if end_dt is not None:
+        params["endDateTime"] = f"'{end_dt.isoformat(timespec='milliseconds')}'"
+
     conditions = []
 
     if activity_filter is not None:
         conditions.append(f"Activity{space}eq{space}{tic}{activity_filter}{tic}")
+
     if user_id_filter is not None:
         conditions.append(f"UserId{space}eq{space}{tic}{user_id_filter}{tic}")
 
-    filter_value = (
-        f"&$filter={f'{space}and{space}'.join(conditions)}" if conditions else ""
+    if conditions:
+        params["filder"] = f"{f'{space}and{space}'.join(conditions)}"
+
+    url_parts = list(urllib.parse.urlparse(url))
+    url_parts[4] = urllib.parse.urlencode(params)
+    url = urllib.parse.urlunparse(url_parts)
+
+    response = client.get(url)
+
+    if response.status_code != 200:
+        raise FabricHTTPException(response)
+
+    responses = pagination(client, response)
+
+    for r in responses:
+        if return_dataframe:
+            for i in r.get("activityEventEntities", []):
+                new_data = {
+                    "Id": i.get("id"),
+                    "Record Type": i.get("RecordType"),
+                    "Creation Time": i.get("CreationTime"),
+                    "Operation": i.get("Operation"),
+                    "Organization Id": i.get("OrganizationId"),
+                    "User Type": i.get("UserType"),
+                    "User Key": i.get("UserKey"),
+                    "Workload": i.get("Workload"),
+                    "Result Status": i.get("ResultStatus"),
+                    "User Id": i.get("UserId"),
+                    "Client IP": i.get("ClientIP"),
+                    "User Agent": i.get("UserAgent"),
+                    "Activity": i.get("Activity"),
+                    "Workspace Name": i.get("WorkSpaceName"),
+                    "Workspace Id": i.get("WorkspaceId"),
+                    "Object Id": i.get("ObjectId"),
+                    "Request Id": i.get("RequestId"),
+                    "Object Type": i.get("ObjectType"),
+                    "Object Display Name": i.get("ObjectDisplayName"),
+                    "Experience": i.get("Experience"),
+                    "Refresh Enforcement Policy": i.get("RefreshEnforcementPolicy"),
+                }
+                df = pd.concat(
+                    [df, pd.DataFrame(new_data, index=[0])],
+                    ignore_index=True,
+                )
+        else:
+            resposeJson["activityEventEntities"].extend(r.get("activityEventEntities"))
+
+    if return_dataframe:
+        df["Creation Time"] = pd.to_datetime(df["Creation Time"])
+        activity_events = df
+    else:
+        activity_events = resposeJson
+
+    return activity_events
+
+
+def _resolve_capacity_name_and_id(
+    capacity: str | UUID,
+) -> Tuple[str, UUID]:
+
+    dfC = list_capacities(capacity=capacity)
+    try:
+        capacity_name = dfC["Capacity Name"].iloc[0]
+        capacity_id = dfC["Capacity Id"].iloc[0]
+    except Exception:
+        raise ValueError(f"{icons.red_dot} The '{capacity}' capacity was not found.")
+
+    return capacity_name, capacity_id
+
+
+def _list_capacities_meta() -> pd.DataFrame:
+    """
+    Shows the a list of capacities and their properties. This function is the admin version.
+
+    This is a wrapper function for the following API: `Admin - Get Capacities As Admin <https://learn.microsoft.com/rest/api/power-bi/admin/get-capacities-as-admin>`_.
+
+    Returns
+    -------
+    pandas.DataFrame
+        A pandas dataframe showing the capacities and their properties
+    """
+
+    client = fabric.FabricRestClient()
+
+    df = pd.DataFrame(
+        columns=["Capacity Id", "Capacity Name", "Sku", "Region", "State", "Admins"]
     )
 
-    full_url = f"{base_url}?startDateTime={tic}{start_time}{tic}&endDateTime={tic}{end_time}{tic}{filter_value}"
-    response = client.get(full_url)
+    response = client.get("/v1.0/myorg/admin/capacities")
+
     if response.status_code != 200:
         raise FabricHTTPException(response)
 
     responses = pagination(client, response)
 
     for r in responses:
-        for i in r.get("activityEventEntities", []):
+        for i in r.get("value", []):
             new_data = {
-                "Id": i.get("id"),
-                "Record Type": i.get("RecordType"),
-                "Creation Time": i.get("CreationTime"),
-                "Operation": i.get("Operation"),
-                "Organization Id": i.get("OrganizationId"),
-                "User Type": i.get("UserType"),
-                "User Key": i.get("UserKey"),
-                "Workload": i.get("Workload"),
-                "Result Status": i.get("ResultStatus"),
-                "User Id": i.get("UserId"),
-                "Client IP": i.get("ClientIP"),
-                "User Agent": i.get("UserAgent"),
-                "Activity": i.get("Activity"),
-                "Workspace Name": i.get("WorkSpaceName"),
-                "Workspace Id": i.get("WorkspaceId"),
-                "Object Id": i.get("ObjectId"),
-                "Request Id": i.get("RequestId"),
-                "Object Type": i.get("ObjectType"),
-                "Object Display Name": i.get("ObjectDisplayName"),
-                "Experience": i.get("Experience"),
-                "Refresh Enforcement Policy": i.get("RefreshEnforcementPolicy"),
+                "Capacity Id": i.get("id").lower(),
+                "Capacity Name": i.get("displayName"),
+                "Sku": i.get("sku"),
+                "Region": i.get("region"),
+                "State": i.get("state"),
+                "Admins": [i.get("admins", [])],
             }
-            df = pd.concat(
-                [df, pd.DataFrame(new_data, index=[0])],
-                ignore_index=True,
-            )
-
-    df["Creation Time"] = pd.to_datetime(df["Creation Time"])
+            df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
 
     return df
 
 
-def list_modified_workspaces(
-    modified_since: Optional[str] = None,
-    exclude_inactive_workspaces: bool = False,
-    exclude_personal_workspaces: bool = False,
+def _resolve_workspace_name_and_id(
+    workspace: str | UUID,
+) -> Tuple[str, UUID]:
+
+    dfW = list_workspaces(workspace=workspace)
+    try:
+        workspace_name = dfW["Name"].iloc[0]
+        workspace_id = dfW["Id"].iloc[0]
+    except Exception:
+        raise ValueError(f"{icons.red_dot} The '{workspace}' workspace was not found.")
+
+    return workspace_name, workspace_id
+
+
+def list_reports(
+    top: Optional[int] = None, skip: Optional[int] = None, filter: Optional[str] = None
 ) -> pd.DataFrame:
     """
-    Gets a list of workspace IDs in the organization.
+    Shows a list of reports for the organization.
 
-    This is a wrapper function for the following API: `Admin - WorkspaceInfo GetModifiedWorkspaces <https://learn.microsoft.com/rest/api/power-bi/admin/workspace-info-get-modified-workspaces>`_.
-
-    Parameters
-    ----------
-    modified_since : str
-        Last modified date (must be in ISO 8601 compliant UTC format). Example: "2024-11-02T05:51:30.0000000Z".
-    exclude_inactive_workspaces : bool, default=False
-        Whether to exclude inactive workspaces.
-    exclude_personal_workspaces : bool, default=False
-        Whether to exclude personal workspaces.
+    This is a wrapper function for the following API: `Admin - Reports GetReportsAsAdmin <https://learn.microsoft.com/rest/api/power-bi/admin/reports-get-reports-as-admin>`_.
 
     Returns
     -------
     pandas.DataFrame
-        A pandas dataframe showing a list of workspace IDs in the organization.
+        A pandas dataframe showing a list of reports for the organization.
     """
 
-    client = fabric.PowerBIRestClient()
-    url = "/v1.0/myorg/admin/workspaces/modified?"
+    df = pd.DataFrame(
+        columns=[
+            "Report Id",
+            "Report Name",
+            "Type",
+            "Web URL",
+            "Embed URL",
+            "Dataset Id",
+            "Created Date",
+            "Modified Date",
+            "Created By",
+            "Modified By",
+            "Sensitivity Label Id",
+            "Users",
+            "Subscriptions",
+            "Workspace Id",
+            "Report Flags",
+        ]
+    )
 
-    if modified_since is not None:
-        url += f"modifiedSince={modified_since}&"
-    if exclude_inactive_workspaces:
-        url += f"excludeInActiveWorkspaces={exclude_inactive_workspaces}&"
-    if exclude_personal_workspaces:
-        url += f"excludePersonalWorkspaces={exclude_personal_workspaces}&"
+    url = "/v1.0/myorg/admin/reports?"
+    if top is not None:
+        url += f"$top={top}&"
+    if skip is not None:
+        url += f"$skip={skip}&"
+    if filter is not None:
+        url += f"$filter={filter}&"
 
-    url = url.rstrip("&").rstrip("?")
+    url.rstrip("$").rstrip("?")
 
+    client = fabric.PowerBIRestClient()
     response = client.get(url)
+
     if response.status_code != 200:
         raise FabricHTTPException(response)
 
-    df = pd.DataFrame(response.json()).rename(columns={"id": "Workspace Id"})
+    for v in response.json().get("value", []):
+        new_data = {
+            "Report Id": v.get("id"),
+            "Report Name": v.get("name"),
+            "Type": v.get("reportType"),
+            "Web URL": v.get("webUrl"),
+            "Embed URL": v.get("embedUrl"),
+            "Dataset Id": v.get("datasetId"),
+            "Created Date": v.get("createdDateTime"),
+            "Modified Date": v.get("modifiedDateTime"),
+            "Created By": v.get("createdBy"),
+            "Modified By": v.get("modifiedBy"),
+            "Sensitivity Label Id": v.get("sensitivityLabel", {}).get("labelId"),
+            "Users": v.get("users"),
+            "Subscriptions": v.get("subscriptions"),
+            "Workspace Id": v.get("workspaceId"),
+            "Report Flags": v.get("reportFlags"),
+        }
+        df = pd.concat([df, pd.DataFrame([new_data])], ignore_index=True)
+
+    int_cols = ["Report Flags"]
+    df[int_cols] = df[int_cols].astype(int)
+
+    df["Created Date"] = pd.to_datetime(df["Created Date"], errors="coerce")
+    df["Modified Date"] = pd.to_datetime(df["Modified Date"], errors="coerce")
 
     return df