Fixing the n/w layer

examples/ios/RunAnywhereAI/scripts/build_and_run.sh

@@ -37,6 +37,7 @@
 #   --build-sdk       Build runanywhere-swift (Swift SDK)
 #   --build-all       Build everything (core + commons + sdk)
 #   --skip-app        Only build SDK components, skip Xcode app build
+#   --local           Use local builds (copies core to commons, frameworks to swift, enables testLocal)
 #
 # OTHER OPTIONS:
 #   --clean           Clean build artifacts before building
@@ -47,6 +48,7 @@
 #   ./build_and_run.sh device --build-all          # Rebuild everything, run on device
 #   ./build_and_run.sh simulator --build-commons   # Rebuild commons + SDK, run on sim
 #   ./build_and_run.sh --build-all --skip-app      # Just rebuild all SDK components
+#   ./build_and_run.sh device --build-all --local  # Full local build (core->commons->swift->app)
 #
 # INDIVIDUAL PROJECT BUILDS (can be run standalone):
 #   cd runanywhere-core && ./scripts/ios/build.sh && ./scripts/build-xcframework.sh
@@ -62,12 +64,12 @@ set -e
 # =============================================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-WORKSPACE_ROOT="$(cd "$SCRIPT_DIR/../../../../.." && pwd)"
+WORKSPACE_ROOT="$(cd "$SCRIPT_DIR/../../../../" && pwd)"
 
 # Project directories
-CORE_DIR="$WORKSPACE_ROOT/runanywhere-core"
-COMMONS_DIR="$WORKSPACE_ROOT/sdks/sdk/runanywhere-commons"
-SWIFT_SDK_DIR="$WORKSPACE_ROOT/sdks/sdk/runanywhere-swift"
+CORE_DIR="$WORKSPACE_ROOT/../runanywhere-core"
+COMMONS_DIR="$WORKSPACE_ROOT/sdk/runanywhere-commons"
+SWIFT_SDK_DIR="$WORKSPACE_ROOT/sdk/runanywhere-swift"
 APP_DIR="$SCRIPT_DIR/.."
 
 # Build scripts (each project has its own)
@@ -137,6 +139,7 @@ BUILD_COMMONS=false
 BUILD_SDK=false
 SKIP_APP=false
 CLEAN_BUILD=false
+LOCAL_MODE=false
 
 [[ "$1" == "--help" || "$1" == "-h" ]] && show_help
 
@@ -164,6 +167,9 @@ for arg in "$@"; do
         --skip-app)
             SKIP_APP=true
             ;;
+        --local)
+            LOCAL_MODE=true
+            ;;
         --clean)
             CLEAN_BUILD=true
             ;;
