Nuitka-winsvc 2.7.7__tar.gz → 2.7.12__tar.gz

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/Nuitka_winsvc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Nuitka-winsvc
-Version: 2.7.7
+Version: 2.7.12
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Nuitka-winsvc
-Version: 2.7.7
+Version: 2.7.12
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/OptionParsing.py

@@ -1803,8 +1803,8 @@ Request an entitlement for access to a macOS protected resources, e.g.
 requests access to the microphone and provides an informative text for
 the user, why that is needed. Before the colon, is an OS identifier for
 an access right, then the informative text. Legal values can be found on
-https://developer.apple.com/documentation/bundleresources/information_property_list/protected_resources and
-the option can be specified multiple times. Default empty.""",
+https://developer.apple.com/documentation/bundleresources/information_property_list/protected_resources
+and the option can be specified multiple times. Default empty.""",
 )
 
 

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/Options.py

@@ -1061,6 +1061,15 @@ The Python without GIL is only experimentally supported by \
 and recommended only for use in Nuitka development and testing."""
         )
 
+    if python_version == 0x3D4 and isWin32Windows() and isCPythonOfficialPackage():
+        Tracing.general.sysexit(
+            """\
+Due to a CPython bug of 3.13.4 precisely (not <3.13.4 and >3.14.5) \
+it's not possible to use Nuitka with this Python version, as it \
+broke the separation between GIL and no-GIL for the link \
+library. Please upgrade/downgrade to a supported micro version."""
+        )
+
     default_reference_mode = (
         "runtime" if shallMakeModule() or isStandaloneMode() else "original"
     )

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V2.7.7
+Nuitka V2.7.12
 Copyright (C) 2025 Kay Hayen."""
 
 

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/build/include/nuitka/helpers.h

@@ -333,6 +333,9 @@ extern wchar_t const *getBinaryDirectoryWideChars(bool resolve_symlinks);
 // Get the binary directory, translated to ANSI/native path
 extern char const *getBinaryDirectoryHostEncoded(bool resolve_symlinks);
 
+// Get the program directory as an object with symlinks resolved or not.
+extern PyObject *getPythonProgramDirectoryObject(bool resolve_symlinks);
+
 // Get the containing directory as an object with symlinks resolved or not.
 extern PyObject *getContainingDirectoryObject(bool resolve_symlinks);
 

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/build/static_src/CompiledAsyncgenType.c

@@ -478,7 +478,7 @@ static PyObject *_Nuitka_Asyncgen_send(PyThreadState *tstate, struct Nuitka_Asyn
     case PYGEN_ERROR:
         return NULL;
     default:
-        NUITKA_CANNOT_GET_HERE("invalid PYGEN_ result");
+        NUITKA_CANNOT_GET_HERE("invalid result");
     }
 }
 

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/build/static_src/CompiledCodeHelpers.c

@@ -1854,8 +1854,15 @@ PyObject *getDllFilenameObject(void) {
 }
 #endif
 
+PyObject *getPythonProgramDirectoryObject(bool resolve_symlinks) {
+#if defined(_NUITKA_EXE_MODE)
+    return getBinaryDirectoryObject(resolve_symlinks);
+#else
+    return getDllDirectoryObject();
+#endif
+}
+
 PyObject *getContainingDirectoryObject(bool resolve_symlinks) {
-#if _NUITKA_EXE_MODE
 #if defined(_NUITKA_ONEFILE_MODE)
     environment_char_t const *onefile_directory = getEnvironmentVariable("NUITKA_ONEFILE_DIRECTORY");
     if (onefile_directory != NULL) {
@@ -1864,14 +1871,8 @@ PyObject *getContainingDirectoryObject(bool resolve_symlinks) {
 
         return result;
     }
-
-    return getBinaryDirectoryObject(resolve_symlinks);
-#else
-    return getBinaryDirectoryObject(resolve_symlinks);
-#endif
-#else
-    return getDllDirectoryObject();
 #endif
+    return getPythonProgramDirectoryObject(resolve_symlinks);
 }
 
 #if _NUITKA_STANDALONE_MODE
@@ -1968,7 +1969,7 @@ PyObject *MAKE_RELATIVE_PATH(PyObject *relative) {
     static PyObject *our_path_object = NULL;
 
     if (our_path_object == NULL) {
-        our_path_object = getContainingDirectoryObject(true);
+        our_path_object = getPythonProgramDirectoryObject(true);
     }
 
     return JOIN_PATH2(our_path_object, relative);

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/build/static_src/OnefileBootstrap.c

@@ -1157,12 +1157,8 @@ int main(int argc, char **argv) {
 
     NUITKA_PRINT_TIMING("ONEFILE: Entered main().");
 
-    filename_char_t const *pattern = FILENAME_EMPTY_STR _NUITKA_ONEFILE_TEMP_SPEC;
-    bool bool_res = expandTemplatePathFilename(payload_path, pattern, sizeof(payload_path) / sizeof(filename_char_t));
-
-    // _putws(payload_path);
-
 #if _NUITKA_ONEFILE_DLL_MODE
+    NUITKA_PRINT_TIMING("ONEFILE: Checking role of process.");
     environment_char_t const *process_role = getEnvironmentVariable("NUITKA_ONEFILE_PARENT");
 
     // Empty strings do not count.
@@ -1204,14 +1200,30 @@ int main(int argc, char **argv) {
         } else {
             process_role = NULL;
         }
+
+        // Do not inherit these from another onefile binary.
+        if (process_role == NULL) {
+            NUITKA_PRINT_TIMING("ONEFILE: Removing other onefile environment.");
+
+            unsetEnvironmentVariable("NUITKA_ONEFILE_PARENT");
+            unsetEnvironmentVariable("NUITKA_ONEFILE_START");
+        } else {
+            NUITKA_PRINT_TIMING("ONEFILE: Decided we child environment.");
+        }
     }
 #endif
-
 #else
+    // TODO: Only Windows has the solved so far, it's also the only platform we
+    // use it on right now.
     environment_char_t const *process_role = NULL;
 #endif
 
-    // IF we are the bootstrasp binary, show the splash screen.
+    filename_char_t const *pattern = FILENAME_EMPTY_STR _NUITKA_ONEFILE_TEMP_SPEC;
+    bool bool_res = expandTemplatePathFilename(payload_path, pattern, sizeof(payload_path) / sizeof(filename_char_t));
+
+    // _putws(payload_path);
+
+    // If we are the onefile initial bootstrap binary, show the splash screen.
 #if defined(_NUITKA_ONEFILE_SPLASH_SCREEN) && _NUITKA_ONEFILE_COMPRESSION_BOOL == 1
     if (process_role == NULL) {
         initSplashScreen();

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/code_generation/templates/CodeTemplatesConstants.py

@@ -156,19 +156,19 @@ static void _createGlobalConstants(PyThreadState *tstate) {
 
     PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 3, Nuitka_String_FromString("%(nuitka_version_level)s"));
 
-    PyObject *binary_directory = getContainingDirectoryObject(false);
+    PyObject *containing_directory = getContainingDirectoryObject(false);
 #if _NUITKA_STANDALONE_MODE
 #if !_NUITKA_ONEFILE_MODE
-    binary_directory = STRIP_DIRNAME(binary_directory);
+    containing_directory = STRIP_DIRNAME(containing_directory);
 #endif
 
 #if _NUITKA_MACOS_BUNDLE_MODE
-    binary_directory = STRIP_DIRNAME(binary_directory);
-    binary_directory = STRIP_DIRNAME(binary_directory);
+    containing_directory = STRIP_DIRNAME(containing_directory);
+    containing_directory = STRIP_DIRNAME(containing_directory);
 #endif
 #endif
 
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 4, binary_directory);
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 4, containing_directory);
 
 #if _NUITKA_STANDALONE_MODE
     PyObject *is_standalone_mode = Py_True;

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/importing/Importing.py

@@ -135,6 +135,9 @@ def makeModuleUsageAttempt(
 ):
     assert source_ref is not None
 
+    # The looked for module usage attempt, cannot be a relative module name
+    assert module_name.getTopLevelPackageName() != "", source_ref
+
     return ModuleUsageAttempt(
         module_name=module_name,
         filename=filename,

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/importing/Recursion.py

@@ -103,7 +103,7 @@ def decideRecursion(
 ):
     package_part, _remainder = module_name.splitModuleBasename()
 
-    if package_part is not None:
+    if package_part is not None and package_part.getTopLevelPackageName() != "":
         (
             _package_part,
             package_filename,

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/nodes/ImportNodes.py

@@ -943,17 +943,18 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
             module_kind=module_kind,
         )
 
-        self.used_modules = makeParentModuleUsagesAttempts(
-            makeModuleUsageAttempt(
-                module_name=module_name_found,
-                filename=module_filename,
-                module_kind=module_kind,
-                finding=self.finding,
-                level=level_value,
-                source_ref=self.source_ref,
-                reason="import",
+        if module_name_found.getTopLevelPackageName() != "":
+            self.used_modules = makeParentModuleUsagesAttempts(
+                makeModuleUsageAttempt(
+                    module_name=module_name_found,
+                    filename=module_filename,
+                    module_kind=module_kind,
+                    finding=self.finding,
+                    level=level_value,
+                    source_ref=self.source_ref,
+                    reason="import",
+                )
             )
-        )
 
         if self.finding != "not-found":
             module_name = module_name_found
@@ -1066,40 +1067,42 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
                         parent_package = parent_package.getPackageName()
                         level_value -= 1
 
-                    if imported_module_name != "":
-                        candidate_module_name = parent_package.getChildNamed(
-                            imported_module_name
-                        )
-                    else:
-                        candidate_module_name = parent_package
-
-                    if (
-                        candidate_module_name in hard_modules_non_stdlib
-                        or module_filename is None
-                        or isStandardLibraryPath(module_filename)
-                    ):
-                        result = ExpressionImportModuleHard(
-                            using_module_name=self.getParentModule().getFullName(),
-                            module_name=candidate_module_name,
-                            value_name=self._getImportedValueName(
-                                candidate_module_name
-                            ),
-                            source_ref=self.source_ref,
-                        )
+                    if parent_package is not None:
+                        if imported_module_name != "":
+                            candidate_module_name = parent_package.getChildNamed(
+                                imported_module_name
+                            )
+                        else:
+                            candidate_module_name = parent_package
+
+                        if (
+                            candidate_module_name in hard_modules_non_stdlib
+                            or module_filename is None
+                            or isStandardLibraryPath(module_filename)
+                        ):
+                            result = ExpressionImportModuleHard(
+                                using_module_name=self.getParentModule().getFullName(),
+                                module_name=candidate_module_name,
+                                value_name=self._getImportedValueName(
+                                    candidate_module_name
+                                ),
+                                source_ref=self.source_ref,
+                            )
 
-                        return (
-                            result,
-                            "new_expression",
-                            "Lowered import %s module '%s' to hard import."
-                            % (
-                                (
-                                    "hard import"
-                                    if candidate_module_name in hard_modules_non_stdlib
-                                    else "standard library"
+                            return (
+                                result,
+                                "new_expression",
+                                "Lowered import %s module '%s' to hard import."
+                                % (
+                                    (
+                                        "hard import"
+                                        if candidate_module_name
+                                        in hard_modules_non_stdlib
+                                        else "standard library"
+                                    ),
+                                    candidate_module_name.asString(),
                                 ),
-                                candidate_module_name.asString(),
-                            ),
-                        )
+                            )
 
                 imported_module_name = resolveModuleName(imported_module_name)
 

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/nodes/ModuleNodes.py

@@ -49,6 +49,7 @@ class PythonModuleBase(NodeBase):
     def __init__(self, module_name, reason, source_ref):
         assert type(module_name) is ModuleName, module_name
         assert module_name != "", source_ref
+        assert module_name.getTopLevelPackageName() != "", module_name
 
         NodeBase.__init__(self, source_ref=source_ref)
 

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/plugins/PluginBase.py

@@ -1433,7 +1433,9 @@ except Exception as e:
             values=(("key", value),),
         ).key
 
-    def onFunctionBodyParsing(self, module_name, function_name, body):
+    def onFunctionBodyParsing(
+        self, module_name, function_qualname, function_name, body
+    ):
         """Provide a different function body for the function of that module.
 
         Should return a boolean, indicating if any actual change was done.

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/plugins/Plugins.py

