satisfactoscript 0.5.2__tar.gz → 0.5.4__tar.gz

{satisfactoscript-0.5.2 → satisfactoscript-0.5.4}/PKG-INFO

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

{satisfactoscript-0.5.2 → satisfactoscript-0.5.4}/pyproject.toml

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

{satisfactoscript-0.5.2 → satisfactoscript-0.5.4}/src/satisfactoscript/core/core.py

@@ -159,15 +159,14 @@ class SatisfactoEngine:
         # ======================================================================
         # 0. CHARGEMENT DES VARIABLES D'ENVIRONNEMENT (.env)
         # ======================================================================
-        current_file_path = os.path.abspath(__file__)
-        project_root = os.path.dirname(os.path.dirname(current_file_path))
-        env_path = os.path.join(project_root, ".env")
+        # Dynamically find the .env file starting from the current working directory
+        env_path = self._find_file_upwards(".env")
 
-        if os.path.exists(env_path):
+        if env_path:
             load_dotenv(env_path)
-            print(" 🔒 [Init] Sécurité : Variables d'environnement chargées depuis .env")
+            print(f" 🔒 [Init] Sécurité : Variables d'environnement chargées depuis {env_path}")
         else:
-            print(" ⚠️ [Init] Aucun fichier .env trouvé à la racine.")
+            print(" ⚠️ [Init] Aucun fichier .env trouvé dans le répertoire courant ou ses parents.")
 
         # ======================================================================
         # 1. AUTO-DÉTECTION DE SPARK (Compatible Web & PyCharm/Local)
@@ -193,7 +192,12 @@ class SatisfactoEngine:
                     # This relies on the environment having valid Databricks configuration
                     # e.g., DATABRICKS_HOST, DATABRICKS_TOKEN, DATABRICKS_CLUSTER_ID 
                     # or a valid ~/.databrickscfg file.
-                    self.spark = DatabricksSession.builder.sdkConfig(Config()).getOrCreate()
+                    # We pass a specific cluster_id if it exists in env, else it relies on profile
+                    conf = Config()
+                    if os.getenv("DATABRICKS_CLUSTER_ID"):
+                        conf.cluster_id = os.getenv("DATABRICKS_CLUSTER_ID")
+                        
+                    self.spark = DatabricksSession.builder.sdkConfig(conf).getOrCreate()
                     print("   [Init] 🚀 Remote DatabricksSession (Databricks Connect) initialized.")
                 except Exception as e:
                     print(f"   [Init] ⚠️ Databricks Connect detection failed: {e}. Falling back to standard Spark.")
@@ -212,28 +216,14 @@ class SatisfactoEngine:
         if config_path:
             self._load_config_from_yaml(config_path)
         else:
-            # Recherche automatique basée sur l'emplacement de ce fichier core.py
-            current_file_path = os.path.abspath(__file__)
-            framework_dir = os.path.dirname(current_file_path)
-            project_root = os.path.dirname(framework_dir)
-
-            # Liste des candidats
-            candidates = [
-                os.path.join(project_root, "config.yaml"),       # ../config.yaml (Standard)
-                os.path.join(os.getcwd(), "config.yaml"),        # ./config.yaml
-                os.path.join(os.getcwd(), "../..", "config.yaml")   # ../config.yaml
-            ]
-
-            found = False
-            for path in candidates:
-                if os.path.exists(path):
-                    self._load_config_from_yaml(path)
-                    found = True
-                    break
-
-            if not found:
+            # Recherche automatique basée sur l'emplacement d'exécution
+            found_config_path = self._find_file_upwards("config.yaml")
+
+            if found_config_path:
+                self._load_config_from_yaml(found_config_path)
+            else:
                 raise FileNotFoundError(
-                    f"CRITICAL: 'config.yaml' not found. Searched in: {candidates}. "
+                    "CRITICAL: 'config.yaml' not found in current directory or any parent directory. "
                     "Please check file location or pass 'config_path' explicitly."
                 )
 
@@ -259,6 +249,25 @@ class SatisfactoEngine:
 
         print(f"✅ Framework Ready. Env: {self.env} | DB: {self.db} | Suffix: '{self.schema_suffix}'")
 
+    def _find_file_upwards(self, filename):
+        """
+        Searches for a file starting from current working directory and moving up.
+        Returns absolute path if found, else None.
+        """
+        current_dir = os.getcwd()
+        
+        # Loop until we hit the root of the filesystem
+        while True:
+            check_path = os.path.join(current_dir, filename)
+            if os.path.exists(check_path):
+                return check_path
+            
+            parent_dir = os.path.dirname(current_dir)
+            if parent_dir == current_dir:
+                # We hit the filesystem root (e.g. /) without finding the file
+                return None
+            current_dir = parent_dir
+
     def _load_config_from_yaml(self, config_path):
         """
         Loads configuration from YAML and determines the active environment.

{satisfactoscript-0.5.2 → satisfactoscript-0.5.4}/src/satisfactoscript.egg-info/PKG-INFO

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