Update PyInstaller engine and related files

Author: raidos23

ENGINES/pyinstaller/__init__.py

@@ -1,3 +1,56 @@
-from .engine import PyInstallerEngine
+# SPDX-License-Identifier: Apache-2.0
+# Copyright 2025 Ague Samuel Amen
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-__all__ = ["PyInstallerEngine"]
+from __future__ import annotations
+
+import importlib
+import pkgutil
+
+__all__: list[str] = []
+
+# Explicit registration to ensure the engine is available even if auto-import misses it
+try:
+    from engine_sdk import registry as _registry  # type: ignore
+
+    from .engine import PyInstallerEngine as _PyInstallerEngine
+
+    if _registry:
+        _registry.register(_PyInstallerEngine)
+except Exception:
+    pass
+
+
+def _auto_import_all() -> None:
+    """
+    Import all Python modules and subpackages contained in this package.
+    This ensures any engine definitions or side-effects are loaded on import.
+    """
+    try:
+        pkg_name = __name__
+        for _finder, name, _ispkg in pkgutil.walk_packages(
+            __path__, prefix=f"{pkg_name}."
+        ):
+            try:
+                importlib.import_module(name)
+                short = name.rsplit(".", 1)[-1]
+                if short not in __all__:
+                    __all__.append(short)
+            except Exception:
+                pass
+    except Exception:
+        pass
+
+
+_auto_import_all()

ENGINES/pyinstaller/auto_plugins.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2026 Ague Samuel Amen
+# Copyright 2025 Ague Samuel Amen
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 from __future__ import annotations
 
 # Engine-controlled auto builder for PyInstaller
@@ -27,38 +28,82 @@ def AUTO_BUILDER(
     Build PyInstaller arguments from the engine-owned mapping.
 
     Mapping conventions supported for an entry value under key "pyinstaller":
-      - str: a single CLI argument (e.g., "--collect-all=numpy")
-      - list[str]: multiple CLI arguments
-      - dict: expects 'args' or 'flags' -> str | list[str]
-      - True: ignored by default (no generic meaning)
+      - True: emit ["--collect-all", {import_name}] for the matched package
+      - str: a single CLI arg; supports {import_name} placeholder
+      - list[str]: multiple CLI args; supports {import_name} placeholder
+      - dict: expects 'args' or 'flags' -> str | list[str]; supports placeholder
     """
     out: list[str] = []
-    seen = set()
+    seen_items = set()
+    seen_collect_all = set()
 
     for pkg, entry in matched.items():
         if not isinstance(entry, dict):
             continue
         val = entry.get("pyinstaller")
-        if val is None:
-            continue
+        import_name = pkg_to_import.get(pkg, pkg)
+
         args: list[str] = []
-        if isinstance(val, str):
-            tmpl_import = pkg_to_import.get(pkg, pkg)
-            args = [val.replace("{import_name}", tmpl_import)]
+        if val is True:
+            if import_name and import_name not in seen_collect_all:
+                args = ["--collect-all", import_name]
+                seen_collect_all.add(import_name)
+        elif isinstance(val, str):
+            # Split single string into proper argv tokens (e.g. "--collect-all {import_name}")
+            s = val.replace("{import_name}", import_name)
+            try:
+                import shlex as _shlex
+
+                args = _shlex.split(s)
+            except Exception:
+                args = s.split()
         elif isinstance(val, list):
-            tmpl_import = pkg_to_import.get(pkg, pkg)
-            args = [str(x).replace("{import_name}", tmpl_import) for x in val]
+            # Flatten list entries, splitting any that contain spaces
+            tmp: list[str] = []
+            for x in val:
+                s = str(x).replace("{import_name}", import_name)
+                try:
+                    import shlex as _shlex
+
+                    parts = _shlex.split(s)
+                except Exception:
+                    parts = s.split()
+                tmp.extend(parts)
+            args = tmp
         elif isinstance(val, dict):
-            tmpl_import = pkg_to_import.get(pkg, pkg)
             a = val.get("args") or val.get("flags")
             if isinstance(a, list):
-                args = [str(x).replace("{import_name}", tmpl_import) for x in a]
+                tmp: list[str] = []
+                for x in a:
+                    s = str(x).replace("{import_name}", import_name)
+                    try:
+                        import shlex as _shlex
+
+                        parts = _shlex.split(s)
+                    except Exception:
+                        parts = s.split()
+                    tmp.extend(parts)
+                args = tmp
             elif isinstance(a, str):
-                args = [str(a).replace("{import_name}", tmpl_import)]
-        for a in args:
-            if a not in seen:
-                out.append(a)
-                seen.add(a)
+                s = str(a).replace("{import_name}", import_name)
+                try:
+                    import shlex as _shlex
+
+                    args = _shlex.split(s)
+                except Exception:
+                    args = s.split()
+
+        # de-dup while preserving order
+        i = 0
+        while i < len(args):
+            item = args[i]
+            key = item
+            if item == "--collect-all" and (i + 1) < len(args):
+                key = f"--collect-all {args[i+1]}"
+            if key not in seen_items:
+                out.append(item)
+                seen_items.add(key)
+            i += 1
 
     return out