@@ -418,7 +418,15 @@ class Plugins(object):
                         % (plugin.plugin_name, v, module.getFullName())
                     )
 
-                yield ModuleName(v)
+                v = ModuleName(v)
+
+                if v.getTopLevelPackageName() == "":
+                    plugin.sysexit(
+                        "Plugin '%s' returned an invalid relative module name, not %r (for module '%s')"
+                        % (plugin.plugin_name, v, module.getFullName())
+                    )
+
+                yield v
 
         seen = set()
 
@@ -1052,6 +1060,9 @@ class Plugins(object):
 
     @classmethod
     def onModuleUsageLookAhead(cls, module_name, module_filename, module_kind):
+        if module_name.getTopLevelPackageName() == "":
+            return
+
         if module_name in cls.module_usage_looked_ahead_cache:
             return
 
@@ -1405,11 +1416,14 @@ class Plugins(object):
     def onFunctionBodyParsing(cls, provider, function_name, body):
         module_name = provider.getParentModule().getFullName()
 
+        function_qualname = provider.getChildQualname(function_name)
+
         for plugin in getActivePlugins():
             # TODO: Could record what functions got modified by what plugin
             # and in what way checking the return value
             plugin.onFunctionBodyParsing(
                 module_name=module_name,
+                function_qualname=function_qualname,
                 function_name=function_name,
                 body=body,
             )

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/plugins/standard/AntiBloatPlugin.py

