pythonnative 0.35.0__py3-none-any.whl → 0.37.0__py3-none-any.whl

pythonnative/templates/ios_template/ios_template/SceneDelegate.swift

@@ -3,9 +3,11 @@
 //  ios_template
 //
 //  Creates the window programmatically and forwards scene-level events
-//  (deep links, foreground/background transitions) to the Python side.
+//  (deep links, foreground/background transitions) to the Swift native
+//  modules, which relay them to Python over the bridge.
 //
 
+import PythonNativeKit
 import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
@@ -18,10 +20,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     ) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
         // A cold start from a deep link delivers the URL here, before
-        // Python is running; PythonRuntime buffers it and flushes after
-        // startup so Linking.get_initial_url() sees it.
+        // Python is running; LinkingModule buffers it until the bridge
+        // callback is registered so Linking.get_initial_url() sees it.
         for context in connectionOptions.urlContexts {
-            PythonRuntime.shared.deliverURL(context.url.absoluteString)
+            LinkingModule.deliver(url: context.url.absoluteString)
         }
         let window = UIWindow(windowScene: windowScene)
         let root = ViewController()
@@ -33,33 +35,26 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
         for context in URLContexts {
-            PythonRuntime.shared.deliverURL(context.url.absoluteString)
+            LinkingModule.deliver(url: context.url.absoluteString)
         }
     }
 
     // MARK: - AppState forwarding
 
-    private func dispatchAppState(_ state: String) {
-        guard PythonRuntime.shared.started else { return }
-        PythonRuntime.shared.notify(
-            module: "pythonnative.native_modules.app_state", function: "dispatch_app_state", state
-        )
-    }
-
     func sceneDidBecomeActive(_ scene: UIScene) {
-        dispatchAppState("active")
+        AppStateModule.dispatch("active")
     }
 
     func sceneWillResignActive(_ scene: UIScene) {
-        dispatchAppState("inactive")
+        AppStateModule.dispatch("inactive")
     }
 
     func sceneWillEnterForeground(_ scene: UIScene) {
-        dispatchAppState("inactive")
+        AppStateModule.dispatch("inactive")
     }
 
     func sceneDidEnterBackground(_ scene: UIScene) {
-        dispatchAppState("background")
+        AppStateModule.dispatch("background")
     }
 
     func sceneDidDisconnect(_ scene: UIScene) {}

pythonnative/templates/ios_template/ios_template/ViewController.swift

@@ -2,158 +2,28 @@
 //  ViewController.swift
 //  ios_template
 //
-//  Hosts one PythonNative screen. Python is initialized through
-//  PythonRuntime (linked CPython, no PythonKit); a bootstrap failure
-//  shows a full-screen error report instead of a silent fallback.
+//  Hosts one PythonNative screen. All screen plumbing lives in
+//  PythonNativeKit's PNViewController; this subclass only starts the
+//  embedded interpreter (showing a bootstrap error on failure) and
+//  points dev builds at the hot-reload overlay.
 //
 
+import PythonNativeKit
 import UIKit
 
