fix: ambignous slint.slint now slint.core via workable maturin configuration

Author: GreyElaina

api/python/slint/Cargo.toml

@@ -54,6 +54,3 @@ css-color-parser2 = { workspace = true }
 pyo3-stub-gen = { version = "0.9.0", default-features = false }
 smol = { version = "2.0.0" }
 smol_str = { workspace = true }
-
-[package.metadata.maturin]
-python-source = "slint"

api/python/slint/lib.rs

@@ -158,7 +158,7 @@ impl Translator for PyGettextTranslator {
 
 use pyo3::prelude::*;
 
-#[pymodule]
+#[pymodule(name = "core")]
 fn slint(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
     i_slint_backend_selector::with_platform(|_b| {
         // Nothing to do, just make sure a backend was created

api/python/slint/pyproject.toml

@@ -51,6 +51,10 @@ dev = [
   "aiohttp>=3.12.15",
 ]
 
+[tool.maturin]
+module-name = "slint.core"
+python-packages = ["slint"]
+
 [tool.uv]
 # Rebuild package when any rust files change
 cache-keys = [{ file = "pyproject.toml" }, { file = "Cargo.toml" }, { file = "**/*.rs" }]

api/python/slint/slint/__init__.py

@@ -7,32 +7,32 @@
 
 import os
 import sys
-from . import slint as native
+from . import core
 import types
 import logging
 import copy
 import typing
 from typing import Any, Callable, TypeVar, overload
 import pathlib
 from .models import ListModel, Model
-from .slint import Image, Color, Brush, Timer, TimerMode
+from .core import Image, Color, Brush, Timer, TimerMode
 from .loop import SlintEventLoop
 from pathlib import Path
 from collections.abc import Coroutine
 import asyncio
 import gettext
 
-Struct = native.PyStruct
+Struct = core.PyStruct
 
 
 class CompileError(Exception):
     message: str
     """The error message that produced this compile error."""
 
-    diagnostics: list[native.PyDiagnostic]
+    diagnostics: list[core.PyDiagnostic]
     """A list of detailed diagnostics that were produced as part of the compilation."""
 
-    def __init__(self, message: str, diagnostics: list[native.PyDiagnostic]):
+    def __init__(self, message: str, diagnostics: list[core.PyDiagnostic]):
         """@private"""
         super().__init__(message)
         self.message = message
@@ -45,7 +45,7 @@ class Component:
     """Component is the base class for all instances of Slint components. Use the member functions to show or hide the
     window, or spin the event loop."""
 
-    __instance__: native.ComponentInstance
+    __instance__: core.ComponentInstance
 
     def show(self) -> None:
         """Shows the window on the screen."""
@@ -68,7 +68,7 @@ def _normalize_prop(name: str) -> str:
     return name.replace("-", "_")
 
 
-def _build_global_class(compdef: native.ComponentDefinition, global_name: str) -> Any:
+def _build_global_class(compdef: core.ComponentDefinition, global_name: str) -> Any:
     properties_and_callbacks = {}
 
     for prop_name in compdef.global_properties(global_name).keys():
@@ -139,7 +139,7 @@ def call(*args: Any) -> Any:
 
 
 def _build_class(
-    compdef: native.ComponentDefinition,
+    compdef: core.ComponentDefinition,
 ) -> typing.Callable[..., Component]:
     def cls_init(self: Component, **kwargs: Any) -> Any:
         self.__instance__ = compdef.create()
@@ -252,8 +252,8 @@ def global_getter(self: Component) -> Any:
     return type("SlintClassWrapper", (Component,), properties_and_callbacks)
 
 
-def _build_struct(name: str, struct_prototype: native.PyStruct) -> type:
-    def new_struct(cls: Any, *args: Any, **kwargs: Any) -> native.PyStruct:
+def _build_struct(name: str, struct_prototype: core.PyStruct) -> type:
+    def new_struct(cls: Any, *args: Any, **kwargs: Any) -> core.PyStruct:
         inst = copy.copy(struct_prototype)
 
         for prop, val in kwargs.items():
@@ -291,7 +291,7 @@ def load_file(
 
     """
 
-    compiler = native.Compiler()
+    compiler = core.Compiler()
 
     if style is not None:
         compiler.style = style
@@ -308,11 +308,11 @@ def load_file(
     if diagnostics:
         if not quiet:
             for diag in diagnostics:
-                if diag.level == native.DiagnosticLevel.Warning:
+                if diag.level == core.DiagnosticLevel.Warning:
                     logging.warning(diag)
 
         errors = [
-            diag for diag in diagnostics if diag.level == native.DiagnosticLevel.Error
+            diag for diag in diagnostics if diag.level == core.DiagnosticLevel.Error
         ]
         if errors:
             raise CompileError(f"Could not compile {path}", diagnostics)
@@ -492,7 +492,7 @@ def set_xdg_app_id(app_id: str) -> None:
     """Sets the application id for use on Wayland or X11 with [xdg](https://specifications.freedesktop.org/desktop-entry-spec/latest/)
     compliant window managers. This id must be set before the window is shown; it only applies to Wayland or X11."""
 
-    native.set_xdg_app_id(app_id)
+    core.set_xdg_app_id(app_id)
 
 
 quit_event = asyncio.Event()
@@ -573,7 +573,7 @@ def init_translations(translations: typing.Optional[gettext.GNUTranslations]) ->
         pass
     ```
     """
-    native.init_translations(translations)
+    core.init_translations(translations)
 
 
 __all__ = [

api/python/slint/slint/codegen/generator.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterable
 
-from .. import slint as native
+from .. import core
 from .. import _normalize_prop
 
 from .emitters import write_python_module, write_stub_module
@@ -25,7 +25,7 @@
 )
 
 if TYPE_CHECKING:
-    from slint.slint import CallbackInfo, FunctionInfo, PyDiagnostic
+    from slint.core import CallbackInfo, FunctionInfo, PyDiagnostic
 
 
 def generate_project(
@@ -42,7 +42,7 @@ def generate_project(
     if output_dir is not None:
         output_dir.mkdir(parents=True, exist_ok=True)
 
-    compiler = native.Compiler()
+    compiler = core.Compiler()
     if config.style:
         compiler.style = config.style
     if config.include_paths:
@@ -102,14 +102,14 @@ def _discover_slint_files(inputs: Iterable[Path]) -> Iterable[tuple[Path, Path]]
 
 
 def _compile_slint(
-    compiler: native.Compiler,
+    compiler: core.Compiler,
     source_path: Path,
     config: GenerationConfig,
-) -> native.CompilationResult | None:
+) -> core.CompilationResult | None:
     result = compiler.build_from_path(source_path)
 
     diagnostics = result.diagnostics
-    diagnostic_error = getattr(native, "DiagnosticLevel", None)
+    diagnostic_error = getattr(core, "DiagnosticLevel", None)
     error_enum = getattr(diagnostic_error, "Error", None)
 
     def is_error(diag: PyDiagnostic) -> bool:
@@ -133,7 +133,7 @@ def is_error(diag: PyDiagnostic) -> bool:
     return result
 
 
-def _collect_metadata(result: native.CompilationResult) -> ModuleArtifacts:
+def _collect_metadata(result: core.CompilationResult) -> ModuleArtifacts:
     components: list[ComponentMeta] = []
     for name in result.component_names:
         comp = result.component(name)
@@ -275,9 +275,9 @@ def _python_value_hint(value: object) -> str:
         return "float"
     if isinstance(value, str):
         return "str"
-    if isinstance(value, native.Image):
+    if isinstance(value, core.Image):
         return "slint.Image"
-    if isinstance(value, native.Brush):
+    if isinstance(value, core.Brush):
         return "slint.Brush"
     return "Any"
 

api/python/slint/slint/slint.pyi renamed to api/python/slint/slint/core.pyi

@@ -1,7 +1,7 @@
 # Copyright © SixtyFPS GmbH <[email protected]>
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
-from . import slint as native
+from . import core
 import asyncio.selector_events
 import asyncio
 import asyncio.events
@@ -44,7 +44,7 @@ class _SlintSelector(selectors.BaseSelector):
     def __init__(self) -> None:
         self.fd_to_selector_key: typing.Dict[typing.Any, selectors.SelectorKey] = {}
         self.mapping = _SlintSelectorMapping(self)
-        self.adapters: typing.Dict[int, native.AsyncAdapter] = {}
+        self.adapters: typing.Dict[int, core.AsyncAdapter] = {}
 
     def register(
         self, fileobj: typing.Any, events: typing.Any, data: typing.Any = None
@@ -53,7 +53,7 @@ def register(
         key = selectors.SelectorKey(fileobj, fd, events, data)
         self.fd_to_selector_key[fd] = key
 
-        adapter = native.AsyncAdapter(fd)
+        adapter = core.AsyncAdapter(fd)
         self.adapters[fd] = adapter
 
         if events & selectors.EVENT_READ:
@@ -114,22 +114,22 @@ def write_notify(self, fd: int) -> None:
 class SlintEventLoop(asyncio.SelectorEventLoop):
     def __init__(self) -> None:
         self._is_running = False
-        self._timers: typing.Set[native.Timer] = set()
+        self._timers: typing.Set[core.Timer] = set()
         self.stop_run_forever_event = asyncio.Event()
         self._soon_tasks: typing.List[asyncio.TimerHandle] = []
         super().__init__(_SlintSelector())
 
     def run_forever(self) -> None:
         async def loop_stopper(event: asyncio.Event) -> None:
             await event.wait()
-            native.quit_event_loop()
+            core.quit_event_loop()
 
         asyncio.events._set_running_loop(self)
         self._is_running = True
         try:
             self.stop_run_forever_event = asyncio.Event()
             self.create_task(loop_stopper(self.stop_run_forever_event))
-            native.run_event_loop()
+            core.run_event_loop()
         finally:
             self._is_running = False
             asyncio.events._set_running_loop(None)
@@ -178,7 +178,7 @@ def is_closed(self) -> bool:
         return False
 
     def call_later(self, delay, callback, *args, context=None) -> asyncio.TimerHandle:  # type: ignore
-        timer = native.Timer()
+        timer = core.Timer()
 
         handle = asyncio.TimerHandle(
             when=self.time() + delay,
@@ -196,7 +196,7 @@ def timer_done_cb() -> None:
                 handle._run()
 
         timer.start(
-            native.TimerMode.SingleShot,
+            core.TimerMode.SingleShot,
             interval=datetime.timedelta(seconds=delay),
             callback=timer_done_cb,
         )
@@ -237,7 +237,7 @@ def run_handle_cb() -> None:
             if not handle._cancelled:
                 handle._run()
 
-        native.invoke_from_event_loop(run_handle_cb)
+        core.invoke_from_event_loop(run_handle_cb)
         return handle
 
     def _write_to_self(self) -> None:

api/python/slint/slint/loop.py

@@ -1,14 +1,14 @@
 # Copyright © SixtyFPS GmbH <[email protected]>
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
-from . import slint as native
+from . import core
 from collections.abc import Iterable
 from abc import abstractmethod
 import typing
 from typing import Any, cast, Iterator
 
 
-class Model[T](native.PyModelBase, Iterable[T]):
+class Model[T](core.PyModelBase, Iterable[T]):
     """Model is the base class for feeding dynamic data into Slint views.
 
     Subclass Model to implement your own models, or use `ListModel` to wrap a list.

api/python/slint/slint/models.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
 import slint
-from slint import slint as native
+from slint import core
 import asyncio
 import typing
 import aiohttp
@@ -166,11 +166,11 @@ async def run_server_and_client(exception_check: typing.List[Exception]) -> None
 
 def test_loop_close_while_main_future_runs() -> None:
     def q() -> None:
-        native.quit_event_loop()
+        core.quit_event_loop()
 
     async def never_quit() -> None:
         loop = asyncio.get_running_loop()
-        # Call native.quit_event_loop() directly as if the user closed the last window. We should gracefully
+        # Call core.quit_event_loop() directly as if the user closed the last window. We should gracefully
         # handle that the future that this function represents isn't terminated.
         loop.call_later(0.1, q)
         while True:

api/python/slint/tests/test_async.py

@@ -1,13 +1,13 @@
 # Copyright © SixtyFPS GmbH <[email protected]>
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
-from slint import slint as native
-from slint.slint import ValueType
+from slint import core
+from slint.core import ValueType
 from pathlib import Path
 
 
 def test_basic_compiler() -> None:
-    compiler = native.Compiler()
+    compiler = core.Compiler()
 
     assert compiler.include_paths == []
     compiler.include_paths = [Path("testing")]
@@ -79,13 +79,13 @@ def test_basic_compiler() -> None:
 
 
 def test_compiler_build_from_path() -> None:
-    compiler = native.Compiler()
+    compiler = core.Compiler()
 
     result = compiler.build_from_path(Path("Nonexistent.slint"))
     assert len(result.component_names) == 0
 
     diags = result.diagnostics
     assert len(diags) == 1
 
-    assert diags[0].level == native.DiagnosticLevel.Error
+    assert diags[0].level == core.DiagnosticLevel.Error
     assert diags[0].message.startswith("Could not load Nonexistent.slint:")