pythonnative 0.7.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

pythonnative/reconciler.py

@@ -11,8 +11,12 @@ Supports:
   ``@component``).  Their hook state is preserved across renders.
 - **Provider elements** (type ``"__Provider__"``), which push/pop
   context values during tree traversal.
+- **Error boundary elements** (type ``"__ErrorBoundary__"``), which
+  catch exceptions in child subtrees and render a fallback.
 - **Key-based child reconciliation** for stable identity across
   re-renders.
+- **Post-render effect flushing**: after each mount or reconcile pass,
+  all queued effects are executed so they see the committed native tree.
 """
 
 from typing import Any, List, Optional
@@ -36,6 +40,10 @@ class VNode:
 class Reconciler:
     """Create, diff, and patch native view trees from Element descriptors.
 
+    After each ``mount`` or ``reconcile`` call the reconciler walks the
+    committed tree and flushes all pending effects so that effect
+    callbacks run **after** native mutations are applied.
+
     Parameters
     ----------
     backend:
@@ -56,6 +64,7 @@ class Reconciler:
     def mount(self, element: Element) -> Any:
         """Build native views from *element* and return the root native view."""
         self._tree = self._create_tree(element)
+        self._flush_effects()
         return self._tree.native_view
 
     def reconcile(self, new_element: Element) -> Any:
@@ -65,11 +74,28 @@ class Reconciler:
         """
         if self._tree is None:
             self._tree = self._create_tree(new_element)
+            self._flush_effects()
             return self._tree.native_view
 
         self._tree = self._reconcile_node(self._tree, new_element)
+        self._flush_effects()
         return self._tree.native_view
 
+    # ------------------------------------------------------------------
+    # Effect flushing
+    # ------------------------------------------------------------------
+
+    def _flush_effects(self) -> None:
+        """Walk the committed tree and flush pending effects (depth-first)."""
+        if self._tree is not None:
+            self._flush_tree_effects(self._tree)
+
+    def _flush_tree_effects(self, node: VNode) -> None:
+        for child in node.children:
+            self._flush_tree_effects(child)
+        if node.hook_state is not None:
+            node.hook_state.flush_pending_effects()
+
     # ------------------------------------------------------------------
     # Internal helpers
     # ------------------------------------------------------------------
@@ -87,6 +113,10 @@ class Reconciler:
             children = [child_node] if child_node else []
             return VNode(element, native_view, children)
 
+        # Error boundary: catch exceptions in the child subtree
+        if element.type == "__ErrorBoundary__":
+            return self._create_error_boundary(element)
+
         # Function component: call with hook context
         if callable(element.type):
             from .hooks import HookState, _set_hook_state
@@ -114,6 +144,20 @@ class Reconciler:
             children.append(child_node)
         return VNode(element, native_view, children)
 
+    def _create_error_boundary(self, element: Element) -> VNode:
+        fallback_fn = element.props.get("__fallback__")
+        try:
+            child_node = self._create_tree(element.children[0]) if element.children else None
+        except Exception as exc:
+            if fallback_fn is not None:
+                fallback_el = fallback_fn(exc) if callable(fallback_fn) else fallback_fn
+                child_node = self._create_tree(fallback_el)
+            else:
+                raise
+        native_view = child_node.native_view if child_node else None
+        children = [child_node] if child_node else []
+        return VNode(element, native_view, children)
+
     def _reconcile_node(self, old: VNode, new_el: Element) -> VNode:
         if not self._same_type(old.element, new_el):
             new_node = self._create_tree(new_el)
@@ -138,6 +182,10 @@ class Reconciler:
             old.element = new_el
             return old
 
+        # Error boundary
+        if new_el.type == "__ErrorBoundary__":
+            return self._reconcile_error_boundary(old, new_el)
+
         # Function component
         if callable(new_el.type):
             from .hooks import _set_hook_state
@@ -175,10 +223,34 @@ class Reconciler:
         old.element = new_el
         return old
 
+    def _reconcile_error_boundary(self, old: VNode, new_el: Element) -> VNode:
+        fallback_fn = new_el.props.get("__fallback__")
+        try:
+            if old.children and new_el.children:
+                child = self._reconcile_node(old.children[0], new_el.children[0])
+                old.children = [child]
+                old.native_view = child.native_view
+            elif new_el.children:
+                child = self._create_tree(new_el.children[0])
+                old.children = [child]
+                old.native_view = child.native_view
+        except Exception as exc:
+            for c in old.children:
+                self._destroy_tree(c)
+            if fallback_fn is not None:
+                fallback_el = fallback_fn(exc) if callable(fallback_fn) else fallback_fn
+                child = self._create_tree(fallback_el)
+                old.children = [child]
+                old.native_view = child.native_view
+            else:
+                raise
+        old.element = new_el
+        return old
+
     def _reconcile_children(self, parent: VNode, new_children: List[Element]) -> None:
         old_children = parent.children
         parent_type = parent.element.type
-        is_native = isinstance(parent_type, str) and parent_type != "__Provider__"
+        is_native = isinstance(parent_type, str) and parent_type not in ("__Provider__", "__ErrorBoundary__")
 
         old_by_key: dict = {}
         old_unkeyed: list = []
@@ -215,7 +287,11 @@ class Reconciler:
                     self.backend.insert_child(parent.native_view, node.native_view, parent_type, i)
                 new_child_nodes.append(node)
             else:
+                old_native = matched.native_view
                 updated = self._reconcile_node(matched, new_el)
+                if is_native and updated.native_view is not old_native:
+                    self.backend.remove_child(parent.native_view, old_native, parent_type)
+                    self.backend.insert_child(parent.native_view, updated.native_view, parent_type, i)
                 new_child_nodes.append(updated)
 
         # Destroy unused old nodes
@@ -229,6 +305,18 @@ class Reconciler:
                 self.backend.remove_child(parent.native_view, node.native_view, parent_type)
             self._destroy_tree(node)
 
+        # Reorder native children when keyed children changed positions.
+        # Without this, native sibling order drifts from the logical tree
+        # when keyed children swap positions across reconcile passes.
+        if is_native and used_keyed:
+            old_key_order = [c.element.key for c in old_children if c.element.key in used_keyed]
+            new_key_order = [n.element.key for n in new_child_nodes if n.element.key in used_keyed]
+            if old_key_order != new_key_order:
+                for node in new_child_nodes:
+                    self.backend.remove_child(parent.native_view, node.native_view, parent_type)
+                for node in new_child_nodes:
+                    self.backend.add_child(parent.native_view, node.native_view, parent_type)
+
         parent.children = new_child_nodes
 
     def _destroy_tree(self, node: VNode) -> None:

pythonnative/templates/ios_template/ios_template/ViewController.swift

@@ -27,13 +27,18 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         // Ensure a visible background when created programmatically (storyboards set this automatically)
         view.backgroundColor = .systemBackground
-        NSLog("[PN][ViewController] viewDidLoad")
-        if let bundleId = Bundle.main.bundleIdentifier {
-            NSLog("[PN] Bundle Identifier: \(bundleId)")
-        }
-        NSLog("[PN] Bundle Path: \(Bundle.main.bundlePath)")
-        NSLog("[PN] Resource Path: \(Bundle.main.resourcePath ?? "nil")")
-        // Configure embedded Python if available in bundle
+
+        let firstInit = !ViewController.hasInitializedPython
+
+        // Signal to pythonnative that we're running on iOS. Read on the
+        // Python side (pythonnative.utils.IS_IOS) to gate iOS-only setup
+        // like sys.stdout redirection. Set before Python starts so it's
+        // visible to the very first import.
+        setenv("PN_PLATFORM", "ios", 1)
+
+        // Configure embedded Python if available in bundle. PYTHONHOME /
+        // PYTHONPATH only need to be set once per process, but setting them
+        // again is harmless and keeps the flow simple.
         if let resourcePath = Bundle.main.resourcePath {
             let pyStd = "\(resourcePath)/python-stdlib"
             let pyDyn = "\(resourcePath)/python-stdlib/lib-dynload"
@@ -44,8 +49,6 @@ class ViewController: UIViewController {
             }
             setenv("PYTHONHOME", pyStd, 1)
             setenv("PYTHONPATH", pyPath, 1)
-            NSLog("[PN] Set PYTHONHOME=\(pyStd)")
-            NSLog("[PN] Set PYTHONPATH=\(pyPath)")
         }
         #if canImport(PythonKit)
         // Ensure PythonKit knows where to load the Python library from when using an embedded framework.
@@ -53,34 +56,25 @@ class ViewController: UIViewController {
             let frameworkLib = "\(bundlePath)/Frameworks/Python.framework/Python"
             setenv("PYTHON_LIBRARY", frameworkLib, 1)
             if FileManager.default.fileExists(atPath: frameworkLib) {
-                if !ViewController.hasInitializedPython {
-                    NSLog("[PN] Using embedded Python lib at: \(frameworkLib)")
+                if firstInit {
                     PythonLibrary.useLibrary(at: frameworkLib)
                     ViewController.hasInitializedPython = true
-                } else {
-                    NSLog("[PN] Python library already initialized; skipping useLibrary")
                 }
                 pythonReady = true
             } else {
                 NSLog("[PN] Embedded Python library not found at: \(frameworkLib)")
             }
         }
-        NSLog("[PN] PythonKit available; attempting Python bootstrap")
         let sys = Python.import("sys")
-        NSLog("[PN] Python version: \(sys.version)")
-        NSLog("[PN] Initial sys.path: \(sys.path)")
+        if firstInit {
+            // One concise bootstrap line per process; per-page detail is left
+            // to Python-side print() statements streamed via pn run ios.
+            let shortVersion = "\(sys.version)".split(separator: "\n").first.map(String.init) ?? "\(sys.version)"
+            NSLog("[PN] Python \(shortVersion) initialized")
+        }
         if let resourcePath = Bundle.main.resourcePath {
             sys.path.append(resourcePath)
             sys.path.append("\(resourcePath)/app")
-            NSLog("[PN] Updated sys.path: \(sys.path)")
-            // List bundled resources to verify Python files are present
-            let fm = FileManager.default
-            let appDir = "\(resourcePath)/app"
-            if let entries = try? fm.contentsOfDirectory(atPath: appDir) {
-                NSLog("[PN] Contents of /app in bundle: \(entries)")
-            } else {
-                NSLog("[PN] Could not list contents of \(appDir).")
-            }
         }
         // Determine which Python page to load
         let pagePath: String = requestedPagePath ?? "app.main_page.MainPage"

pythonnative/utils.py

@@ -5,6 +5,7 @@ importing platform-specific packages at module level.
 """
 
 import os