@@ -183,6 +189,12 @@ build_core() {
     log_header "Building runanywhere-core"
     local start_time=$(date +%s)
 
+    if [[ ! -d "$CORE_DIR" ]]; then
+        log_error "runanywhere-core not found at: $CORE_DIR"
+        log_error "Expected location: $WORKSPACE_ROOT/../runanywhere-core"
+        exit 1
+    fi
+
     if [[ ! -x "$CORE_BUILD_SCRIPT" ]]; then
         log_error "Core build script not found: $CORE_BUILD_SCRIPT"
         exit 1
@@ -203,6 +215,46 @@ build_core() {
     log_time "Core build time: $(format_duration $TIME_CORE)"
 }
 
+copy_core_to_commons() {
+    if ! $LOCAL_MODE; then
+        return 0
+    fi
+
+    log_header "Copying runanywhere-core to runanywhere-commons (Local Mode)"
+
+    local core_dest="$COMMONS_DIR/third_party/runanywhere-core"
+
+    if [[ ! -d "$CORE_DIR" ]]; then
+        log_error "runanywhere-core not found at: $CORE_DIR"
+        exit 1
+    fi
+
+    log_step "Copying runanywhere-core source to $core_dest"
+    mkdir -p "$(dirname "$core_dest")"
+
+    # Remove existing if present
+    if [[ -d "$core_dest" ]]; then
+        log_step "Removing existing copy..."
+        rm -rf "$core_dest"
+    fi
+
+    # Copy source (exclude build artifacts)
+    log_step "Copying source files..."
+    if command -v rsync &> /dev/null; then
+        rsync -av --exclude='build/' --exclude='.git/' --exclude='dist/' --exclude='*.xcframework' "$CORE_DIR/" "$core_dest/" || {
+            log_warn "rsync failed, using cp..."
+            cp -r "$CORE_DIR" "$(dirname "$core_dest")/"
+        }
+    else
+        cp -r "$CORE_DIR" "$(dirname "$core_dest")/"
+        # Clean up build artifacts after copy
+        find "$core_dest" -type d -name "build" -exec rm -rf {} + 2>/dev/null || true
+        find "$core_dest" -type d -name ".git" -exec rm -rf {} + 2>/dev/null || true
+    fi
+
+    log_info "Copied runanywhere-core to commons third_party"
+}
+
 build_commons() {
     log_header "Building runanywhere-commons"
     local start_time=$(date +%s)
@@ -212,16 +264,140 @@ build_commons() {
         exit 1
     fi
 
+    # In local mode, download PRE-BUILT core libraries (not source)
+    # Commons will link against pre-built libraries instead of compiling core
+    if $LOCAL_MODE; then
+        local download_script="$COMMONS_DIR/scripts/download-core-prebuilt.sh"
+        if [[ -x "$download_script" ]]; then
+            # Check if directory exists AND has required files
+            local prebuilt_dir="$COMMONS_DIR/third_party/runanywhere-core-prebuilt"
+            local has_libs=false
+            if [[ -d "$prebuilt_dir" ]] && [[ -f "$prebuilt_dir/librunanywhere_bridge.a" ]]; then
+                has_libs=true
+            fi
+
+            if [[ "$has_libs" == false ]]; then
+                log_info "Local mode: Downloading PRE-BUILT runanywhere-core libraries"
+                log_info "  (Commons will link against pre-built libraries, not compile core)"
+                log_step "Running: $download_script"
+                cd "$COMMONS_DIR"
+                if ! "$download_script"; then
+                    log_warn "Failed to download pre-built core libraries"
+                    log_warn "Pre-built static libraries may not be available for this version"
+                    log_warn "Commons build may fail - you may need to build core locally or use a different version"
+                fi
+            else
+                log_info "Local mode: Using downloaded PRE-BUILT core libraries"
+                log_info "  (Commons will link against pre-built libraries, not compile core)"
+            fi
+        else
+            log_warn "download-core-prebuilt.sh not found - commons build may fail if core is missing"
+        fi
+    fi
+
     log_step "Running: $COMMONS_BUILD_SCRIPT"
     cd "$COMMONS_DIR"
-    "$COMMONS_BUILD_SCRIPT"
+    # In local mode, try to use pre-built core libraries
+    # If pre-built libraries aren't available, fall back to building core from source
+    if $LOCAL_MODE; then
+        local prebuilt_dir="$COMMONS_DIR/third_party/runanywhere-core-prebuilt"
+        if [[ -d "$prebuilt_dir" ]] && [[ -f "$prebuilt_dir/librunanywhere_bridge.a" ]]; then
+            log_info "Using pre-built core libraries"
+            USE_PREBUILT_CORE=ON "$COMMONS_BUILD_SCRIPT"
+        else
+            log_warn "Pre-built core libraries not available - building core from source (temporary workaround)"
+            log_warn "Note: Pre-built libraries should be published for proper local dev workflow"
+            "$COMMONS_BUILD_SCRIPT"
+        fi
+    else
+        "$COMMONS_BUILD_SCRIPT"
+    fi
 
     local end_time=$(date +%s)
     TIME_COMMONS=$((end_time - start_time))
     log_info "runanywhere-commons build complete"
     log_time "Commons build time: $(format_duration $TIME_COMMONS)"
 }
 
+copy_frameworks_to_swift() {
+    if ! $LOCAL_MODE; then
+        return 0
+    fi
+
+    log_header "Copying XCFrameworks to runanywhere-swift/Binaries (Local Mode - Commons Only)"
+    log_info "Note: onnxruntime will be consumed from remote releases"
+
+    local binaries_dir="$SWIFT_SDK_DIR/Binaries"
+    mkdir -p "$binaries_dir"
+
+    # Copy all runanywhere-commons frameworks (built locally)
+    # onnxruntime comes from remote GitHub releases
+    local frameworks=("RACommons" "RABackendLlamaCPP" "RABackendONNX")
+    for framework in "${frameworks[@]}"; do
+        local src="$COMMONS_DIR/dist/${framework}.xcframework"
+        if [[ -d "$src" ]]; then
+            log_step "Copying ${framework}.xcframework (local build)"
+            rm -rf "$binaries_dir/${framework}.xcframework"
+            cp -r "$src" "$binaries_dir/"
+            log_info "  ✓ ${framework}.xcframework"
+        else
+            log_warn "  ✗ ${framework}.xcframework not found at $src"
+        fi
+    done
+
+    log_info "XCFrameworks copied to: $binaries_dir"
+    log_info "onnxruntime will be downloaded from GitHub releases"
+}
+
+set_package_mode() {
+    local package_file="$SWIFT_SDK_DIR/Package.swift"
+
+    if [[ ! -f "$package_file" ]]; then
+        log_error "Package.swift not found: $package_file"
+        exit 1
+    fi
+
+    if $LOCAL_MODE; then
+        log_header "Enabling Local Mode in Package.swift"
+
+        # Check if already in local mode
+        if grep -q 'let testLocal = true' "$package_file"; then
+            log_info "Already in local mode"
+            return 0
+        fi
+
+        # Change testLocal to true
+        log_step "Setting testLocal = true"
+        if [[ "$OSTYPE" == "darwin"* ]]; then
+            sed -i '' 's/let testLocal = false/let testLocal = true/' "$package_file"
+        else
+            sed -i 's/let testLocal = false/let testLocal = true/' "$package_file"
+        fi
+
+        if grep -q 'let testLocal = true' "$package_file"; then
+            log_info "✓ Local mode enabled"
+        else
+            log_error "Failed to enable local mode"
+            exit 1
+        fi
+    else
+        # Restore remote mode if currently in local mode
+        if grep -q 'let testLocal = true' "$package_file"; then
+            log_header "Restoring Remote Mode in Package.swift"
+            log_step "Setting testLocal = false"
+            if [[ "$OSTYPE" == "darwin"* ]]; then
+                sed -i '' 's/let testLocal = true/let testLocal = false/' "$package_file"
+            else
+                sed -i 's/let testLocal = true/let testLocal = false/' "$package_file"
+            fi
+
+            if grep -q 'let testLocal = false' "$package_file"; then
+                log_info "✓ Remote mode restored"
+            fi
+        fi
+    fi
+}
+
 build_swift_sdk() {
     log_header "Building runanywhere-swift"
     local start_time=$(date +%s)
@@ -231,11 +407,17 @@ build_swift_sdk() {
         exit 1
     fi
 
+    # In local mode, copy frameworks and set package mode
+    if $LOCAL_MODE; then
+        copy_frameworks_to_swift
+    fi
+    set_package_mode
+
     # Determine what flags to pass
     local FLAGS=""
 
-    # Install frameworks if core or commons was rebuilt
-    if $BUILD_CORE || $BUILD_COMMONS; then
+    # Install frameworks if core or commons was rebuilt (only if not in local mode)
+    if ! $LOCAL_MODE && ($BUILD_CORE || $BUILD_COMMONS); then
         FLAGS="$FLAGS --install-frameworks --sync-headers"
     fi
 
@@ -395,6 +577,7 @@ main() {
     echo "Build Commons: $BUILD_COMMONS"
     echo "Build SDK: $BUILD_SDK"
     echo "Skip App: $SKIP_APP"
+    echo "Local Mode: $LOCAL_MODE"
     echo ""
     echo "Scripts:"
     echo "  Core:    $CORE_BUILD_SCRIPT"
@@ -403,8 +586,26 @@ main() {
     echo ""
 
     # Execute build steps by calling individual project scripts
-    $BUILD_CORE && build_core
-    $BUILD_COMMONS && build_commons
+    # 
+    # WITHOUT --local flag (REMOTE MODE):
+    #   - Everything consumed from remote GitHub releases
+    #   - No local builds, all XCFrameworks downloaded
+    #
+    # WITH --local flag (LOCAL DEVELOPMENT MODE):
+    #   - Downloads PRE-BUILT core libraries (not source, not compiled)
+    #   - Only runanywhere-commons is built locally
+    #   - Commons links against pre-built core libraries (remote)
+    #   - Commons frameworks copied to Swift SDK for local use
+    if $LOCAL_MODE; then
+        log_info "Local mode: Using pre-built core libraries (remote), building commons locally"
+        # Build commons locally (links against pre-built core libraries)
+        $BUILD_COMMONS && build_commons
+    else
+        # Remote mode: Everything from GitHub releases, no local builds
+        log_info "Remote mode: All frameworks from GitHub releases"
+        # Note: build_core and build_commons are skipped in remote mode
+        # All XCFrameworks come from Package.swift remote URLs
+    fi
     $BUILD_SDK && build_swift_sdk
 
     # Build and deploy app