-class ViewController: UIViewController {
-    // Optional keys for dynamic screen navigation. Push navigation sets
-    // these before presenting the controller; nil means the app's entry
-    // module (Info.plist `PNEntryModule`, default "app.main").
-    @objc dynamic var requestedScreenPath: String? = nil
-    @objc dynamic var requestedScreenArgsJSON: String? = nil
-
-    private var screen: PyRef? = nil
-    #if DEBUG
-    private var hotReloadTimer: Timer? = nil
-    #endif
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        view.backgroundColor = .systemBackground
-
+final class ViewController: PNViewController {
+    override func prepareRuntime() -> Bool {
         do {
             try PythonRuntime.shared.ensureStarted()
         } catch {
             showBootstrapError("Python failed to start.\n\n\(error)")
-            return
+            return false
         }
-
-        // PythonNative's convention is "import the module and grab its
-        // top-level `App` attribute". The entry module comes from
-        // `app.entry_point` in pythonnative.toml (written to Info.plist as
-        // `PNEntryModule` by `pn build`); push navigation overrides it via
-        // `requestedScreenPath`.
-        let entryModule = Bundle.main.object(forInfoDictionaryKey: "PNEntryModule") as? String
-        let screenPath: String = requestedScreenPath ?? entryModule ?? "app.main"
-        let addr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque())
-        do {
-            let screen: PyRef
-            if let argsJSON = requestedScreenArgsJSON {
-                screen = try PythonRuntime.shared.call(
-                    module: "pythonnative.hosts", function: "create_screen", screenPath, addr, argsJSON
-                )
-            } else {
-                screen = try PythonRuntime.shared.call(
-                    module: "pythonnative.hosts", function: "create_screen", screenPath, addr
-                )
-            }
-            self.screen = screen
-            #if DEBUG
-            let devRoot = "\(NSHomeDirectory())/Documents/pythonnative_dev"
-            try screen.call("enable_hot_reload", "\(devRoot)/reload.json", devRoot)
-            #endif
-            try screen.call("on_create")
-            #if DEBUG
-            startHotReloadPolling()
-            #endif
-        } catch {
-            showBootstrapError("The PythonNative screen failed to mount.\n\n\(error)")
-        }
-    }
-
-    // MARK: - Lifecycle forwarding
-
-    private func forwardLifecycle(_ event: String) {
-        guard screen != nil else { return }
-        let addr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque())
-        PythonRuntime.shared.notify(
-            module: "pythonnative.hosts", function: "forward_lifecycle", addr, event
-        )
-    }
-
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        forwardLifecycle("on_start")
-    }
-
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        // The root view's safeAreaInsets are only valid after iOS has
-        // positioned the view in its window; forward every layout pass
-        // to Python so the reconciler can re-run layout against the
-        // correct viewport (initial mount, rotation, multitasking, etc.).
-        forwardLifecycle("on_layout")
-    }
-
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        forwardLifecycle("on_resume")
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        forwardLifecycle("on_pause")
-    }
-
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-        forwardLifecycle("on_stop")
-    }
-
-    override func encodeRestorableState(with coder: NSCoder) {
-        super.encodeRestorableState(with: coder)
-        forwardLifecycle("on_save_instance_state")
-    }
-
-    override func decodeRestorableState(with coder: NSCoder) {
-        super.decodeRestorableState(with: coder)
-        forwardLifecycle("on_restore_instance_state")
-    }
-
-    deinit {
         #if DEBUG
-        hotReloadTimer?.invalidate()
-        #endif
-        if screen != nil {
-            let addr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque())
-            PythonRuntime.shared.notify(
-                module: "pythonnative.hosts", function: "forward_lifecycle", addr, "on_destroy"
-            )
+        if devRoot == nil {
+            devRoot = "\(NSHomeDirectory())/Documents/pythonnative_dev"
         }
-    }
-
-    // MARK: - Hot reload (dev builds only)
-
-    #if DEBUG
-    private func startHotReloadPolling() {
-        hotReloadTimer?.invalidate()
-        hotReloadTimer = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { [weak self] _ in
-            guard let screen = self?.screen else { return }
-            do {
-                try screen.call("hot_reload_tick")
-            } catch {
-                NSLog("[PN] hot_reload_tick failed: \(error)")
-            }
-        }
-    }
-    #endif
-
-    // MARK: - Bootstrap error UI
-
-    private func showBootstrapError(_ message: String) {
-        NSLog("[PN] %@", message)
-        let text = UITextView(frame: view.bounds)
-        text.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        text.isEditable = false
-        text.backgroundColor = UIColor(red: 0.75, green: 0.10, blue: 0.10, alpha: 1.0)
-        text.textColor = .white
-        text.font = UIFont.monospacedSystemFont(ofSize: 13, weight: .regular)
-        text.textContainerInset = UIEdgeInsets(top: 60, left: 16, bottom: 40, right: 16)
-        text.text = "PythonNative could not start\n\n\(message)"
-        view.addSubview(text)
+        #endif
+        return true
     }
 }