+import sys
 from typing import Any, Optional
 
 # ======================================================================
@@ -12,6 +13,7 @@ from typing import Any, Optional
 # ======================================================================
 
 _is_android: Optional[bool] = None
+_is_ios: Optional[bool] = None
 
 
 def _detect_android() -> bool:
@@ -27,10 +29,40 @@ def _detect_android() -> bool:
     return False
 
 
+def _detect_ios() -> bool:
+    """Detect whether we're running inside an iOS app bundle.
+
+    Signals, in priority order:
+
+    - Explicit ``PN_PLATFORM=ios`` env var (set by the iOS template's
+      ``ViewController.swift`` before Python starts). This is the
+      canonical signal and survives even on hosts where ``sys.platform``
+      is generic ``darwin``.
+    - ``sys.platform == "ios"`` (CPython 3.13+ native iOS builds).
+    - ``/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.
+    """
+    if os.environ.get("PN_PLATFORM") == "ios":
+        return True
+    if sys.platform == "ios":
+        return True
+    home = os.environ.get("HOME", "")
+    if "/CoreSimulator/Devices/" in home:
+        return True
+    return False
+
+
 def _ensure_platform_detection() -> None:
-    global _is_android
+    global _is_android, _is_ios
     if _is_android is None:
         _is_android = _detect_android()
+    if _is_ios is None:
+        _is_ios = (not _is_android) and _detect_ios()
 
 
 def _get_is_android() -> bool:
@@ -39,7 +71,14 @@ def _get_is_android() -> bool:
     return _is_android
 
 
+def _get_is_ios() -> bool:
+    _ensure_platform_detection()
+    assert _is_ios is not None
+    return _is_ios
+
+
 IS_ANDROID: bool = _get_is_android()
+IS_IOS: bool = _get_is_ios()
 
 # ======================================================================
 # Android context management

