Refactor: Séparation des exclusions workspace/build et simplification de BCASL (retrait timeout/parallélisme)

Author: raidos23

Core/AdvancedConfigEditor.py

@@ -374,6 +374,12 @@ def validate_payload(file_id: str, data: Any) -> tuple[list[str], list[str]]:
                 errs.append("build.entrypoint must be a string or null.")
             if isinstance(ep, str) and not ep.strip():
                 warns.append("build.entrypoint is empty.")
+            exclude = build.get("exclude")
+            if exclude is not None and (
+                not isinstance(exclude, list)
+                or not all(isinstance(item, str) for item in exclude)
+            ):
+                errs.append("build.exclude must be a list of strings.")
 
         deps = data.get("dependencies")
         if deps is not None and not isinstance(deps, dict):
@@ -428,14 +434,6 @@ def validate_payload(file_id: str, data: Any) -> tuple[list[str], list[str]]:
         if isinstance(options, dict):
             if "enabled" in options and not isinstance(options.get("enabled"), bool):
                 errs.append("options.enabled must be a boolean.")
-            if "plugin_timeout_s" in options and not isinstance(
-                options.get("plugin_timeout_s"), (int, float)
-            ):
-                errs.append("options.plugin_timeout_s must be numeric.")
-            if "plugin_parallelism" in options and not isinstance(
-                options.get("plugin_parallelism"), int
-            ):
-                errs.append("options.plugin_parallelism must be an integer.")
 
         plugins = data.get("plugins")
         if plugins is not None and not isinstance(plugins, dict):
@@ -498,9 +496,7 @@ def make_default_content(
             "exclude_patterns": ["**/__pycache__/**", ".venv/**", "venv/**"],
             "options": {
                 "enabled": True,
-                "plugin_timeout_s": 0.0,
                 "sandbox": True,
-                "plugin_parallelism": 0,
                 "iter_files_cache": True,
             },
             "plugins": {},

Core/Configs/__init__.py

@@ -104,6 +104,7 @@
         "engine": "pyinstaller",
         "output": "dist/",
         "data": [],
+        "exclude": [],
     },
 }
 
@@ -178,6 +179,10 @@ def _normalize_list(values: Any) -> list[Any]:
     return [item for item in values if item is not None and str(item).strip()]
 
 
+def _normalize_build_exclude(values: Any) -> list[str]:
+    return list(dict.fromkeys(pattern for pattern in _normalize_list(values) if pattern))
+
+
 def _normalize_workspace_exclude(values: Any) -> list[str]:
     merged: list[str] = []
     for item in DEFAULT_EXCLUDE_PATTERNS:
@@ -291,6 +296,7 @@ def normalize_ark_config(config: dict[str, Any]) -> dict[str, Any]:
             for item in _normalize_list(build.get("data"))
             if isinstance(item, dict)
         ],
+        "exclude": _normalize_build_exclude(build.get("exclude")),
     }
     icon_value = build.get("icon")
     if isinstance(icon_value, str) and icon_value.strip():
