semantic-link-labs 0.12.1__py3-none-any.whl → 0.12.3__py3-none-any.whl

sempy_labs/tom/_model.py

@@ -6,21 +6,21 @@ import os
 import json
 from datetime import datetime
 from decimal import Decimal
-from .._helper_functions import (
+from sempy_labs._helper_functions import (
     format_dax_object_name,
     generate_guid,
     _make_list_unique,
     resolve_dataset_name_and_id,
     resolve_workspace_name_and_id,
-    _base_api,
     resolve_workspace_id,
     resolve_item_id,
     resolve_lakehouse_id,
     _validate_weight,
+    _get_url_prefix,
 )
-from .._list_functions import list_relationships
-from .._refresh_semantic_model import refresh_semantic_model
-from ..directlake._dl_helper import check_fallback_reason
+from sempy_labs._list_functions import list_relationships
+from sempy_labs._refresh_semantic_model import refresh_semantic_model
+from sempy_labs.directlake._dl_helper import check_fallback_reason
 from contextlib import contextmanager
 from typing import List, Iterator, Optional, Union, TYPE_CHECKING, Literal
 from sempy._utils._log import log
@@ -28,7 +28,9 @@ import sempy_labs._icons as icons
 import ast
 from uuid import UUID
 import sempy_labs._authentication as auth
-from ..lakehouse._lakehouse import lakehouse_attached
+from sempy_labs.lakehouse._lakehouse import lakehouse_attached
+import requests
+from sempy.fabric.exceptions import FabricHTTPException
 
 
 if TYPE_CHECKING:
@@ -4601,8 +4603,12 @@ class TOMWrapper:
         pandas.DataFrame
             A pandas dataframe showing the updated measure(s) and their new description(s).
         """
+        import notebookutils
+
         icons.sll_tags.append("GenerateMeasureDescriptions")
 
+        prefix = _get_url_prefix()
+
         df = pd.DataFrame(
             columns=["Table Name", "Measure Name", "Expression", "Description"]
         )
@@ -4655,11 +4661,15 @@ class TOMWrapper:
                     "modelItems"
                 ].append(new_item)
 
-            response = _base_api(
-                request="/explore/v202304/nl2nl/completions",
-                method="post",
-                payload=payload,
+            token = notebookutils.credentials.getToken("pbi")
+            headers = {"Authorization": f"Bearer {token}"}
+            response = requests.post(
+                f"{prefix}/explore/v202304/nl2nl/completions",
+                headers=headers,
+                json=payload,
             )
+            if response.status_code != 200:
+                raise FabricHTTPException(response)
 
             for item in response.json().get("modelItems", []):
                 ms_name = item["urn"]
@@ -5096,7 +5106,9 @@ class TOMWrapper:
         """
         import Microsoft.AnalysisServices.Tabular as TOM
 
-        p = next(p for p in self.model.Tables[table_name].Partitions)
+        t = self.model.Tables[table_name]
+
+        p = next(p for p in t.Partitions)
         if p.Mode != TOM.ModeType.DirectLake:
             print(f"{icons.info} The '{table_name}' table is not in Direct Lake mode.")
             return
@@ -5106,9 +5118,7 @@ class TOMWrapper:
         partition_schema = schema or p.Source.SchemaName
 
         # Update name of the Direct Lake partition (will be removed later)
-        self.model.Tables[table_name].Partitions[
-            partition_name
-        ].Name = f"{partition_name}_remove"
+        t.Partitions[partition_name].Name = f"{partition_name}_remove"
 
         source_workspace_id = resolve_workspace_id(workspace=source_workspace)
         if source_type == "Lakehouse":
@@ -5120,21 +5130,41 @@ class TOMWrapper:
                 item=source, type=source_type, workspace=source_workspace_id
             )
 
+        column_pairs = []
+        m_filter = None
+        for c in t.Columns:
+            if c.Type == TOM.ColumnType.Data:
+                if c.Name != c.SourceColumn:
+                    column_pairs.append((c.SourceColumn, c.Name))
+
+        if column_pairs:
+            m_filter = (
+                f'#"Renamed Columns" = Table.RenameColumns(ToDelta, {{'
+                + ", ".join([f'{{"{old}", "{new}"}}' for old, new in column_pairs])
+                + "})"
+            )
+
         def _generate_m_expression(
-            workspace_id, artifact_id, artifact_type, table_name, schema_name
+            workspace_id, artifact_id, artifact_type, table_name, schema_name, m_filter
         ):
             """
-            Generates the M expression for the import partition.
+            Generates the M expression for the import partition. Adds a rename step if any columns have been renamed in the model.
             """
 
             full_table_name = (
                 f"{schema_name}/{table_name}" if schema_name else table_name
             )
 
-            return f"""let\n\tSource = AzureStorage.DataLake("https://onelake.dfs.fabric.microsoft.com/{workspace_id}/{artifact_id}", [HierarchicalNavigation=true]),
+            code = f"""let\n\tSource = AzureStorage.DataLake("https://onelake.dfs.fabric.microsoft.com/{workspace_id}/{artifact_id}", [HierarchicalNavigation=true]),
         Tables = Source{{[Name = "Tables"]}}[Content],
         ExpressionTable = Tables{{[Name = "{full_table_name}"]}}[Content],
-        ToDelta = DeltaLake.Table(ExpressionTable)\nin\n\tToDelta"""
+        ToDelta = DeltaLake.Table(ExpressionTable)"""
+            if m_filter is None:
+                code += "\n in\n\tToDelta"
+            else:
+                code += f',\n\t {m_filter} \n in\n\t#"Renamed Columns"'
+
+            return code
 
         m_expression = _generate_m_expression(
             source_workspace_id,
@@ -5142,6 +5172,7 @@ class TOMWrapper:
             source_type,
             partition_entity_name,
             partition_schema,
+            m_filter,
         )
 
         # Add the import partition