semantic-link-labs 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

sempy_labs/migration/_migrate_tables_columns_to_semantic_model.py

@@ -6,7 +6,7 @@ from sempy_labs._list_functions import list_tables
 from sempy_labs.directlake._get_shared_expression import get_shared_expression
 from sempy_labs._helper_functions import resolve_lakehouse_name
 from sempy_labs.lakehouse._lakehouse import lakehouse_attached
-from sempy_labs._tom import connect_semantic_model
+from sempy_labs.tom import connect_semantic_model
 from typing import List, Optional, Union
 from sempy._utils._log import log
 import sempy_labs._icons as icons
@@ -50,13 +50,13 @@ def migrate_tables_columns_to_semantic_model(
 
     workspace = fabric.resolve_workspace_name(workspace)
 
-    if new_dataset_workspace == None:
+    if new_dataset_workspace is None:
         new_dataset_workspace = workspace
 
-    if lakehouse_workspace == None:
+    if lakehouse_workspace is None:
         lakehouse_workspace = new_dataset_workspace
 
-    if lakehouse == None:
+    if lakehouse is None:
         lakehouse_id = fabric.get_lakehouse_id()
         lakehouse = resolve_lakehouse_name(lakehouse_id, lakehouse_workspace)
 
@@ -158,8 +158,8 @@ def migrate_tables_columns_to_semantic_model(
             f"{icons.red_dot} Lakehouse not attached to notebook and lakehouse/lakehouse_workspace are not specified. Please add your lakehouse to this notebook or specify the lakehouse/lakehouse_workspace parameters."
         )
         print(
-            f"To attach a lakehouse to a notebook, go to the the 'Explorer' window to the left, click 'Lakehouses' to add your lakehouse to this notebook"
+            "To attach a lakehouse to a notebook, go to the the 'Explorer' window to the left, click 'Lakehouses' to add your lakehouse to this notebook"
         )
         print(
-            f"\nLearn more here: https://learn.microsoft.com/fabric/data-engineering/lakehouse-notebook-explore#add-or-remove-a-lakehouse"
+            "\nLearn more here: https://learn.microsoft.com/fabric/data-engineering/lakehouse-notebook-explore#add-or-remove-a-lakehouse"
         )

sempy_labs/migration/_migration_validation.py

@@ -1,173 +1,10 @@
 import sempy
 import sempy.fabric as fabric
 import pandas as pd
-from sempy_labs._helper_functions import create_relationship_name
-from sempy_labs._tom import connect_semantic_model
 from typing import List, Optional, Union
+from sempy_labs._list_functions import list_semantic_model_objects
 from sempy._utils._log import log
 
-
-def list_semantic_model_objects(dataset: str, workspace: Optional[str] = None):
-    """
-    Shows a list of semantic model objects.
-
-    Parameters
-    ----------
-    dataset : str
-        Name of the semantic model.
-    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 objects in the semantic model
-    """
-
-    df = pd.DataFrame(columns=["Parent Name", "Object Name", "Object Type"])
-    with connect_semantic_model(
-        dataset=dataset, workspace=workspace, readonly=True
-    ) as tom:
-        for t in tom.model.Tables:
-            if t.CalculationGroup is not None:
-                new_data = {
-                    "Parent Name": t.Parent.Name,
-                    "Object Name": t.Name,
-                    "Object Type": "Calculation Group",
-                }
-                df = pd.concat(
-                    [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                )
-                for ci in t.CalculationGroup.CalculationItems:
-                    new_data = {
-                        "Parent Name": t.Name,
-                        "Object Name": ci.Name,
-                        "Object Type": str(ci.ObjectType),
-                    }
-                    df = pd.concat(
-                        [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                    )
-            elif any(str(p.SourceType) == "Calculated" for p in t.Partitions):
-                new_data = {
-                    "Parent Name": t.Parent.Name,
-                    "Object Name": t.Name,
-                    "Object Type": "Calculated Table",
-                }
-                df = pd.concat(
-                    [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                )
-            else:
-                new_data = {
-                    "Parent Name": t.Parent.Name,
-                    "Object Name": t.Name,
-                    "Object Type": str(t.ObjectType),
-                }
-                df = pd.concat(
-                    [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                )
-            for c in t.Columns:
-                if str(c.Type) != "RowNumber":
-                    if str(c.Type) == "Calculated":
-                        new_data = {
-                            "Parent Name": c.Parent.Name,
-                            "Object Name": c.Name,
-                            "Object Type": "Calculated Column",
-                        }
-                        df = pd.concat(
-                            [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                        )
-                    else:
-                        new_data = {
-                            "Parent Name": c.Parent.Name,
-                            "Object Name": c.Name,
-                            "Object Type": str(c.ObjectType),
-                        }
-                        df = pd.concat(
-                            [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                        )
-            for m in t.Measures:
-                new_data = {
-                    "Parent Name": m.Parent.Name,
-                    "Object Name": m.Name,
-                    "Object Type": str(m.ObjectType),
-                }
-                df = pd.concat(
-                    [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                )
-            for h in t.Hierarchies:
-                new_data = {
-                    "Parent Name": h.Parent.Name,
-                    "Object Name": h.Name,
-                    "Object Type": str(h.ObjectType),
-                }
-                df = pd.concat(
-                    [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                )
-                for l in h.Levels:
-                    new_data = {
-                        "Parent Name": l.Parent.Name,
-                        "Object Name": l.Name,
-                        "Object Type": str(l.ObjectType),
-                    }
-                    df = pd.concat(
-                        [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                    )
-            for p in t.Partitions:
-                new_data = {
-                    "Parent Name": p.Parent.Name,
-                    "Object Name": p.Name,
-                    "Object Type": str(p.ObjectType),
-                }
-                df = pd.concat(
-                    [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                )
-        for r in tom.model.Relationships:
-            rName = create_relationship_name(
-                r.FromTable.Name, r.FromColumn.Name, r.ToTable.Name, r.ToColumn.Name
-            )
-            new_data = {
-                "Parent Name": r.Parent.Name,
-                "Object Name": rName,
-                "Object Type": str(r.ObjectType),
-            }
-            df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
-        for role in tom.model.Roles:
-            new_data = {
-                "Parent Name": role.Parent.Name,
-                "Object Name": role.Name,
-                "Object Type": str(role.ObjectType),
-            }
-            df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
-            for rls in role.TablePermissions:
-                new_data = {
-                    "Parent Name": role.Name,
-                    "Object Name": rls.Name,
-                    "Object Type": str(rls.ObjectType),
-                }
-                df = pd.concat(
-                    [df, pd.DataFrame(new_data, index=[0])], ignore_index=True
-                )
-        for tr in tom.model.Cultures:
-            new_data = {
-                "Parent Name": tr.Parent.Name,
-                "Object Name": tr.Name,
-                "Object Type": str(tr.ObjectType),
-            }
-            df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
-        for per in tom.model.Perspectives:
-            new_data = {
-                "Parent Name": per.Parent.Name,
-                "Object Name": per.Name,
-                "Object Type": str(per.ObjectType),
-            }
-            df = pd.concat([df, pd.DataFrame(new_data, index=[0])], ignore_index=True)
-
-    return df
-
-
 @log
 def migration_validation(
     dataset: str,

sempy_labs/migration/_refresh_calc_tables.py

@@ -3,7 +3,7 @@ import sempy.fabric as fabric
 import pandas as pd
 import re, datetime, time
 from pyspark.sql import SparkSession
-from sempy_labs._tom import connect_semantic_model
+from sempy_labs.tom import connect_semantic_model
 from typing import List, Optional, Union
 from sempy._utils._log import log
 import sempy_labs._icons as icons
@@ -118,10 +118,8 @@ def refresh_calc_tables(dataset: str, workspace: Optional[str] = None):
                             print(
                                 f"{icons.green_dot} Calculated table '{tName}' has been refreshed as the '{delta_table_name.lower()}' table in the lakehouse."
                             )
-                        except:
-                            print(
-                                f"{icons.red_dot} Failed to create calculated table '{tName}' as a delta table in the lakehouse."
-                            )
+                        except Exception as e:
+                            raise ValueError(f"{icons.red_dot} Failed to create calculated table '{tName}' as a delta table in the lakehouse.") from e
 
         except Exception as e:
             if datetime.datetime.now() - start_time > timeout:

sempy_labs/report/__init__.py

@@ -1,6 +1,6 @@
 from sempy_labs.report._generate_report import (
     create_report_from_reportjson,
-    update_report_from_reportjson,
+    #update_report_from_reportjson,
 )
 from sempy_labs.report._report_functions import (
     get_report_json,
@@ -20,7 +20,7 @@ from sempy_labs.report._report_rebind import (
 
 __all__ = [
     "create_report_from_reportjson",
-    "update_report_from_reportjson",
+    #"update_report_from_reportjson",
     "get_report_json",
     # report_dependency_tree,
     "export_report",

sempy_labs/report/_generate_report.py

@@ -4,13 +4,14 @@ import pandas as pd
 import json, base64, time
 from typing import Optional
 from sempy_labs._helper_functions import resolve_workspace_name_and_id
+import sempy_labs._icons as icons
 
 
 def create_report_from_reportjson(
     report: str,
     dataset: str,
-    report_json: str,
-    theme_json: Optional[str] = None,
+    report_json: dict,
+    theme_json: Optional[dict] = None,
     workspace: Optional[str] = None,
 ):
     """
@@ -22,9 +23,9 @@ def create_report_from_reportjson(
         Name of the report.
     dataset : str
         Name of the semantic model to connect to the report.
-    report_json : str
+    report_json : dict
         The report.json file to be used to create the report.
-    theme_json : str, default=None
+    theme_json : dict, default=None
         The theme.json file to be used for the theme of the report.
     workspace : str, default=None
         The Fabric workspace name.
@@ -41,7 +42,7 @@ def create_report_from_reportjson(
 
     if len(dfI_model) == 0:
         print(
-            f"ERROR: The '{dataset}' semantic model does not exist in the '{workspace}' workspace."
+            f"{icons.red_dot} The '{dataset}' semantic model does not exist in the '{workspace}' workspace."
         )
         return
 
@@ -52,7 +53,7 @@ def create_report_from_reportjson(
 
     if len(dfI_rpt) > 0:
         print(
-            f"WARNING: '{report}' already exists as a report in the '{workspace}' workspace."
+            f"{icons.yellow_dot} '{report}' already exists as a report in the '{workspace}' workspace."
         )
         return
 
@@ -82,7 +83,7 @@ def create_report_from_reportjson(
     definitionPBIR = conv_b64(defPBIR)
     payloadReportJson = conv_b64(report_json)
 
-    if theme_json == None:
+    if theme_json is None:
         request_body = {
             "displayName": report,
             "type": objectType,
@@ -132,7 +133,7 @@ def create_report_from_reportjson(
     response = client.post(f"/v1/workspaces/{workspace_id}/items", json=request_body)
 
     if response.status_code == 201:
-        print("Report creation succeeded")
+        print(f"{icons.green_dot} Report creation succeeded")
         print(response.json())
     elif response.status_code == 202:
         operationId = response.headers["x-ms-operation-id"]
@@ -143,7 +144,7 @@ def create_report_from_reportjson(
             response = client.get(f"/v1/operations/{operationId}")
             response_body = json.loads(response.content)
         response = client.get(f"/v1/operations/{operationId}/result")
-        print("Report creation succeeded")
+        print(f"{icons.green_dot} Report creation succeeded")
         print(response.json())
 
 
@@ -167,13 +168,11 @@ def update_report_from_reportjson(
 
     (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
 
-    objectType = "Report"
-
     dfR = fabric.list_reports(workspace=workspace)
     dfR_filt = dfR[(dfR["Name"] == report) & (dfR["Report Type"] == "PowerBIReport")]
 
     if len(dfR_filt) == 0:
-        print(f"The '{report}' report does not exist in the '{workspace}' workspace.")
+        print(f"{icons.red_dot} The '{report}' report does not exist in the '{workspace}' workspace.")
         return
 
     reportId = dfR_filt["Id"].iloc[0]
@@ -215,7 +214,7 @@ def update_report_from_reportjson(
 
     request_body = {
         "displayName": report,
-        "type": objectType,
+        "type": 'Report',
         "definition": {
             "parts": [
                 {
@@ -238,7 +237,7 @@ def update_report_from_reportjson(
     )
 
     if response.status_code == 201:
-        print(f"The '{report}' report has been successfully updated.")
+        print(f"{icons.green_dot} The '{report}' report has been successfully updated.")
         # print(response.json())
     elif response.status_code == 202:
         operationId = response.headers["x-ms-operation-id"]
@@ -249,5 +248,5 @@ def update_report_from_reportjson(
             response = client.get(f"/v1/operations/{operationId}")
             response_body = json.loads(response.content)
         response = client.get(f"/v1/operations/{operationId}/result")
-        print(f"The '{report}' report has been successfully updated.")
+        print(f"{icons.green_dot} The '{report}' report has been successfully updated.")
         # print(response.json())

sempy_labs/report/_report_functions.py

@@ -1,7 +1,7 @@
 import sempy
 import sempy.fabric as fabric
 import pandas as pd
-import json, os, time, base64, copy, re
+import json, os, time, base64, copy
 from anytree import Node, RenderTree
 from powerbiclient import Report
 from synapse.ml.services import Translate
@@ -73,7 +73,7 @@ def get_report_json(
 
     if save_to_file_name is not None:
         lakeAttach = lakehouse_attached()
-        if lakeAttach == False:
+        if lakeAttach is False:
             print(
                 f"{icons.red_dot} In order to save the report.json file, a lakehouse must be attached to the notebook. Please attach a lakehouse to this notebook."
             )
@@ -107,7 +107,7 @@ def report_dependency_tree(workspace: Optional[str] = None):
         or if no lakehouse attached, resolves to the workspace of the notebook.
     """
 
-    if workspace == None:
+    if workspace is None:
         workspaceId = fabric.get_workspace_id()
         workspace = fabric.resolve_workspace_name(workspaceId)
 
@@ -190,7 +190,7 @@ def export_report(
 
     lakeAttach = lakehouse_attached()
 
-    if lakeAttach == False:
+    if lakeAttach is False:
         print(
             f"{icons.red_dot} In order to run the 'export_report' function, a lakehouse must be attached to the notebook. Please attach a lakehouse to this notebook."
         )
@@ -240,7 +240,7 @@ def export_report(
         )
         return
 
-    if file_name == None:
+    if file_name is None:
         file_name = report + fileExt
     else:
         file_name = file_name + fileExt
@@ -466,7 +466,7 @@ def clone_report(
             return
         target_workspace_id = dfW_filt["Id"].iloc[0]
 
-    if target_dataset == None:
+    if target_dataset is None:
         dfR = fabric.list_reports(workspace=target_workspace)
         dfR_filt = dfR[dfR["Name"] == report]
         target_dataset_id = dfR_filt["Dataset Id"].iloc[0]
@@ -532,7 +532,7 @@ def launch_report(report: str, workspace: Optional[str] = None):
         An embedded Power BI report within the notebook.
     """
 
-    from .HelperFunctions import resolve_report_id
+    from sempy_labs import resolve_report_id
 
     (workspace, workspace_id) = resolve_workspace_name_and_id(workspace)
 
@@ -562,7 +562,7 @@ def list_report_pages(report: str, workspace: Optional[str] = None):
         A pandas dataframe showing the pages within a Power BI report and their properties.
     """
 
-    if workspace == None:
+    if workspace is None:
         workspace_id = fabric.get_workspace_id()
         workspace = fabric.resolve_workspace_name(workspace_id)
 
@@ -626,7 +626,7 @@ def list_report_visuals(report: str, workspace: Optional[str] = None):
         A pandas dataframe showing the visuals within a Power BI report and their properties.
     """
 
-    if workspace == None:
+    if workspace is None:
         workspace_id = fabric.get_workspace_id()
         workspace = fabric.resolve_workspace_name(workspace_id)
 
@@ -681,7 +681,7 @@ def list_report_bookmarks(report: str, workspace: Optional[str] = None):
         A pandas dataframe showing the bookmarks within a Power BI report and their properties.
     """
 
-    if workspace == None:
+    if workspace is None:
         workspace_id = fabric.get_workspace_id()
         workspace = fabric.resolve_workspace_name(workspace_id)
 
@@ -750,6 +750,7 @@ def list_report_bookmarks(report: str, workspace: Optional[str] = None):
         )
 
 
+@log
 def translate_report_titles(
     report: str, languages: Union[str, List[str]], workspace: Optional[str] = None
 ):

sempy_labs/report/_report_rebind.py

@@ -1,11 +1,10 @@
 import sempy
 import sempy.fabric as fabric
 from sempy_labs._helper_functions import resolve_dataset_id, resolve_report_id
-from typing import List, Optional, Union
+from typing import Optional
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 
-
 @log
 def report_rebind(
     report: str,
@@ -36,12 +35,12 @@ def report_rebind(
 
     """
 
-    if report_workspace == None:
+    if report_workspace is None:
         report_workspace_id = fabric.get_workspace_id()
         report_workspace = fabric.resolve_workspace_name(report_workspace_id)
     else:
         report_workspace_id = fabric.resolve_workspace_id(report_workspace)
-    if dataset_workspace == None:
+    if dataset_workspace is None:
         dataset_workspace = report_workspace
 
     client = fabric.PowerBIRestClient()
@@ -104,16 +103,16 @@ def report_rebind_all(
 
     """
 
-    if dataset_workspace == None:
+    if dataset_workspace is None:
         dataset_workspace_id = fabric.get_workspace_id()
         dataset_workspace = fabric.resolve_workspace_name(dataset_workspace_id)
     else:
         dataset_workspace_id = fabric.resolve_workspace_id(dataset_workspace)
 
-    if new_dataset_workpace == None:
+    if new_dataset_workpace is None:
         new_dataset_workpace = dataset_workspace
 
-    if report_workspace == None:
+    if report_workspace is None:
         report_workspace = dataset_workspace
 
     datasetId = resolve_dataset_id(dataset, dataset_workspace)

sempy_labs/tom/__init__.py

@@ -0,0 +1,6 @@
+from sempy_labs.tom._model import TOMWrapper, connect_semantic_model
+
+__all__ = [
+    "TOMWrapper",
+    "connect_semantic_model"
+]