Nuitka-winsvc 1.9.2__cp312-cp312-win_amd64.whl → 1.9.5__cp312-cp312-win_amd64.whl

nuitka/nodes/PackageMetadataNodes.py

@@ -75,11 +75,20 @@ class ExpressionPkgResourcesRequireCall(ExpressionPkgResourcesRequireCallBase):
     kind = "EXPRESSION_PKG_RESOURCES_REQUIRE_CALL"
 
     def replaceWithCompileTimeValue(self, trace_collection):
-        require = _getPkgResourcesModule().require
-        ResolutionError = _getPkgResourcesModule().ResolutionError
-        InvalidRequirement = (
-            _getPkgResourcesModule().extern.packaging.requirements.InvalidRequirement
-        )
+        resources_module = _getPkgResourcesModule()
+
+        require = resources_module.require
+        ResolutionError = resources_module.ResolutionError
+
+        try:
+            InvalidRequirement = (
+                resources_module.extern.packaging.requirements.InvalidRequirement
+            )
+        except AttributeError:
+            # Debian removes "extern.packaging" in some versions
+            import packaging
+
+            InvalidRequirement = packaging.requirements.InvalidRequirement
 
         args = tuple(
             element.getCompileTimeConstant() for element in self.subnode_requirements
@@ -135,8 +144,9 @@ class ExpressionPkgResourcesGetDistributionCall(
     kind = "EXPRESSION_PKG_RESOURCES_GET_DISTRIBUTION_CALL"
 
     def replaceWithCompileTimeValue(self, trace_collection):
-        get_distribution = _getPkgResourcesModule().get_distribution
-        DistributionNotFound = _getPkgResourcesModule().DistributionNotFound
+        pkg_resources_module = _getPkgResourcesModule()
+        get_distribution = pkg_resources_module.get_distribution
+        DistributionNotFound = pkg_resources_module.DistributionNotFound
 
         arg = self.subnode_dist.getCompileTimeConstant()
 
@@ -363,8 +373,9 @@ class ExpressionPkgResourcesIterEntryPointsCall(
     kind = "EXPRESSION_PKG_RESOURCES_ITER_ENTRY_POINTS_CALL"
 
     def replaceWithCompileTimeValue(self, trace_collection):
-        iter_entry_points = _getPkgResourcesModule().iter_entry_points
-        DistributionNotFound = _getPkgResourcesModule().DistributionNotFound
+        pkg_resources_module = _getPkgResourcesModule()
+        iter_entry_points = pkg_resources_module.iter_entry_points
+        DistributionNotFound = pkg_resources_module.DistributionNotFound
 
         group = self.subnode_group.getCompileTimeConstant()
         if self.subnode_name is not None:

nuitka/plugins/PluginBase.py

@@ -1211,18 +1211,13 @@ except ImportError:
                 "no_annotations": hasPythonFlagNoAnnotations(),
                 # Querying package properties
                 "has_builtin_module": isBuiltinModuleName,
+                # Architectures
+                "arch_x86": getArchitecture() == "x86",
+                "arch_amd64": getArchitecture() == "x86_64",
+                "arch_arm64": getArchitecture() == "arm64",
             }
         )
 
-        if isWin32Windows():
-            context.update(
-                {
-                    "arch_x86": getArchitecture() == "x86",
-                    "arch_amd64": getArchitecture() == "x86_64",
-                    "arch_arm64": getArchitecture() == "arm64",
-                }
-            )
-
         versions = getTestExecutionPythonVersions()
 
         for version in versions:

nuitka/plugins/standard/AntiBloatPlugin.py

@@ -603,13 +603,14 @@ Error, cannot eval module '%s' function '%s' replacement code '%s' in '%s' due t
                 return
 
             if module_name.hasNamespace(handled_module_name):
-                override_mode = self._getModuleBloatModeOverrides(
-                    using_module_name=using_module_name,
-                    intended_module_name=intended_module_name,
-                )
+                if using_module_name is not None:
+                    override_mode = self._getModuleBloatModeOverrides(
+                        using_module_name=using_module_name,
+                        intended_module_name=intended_module_name,
+                    )
 
-                if override_mode is not None:
-                    mode = override_mode
+                    if override_mode is not None:
+                        mode = override_mode
 
                 # Make sure the compilation aborts or warns if asked to
                 if mode == "error":

nuitka/plugins/standard/DillPlugin.py

@@ -48,25 +48,4 @@ Extending "dill" for compiled types to be pickle-able as well.""",
         return {"_NUITKA_PLUGIN_DILL_ENABLED": "1"}
 
     def getExtraCodeFiles(self):
-        return {"DillPlugin.c": extra_code}
-
-
-extra_code = r"""
-#include "nuitka/prelude.h"
-
-void registerDillPluginTables(PyThreadState *tstate, char const *module_name, PyMethodDef *reduce_compiled_function, PyMethodDef *create_compiled_function) {
-    PyObject *function_tables = PyObject_GetAttrString((PyObject *)builtin_module, "compiled_function_tables");
-
-    if (function_tables == NULL) {
-        CLEAR_ERROR_OCCURRED(tstate);
-
-        function_tables = MAKE_DICT_EMPTY();
-        PyObject_SetAttrString((PyObject *)builtin_module, "compiled_function_tables", function_tables);
-    }
-
-    PyObject *funcs = MAKE_TUPLE2_0(PyCFunction_New(reduce_compiled_function, NULL), PyCFunction_New(create_compiled_function, NULL));
-
-    PyDict_SetItemString(function_tables, module_name, funcs);
-}
-
-"""
+        return {"DillPlugin.c": self.getPluginDataFileContents("DillPlugin.c")}

nuitka/plugins/standard/DllFilesPlugin.py

@@ -87,6 +87,8 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
             exe = dll_config.get("executable", "no") == "yes"
 
             suffixes = dll_config.get("suffixes")
+            if suffixes is not None:
+                suffixes = tuple(suffix.lstrip(".") for suffix in suffixes)
 
             for prefix in dll_config.get("prefixes"):
                 if exe:

nuitka/plugins/standard/ImplicitImports.py

@@ -395,22 +395,25 @@ __file__ = (__nuitka_binary_dir + '%ssite.py') if '__nuitka_binary_dir' in dict(
 
                 # Inline the values, to avoid the data files.
                 if result is not None:
-                    source_code = source_code.replace(
-                        attach_call,
-                        attach_call_replacement
-                        % {
-                            "module_name": module_name.asString(),
-                            "submodules": tuple(
-                                module_name.asString() for module_name in result[0]
-                            ),
-                            "attrs": dict(
-                                (module_name.asString(), module_attributes)
-                                for (module_name, module_attributes) in sorted(
-                                    result[1].items()
-                                )
-                            ),
-                        },
-                    )
+                    replacement = attach_call_replacement % {
+                        "module_name": module_name.asString(),
+                        "submodules": tuple(
+                            sub_module_name.asString() for sub_module_name in result[0]
+                        ),
+                        "attrs": dict(
+                            (
+                                sub_module_name.getChildNameFromPackage(
+                                    module_name
+                                ).asString(),
+                                module_attributes,
+                            )
+                            for (sub_module_name, module_attributes) in sorted(
+                                result[1].items()
+                            )
+                        ),
+                    }
+
+                    source_code = source_code.replace(attach_call, replacement)
 
         if module_name == "huggingface_hub":
             # Special handling for huggingface that uses the source code variant
@@ -594,6 +597,7 @@ __file__ = (__nuitka_binary_dir + '%ssite.py') if '__nuitka_binary_dir' in dict(
         "transformers.utils.dummy_pt_objects",  # Not performance relevant.
         "transformers.utils.dummy_flax_objects",  # Not performance relevant.
         "transformers.utils.dummy_tf_objects",  # Not performance relevant.
+        "rich",  #  # Not performance relevant and memory leaking due to empty compiled cell leaks
     )
 
     def decideCompilation(self, module_name):

nuitka/plugins/standard/OptionsNannyPlugin.py

@@ -103,7 +103,7 @@ Otherwise a terminal window will open"""
 
                 self.info(
                     """\
-Note, when using '%s', consider using '--disable-console' option. %s. However\
+Note, when using '%s', consider using '--disable-console' option. %s. However \
 for debugging, terminal output is the easiest way to see informative traceback \
 and error information, so delay this until your program working and remove \
 once you find it non-working, and use '--enable-console' to make it explicit \

nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -326,6 +326,57 @@
       change_function:
         'test': 'un-callable'
 
+- module-name: 'bitsandbytes.cextension'
+  dlls:
+    - from_filenames:
+        prefixes:
+          - 'libbitsandbytes_'
+        suffixes:
+          # Applies currently to all OSes in bitsandbytes wheels.
+          - 'so'
+
+- module-name: 'bitsandbytes.triton.dequantize_rowwise'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.int8_matmul_mixed_dequanitze'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.int8_matmul_rowwise_dequantize'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.quantize_columnwise_and_transpose'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.quantize_global'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.quantize_rowwise'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
 - module-name: 'boto3'
   data-files:
     dirs:
@@ -508,6 +559,7 @@
   implicit-imports:
     - depends:
         - 'chromadb.telemetry.posthog'
+        - 'chromadb.telemetry.product.posthog'
         - 'chromadb.api.local'
         - 'chromadb.db.duckdb'
         - 'chromadb.db.impl.sqlite'
@@ -518,6 +570,7 @@
         - 'chromadb.migrations.embeddings_queue'
         - 'chromadb.migrations.sysdb'
         - 'chromadb.migrations.metadb'
+        - 'chromadb.ingest.impl.simple_policy'
 
 - module-name: 'chromadb.migrations.embeddings_queue'
   data-files:
@@ -769,7 +822,7 @@
         relative_path: 'OSX64'
         prefixes:
           - 'libDelphiFMX'
-      when: 'macos and arch_x86'
+      when: 'macos and arch_amd64'
     - from_filenames:
         relative_path: 'OSXARM64'
         prefixes:
@@ -798,6 +851,13 @@
       replacements_plain:
         'from .testing import setup_test': ''
 
+- module-name: 'distributed.client'
+  anti-bloat:
+    - description: 'remove IPython reference'
+      no-auto-follow:
+        'IPython': 'ignore'
+      when: 'not use_ipython'
+
 - module-name: 'distributed.config'
   data-files:
     patterns:
@@ -810,6 +870,13 @@
         'from IPython.display import display': 'raise ImportError'
       when: 'not use_ipython'
 
+- module-name: 'distributed.diagnostics.progressbar'
+  anti-bloat:
+    - description: 'remove IPython reference'
+      no-auto-follow:
+        'IPython': 'ignore'
+      when: 'not use_ipython'
+
 - module-name: 'distributed.scheduler'
   anti-bloat:
     - description: 'remove cython support'
@@ -818,6 +885,13 @@
         'from cython import compiled': 'raise ImportError'
         'if compiled:': 'if False:'
 
+- module-name: 'distributed.utils'
+  anti-bloat:
+    - description: 'remove IPython reference'
+      change_function:
+        'is_kernel': "'(lambda : False)'"
+      when: 'not use_ipython'
+
 - module-name: 'dns.rdtypes'
   implicit-imports:
     - depends:
@@ -1433,6 +1507,8 @@
     - description: 'workaround for forking itself'
       replacements_plain:
         "getattr(sys, 'frozen', False)": 'False'
+        'getattr(sys, "frozen", False)': 'False'
+        'assert is_forking(sys.argv), "Not forking"': ''
       when: 'win32'
 
 - module-name: 'joblib.externals.loky.backend.resource_tracker'
@@ -1546,6 +1622,12 @@
     patterns:
       - 'intervals.msgpack'
 
+- module-name: 'libusb_package'
+  dlls:
+    - from_filenames:
+        prefixes:
+          - 'libusb'
+
 - module-name: 'lightgbm.libpath'
   dlls:
     - from_filenames:
@@ -2787,6 +2869,14 @@
     - description: 'workaround __new__ decorator issue'
       append_plain: 'SharedRegistryObject.__new__ = staticmethod(SharedRegistryObject.__new__)'
 
+- module-name: 'pip._vendor.rich.jupyter'
+  # See rich.jupyter
+  anti-bloat:
+    - description: 'remove IPython reference'
+      change_function:
+        'display': 'un-callable'
+      when: 'not use_ipython'
+
 - module-name: 'pkg_resources'
   anti-bloat:
     - description: 'avoid using plistlib dependency on non-macOS'
@@ -3141,6 +3231,10 @@
         macos_bundle_as_onefile: 'yes'
         when: 'macos and use_pyqt5'
 
+  import-hacks:
+    - acceptable-missing-dlls:
+        - 'libqpdf'
+
 - module-name: 'PyQt6'
   options:
     checks:
@@ -3335,7 +3429,19 @@
           from PySide6 import QtCore
           orig_disconnect = QtCore.SignalInstance.disconnect
           QtCore.SignalInstance.disconnect = patched_disconnect
-      when: 'version("PySide6") < (6,6)'
+
+          def patched_connect(self, receiver, type=None):
+              type = type or QtCore.Qt.ConnectionType.AutoConnection
+              if hasattr(receiver, "im_func"):
+                  if hasattr(receiver.im_func, "__compiled__"):
+                      patched_connect._protected = getattr(patched_connect, "_protected", [])
+                      patched_connect._protected.append(receiver)
+
+              return orig_connect(self, receiver, type)
+
+          from PySide6 import QtCore
+          orig_connect = QtCore.SignalInstance.connect
+          QtCore.SignalInstance.connect = patched_connect
 
   options:
     checks:
@@ -4150,6 +4256,13 @@
         - 'skimage.restoration._unwrap_2d'
         - 'skimage.restoration._unwrap_3d'
 
+- module-name: 'skimage.restoration._cycle_spin'
+  anti-bloat:
+    - description: 'remove optional dask usage'
+      replacements_plain:
+        'import dask': 'raise ImportError'
+      when: 'not use_dask'
+
 - module-name: 'skimage.segmentation'
   implicit-imports:
     - depends:
@@ -4858,15 +4971,11 @@
     dirs:
       - 'static'
 
-- module-name: 'streamlit.delta_generator'
+- module-name: 'streamlit.runtime.caching.cache_utils'
   anti-bloat:
-    - description: 'remove IPython reference'
+    - description: 'remove warning for compiled functions'
       replacements_plain:
-        'from streamlit.elements.legacy_altair import LegacyAltairMixin': ''
-        'LegacyAltairMixin,': ''
-        'from streamlit.elements.arrow_altair import ArrowAltairMixin': ''
-        'ArrowAltairMixin,': ''
-      when: 'not use_ipython'
+        '_LOGGER.debug(': '('
 
 - module-name: 'sv_ttk'
   data-files:

nuitka/reports/Reports.py

@@ -44,8 +44,10 @@ from nuitka.Options import (
     getCompilationReportFilename,
     getCompilationReportTemplates,
     getCompilationReportUserData,
+    isOnefileMode,
     shallCreateDiffableCompilationReport,
 )
+from nuitka.OutputDirectories import getResultRunFilename
 from nuitka.plugins.Plugins import getActivePlugins
 from nuitka.PythonFlavors import getPythonFlavorName
 from nuitka.PythonVersions import getSystemPrefixPath, python_version_full_str
@@ -169,6 +171,9 @@ def _getReportInputData(aborted):
         if _decision is not False:
             continue
 
+        if _using_module_name is None:
+            continue
+
         module_exclusions[_using_module_name][_module_name] = _reason
 
     memory_infos = getMemoryInfos()
@@ -191,6 +196,8 @@ def _getReportInputData(aborted):
 
     data_composer = getDataComposerReportValues()
 
+    output_run_filename = os.path.abspath(getResultRunFilename(onefile=isOnefileMode()))
+
     return dict(
         (var_name, var_value)
         for var_name, var_value in locals().items()
@@ -566,6 +573,14 @@ def writeCompilationReport(report_filename, report_input_data, diffable):
 
     _addUserDataToReport(root=root, user_data=report_input_data["user_data"])
 
+    python_xml_node = TreeXML.appendTreeElement(
+        root,
+        "output",
+        run_filename=_getCompilationReportPath(
+            report_input_data["output_run_filename"]
+        ),
+    )
+
     try:
         putTextFileContents(
             filename=report_filename, contents=TreeXML.toString(root), encoding="utf8"

nuitka/utils/Distributions.py

@@ -19,6 +19,7 @@
 
 import os
 
+from nuitka.__past__ import unicode
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.Options import isExperimental
 from nuitka.PythonFlavors import isAnacondaPython
@@ -27,7 +28,7 @@ from nuitka.PythonVersions import python_version
 from .FileOperations import searchPrefixPath
 from .Importing import getModuleNameAndKindFromFilenameSuffix
 from .ModuleNames import ModuleName, checkModuleName
-from .Utils import isLinux
+from .Utils import isMacOS, isWin32Windows
 
 _package_to_distribution = None
 
@@ -81,6 +82,8 @@ def getDistributionTopLevelPackageNames(distribution):
                 continue
             if first_path_element == "__pycache__":
                 continue
+            if not checkModuleName(first_path_element) or first_path_element == ".":
+                continue
 
             if remainder:
                 module_name = ModuleName(first_path_element)
@@ -215,6 +218,8 @@ def getDistributionFromModuleName(module_name):
 
 def getDistribution(distribution_name):
     """Get a distribution by name."""
+    assert isValidDistributionName(distribution_name), distribution_name
+
     try:
         if isExperimental("force-pkg-resources-metadata"):
             raise ImportError
@@ -254,21 +259,18 @@ def isDistributionPipPackage(distribution_name):
     return getDistributionInstallerName(distribution_name) == "pip"
 
 
-def isDistributionSystemPackage(distribution_name):
-    result = not isDistributionPipPackage(
-        distribution_name
-    ) and not isDistributionCondaPackage(distribution_name)
-
-    # This should only ever happen on Linux, lets know when it does happen
-    # elsewhere, since that is most probably a bug in our installer detection on
-    # non-Linux as well.
-    if result:
-        assert isLinux(), (
-            distribution_name,
-            getDistributionInstallerName(distribution_name),
-        )
+def isDistributionPoetryPackage(distribution_name):
+    return getDistributionInstallerName(distribution_name).startswith("poetry")
 
-    return result
+
+def isDistributionSystemPackage(distribution_name):
+    return (
+        not isMacOS()
+        and not isWin32Windows()
+        and not isDistributionPipPackage(distribution_name)
+        and not isDistributionPoetryPackage(distribution_name)
+        and not isDistributionCondaPackage(distribution_name)
+    )
 
 
 _pdm_dir_cache = {}
@@ -338,6 +340,10 @@ def getDistributionInstallerName(distribution_name):
     return _distribution_to_installer[distribution_name]
 
 
+def isValidDistributionName(distribution_name):
+    return type(distribution_name) in (str, unicode)
+
+
 def getDistributionName(distribution):
     """Get the distribution name from a distribution object.
 
@@ -347,9 +353,12 @@ def getDistributionName(distribution):
     """
 
     if hasattr(distribution, "metadata"):
-        return distribution.metadata["Name"]
+        result = distribution.metadata["Name"]
     else:
-        return distribution.project_name
+        result = distribution.project_name
+
+    assert isValidDistributionName(result), distribution
+    return result
 
 
 def getDistributionVersion(distribution):

nuitka/utils/FileOperations.py

@@ -33,6 +33,7 @@ import stat
 import sys
 import tempfile
 import time
+import unicodedata
 from contextlib import contextmanager
 
 from nuitka.__past__ import (  # pylint: disable=redefined-builtin
@@ -1053,6 +1054,10 @@ def isFilenameBelowPath(path, filename, consider_short=True):
             filename = getExternalUsePath(filename)
             path = getExternalUsePath(path)
 
+            if isWin32Windows():
+                if getWindowsDrive(path) != getWindowsDrive(filename):
+                    return False
+
             result = os.path.relpath(filename, path).split(os.path.sep)[0] != ".."
 
     return result
@@ -1382,3 +1387,17 @@ def syncFileOutput(file_handle):
         except AttributeError:
             # Too old to have "syncfs" available.
             return
+
+
+def isFilesystemEncodable(filename):
+    """Decide if a filename is safe for use as a file system path with tools."""
+    if os.name == "nt":
+        value = (
+            unicodedata.normalize("NFKD", filename)
+            .encode("ascii", "ignore")
+            .decode("ascii")
+        )
+
+        return value == filename
+    else:
+        return True

nuitka/utils/ModuleNames.py

@@ -225,6 +225,13 @@ class ModuleName(str):
         else:
             return ModuleName(parent_new)
 
+    def getChildNameFromPackage(self, package_name):
+        """Get child a module name part for a name in the package."""
+        assert self.hasNamespace(package_name)
+
+        submodule_name_str = str(self)[len(str(package_name)) + 1 :]
+        return ModuleName(submodule_name_str)
+
     def matchesToShellPattern(self, pattern):
         """Match a module name to a list of patterns
 

nuitka/utils/Utils.py

@@ -101,6 +101,8 @@ def getLinuxDistribution():
 
         if os.path.exists("/etc/os-release"):
             result, base, version = _parseOsReleaseFileContents("/etc/os-release")
+        elif os.path.exists("/usr/lib/os-release"):
+            result, base, version = _parseOsReleaseFileContents("/usr/lib/os-release")
         elif os.path.exists("/etc/SuSE-release"):
             result, base, version = _parseOsReleaseFileContents("/etc/SuSE-release")
         elif os.path.exists("/etc/issue"):
@@ -157,6 +159,12 @@ def isFedoraBasedLinux():
     return (base or dist_name) == "Fedora"
 
 
+def isArchBasedLinux():
+    dist_name, base, _dist_version = getLinuxDistribution()
+
+    return (base or dist_name) == "Arch"
+
+
 def isAndroidBasedLinux():
     # spell-checker: ignore googlesource
     if not isLinux():

nuitka/utils/WindowsResources.py

@@ -351,7 +351,7 @@ def getDefaultWindowsExecutableManifest():
     # Note: Supported OS are lied about by CPython.
     template = (
         """\
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
   <assemblyIdentity type="win32" name="Mini" version="1.0.0.0"/>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
@@ -362,6 +362,11 @@ def getDefaultWindowsExecutableManifest():
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
     </application>
   </compatibility>
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <ws2:longPathAware>true</ws2:longPathAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
   %s
 </assembly>
 """