satisfactoscript 0.5.6__tar.gz → 0.5.7__tar.gz

{satisfactoscript-0.5.6 → satisfactoscript-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satisfactoscript
-Version: 0.5.6
+Version: 0.5.7
 Summary: An Enterprise-Ready, Declarative Data Engineering Framework for Databricks Lakehouse.
 Author: julhouba
 Classifier: Programming Language :: Python :: 3

{satisfactoscript-0.5.6 → satisfactoscript-0.5.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "satisfactoscript"
-version = "0.5.6"
+version = "0.5.7"
 description = "An Enterprise-Ready, Declarative Data Engineering Framework for Databricks Lakehouse."
 readme = "README.md"
 authors = [

{satisfactoscript-0.5.6 → satisfactoscript-0.5.7}/src/satisfactoscript/core/core.py

@@ -409,25 +409,44 @@ class SatisfactoEngine:
     def _get_clean_username(self):
         """
         Récupère le user courant (ex: 'julien_hou').
-        
+        Three strategies in order:
+        1. Spark SQL current_user() — works natively on Databricks.
+        2. Databricks SDK REST API — works locally when gRPC DDL fails.
+        3. DBUtils notebook context tags — fallback for classic clusters.
+
         Returns:
             str: The cleaned username of the current execution context.
         """
+        def _clean(email):
+            return email.split('@')[0].replace('.', '_').replace('-', '_').lower()
+
+        # Strategy 1: Spark SQL (works natively on Databricks)
         try:
-            # Priorité à Spark SQL (compatible VS Code & Notebooks)
             rows = self.spark.sql("SELECT current_user()").collect()
-            if rows:
-                email = rows[0][0]
-                return email.split('@')[0].replace('.', '_').replace('-', '_').lower()
-        except:
+            if rows and rows[0][0]:
+                return _clean(rows[0][0])
+        except Exception:
             pass
 
-        # Fallback Tags
+        # Strategy 2: Databricks SDK REST API (works locally when gRPC fails)
+        try:
+            from databricks.sdk import WorkspaceClient
+            host = os.getenv("DATABRICKS_HOST")
+            token = os.getenv("DATABRICKS_TOKEN")
+            if host and token:
+                w = WorkspaceClient(host=host, token=token)
+                email = w.current_user.me().user_name
+                if email:
+                    return _clean(email)
+        except Exception:
+            pass
+
+        # Strategy 3: DBUtils notebook context tags (classic clusters / notebooks)
         try:
             context = self.dbutils.notebook.entry_point.getDbutils().notebook().getContext()
             email = context.tags().apply('user')
-            return email.split('@')[0].replace('.', '_').replace('-', '_').lower()
-        except:
+            return _clean(email)
+        except Exception:
             return "unknown_user"
 
 

{satisfactoscript-0.5.6 → satisfactoscript-0.5.7}/src/satisfactoscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satisfactoscript
-Version: 0.5.6
+Version: 0.5.7
 Summary: An Enterprise-Ready, Declarative Data Engineering Framework for Databricks Lakehouse.
 Author: julhouba
 Classifier: Programming Language :: Python :: 3

{satisfactoscript-0.5.6 → satisfactoscript-0.5.7}/src/satisfactoscript.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ src/satisfactoscript/semantic/semantic.py
 tests/test_config.py
 tests/test_core.py
 tests/test_core_env_detection.py
+tests/test_core_username.py
 tests/test_dummy.py
 tests/test_loaders.py
 tests/test_registry.py

satisfactoscript-0.5.7/tests/test_core_username.py

@@ -0,0 +1,101 @@
+"""
+Tests for SatisfactoEngine._get_clean_username.
+Covers: Spark SQL, Databricks SDK REST API, DBUtils fallback, unknown_user.
+"""
+import sys
+import pytest
+from unittest.mock import MagicMock, patch
+from satisfactoscript.core.core import SatisfactoEngine
+
+
+def _make_engine(spark=None, dbutils=None):
+    engine = object.__new__(SatisfactoEngine)
+    engine.spark = spark or MagicMock()
+    engine.dbutils = dbutils or MagicMock()
+    return engine
+
+
+class TestGetCleanUsername:
+
+    def test_returns_username_from_spark_sql(self):
+        spark = MagicMock()
+        spark.sql.return_value.collect.return_value = [("julien.houba@company.com",)]
+        engine = _make_engine(spark=spark)
+
+        assert engine._get_clean_username() == "julien_houba"
+
+    def test_cleans_dots_and_dashes(self):
+        spark = MagicMock()
+        spark.sql.return_value.collect.return_value = [("jean-pierre.dupont@company.com",)]
+        engine = _make_engine(spark=spark)
+
+        assert engine._get_clean_username() == "jean_pierre_dupont"
+
+    def test_falls_back_to_sdk_when_spark_sql_fails(self):
+        spark = MagicMock()
+        spark.sql.side_effect = Exception("gRPC: Missing UserContext")
+        engine = _make_engine(spark=spark)
+
+        mock_me = MagicMock()
+        mock_me.user_name = "hqhoujul@company.com"
+        mock_wc = MagicMock()
+        mock_wc.current_user.me.return_value = mock_me
+
+        fake_sdk = MagicMock()
+        fake_sdk.WorkspaceClient.return_value = mock_wc
+        sys.modules["databricks.sdk"] = fake_sdk
+
+        with patch.dict("os.environ", {"DATABRICKS_HOST": "https://adb.net", "DATABRICKS_TOKEN": "dapi123"}):
+            result = engine._get_clean_username()
+
+        assert result == "hqhoujul"
+
+    def test_falls_back_to_dbutils_when_sql_and_sdk_fail(self):
+        spark = MagicMock()
+        spark.sql.side_effect = Exception("SQL error")
+        engine = _make_engine(spark=spark)
+
+        fake_sdk = MagicMock()
+        fake_sdk.WorkspaceClient.side_effect = Exception("SDK error")
+        sys.modules["databricks.sdk"] = fake_sdk
+
+        context = MagicMock()
+        context.tags.return_value.apply.return_value = "fallback.user@company.com"
+        engine.dbutils.notebook.entry_point.getDbutils.return_value.notebook.return_value.getContext.return_value = context
+
+        with patch.dict("os.environ", {"DATABRICKS_HOST": "https://adb.net", "DATABRICKS_TOKEN": "dapi123"}):
+            result = engine._get_clean_username()
+
+        assert result == "fallback_user"
+
+    def test_returns_unknown_user_when_all_strategies_fail(self):
+        spark = MagicMock()
+        spark.sql.side_effect = Exception("SQL error")
+        engine = _make_engine(spark=spark)
+
+        fake_sdk = MagicMock()
+        fake_sdk.WorkspaceClient.side_effect = Exception("SDK error")
+        sys.modules["databricks.sdk"] = fake_sdk
+
+        engine.dbutils.notebook.entry_point.getDbutils.side_effect = Exception("no context")
+
+        with patch.dict("os.environ", {}, clear=True):
+            result = engine._get_clean_username()
+
+        assert result == "unknown_user"
+
+    def test_sdk_not_called_when_no_credentials(self):
+        spark = MagicMock()
+        spark.sql.side_effect = Exception("SQL error")
+        engine = _make_engine(spark=spark)
+
+        fake_sdk = MagicMock()
+        sys.modules["databricks.sdk"] = fake_sdk
+
+        engine.dbutils.notebook.entry_point.getDbutils.side_effect = Exception("no context")
+
+        with patch.dict("os.environ", {}, clear=True):
+            engine._get_clean_username()
+
+        # WorkspaceClient must not be called without credentials
+        fake_sdk.WorkspaceClient.assert_not_called()