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

sempy_labs/migration/_migrate_model_objects_to_semantic_model.py

@@ -1,6 +1,8 @@
 import sempy
 import sempy.fabric as fabric
-import re, datetime, time
+import re
+import datetime
+import time
 from sempy_labs._list_functions import list_tables
 from sempy_labs._helper_functions import create_relationship_name
 from sempy_labs.tom import connect_semantic_model
@@ -8,6 +10,7 @@ from typing import Optional
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 
+
 @log
 def migrate_model_objects_to_semantic_model(
     dataset: str,
@@ -38,11 +41,7 @@ def migrate_model_objects_to_semantic_model(
     import Microsoft.AnalysisServices.Tabular as TOM
     import System
 
-    if workspace is None:
-        workspace_id = fabric.get_workspace_id()
-        workspace = fabric.resolve_workspace_name(workspace_id)
-    else:
-        workspace_id = fabric.resolve_workspace_id(workspace)
+    workspace = fabric.resolve_workspace_name(workspace)
 
     if new_dataset_workspace is None:
         new_dataset_workspace = workspace
@@ -63,7 +62,6 @@ def migrate_model_objects_to_semantic_model(
 
     dfP_cc = dfPar[(dfPar["Source Type"] == "Calculated")]
     dfP_fp = dfP_cc[dfP_cc["Query"].str.contains("NAMEOF")]
-    dfC_fp = dfC[dfC["Table Name"].isin(dfP_fp["Table Name"].values)]
 
     print(f"{icons.in_progress} Updating '{new_dataset}' based on '{dataset}'...")
     start_time = datetime.datetime.now()
@@ -128,12 +126,15 @@ def migrate_model_objects_to_semantic_model(
                                 c.IsKey = bool(dfC_filt["Key"].iloc[0])
                                 sbc = dfC_filt["Sort By Column"].iloc[0]
 
-                                if sbc != None:
-                                    try:
+                                if sbc is not None:
+                                    if any(
+                                        o.Name == sbc and o.Parent.Name == c.Parent.Name
+                                        for o in tom.all_columns()
+                                    ):
                                         c.SortByColumn = tom.model.Tables[
                                             t.Name
                                         ].Columns[sbc]
-                                    except:
+                                    else:
                                         print(
                                             f"{icons.red_dot} Failed to create '{sbc}' as a Sort By Column for the '{c.Name}' in the '{t.Name}' table."
                                         )
@@ -163,9 +164,11 @@ def migrate_model_objects_to_semantic_model(
                     cols = r["Column Name"]
                     lvls = r["Level Name"]
 
-                    try:
-                        tom.model.Tables[tName].Hierarchies[hName]
-                    except:
+                    if not any(
+                        t.Name == tName and h.Name == hName
+                        for t in tom.model.Tables
+                        for h in t.Hierarchies
+                    ):
                         tom.add_hierarchy(
                             table_name=tName,
                             hierarchy_name=hName,
@@ -188,9 +191,7 @@ def migrate_model_objects_to_semantic_model(
                     mDesc = r["Measure Description"]
                     mFS = r["Format String"]
 
-                    try:
-                        tom.model.Tables[tName].Measures[mName]
-                    except:
+                    if not any(m.Name == mName for m in tom.all_measures()):
                         tom.add_measure(
                             table_name=tName,
                             measure_name=mName,
@@ -203,7 +204,7 @@ def migrate_model_objects_to_semantic_model(
                         print(
                             f"{icons.green_dot} The '{mName}' measure has been added."
                         )
-
+                print(f"\n{icons.in_progress} Creating calculation groups...")
                 for cgName in dfCI["Calculation Group Name"].unique():
 
                     isHidden = bool(
@@ -220,9 +221,7 @@ def migrate_model_objects_to_semantic_model(
                         (dfCI["Calculation Group Name"] == cgName), "Description"
                     ].iloc[0]
 
-                    try:
-                        tom.model.Tables[cgName]
-                    except:
+                    if not any(t.Name == cgName for t in tom.model.Tables):
                         tom.add_calculation_group(
                             name=cgName,
                             description=desc,
@@ -234,11 +233,11 @@ def migrate_model_objects_to_semantic_model(
                         )
                         tom.model.DiscourageImplicitMeasures = True
 
-                        print(
-                            f"\n{icons.in_progress} Updating calculation group column name..."
-                        )
+                        # print(
+                        #    f"\n{icons.in_progress} Updating calculation group column names..."
+                        # )
                         dfC_filt = dfC[
-                            (dfC["Table Name"] == cgName) & (dfC["Hidden"] is False)
+                            (dfC["Table Name"] == cgName) & (dfC["Hidden"] == False)
                         ]
                         colName = dfC_filt["Column Name"].iloc[0]
                         tom.model.Tables[cgName].Columns["Name"].Name = colName
@@ -267,11 +266,12 @@ def migrate_model_objects_to_semantic_model(
                             & (dfCI["Calculation Item Name"] == calcItem),
                             "Format String Expression",
                         ].iloc[0]
-                        try:
-                            tom.model.Tables[cgName].CalculationGroup.CalculationItems[
-                                calcItem
-                            ]
-                        except:
+
+                        if not any(
+                            ci.CalculationGroup.Parent.Name == cgName
+                            and ci.Name == calcItem
+                            for ci in tom.all_calculation_items()
+                        ):
                             tom.add_calculation_item(
                                 table_name=cgName,
                                 calculation_item_name=calcItem,
@@ -340,7 +340,13 @@ def migrate_model_objects_to_semantic_model(
                             f"{icons.yellow_dot} {relName} was not created since columns used in a relationship must have the same data type."
                         )
                     else:
-                        try:
+                        if not any(
+                            r.FromTable.Name == fromTable
+                            and r.FromColumn.Name == fromColumn
+                            and r.ToTable.Name == toTable
+                            and r.ToColumn.Name == toColumn
+                            for r in tom.model.Relationships
+                        ):
                             tom.add_relationship(
                                 from_table=fromTable,
                                 from_column=fromColumn,
@@ -353,11 +359,10 @@ def migrate_model_objects_to_semantic_model(
                                 rely_on_referential_integrity=rori,
                                 is_active=isActive,
                             )
-
                             print(
                                 f"{icons.green_dot} The {relName} relationship has been added."
                             )
-                        except:
+                        else:
                             print(
                                 f"{icons.red_dot} The {relName} relationship was not added."
                             )
@@ -368,9 +373,7 @@ def migrate_model_objects_to_semantic_model(
                     roleDesc = row["Description"]
                     modPerm = row["Model Permission"]
 
-                    try:
-                        tom.model.Roles[roleName]
-                    except:
+                    if not any(r.Name == roleName for r in tom.model.Roles):
                         tom.add_role(
                             role_name=roleName,
                             model_permission=modPerm,
@@ -386,14 +389,14 @@ def migrate_model_objects_to_semantic_model(
                     tName = row["Table"]
                     expr = row["Filter Expression"]
 
-                    try:
+                    if any(t.Name == tName for t in tom.model.Tables):
                         tom.set_rls(
                             role_name=roleName, table_name=tName, filter_expression=expr
                         )
                         print(
                             f"{icons.green_dot} Row level security for the '{tName}' table within the '{roleName}' role has been set."
                         )
-                    except:
+                    else:
                         print(
                             f"{icons.red_dot} Row level security for the '{tName}' table within the '{roleName}' role was not set."
                         )
@@ -401,9 +404,7 @@ def migrate_model_objects_to_semantic_model(
                 print(f"\n{icons.in_progress} Creating perspectives...")
                 for pName in dfP["Perspective Name"].unique():
 
-                    try:
-                        tom.model.Perspectives[pName]
-                    except:
+                    if not any(p.Name == pName for p in tom.model.Perspectives):
                         tom.add_perspective(perspective_name=pName)
                         print(
                             f"{icons.green_dot} The '{pName}' perspective has been added."
@@ -437,14 +438,12 @@ def migrate_model_objects_to_semantic_model(
                                 object=tom.model.Tables[tName].Hierarchies[oName],
                                 perspective_name=pName,
                             )
-                    except:
+                    except Exception:
                         pass
 
                 print(f"\n{icons.in_progress} Creating translation languages...")
                 for trName in dfTranslation["Culture Name"].unique():
-                    try:
-                        tom.model.Cultures[trName]
-                    except:
+                    if not any(c.Name == trName for c in tom.model.Cultures):
                         tom.add_translation(trName)
                         print(
                             f"{icons.green_dot} The '{trName}' translation language has been added."
@@ -510,14 +509,14 @@ def migrate_model_objects_to_semantic_model(
                                 property=prop,
                                 value=translation,
                             )
-                    except:
+                    except Exception:
                         pass
 
                 print(
                     f"\n{icons.green_dot} Migration of objects from '{dataset}' -> '{new_dataset}' is complete."
                 )
 
-        except Exception as e:
+        except Exception:
             if datetime.datetime.now() - start_time > timeout:
                 break
             time.sleep(1)

sempy_labs/migration/_migrate_tables_columns_to_semantic_model.py

@@ -1,13 +1,13 @@
-import sempy
 import sempy.fabric as fabric
 import pandas as pd
-import datetime, time
+import datetime
+import time
 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 typing import List, Optional, Union
+from typing import Optional
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 
@@ -95,9 +95,9 @@ def migrate_tables_columns_to_semantic_model(
                     dataset=new_dataset, readonly=False, workspace=new_dataset_workspace
                 ) as tom:
                     success = True
-                    try:
-                        tom.model.Expressions["DatabaseQuery"]
-                    except:
+                    if not any(
+                        e.Name == "DatabaseQuery" for e in tom.model.Expressions
+                    ):
                         tom.add_expression("DatabaseQuery", expression=shEx)
                         print(
                             f"{icons.green_dot} The 'DatabaseQuery' expression has been added."
@@ -109,9 +109,7 @@ def migrate_tables_columns_to_semantic_model(
                         tHid = bool(r["Hidden"])
                         tDesc = r["Description"]
 
-                        try:
-                            tom.model.Tables[tName]
-                        except:
+                        if not any(t.Name == tName for t in tom.model.Tables):
                             tom.add_table(
                                 name=tName,
                                 description=tDesc,
@@ -132,9 +130,10 @@ def migrate_tables_columns_to_semantic_model(
                         cHid = bool(r["Hidden"])
                         cDataType = r["Data Type"]
 
-                        try:
-                            tom.model.Tables[tName].Columns[cName]
-                        except:
+                        if not any(
+                            c.Name == cName and c.Parent.Name == tName
+                            for c in tom.all_columns()
+                        ):
                             tom.add_data_column(
                                 table_name=tName,
                                 column_name=cName,
@@ -149,13 +148,14 @@ def migrate_tables_columns_to_semantic_model(
                     print(
                         f"\n{icons.green_dot} All regular tables and columns have been added to the '{new_dataset}' semantic model."
                     )
-            except Exception as e:
+            except Exception:
                 if datetime.datetime.now() - start_time > timeout:
                     break
                 time.sleep(1)
     else:
         print(
-            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."
+            f"{icons.red_dot} Lakehouse not attached to notebook and lakehouse/lakehouse_workspace are not specified. Please add your lakehouse to this notebook"
+            f" or specify the lakehouse/lakehouse_workspace parameters."
         )
         print(
             "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"

sempy_labs/migration/_migration_validation.py

@@ -1,10 +1,10 @@
-import sempy
 import sempy.fabric as fabric
 import pandas as pd
-from typing import List, Optional, Union
+from typing import Optional
 from sempy_labs._list_functions import list_semantic_model_objects
 from sempy._utils._log import log
 
+
 @log
 def migration_validation(
     dataset: str,
@@ -36,6 +36,10 @@ def migration_validation(
        A pandas dataframe showing a list of objects and whether they were successfully migrated. Also shows the % of objects which were migrated successfully.
     """
 
+    workspace = fabric.resolve_workspace_name(workspace)
+    if new_dataset_workspace is None:
+        new_dataset_workspace = workspace
+
     dfA = list_semantic_model_objects(dataset=dataset, workspace=workspace)
     dfB = list_semantic_model_objects(
         dataset=new_dataset, workspace=new_dataset_workspace

sempy_labs/migration/_refresh_calc_tables.py

@@ -1,10 +1,11 @@
-import sempy
 import sempy.fabric as fabric
 import pandas as pd
-import re, datetime, time
+import re
+import datetime
+import time
 from pyspark.sql import SparkSession
 from sempy_labs.tom import connect_semantic_model
-from typing import List, Optional, Union
+from typing import Optional
 from sempy._utils._log import log
 import sempy_labs._icons as icons
 
@@ -30,6 +31,8 @@ def refresh_calc_tables(dataset: str, workspace: Optional[str] = None):
     timeout = datetime.timedelta(minutes=1)
     success = False
 
+    workspace = fabric.resolve_workspace_name(workspace)
+
     while not success:
         try:
             with connect_semantic_model(
@@ -119,9 +122,11 @@ def refresh_calc_tables(dataset: str, workspace: Optional[str] = None):
                                 f"{icons.green_dot} Calculated table '{tName}' has been refreshed as the '{delta_table_name.lower()}' 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
+                            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:
+        except Exception:
             if datetime.datetime.now() - start_time > timeout:
                 break
             time.sleep(1)

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

@@ -1,7 +1,8 @@
-import sempy
 import sempy.fabric as fabric
 import pandas as pd
-import json, base64, time
+import json
+import base64
+import time
 from typing import Optional
 from sempy_labs._helper_functions import resolve_workspace_name_and_id
 import sempy_labs._icons as icons
@@ -41,10 +42,9 @@ def create_report_from_reportjson(
     dfI_model = dfI_m[(dfI_m["Display Name"] == dataset)]
 
     if len(dfI_model) == 0:
-        print(
+        raise ValueError(
             f"{icons.red_dot} The '{dataset}' semantic model does not exist in the '{workspace}' workspace."
         )
-        return
 
     datasetId = dfI_model["Id"].iloc[0]
 
@@ -172,8 +172,9 @@ def update_report_from_reportjson(
     dfR_filt = dfR[(dfR["Name"] == report) & (dfR["Report Type"] == "PowerBIReport")]
 
     if len(dfR_filt) == 0:
-        print(f"{icons.red_dot} The '{report}' report does not exist in the '{workspace}' workspace.")
-        return
+        raise ValueError(
+            f"{icons.red_dot} The '{report}' report does not exist in the '{workspace}' workspace."
+        )
 
     reportId = dfR_filt["Id"].iloc[0]
     client = fabric.FabricRestClient()
@@ -214,7 +215,7 @@ def update_report_from_reportjson(
 
     request_body = {
         "displayName": report,
-        "type": 'Report',
+        "type": "Report",
         "definition": {
             "parts": [
                 {