{pythonnative-0.7.0.dist-info → pythonnative-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonnative
-Version: 0.7.0
+Version: 0.9.0
 Summary: Cross-platform native UI toolkit for Android and iOS
 Author: Owen Carey
 License: MIT License

{pythonnative-0.7.0.dist-info → pythonnative-0.9.0.dist-info}/RECORD

@@ -1,20 +1,25 @@
-pythonnative/__init__.py,sha256=jhPsaI_qyTEQ_YMT5pJumYOQKYamfHbPalWd5VbJ5vY,1575
-pythonnative/components.py,sha256=dvLaXmCFU8O6bnYdudwBVsvad1DkwvmMJoTZRAZi540,10534
+pythonnative/__init__.py,sha256=zKplWL38v3kFMeQ8Q2VqnjF-nAM5vx3EW8UIKqJddDo,2038
+pythonnative/_ios_log.py,sha256=dkTSUeOF9xRQjgxMYdH6EohjzjmeInwOfr-_0tkBmpE,2639
+pythonnative/components.py,sha256=zF24vXM6halq-fweLtLHxZrmBrUKCa9c44hf9Bych-Y,12767
 pythonnative/element.py,sha256=RBUsXzzzM7KdK-NqMD-InVPKdAb8XJ0h0VpI2rwsfHs,1795
-pythonnative/hooks.py,sha256=UMoNTFoMKON4uJpUU9WHBv60tR2GUvx4Q_OgfG24Xcg,10361
-pythonnative/hot_reload.py,sha256=GoooBkRm2_zu_bQGOsOvUx-x9GdFcvRwSWEkhltFg2Y,4498
-pythonnative/native_views.py,sha256=VuqseL-QRHsEoGe3j3Ubh-iPo0dAkx-rcieZqWlt5ho,62037
-pythonnative/page.py,sha256=Pjf2o-0ufmn_6q2hyRZ3zrnHWkDTm2PD6rI4niQTfS8,14803
-pythonnative/reconciler.py,sha256=4Ah8NtYawZH9ZHXoMMjMTfdrTkZ0b4OT3e_85WLTrbU,9850
+pythonnative/hooks.py,sha256=bqnJvEpbYSlbwkBKphT5lLEXQ1mO6AlO4r9SCTBlu7w,13768
+pythonnative/hot_reload.py,sha256=dtppJaQI6Rl7muCTMgLjFNsD4_F4yYnkEpliCLaaWm8,4508
+pythonnative/navigation.py,sha256=dDY9qBPLJKr2NnvdIDs8Xy-6kFesQNCEaLjUDT-0_l8,19042
+pythonnative/page.py,sha256=J1mC6jVAu6IjFSwDGPU3cMfiXLPHoW2RbyZ1kj3OSfk,16814
+pythonnative/reconciler.py,sha256=EuB8InxqlbZpZ0qI8hSjwNQsS-lsvh0vdqGzTnmY1M8,14133
 pythonnative/style.py,sha256=NG58FSJCBTBBWRrDOyUiHZsTxQDA3jg2PSOcCsU2F5g,3882
-pythonnative/utils.py,sha256=IqR_GYknveM_NfAblcaizg9S66hCZfrfiH08HzpOc-4,2537
+pythonnative/utils.py,sha256=dp-cOYSflWvsY9Qh851OeBq-x6S8W1cx4nyjDxlsd0M,3859
 pythonnative/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pythonnative/cli/pn.py,sha256=Yi-RHjl3wUWHgGdwtA4UyEDy-tnjpmBB-PGupyDTae0,32823
+pythonnative/cli/pn.py,sha256=KGDbxRYtZHUS4rId_Br6oI7kEGl0pcRAo5UGztUvTN4,37478
 pythonnative/native_modules/__init__.py,sha256=M_4SW-wCZ8azLuB0JLwUc8PESw00xMCM887-HuN9YNo,647
 pythonnative/native_modules/camera.py,sha256=b3UErkABhBm2nQ-e72lEeFOgXoVDY6245cV6TN9iPBk,3509
 pythonnative/native_modules/file_system.py,sha256=2fvYsIboCtjEyxmVeV72glOjtc9fJN3jTM6uaccru6E,4478
 pythonnative/native_modules/location.py,sha256=bMSNbtG60hAorKXh4RR2vybX88M_BwHkCpTprRbMsZU,1883
 pythonnative/native_modules/notifications.py,sha256=g-zT1GD-ojPsLN5eGXWkyNHTncSxdiEYtjllCXlsBSc,5377
+pythonnative/native_views/__init__.py,sha256=0weXhCaDT79sez9Q1JibXSgouRVB1tjucFibhbPQeYc,2984
+pythonnative/native_views/android.py,sha256=59_VzpGlADHFrY2cG8llVn4sDmPkUSGyUVKbyvfkKiU,32686
+pythonnative/native_views/base.py,sha256=IS4_AQd4WsHgn8fka8np9zpaKdAOn1q0Zo09a8wYOtE,4229
+pythonnative/native_views/ios.py,sha256=G5bQz57v5WSw5-wNmpcrcdX3rb7isb126la7UlveZLA,30087
 pythonnative/templates/android_template/build.gradle,sha256=4gE6CRS6RuBu9kp-_e_uYYU9mBgHVZrqQg9caSxgyuc,352
 pythonnative/templates/android_template/gradle.properties,sha256=REPaKLRfQiiVfIV8wYmgwzPWvF1f3bhh_kAMV9p4HME,1358
 pythonnative/templates/android_template/gradlew,sha256=YxNShxF6Hm0SyEWA8fScYdG6AiGOzShmBgXpf5dufWU,5766
@@ -55,7 +60,7 @@ pythonnative/templates/android_template/gradle/wrapper/gradle-wrapper.properties
 pythonnative/templates/ios_template/ios_template/AppDelegate.swift,sha256=_6G8GNcw4idXd75qKgQKTDCr45Ez73QB8WTvhBqqcMw,1349
 pythonnative/templates/ios_template/ios_template/Info.plist,sha256=ZQIJGpo8Y2qP0j29xqOsIEGvPpEVICLTAw2NehC5CSo,704
 pythonnative/templates/ios_template/ios_template/SceneDelegate.swift,sha256=lqtre92dc6d6s-f4ieh_M_4xmc_zMGW79j46tDu9cOY,2177
-pythonnative/templates/ios_template/ios_template/ViewController.swift,sha256=eRyxIIVYAYWY9Lt9IH498C2c0FDERUcq-L2TalkEoe0,8315
+pythonnative/templates/ios_template/ios_template/ViewController.swift,sha256=5bVNJ4TT6GIaICzVxl8hgcFmBgaPqjiCivlJzFy0p7c,7920
 pythonnative/templates/ios_template/ios_template/Assets.xcassets/Contents.json,sha256=D9Sbo8NYXHCWeOAEaoIcPGBoXscGNyDTDTo0SL46IIs,63
 pythonnative/templates/ios_template/ios_template/Assets.xcassets/AccentColor.colorset/Contents.json,sha256=mvZQhvowtJJS-uGhIlcxaR3nlPd3WvdNcb7-tQfRK3w,123
 pythonnative/templates/ios_template/ios_template/Assets.xcassets/AppIcon.appiconset/Contents.json,sha256=VUwGr7K_geOvQjFh5VKB6iVXV1mi0tjGMinUmB2JvQs,177
@@ -66,9 +71,9 @@ pythonnative/templates/ios_template/ios_template.xcodeproj/project.xcworkspace/x
 pythonnative/templates/ios_template/ios_templateTests/ios_templateTests.swift,sha256=YnwzZx7yXB13xKAXEGNgz17VuhWeqkHTRTtBJ2Vu3_E,1238
 pythonnative/templates/ios_template/ios_templateUITests/ios_templateUITests.swift,sha256=l2Pwa50F_rv-qPu2go6e4bQernM6PTQJeNPFl_c4ivY,1387
 pythonnative/templates/ios_template/ios_templateUITests/ios_templateUITestsLaunchTests.swift,sha256=f5JrG0uVtLMeJQy26Yyz7Om-JUkT220osqcbeIVkj2g,815
-pythonnative-0.7.0.dist-info/licenses/LICENSE,sha256=A69iG7TIAe6KkGQf6xoVHkc5JSZtOr5eRSvC5iuivnI,1067
-pythonnative-0.7.0.dist-info/METADATA,sha256=aa5sabkb9mMAcl_PSvvkIeFfHKlkpOnxJZRkMLTc3gE,6692
-pythonnative-0.7.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pythonnative-0.7.0.dist-info/entry_points.txt,sha256=iUtDawWSAJAEyWTycpZxDuYz73ol31butpzDIEAgPO0,48
-pythonnative-0.7.0.dist-info/top_level.txt,sha256=kT4SEATY2ywzrZ2Pgea6_zxyym44Q_PbOsUoOYjJLFE,13
-pythonnative-0.7.0.dist-info/RECORD,,
+pythonnative-0.9.0.dist-info/licenses/LICENSE,sha256=A69iG7TIAe6KkGQf6xoVHkc5JSZtOr5eRSvC5iuivnI,1067
+pythonnative-0.9.0.dist-info/METADATA,sha256=YOu6Me-TqLtHWoWkL8A8UWp6WY9f-OzzkSfXZp8X86s,6692
+pythonnative-0.9.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pythonnative-0.9.0.dist-info/entry_points.txt,sha256=iUtDawWSAJAEyWTycpZxDuYz73ol31butpzDIEAgPO0,48
+pythonnative-0.9.0.dist-info/top_level.txt,sha256=kT4SEATY2ywzrZ2Pgea6_zxyym44Q_PbOsUoOYjJLFE,13
+pythonnative-0.9.0.dist-info/RECORD,,