databricks-modules-vy 1.1.22__tar.gz → 1.2__tar.gz

{databricks_modules_vy-1.1.22 → databricks_modules_vy-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks_modules_vy
-Version: 1.1.22
+Version: 1.2
 Summary: Databricks modules for Vy
 Author-email: Sindre Kjetså <sindre.kjetsa@vy.no>
 Project-URL: Homepage, https://github.com/nsbno/

{databricks_modules_vy-1.1.22 → databricks_modules_vy-1.2}/databricks_modules_vy/sharepoint.py

@@ -21,10 +21,17 @@ dbutils = DBUtils(spark)
 def _get_sharepoint_ctx(site_name="VyMasterdata") -> ClientContext:
     sharepoint_url = dbutils.secrets.get("SHAREPOINT", "url")
     site_url = f"{sharepoint_url}/sites/{site_name}"
+    tenant = dbutils.secrets.get("SHAREPOINT", "tenant")
     client_id = dbutils.secrets.get("SHAREPOINT", "app_id")
-    client_secret = dbutils.secrets.get("SHAREPOINT", "app_secret")
-
-    return ClientContext(site_url).with_client_credentials(client_id, client_secret)
+    thumbprint = dbutils.secrets.get("SHAREPOINT", "cert_thumbprint")
+    private_key = dbutils.secrets.get("SHAREPOINT", "cert_private_key")
+
+    return ClientContext(site_url).with_client_certificate(
+        tenant=tenant,
+        client_id=client_id,
+        thumbprint=thumbprint,
+        private_key=private_key,
+    )
 
 
 def _execute_query_with_backoff(

{databricks_modules_vy-1.1.22 → databricks_modules_vy-1.2}/databricks_modules_vy/unity_catalog.py

@@ -185,21 +185,17 @@ def upsert_to_uc(
                 merge_condition += f" AND target.{key} = '{value}'"
 
         if upsert_many:
+            # For upsert_many, remove all target rows for affected keys first,
+            # then append full source rows in one write.
+            df_keys = df.select(*upsert_keys).dropDuplicates()
             (
                 target_table.alias("target")
-                .merge(df.alias("source"), merge_condition)
+                .merge(df_keys.alias("source"), merge_condition)
                 .whenMatchedDelete()
                 .execute()
             )
 
-            # Do it again for insert
-            target_table = DeltaTable.forName(spark, target)
-            (
-                target_table.alias("target")
-                .merge(df.alias("source"), merge_condition)
-                .whenNotMatchedInsertAll()
-                .execute()
-            )
+            df.write.mode("append").saveAsTable(target)
         else:
             (
                 target_table.alias("target")

{databricks_modules_vy-1.1.22 → databricks_modules_vy-1.2}/databricks_modules_vy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks_modules_vy
-Version: 1.1.22
+Version: 1.2
 Summary: Databricks modules for Vy
 Author-email: Sindre Kjetså <sindre.kjetsa@vy.no>
 Project-URL: Homepage, https://github.com/nsbno/

{databricks_modules_vy-1.1.22 → databricks_modules_vy-1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "databricks_modules_vy"
-version = "1.1.22"
+version = "1.2"
 authors = [
   { name="Sindre Kjetså", email="sindre.kjetsa@vy.no" },
 ]