pythonnative/templates/ios_template/ios_template.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -20,6 +20,7 @@
 		AA0000000000000000000005 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = AA0000000000000000000003 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		AA0000000000000000000007 /* app in Resources */ = {isa = PBXBuildFile; fileRef = AA0000000000000000000006 /* app */; };
 		AA0000000000000000000009 /* app_packages in Resources */ = {isa = PBXBuildFile; fileRef = AA0000000000000000000008 /* app_packages */; };
+		AA000000000000000000000D /* PythonNativeKit in Frameworks */ = {isa = PBXBuildFile; productRef = AA000000000000000000000C /* PythonNativeKit */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -65,6 +66,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				AA0000000000000000000004 /* Python.xcframework in Frameworks */,
+				AA000000000000000000000D /* PythonNativeKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -158,6 +160,9 @@
 			dependencies = (
 			);
 			name = ios_template;
+			packageProductDependencies = (
+				AA000000000000000000000C /* PythonNativeKit */,
+			);
 			productName = ios_template;
 			productReference = 146EBB7E2A40CCC900E4A2B3 /* ios_template.app */;
 			productType = "com.apple.product-type.application";
@@ -230,6 +235,9 @@
 				Base,
 			);
 			mainGroup = 146EBB752A40CCC900E4A2B3;
+			packageReferences = (
+				AA000000000000000000000E /* XCLocalSwiftPackageReference "PythonNativeKit" */,
+			);
 			productRefGroup = 146EBB7F2A40CCC900E4A2B3 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -504,6 +512,18 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl,-exported_symbol,_pn_bridge_apply",
+					"-Wl,-exported_symbol,_pn_bridge_measure",
+					"-Wl,-exported_symbol,_pn_bridge_command",
+					"-Wl,-exported_symbol,_pn_bridge_animate",
+					"-Wl,-exported_symbol,_pn_bridge_call",
+					"-Wl,-exported_symbol,_pn_bridge_free",
+					"-Wl,-exported_symbol,_pn_bridge_set_callback",
+					"-Wl,-exported_symbol,_pn_bridge_protocol_version",
+					"-Wl,-exported_symbol,_main",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pythonnative.ios-template";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -542,6 +562,18 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl,-exported_symbol,_pn_bridge_apply",
+					"-Wl,-exported_symbol,_pn_bridge_measure",
+					"-Wl,-exported_symbol,_pn_bridge_command",
+					"-Wl,-exported_symbol,_pn_bridge_animate",
+					"-Wl,-exported_symbol,_pn_bridge_call",
+					"-Wl,-exported_symbol,_pn_bridge_free",
+					"-Wl,-exported_symbol,_pn_bridge_set_callback",
+					"-Wl,-exported_symbol,_pn_bridge_protocol_version",
+					"-Wl,-exported_symbol,_main",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pythonnative.ios-template";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -668,6 +700,20 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCLocalSwiftPackageReference section */
+		AA000000000000000000000E /* XCLocalSwiftPackageReference "PythonNativeKit" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = PythonNativeKit;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		AA000000000000000000000C /* PythonNativeKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = PythonNativeKit;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 146EBB762A40CCC900E4A2B3 /* Project object */;
 }

pythonnative/utils.py

@@ -6,19 +6,13 @@ results are cached the first time
 [`IS_ANDROID`][pythonnative.utils.IS_ANDROID] and
 [`IS_IOS`][pythonnative.utils.IS_IOS] are read.
 
