feat(cli,templates,core): bootstrap entrypoint; pn run shows Hello UI

owenthcarey · owenthcarey · commit 2805e1d5c6a5 · 2025-10-12T21:23:33.000-07:00
diff --git a/apps/pythonnative_demo/app/main_page.py b/apps/pythonnative_demo/app/main_page.py
@@ -7,15 +7,12 @@ def __init__(self, native_instance):
 
     def on_create(self):
         super().on_create()
-        stack_view = pn.StackView()
-        # list_data = ["item_{}".format(i) for i in range(100)]
-        # list_view = pn.ListView(self.native_instance, list_data)
-        # stack_view.add_view(list_view)
-        button = pn.Button("Button")
-        button.set_on_click(lambda: self.navigate_to(""))
-        # button.set_on_click(lambda: print("Button was clicked!"))
-        stack_view.add_view(button)
-        self.set_root_view(stack_view)
+        stack = pn.StackView()
+        stack.add_view(pn.Label("Hello from PythonNative Demo!"))
+        button = pn.Button("Tap me")
+        button.set_on_click(lambda: print("Demo button clicked"))
+        stack.add_view(button)
+        self.set_root_view(stack)
 
     def on_start(self):
         super().on_start()
@@ -40,3 +37,9 @@ def on_save_instance_state(self):
 
     def on_restore_instance_state(self):
         super().on_restore_instance_state()
+
+
+def bootstrap(native_instance):
+    page = MainPage(native_instance)
+    page.on_create()
+    return page
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -36,6 +36,13 @@ class MainPage(pn.Page):
         button.set_on_click(lambda: print("Button clicked"))
         stack.add_view(button)
         self.set_root_view(stack)