@@ -369,6 +375,10 @@ def validate_ark_config(
     if not isinstance(exclude_patterns, list):
         errors.append("workspace.exclude must be a list")
 
+    build_exclude_patterns = build.get("exclude")
+    if not isinstance(build_exclude_patterns, list):
+        errors.append("build.exclude must be a list")
+
     return ArkConfigValidationResult(
         config=normalized, warnings=warnings, errors=errors
     )

Core/Locking/__init__.py

@@ -133,8 +133,8 @@ def build_lock_payload(
     dependencies: dict[str, str] | None = None,
 ) -> dict[str, Any]:
     config = normalize_ark_config(config)
-    exclude_patterns = list(((config.get("workspace") or {}).get("exclude")) or [])
     build = config.get("build") or {}
+    exclude_patterns = list(build.get("exclude") or [])
     project = config.get("project") or {}
     ensure_workspace_layout(workspace)
     lock_dir = workspace / ".ark" / "lock"
@@ -150,6 +150,7 @@ def build_lock_payload(
         "build": {
             "output": build.get("output"),
             "data": list(build.get("data") or []),
+            "exclude": exclude_patterns,
             **({"icon": build.get("icon")} if build.get("icon") else {}),
         },
         "engine": {
@@ -207,12 +208,11 @@ def build_context_from_ark_config(config: dict[str, Any]) -> BuildContext:
     config = normalize_ark_config(config)
     project = config.get("project") or {}
     build = config.get("build") or {}
-    workspace_cfg = config.get("workspace") or {}
     return BuildContext(
         project_name=str(project.get("name") or ""),
         entry_point=str(project.get("entry") or ""),
         output_dir=str(build.get("output") or ""),
-        exclude_patterns=list(workspace_cfg.get("exclude") or []),
+        exclude_patterns=list(build.get("exclude") or []),
         data_mappings=list(build.get("data") or []),
         icon=str(build.get("icon")) if build.get("icon") else None,
     )
@@ -222,11 +222,17 @@ def build_context_from_lock(lock_payload: dict[str, Any]) -> BuildContext:
     project = lock_payload.get("project") or {}
     build = lock_payload.get("build") or {}
     workspace_cfg = lock_payload.get("workspace") or {}
+    
+    # Check build.exclude (new) then workspace.exclude_patterns (legacy)
+    exclude_patterns = list(build.get("exclude") or [])
+    if not exclude_patterns:
+        exclude_patterns = list(workspace_cfg.get("exclude_patterns") or [])
+
     return BuildContext(
         project_name=str(project.get("name") or ""),
         entry_point=str(project.get("entry") or ""),
         output_dir=str(build.get("output") or ""),
-        exclude_patterns=list(workspace_cfg.get("exclude_patterns") or []),
+        exclude_patterns=exclude_patterns,
         data_mappings=list(build.get("data") or []),
         icon=str(build.get("icon")) if build.get("icon") else None,
     )

README.md

@@ -14,7 +14,7 @@ Build Python apps with a predictable workflow, a configurable pre-compile pipeli
 
 ## Core capabilities
 
-- **BCASL pre-compile pipeline**: validation, preparation, transformation before the build, with timeouts and safety controls.
+- **BCASL pre-compile pipeline**: validation, preparation, transformation before the build, with safety controls.
 - **Unified EngineRunner architecture**: a single source of truth for both CLI and GUI compilation, ensuring identical build results across all interfaces.
 - **BuildContext-driven builds**: engines receive a normalized project context, abstracting away the source of configuration (YAML vs. Lock files).
 - **Multi-engine support**: switch between PyInstaller, Nuitka, and cx_Freeze seamlessly.
@@ -67,8 +67,7 @@ Workspace
   |-- Load bcasl.yml
   |-- Discover plugins (Plugins/)
   |-- Enable / order / priorities
-  |-- Sandboxed execution (timeouts,  
-  |   optional parallelism)
+  |-- Sandboxed execution (optional)
   |  
   v
 Compilation (PyInstaller / Nuitka / cx_Freeze)
@@ -93,8 +92,8 @@ python3 pycompiler_ark.py build --lock latest.lock   # Rebuild from lock file
 
 # Execution
 python3 pycompiler_ark.py run bcasl                  # Execute BCASL pipeline
-python3 pycompiler_ark.py run bcasl --timeout 30     # With custom timeout
-
+python3 pycompiler_ark.py run bcasl --list-plugins   # List active plugins
+```
 # GUI
 python3 pycompiler_ark.py gui                        # Launch modern IDE-like GUI
 python3 pycompiler_ark.py gui --legacy               # Launch classic GUI
@@ -135,7 +134,7 @@ python3 pycompiler_ark.py init --entry main.py --json
 
 ## Configuration
 
-- **`ark.yml`**: inclusion/exclusion patterns, build entrypoint, and a few workspace-level defaults consumed by BCASL bootstrap.
+- **`ark.yml`**: workspace/build exclusion patterns, build entrypoint, and a few workspace-level defaults consumed by BCASL bootstrap.
 - **`bcasl.yml`**: plugin enable/disable, order, and timeouts.
 
 ---

Ui/Cli/app.py

@@ -308,20 +308,15 @@ def run_group():
         """Run developer-facing commands."""
 
     @run_group.command("bcasl")
-    @click.option("--timeout", type=float)
-    @click.option("--parallel", type=int)
     @click.option("--list-plugins", is_flag=True)
     @click.option("--verbose", "-v", is_flag=True)
-    def run_bcasl_cmd(timeout, parallel, list_plugins, verbose):
+    def run_bcasl_cmd(list_plugins, verbose):
         """Run BCASL in headless mode for the current workspace."""
         args: list[str]
         if list_plugins:
             args = ["list"]
         else:
             args = ["run", str(Path.cwd())]
-            if timeout is not None:
-                args.extend(["--timeout", str(timeout)])
-        del parallel
         raise click.exceptions.Exit(run_bcasl_headless(args, verbose=verbose))
 
     @cli.command("gui")

Ui/Gui/Compilation/mainprocess.py

@@ -460,10 +460,10 @@ def get_exclusion_patterns(self) -> List[str]:
         if self._workspace_dir:
             try:
                 config = load_ark_config(self._workspace_dir)
-                # On utilise la nouvelle structure workspace: exclude
-                workspace_cfg = config.get("workspace", {})
-                if isinstance(workspace_cfg, dict):
-                    return workspace_cfg.get("exclude", DEFAULT_EXCLUDE_PATTERNS)
+                # Pour la compilation, on utilise désormais build: exclude
+                build_cfg = config.get("build", {})
+                if isinstance(build_cfg, dict):
+                    return build_cfg.get("exclude", DEFAULT_EXCLUDE_PATTERNS)
             except Exception:
                 pass
         return DEFAULT_EXCLUDE_PATTERNS

bcasl/Loader.py

@@ -88,7 +88,7 @@ def _discover_bcasl_meta(Plugins_dir: Path) -> dict[str, dict[str, Any]]:
                 spec.loader.exec_module(module)  # type: ignore[attr-defined]
 
                 # Utilise un gestionnaire temporaire pour enregistrer et lire les métadonnées
-                mgr = BCASL(Plugins_dir, config={}, sandbox=False, plugin_timeout_s=0.0)  # type: ignore[call-arg]
+                mgr = BCASL(Plugins_dir, config={}, sandbox=False)  # type: ignore[call-arg]
 
                 # Méthode 1: chercher fonction bcasl_register
                 reg = getattr(module, "bcasl_register", None)
@@ -185,7 +185,7 @@ def _discover_bcasl_plugins(
     """Load les plugins et return un mapping plugin_id -> instance."""
     plugins: dict[str, BcPluginBase] = {}
     try:
-        mgr = BCASL(workspace_root, config=cfg, sandbox=False, plugin_timeout_s=0.0)
+        mgr = BCASL(workspace_root, config=cfg, sandbox=False)
         mgr.load_plugins_from_directory(Plugins_dir)
         for pid, rec in getattr(mgr, "_registry", {}).items():
             try:
@@ -213,23 +213,6 @@ def _emit_log(log_cb: Optional[callable], message: str) -> None:
         pass
 
 
-def _resolve_plugin_timeout(cfg: dict[str, Any]) -> float:
-    """Résout le timeout effectif (config > env), <= 0 => illimité."""
-    try:
-        env_timeout = float(os.environ.get("PYCOMPILER_BCASL_PLUGIN_TIMEOUT", "0"))
-    except Exception:
-        env_timeout = 0.0
-    try:
-        opt = cfg.get("options", {}) if isinstance(cfg, dict) else {}
-        cfg_timeout = (
-            float(opt.get("plugin_timeout_s", 0.0)) if isinstance(opt, dict) else 0.0
-        )
-    except Exception:
-        cfg_timeout = 0.0
-    plugin_timeout = cfg_timeout if cfg_timeout != 0.0 else env_timeout
-    return float(plugin_timeout) if plugin_timeout and plugin_timeout > 0 else 0.0
-
-
 def _is_bcasl_enabled(workspace_root: Path) -> bool:
     """Consulte ark.yml pour savoir si le BCASL est activé globalement."""
     try:
@@ -306,7 +289,6 @@ def _run_bcasl_sync(
     workspace_root: Path,
     plugins_dir: Path,
     cfg: dict[str, Any],
-    plugin_timeout: float,
     log_cb: Optional[callable] = None,
     stop_requested: Optional[callable] = None,
     build_context: Optional[Any] = None,
@@ -315,7 +297,6 @@ def _run_bcasl_sync(
     manager = BCASL(
         workspace_root,
         config=cfg,
-        plugin_timeout_s=plugin_timeout,
         build_context=build_context,
     )
     loaded, errors = manager.load_plugins_from_directory(plugins_dir)
@@ -439,10 +420,15 @@ def _read_yml(p: Path) -> dict[str, Any]:
 
             ark_config = load_ark_config(str(workspace_root))
 
-            # exclusion_patterns est désormais dans workspace: exclude
-            workspace_cfg = ark_config.get("workspace", {})
-            if isinstance(workspace_cfg, dict):
-                exclude_patterns = workspace_cfg.get("exclude", exclude_patterns)
+            # On privilégie build: exclude pour les actions pré-compilation
+            build_cfg = ark_config.get("build", {})
+            if isinstance(build_cfg, dict) and "exclude" in build_cfg:
+                exclude_patterns = build_cfg.get("exclude", exclude_patterns)
+            else:
+                # Fallback legacy ou si build: exclude est absent (peu probable avec normalization)
+                workspace_cfg = ark_config.get("workspace", {})
+                if isinstance(workspace_cfg, dict):
+                    exclude_patterns = workspace_cfg.get("exclude", exclude_patterns)
 
             # inclusion_patterns n'est plus supporté (l'exclusion suffit)
 
@@ -467,9 +453,7 @@ def _read_yml(p: Path) -> dict[str, Any]:
             "file_patterns": file_patterns,
             "exclude_patterns": exclude_patterns,
             "options": {
-                "plugin_timeout_s": plugin_timeout,
                 "sandbox": True,
-                "plugin_parallelism": 0,
                 "iter_files_cache": True,
             },
             "phases": default_phases,
@@ -547,17 +531,8 @@ def ensure_bcasl_thread_stopped(self, timeout_ms: int = 5000) -> None:
 
 
 def resolve_bcasl_timeout(self) -> float:
-    """Résout le timeout effectif des plugins à partir de la config et de l'env.
-    <= 0 => illimité (0.0 renvoyé)
-    """
-    try:
-        if not getattr(self, "workspace_dir", None):
-            return 0.0
-        workspace_root = Path(self.workspace_dir).resolve()
-        cfg = _load_workspace_config(workspace_root)
-        return _resolve_plugin_timeout(cfg)
-    except Exception:
-        return 0.0
+    """Legacy resolve_bcasl_timeout - returns 0.0 (no timeout)."""
+    return 0.0
 
 
 def open_bc_loader_dialog(self) -> None:
@@ -647,7 +622,6 @@ def run_pre_compile_async(
         Plugins_dir = _get_plugins_dir()
 
         cfg = _load_workspace_config(workspace_root)
-        plugin_timeout = _resolve_plugin_timeout(cfg)
 
         # Vérifier si BCASL est activé globalement via ark.yml
         if not _is_bcasl_enabled(workspace_root):
@@ -676,7 +650,6 @@ def run_pre_compile_async(
                 workspace_root,
                 Plugins_dir,
                 cfg,
-                plugin_timeout,
                 build_context=build_context,
             )
             try:
@@ -709,7 +682,6 @@ def run_pre_compile_async(
                 workspace_root,
                 Plugins_dir,
                 cfg,
-                plugin_timeout,
                 log_cb=log_cb,
                 build_context=build_context,
             )
@@ -747,7 +719,6 @@ def run_pre_compile(self, build_context: Optional[Any] = None) -> Optional[objec
         Plugins_dir = _get_plugins_dir()
 
         cfg = _load_workspace_config(workspace_root)
-        plugin_timeout = _resolve_plugin_timeout(cfg)
 
         # Vérifier si BCASL est activé globalement via ark.yml
         if not _is_bcasl_enabled(workspace_root):
@@ -765,7 +736,6 @@ def run_pre_compile(self, build_context: Optional[Any] = None) -> Optional[objec
             workspace_root,
             Plugins_dir,
             cfg,
-            plugin_timeout,
             log_cb=log_cb,
             build_context=build_context,
         )