-The Android variants also expose a small global registry for the
-current `Activity` / `Context` and the screen's fragment container view;
-both are populated by the bundled Android template before any
-PythonNative code runs.
-
 Attributes:
     IS_ANDROID: `True` when running inside an Android process (either
         because `ANDROID_*` env vars are present or because Chaquopy's
         `java` module imports successfully).
     IS_IOS: `True` when running inside an iOS app bundle (signaled by
         `PN_PLATFORM=ios`, `sys.platform == "ios"`, or a Simulator
-        `HOME` path). Importing `rubicon-objc` alone is intentionally
-        not enough to trigger this flag.
+        `HOME` path).
     IS_DESKTOP: `True` when running the desktop preview backend
         (signaled by `PN_PLATFORM=desktop`, set by ``pn preview``).
         This drives the Tkinter native-view registry so a PythonNative
@@ -27,7 +21,7 @@ Attributes:
 
 import os
 import sys
-from typing import Any, Optional
+from typing import Optional
 
 # ======================================================================
 # Platform detection
@@ -65,10 +59,8 @@ def _detect_ios() -> bool:
     - `/CoreSimulator/Devices/` in `$HOME` (iOS Simulator fallback if
       the template signal is missing for some reason).
 
-    Crucially, having `rubicon-objc` importable is *not* enough:
-    developers frequently install it on macOS via the `[ios]` extra,
-    and treating that as iOS would cause subtle side effects
-    (e.g., stdout redirection) on desktop machines.
+    Running on macOS is never enough on its own: the desktop preview
+    and unit tests run there and must not be mistaken for iOS.
     """
     if os.environ.get("PN_PLATFORM") == "ios":
         return True
@@ -148,73 +140,3 @@ Set by ``pn preview`` via ``PN_PLATFORM=desktop``. Mutually exclusive
 with `IS_ANDROID` / `IS_IOS`. Off-device unit tests leave this
 ``False`` and inject a mock registry instead.
 """
-
-# ======================================================================
-# Android context management
-# ======================================================================
-
-_android_context: Any = None
-_android_fragment_container: Any = None
-
-
-def set_android_context(context: Any) -> None:
-    """Record the current Android `Activity`/`Context`.
-
-    Called by the bundled Android template before any view is created;
-    most app code should not call this directly.
-
-    Args:
-        context: A Java `android.content.Context` (typically the
-            current `Activity`).
-    """
-    global _android_context
-    _android_context = context
-
-
-def set_android_fragment_container(container_view: Any) -> None:
-    """Record the current `Fragment` root container `ViewGroup`.
-
-    Args:
-        container_view: A Java `android.view.ViewGroup` that holds the
-            screen's view tree.
-    """
-    global _android_fragment_container
-    _android_fragment_container = container_view
-
-
-def get_android_context() -> Any:
-    """Return the current Android `Activity`/`Context`.
-
-    Returns:
-        The most recently recorded Android context.
-
-    Raises:
-        RuntimeError: If called on a non-Android platform, or before
-            the template has registered a context.
-    """
-    if not IS_ANDROID:
-        raise RuntimeError("get_android_context() called on non-Android platform")
-    if _android_context is None:
-        raise RuntimeError(
-            "Android context not set. Ensure the screen host is initialized from an Activity before constructing views."
-        )
-    return _android_context
-
-
-def get_android_fragment_container() -> Any:
-    """Return the current `Fragment` container `ViewGroup`.
-
-    Returns:
-        The most recently recorded fragment container view.
-
-    Raises:
-        RuntimeError: If called on a non-Android platform, or before
-            `ScreenFragment` has registered its container.
-    """
-    if not IS_ANDROID:
-        raise RuntimeError("get_android_fragment_container() called on non-Android platform")
-    if _android_fragment_container is None:
-        raise RuntimeError(
-            "Android fragment container not set. Ensure ScreenFragment has been created before set_root_view."
-        )
-    return _android_fragment_container

pythonnative/virtual_rows.py

@@ -90,9 +90,9 @@ class RowSubtree:
 class RowHostPool:
     """Per-list bookkeeping of row subtrees keyed by native container.
 
-    Platform handlers create one pool per virtualized list view. Keys
-    are platform-stable container identities (Java identity hash on
-    Android, ``contentView`` pointer on iOS).
+    The view backend creates one pool per virtualized list view. Keys
+    are the container ids native sends with ``on_bind_row`` (stable for
+    the life of a recycled cell).
     """
 
     def __init__(self) -> None:

{pythonnative-0.35.0.dist-info → pythonnative-0.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonnative
-Version: 0.35.0
+Version: 0.37.0
 Summary: Cross-platform native UI toolkit for Android and iOS
 Author: Owen Carey
 License: MIT License
@@ -44,8 +44,6 @@ License-File: LICENSE
 Requires-Dist: requests>=2.31.0
 Requires-Dist: tomli>=2.0; python_version < "3.11"
 Requires-Dist: typing_extensions>=4.4; python_version < "3.11"
-Provides-Extra: ios
-Requires-Dist: rubicon-objc<0.5.0,>=0.4.6; extra == "ios"
 Provides-Extra: build
 Requires-Dist: Pillow>=10.0; extra == "build"
 Dynamic: license-file
@@ -78,7 +76,7 @@ Dynamic: license-file
 
 ## Overview
 
-PythonNative is a cross-platform toolkit for building native Android and iOS apps in Python. It provides a **declarative, React-like component model** with hooks and automatic reconciliation, powered by Chaquopy on Android and rubicon-objc on iOS. Write function components with `use_state`, `use_effect`, and friends, just like React, and let PythonNative handle creating and updating native views.
+PythonNative is a cross-platform toolkit for building native Android and iOS apps in Python. It provides a **declarative, React-like component model** with hooks and automatic reconciliation on top of a **native rendering core** written in Swift and Kotlin. Write function components with `use_state`, `use_effect`, and friends, just like React, and let PythonNative handle creating and updating native views.
 
 ## Features
 
@@ -94,7 +92,7 @@ PythonNative is a cross-platform toolkit for building native Android and iOS app
 - **Native-driven animations:** The `Animated` API (timing / spring / decay / loop / stagger, awaitable or fire-and-forget) hands animations to Core Animation and `ViewPropertyAnimator` whenever possible, so no Python code runs per frame; a pure-Python ticker covers the rest. `interpolate`, arithmetic operators on animated nodes, `Animated.event` scroll binding, and `diff_clamp` cover the scroll-driven patterns (collapsing headers, parallax) that define native feel.
 - **Native gesture system:** Attach `Tap`, `LongPress`, `Pan`, `Swipe`, `Fling`, `Pinch`, and `Rotation` recognizers to any view via the `gestures=` prop, backed by `UIGestureRecognizer` on iOS and a unit-testable pure-Python arbiter on Android and desktop. Compose them with `Race`, `Exclusive`, and `Simultaneous` for cross-gesture arbitration (single vs. double tap, drag vs. long press).
 - **Virtualized lists:** `FlatList` / `SectionList` window their rows in Python over the platform scroll view: uniform, exact, or measured variable heights, grids, headers/footers, infinite scroll, and an imperative scroll controller, identical on every platform.
-- **Direct native bindings:** Python calls platform APIs directly through Chaquopy and rubicon-objc, with no JavaScript bridge.
+- **Native rendering core:** each commit is one serialized transaction applied by Swift and Kotlin component managers, the same shape as React Native's Fabric. Device APIs are native modules registered by name (TurboModules-style), callable from thin Python facades.
 - **Custom-component SDK:** Wrap any platform widget as a first-class element with type-checked props via `pythonnative.sdk` (`Props`, `@native_component`, `element_factory`). Plugins distributed on PyPI auto-register through the `pythonnative.handlers` entry-point group.
 - **CLI scaffolding:** `pn init` creates a ready-to-run project; `pn run android` and `pn run ios` build and launch your app.
 - **Instant desktop preview:** `pn preview` renders your app in a native desktop window via Tkinter with Fast Refresh on every save: iterate on layout, state, and navigation in milliseconds without booting a simulator or device. The reconciler, hooks, layout engine, and navigation are the same code that ships to the phone.