@@ -574,17 +574,29 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
         module_name,
         config_prefix,
         anti_bloat_config,
+        function_qualname,
         function_name,
         body,
     ):
-        replace_code = anti_bloat_config.get(config_prefix + "change_function", {}).get(
-            function_name
-        )
+        # Can be "change_function" or "global_change_function"
+        config_item_name = config_prefix + "change_function"
+
+        # TODO: Ought to always use "function_qualname", but for now we cannot
+        # make the switch easily for "change_function" as it we would have to
+        # correct all their uses.
+        if config_prefix == "":
+            replace_code = anti_bloat_config.get(config_item_name, {}).get(
+                function_name
+            )
+        else:
+            replace_code = anti_bloat_config.get(config_item_name, {}).get(
+                function_qualname
+            )
 
         if replace_code == "un-callable":
             replace_code = """'raise RuntimeError("Must not call %s.%s")'""" % (
                 module_name,
-                function_name,
+                function_qualname,
             )
 
         if replace_code is None:
@@ -594,8 +606,8 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
             config_module_name=config_module_name,
             module_name=module_name,
             expression=replace_code,
-            config_name="module '%s' config '%schange_function' of '%s'"
-            % (module_name, config_prefix, function_name),
+            config_name="module '%s' config '%s' of '%s'"
+            % (module_name, config_item_name, function_name),
             extra_context=self._getContextCode(
                 module_name=module_name, anti_bloat_config=anti_bloat_config
             ),