+
+
+def bootstrap(native_instance):
+    """Entry point called by the host app (Activity or ViewController)."""
+    page = MainPage(native_instance)
+    page.on_create()
+    return page
 ```
 
 ## Run on a platform
diff --git a/src/pythonnative/cli/pn.py b/src/pythonnative/cli/pn.py
@@ -54,8 +54,18 @@ def __init__(self, native_instance):
     def on_create(self):
         super().on_create()
         stack = pn.StackView()
-        stack.add_view(pn.Label(\"Hello from PythonNative!\"))
+        stack.add_view(pn.Label("Hello from PythonNative!"))
+        button = pn.Button("Tap me")
+        button.set_on_click(lambda: print("Button clicked"))
+        stack.add_view(button)
         self.set_root_view(stack)
+
+
+def bootstrap(native_instance):
+    '''Entry point called by the host app (Android Activity or iOS ViewController).'''
+    page = MainPage(native_instance)
+    page.on_create()
+    return page
 """
             )
 
@@ -243,10 +253,11 @@ def run_project(args: argparse.Namespace) -> None:
             check=True,
         )
     elif platform == "ios":
-        # Attempt to build the iOS project for Simulator (best-effort)
+        # Attempt to build and run on iOS Simulator (best-effort)
         ios_project_dir: str = os.path.join(build_dir, "ios_template")
         if os.path.isdir(ios_project_dir):
             os.chdir(ios_project_dir)
+            derived_data = os.path.join(ios_project_dir, "build")
             try:
                 subprocess.run(
                     [
@@ -255,14 +266,74 @@ def run_project(args: argparse.Namespace) -> None:
                         "ios_template.xcodeproj",
                         "-scheme",
                         "ios_template",
+                        "-configuration",
+                        "Debug",
                         "-destination",
                         "platform=iOS Simulator,name=iPhone 15",
+                        "-derivedDataPath",
+                        derived_data,
                         "build",
                     ],
                     check=False,
                 )
             except FileNotFoundError:
                 print("xcodebuild not found. Skipping iOS build step.")
+                return
+
+            # Locate built app
+            app_path = os.path.join(derived_data, "Build", "Products", "Debug-iphonesimulator", "ios_template.app")
+            if not os.path.isdir(app_path):
+                print("Could not locate built .app; open the project in Xcode to run.")
+                return
+
+            # Copy staged Python app into the .app bundle so PythonKit can import it
+            try:
+                staged_app_src = os.path.join(build_dir, "app")
+                if os.path.isdir(staged_app_src):
+                    shutil.copytree(staged_app_src, os.path.join(app_path, "app"), dirs_exist_ok=True)
+            except Exception:
+                # Non-fatal; fallback UI will appear if import fails
+                pass
+
+            # Find an available simulator and boot it
+            try:
+                import json as _json
+
+                result = subprocess.run(
+                    ["xcrun", "simctl", "list", "devices", "available", "--json"],
+                    check=False,
+                    capture_output=True,
+                    text=True,
+                )
+                devices_json = _json.loads(result.stdout or "{}")
+                all_devices = []
+                for _runtime, devices in (devices_json.get("devices") or {}).items():
+                    all_devices.extend(devices or [])
+                # Prefer iPhone 15/15 Pro names; else first available iPhone
+                preferred = None
+                for d in all_devices:
+                    name = (d.get("name") or "").lower()
+                    if "iphone 15" in name and d.get("isAvailable"):
+                        preferred = d
+                        break
+                if not preferred:
+                    for d in all_devices:
+                        if d.get("isAvailable") and (d.get("name") or "").lower().startswith("iphone"):
+                            preferred = d
+                            break
+                if not preferred:
+                    print("No available iOS Simulators found; open the project in Xcode to run.")
+                    return
+
+                udid = preferred.get("udid")
+                # Boot (no-op if already booted)
+                subprocess.run(["xcrun", "simctl", "boot", udid], check=False)
+                # Install and launch
+                subprocess.run(["xcrun", "simctl", "install", udid, app_path], check=False)
+                subprocess.run(["xcrun", "simctl", "launch", udid, "com.pythonnative.ios-template"], check=False)
+                print("Launched iOS app on Simulator (best-effort).")
+            except Exception:
+                print("Failed to auto-run on Simulator; open the project in Xcode to run.")
 
 
 def clean_project(args: argparse.Namespace) -> None:
diff --git a/src/pythonnative/page.py b/src/pythonnative/page.py
@@ -160,7 +160,16 @@ def __init__(self, native_instance) -> None:
             # self.native_instance = self.native_class.alloc().init()
 
         def set_root_view(self, view) -> None:
-            self.native_instance.view().addSubview_(view.native_instance)
+            root_view = self.native_instance.view()
+            # Size the root child to fill the controller's view and enable autoresizing
+            try:
+                bounds = root_view.bounds()
+                view.native_instance.setFrame_(bounds)
+                # UIViewAutoresizingFlexibleWidth (2) | UIViewAutoresizingFlexibleHeight (16)
+                view.native_instance.setAutoresizingMask_(2 | 16)
+            except Exception:
+                pass
+            root_view.addSubview_(view.native_instance)
 
         def on_create(self) -> None:
             print("iOS on_create() called")
diff --git a/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt b/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt
@@ -2,7 +2,7 @@ package com.pythonnative.android_template
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.view.View
+import android.widget.TextView
 import com.chaquo.python.Python
 import com.chaquo.python.android.AndroidPlatform
 
@@ -15,9 +15,16 @@ class MainActivity : AppCompatActivity() {
         if (!Python.isStarted()) {
             Python.start(AndroidPlatform(this))
         }
-        val py = Python.getInstance()
-        val pyModule = py.getModule("app/main")
-        val pyLayout = pyModule.callAttr("main", this).toJava(View::class.java)
-        setContentView(pyLayout)
+        try {
+            val py = Python.getInstance()
+            val pyModule = py.getModule("app.main_page")
+            pyModule.callAttr("bootstrap", this)
+            // Python Page will set the content view via set_root_view
+        } catch (e: Exception) {
+            // Fallback: show a simple native label if Python bootstrap fails
+            val tv = TextView(this)
+            tv.text = "Hello from PythonNative (Android template)"
+            setContentView(tv)
+        }
     }
 }
diff --git a/templates/ios_template/ios_template/ViewController.swift b/templates/ios_template/ios_template/ViewController.swift
@@ -12,19 +12,27 @@ class ViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Minimal PythonKit bootstrap: print Python version and attempt to import Rubicon.
+        // Attempt Python bootstrap of app.main_page.bootstrap(self)
         let sys = Python.import("sys")
-        print("Python Version: \(sys.version_info.major).\(sys.version_info.minor)")
-        print("Python Path: \(sys.path)")
-
-        // Try to import Rubicon-ObjC if available. Safe no-op if not present.
+        if let resourcePath = Bundle.main.resourcePath {
+            sys.path.append(resourcePath)
+            sys.path.append("\(resourcePath)/app")
+        }
         do {
-            let rubiconObjC = try Python.attemptImport("rubicon.objc")
-            let ObjCClass = rubiconObjC.ObjCClass
-            print("Rubicon available: \(ObjCClass)")
+            let app = try Python.attemptImport("app.main_page")
+            let bootstrap = app.bootstrap
+            _ = bootstrap(self)
+            return
         } catch {
-            print("Rubicon not available; continuing without it.")
+            print("Python bootstrap failed: \(error)")
         }
+
+        // Fallback UI if Python import/bootstrap fails
+        let label = UILabel(frame: view.bounds)
+        label.text = "Hello from PythonNative (iOS template)"
+        label.textAlignment = .center
+        label.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        view.addSubview(label)
     }
 
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -17,6 +17,12 @@ def test_cli_init_and_clean():
         result = run_pn(["init", "MyApp"], tmpdir)
         assert result.returncode == 0, result.stderr
         assert os.path.isdir(os.path.join(tmpdir, "app"))
+        # scaffolded entrypoint
+        main_page_path = os.path.join(tmpdir, "app", "main_page.py")
+        assert os.path.isfile(main_page_path)
+        with open(main_page_path, "r", encoding="utf-8") as f:
+            content = f.read()
+        assert "def bootstrap(" in content
         assert os.path.isfile(os.path.join(tmpdir, "pythonnative.json"))
         assert os.path.isfile(os.path.join(tmpdir, "requirements.txt"))
         assert os.path.isfile(os.path.join(tmpdir, ".gitignore"))