@@ -624,7 +636,9 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
 
         return True
 
-    def onFunctionBodyParsing(self, module_name, function_name, body):
+    def onFunctionBodyParsing(
+        self, module_name, function_qualname, function_name, body
+    ):
         result = False
 
         config_module_name = module_name
@@ -643,6 +657,7 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
                             module_name=module_name,
                             anti_bloat_config=anti_bloat_config,
                             config_prefix="",
+                            function_qualname=function_qualname,
                             function_name=function_name,
                             body=body,
                         ):
@@ -653,6 +668,7 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
                         module_name=module_name,
                         anti_bloat_config=anti_bloat_config,
                         config_prefix="global_",
+                        function_qualname=function_qualname,
                         function_name=function_name,
                         body=body,
                     ):

{nuitka_winsvc-2.7.7 → nuitka_winsvc-2.7.12}/nuitka/plugins/standard/TransformersPlugin.py

@@ -5,6 +5,8 @@
 
 """
 
+import os
+
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 
 
@@ -42,13 +44,24 @@ class NuitkaPluginTransformers(NuitkaPluginBase):
         if "_import_structure = {" in source_code:
             self._import_structure_modules.add(module_name)
 
-    def _getImportStructureDefinition(self, module_name, source_filename):
+    def _getImportStructureDefinition(self, module_name, source_filename, prefix):
         # TODO: Is caching is not needed, because it does that on
         # its own?
+
+        if prefix is None:
+            value = (
+                "{tuple(key): value for (key, value) in define_import_structure(%r).items()}"
+                % source_filename
+            )
+        else:
+            value = (
+                "{tuple(key): value for (key, value) in define_import_structure(%r, prefix=%r).items()}"
+                % (source_filename, prefix)
+            )
+
         import_structure_value = self.queryRuntimeInformationSingle(
             setup_codes="from transformers.utils.import_utils import define_import_structure",
-            value="{tuple(key): value for (key, value) in define_import_structure(%r).items()}"
-            % source_filename,
+            value=value,
             info_name="transformers_%s_import_structure" % module_name.asString(),
         )
 
@@ -77,16 +90,44 @@ class NuitkaPluginTransformers(NuitkaPluginBase):
                 yield sub_module_name
 
         if module_name in self._define_structure_modules:
-            for sub_module_name in self._define_structure_modules[module_name][
-                frozenset()
-            ].keys():
+            for sub_module_name in (
+                self._define_structure_modules[module_name].get(frozenset(), {}).keys()
+            ):
                 yield module_name.getChildNamed(sub_module_name)
 
     def onModuleSourceCode(self, module_name, source_filename, source_code):
         if module_name.hasNamespace("transformers"):
+            if (
+                'define_import_structure(Path(__file__).parent / "models", prefix="models")'
+                in source_code
+            ):
+                import_structure_value = self._getImportStructureDefinition(
+                    module_name=module_name,
+                    source_filename=os.path.join(
+                        os.path.dirname(source_filename), "models"
+                    ),
+                    prefix="models",
+                )
+
+                # Frozenset does not transport as such, so we converted
+                # them to tuples and now back for compatibility.
+                import_structure_value = dict(
+                    (frozenset(key), value)
+                    for key, value in import_structure_value.items()
+                )
+
+                source_code = source_code.replace(
+                    'define_import_structure(Path(__file__).parent / "models", prefix="models")',
+                    repr(import_structure_value),
+                )
+
+                self._define_structure_modules[module_name] = import_structure_value
+
             if "define_import_structure(_file)" in source_code:
                 import_structure_value = self._getImportStructureDefinition(
-                    module_name=module_name, source_filename=source_filename
+                    module_name=module_name,
+                    source_filename=source_filename,
+                    prefix=None,
                 )
 
                 # Frozenset does not transport as such, so we converted