fixing ios/swift - remvoing ragbackend - refactor

Author: shubhammalhotra28

Package.swift

@@ -37,7 +37,7 @@ import Foundation
 //   ./scripts/build-swift.sh --set-remote  (sets useLocalBinaries = false)
 //
 // =============================================================================
-let useLocalBinaries = false //  Toggle: true for local dev, false for release
+let useLocalBinaries = true //  Toggle: true for local dev, false for release
 
 // Version for remote XCFrameworks (used when testLocal = false)
 // Updated automatically by CI/CD during releases
@@ -146,7 +146,6 @@ let package = Package(
                 .product(name: "StableDiffusion", package: "ml-stable-diffusion"),
                 "CRACommons",
                 "RACommonsBinary",
-                "RABackendRAGBinary",
             ],
             path: "sdk/runanywhere-swift/Sources/RunAnywhere",
             exclude: ["CRACommons"],
@@ -256,10 +255,6 @@ func binaryTargets() -> [Target] {
                 name: "RABackendONNXBinary",
                 path: "sdk/runanywhere-swift/Binaries/RABackendONNX.xcframework"
             ),
-            .binaryTarget(
-                name: "RABackendRAGBinary",
-                path: "sdk/runanywhere-swift/Binaries/RABackendRAG.xcframework"
-            ),
         ]
 
         // ONNX Runtime xcframeworks - split by platform
@@ -311,14 +306,6 @@ func binaryTargets() -> [Target] {
             ),
         ]
 
-        targets.append(
-            .binaryTarget(
-                name: "RABackendRAGBinary",
-                url: "https://github.com/RunanywhereAI/runanywhere-sdks/releases/download/v\(sdkVersion)/RABackendRAG-v\(sdkVersion).zip",
-                checksum: "0000000000000000000000000000000000000000000000000000000000000000" // TODO: Replace with actual checksum on release
-            )
-        )
-
         return targets
     }
 }

examples/ios/RunAnywhereAI/RunAnywhereAI.xcodeproj/project.pbxproj

@@ -14,7 +14,6 @@
 		54398D332F4939A7009D6B51 /* RunAnywhereActivityExtensionExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 54398D202F4939A7009D6B51 /* RunAnywhereActivityExtensionExtension.appex */; platformFilters = (ios, ); settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		58ABEDD22ED16DA40058D033 /* RunAnywhereONNX in Frameworks */ = {isa = PBXBuildFile; productRef = 58ABEDD12ED16DA40058D033 /* RunAnywhereONNX */; };
 		58LLAMACPP12ED16DA40058D0 /* RunAnywhereLlamaCPP in Frameworks */ = {isa = PBXBuildFile; productRef = 58LLAMACPP02ED16DA40058D0 /* RunAnywhereLlamaCPP */; };
-		58RAGBKND12ED16DA40058D03 /* RunAnywhereRAG in Frameworks */ = {isa = PBXBuildFile; productRef = 58RAGBKND02ED16DA40058D03 /* RunAnywhereRAG */; };
 		58WHISPERKIT1ED16DA40058D0 /* RunAnywhereWhisperKit in Frameworks */ = {isa = PBXBuildFile; productRef = 58WHISPERKIT0ED16DA40058D0 /* RunAnywhereWhisperKit */; };
 		RACACTIVITY01ACTIVITY01RAC /* DictationActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = RACACTIVITY02ACTIVITY02RAC /* DictationActivityAttributes.swift */; };
 		RACSHARED01RACSHARED01RACS /* SharedConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = RACSHARED02RACSHARED02RACS /* SharedConstants.swift */; };
@@ -169,7 +168,6 @@
 				58ABEDD22ED16DA40058D033 /* RunAnywhereONNX in Frameworks */,
 				541C59DA2E63772A00DD7839 /* RunAnywhere in Frameworks */,
 				58LLAMACPP12ED16DA40058D0 /* RunAnywhereLlamaCPP in Frameworks */,
-				58RAGBKND12ED16DA40058D03 /* RunAnywhereRAG in Frameworks */,
 				58WHISPERKIT1ED16DA40058D0 /* RunAnywhereWhisperKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -310,7 +308,6 @@
 				541C59D92E63772A00DD7839 /* RunAnywhere */,
 				58ABEDD12ED16DA40058D033 /* RunAnywhereONNX */,
 				58LLAMACPP02ED16DA40058D0 /* RunAnywhereLlamaCPP */,
-				58RAGBKND02ED16DA40058D03 /* RunAnywhereRAG */,
 				58WHISPERKIT0ED16DA40058D0 /* RunAnywhereWhisperKit */,
 			);
 			productName = RunAnywhereAI;
@@ -1082,11 +1079,6 @@
 			package = 58E021172E52A86000B722EF /* XCLocalSwiftPackageReference "../../.." */;
 			productName = RunAnywhereLlamaCPP;
 		};
-		58RAGBKND02ED16DA40058D03 /* RunAnywhereRAG */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 58E021172E52A86000B722EF /* XCLocalSwiftPackageReference "../../.." */;
-			productName = RunAnywhereRAG;
-		};
 		58WHISPERKIT0ED16DA40058D0 /* RunAnywhereWhisperKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 58E021172E52A86000B722EF /* XCLocalSwiftPackageReference "../../.." */;

sdk/runanywhere-commons/scripts/build-ios.sh

@@ -24,10 +24,9 @@
 #   --help              Show this help
 #
 # OUTPUTS:
-#   dist/RACommons.xcframework                 (always built)
+#   dist/RACommons.xcframework                 (always built, includes RAG pipeline)
 #   dist/RABackendLLAMACPP.xcframework         (if --backend llamacpp or all)
 #   dist/RABackendONNX.xcframework             (if --backend onnx or all)
-#   dist/RABackendRAG.xcframework              (if --backend rag or all)
 #
 # EXAMPLES:
 #   # Full build (all backends, iOS only)
@@ -730,21 +729,50 @@ main() {
         build_macos
     fi
 
-    # Step 3: Create RACommons.xcframework
+    # Step 3: Merge RAG pipeline into rac_commons (RAG is a feature, not a separate backend)
+    if [[ "$SKIP_BACKENDS" != true ]]; then
+        log_step "Merging RAG pipeline into rac_commons..."
+        local MERGE_PLATFORMS="OS SIMULATORARM64 SIMULATOR"
+        if [[ "$INCLUDE_MACOS" == true ]]; then
+            MERGE_PLATFORMS="$MERGE_PLATFORMS MACOS"
+        fi
+        for PLATFORM in $MERGE_PLATFORMS; do
+            local PLATFORM_DIR="${BUILD_DIR}/${PLATFORM}"
+            local COMMONS_LIB="${PLATFORM_DIR}/librac_commons.a"
+            local RAG_LIB=""
+
+            for possible_path in \
+                "${PLATFORM_DIR}/src/features/rag/librac_backend_rag.a" \
+                "${PLATFORM_DIR}/src/backends/rag/librac_backend_rag.a" \
+                "${PLATFORM_DIR}/librac_backend_rag.a"; do
+                if [[ -f "$possible_path" ]]; then
+                    RAG_LIB="$possible_path"
+                    break
+                fi
+            done
+
+            if [[ -n "$RAG_LIB" && -f "$COMMONS_LIB" ]]; then
+                libtool -static -o "${COMMONS_LIB}.merged" "$COMMONS_LIB" "$RAG_LIB"
+                mv "${COMMONS_LIB}.merged" "$COMMONS_LIB"
+                log_info "  ${PLATFORM}: Merged librac_backend_rag.a into librac_commons.a"
+            elif [[ -f "$COMMONS_LIB" ]]; then
+                log_warn "  ${PLATFORM}: librac_backend_rag.a not found — RAG not merged"
+            fi
+        done
+    fi
+
+    # Step 4: Create RACommons.xcframework (now includes RAG pipeline)
     log_header "Creating XCFrameworks"
     create_xcframework "rac_commons" "RACommons"
 
-    # Step 4: Create backend XCFrameworks
+    # Step 5: Create backend XCFrameworks
     if [[ "$SKIP_BACKENDS" != true ]]; then
         if [[ "$BUILD_BACKEND" == "all" || "$BUILD_BACKEND" == "llamacpp" ]]; then
             create_backend_xcframework "llamacpp" "RABackendLLAMACPP"
         fi
         if [[ "$BUILD_BACKEND" == "all" || "$BUILD_BACKEND" == "onnx" ]]; then
             create_backend_xcframework "onnx" "RABackendONNX"
         fi
-        if [[ "$BUILD_BACKEND" == "all" || "$BUILD_BACKEND" == "rag" ]]; then
-            create_backend_xcframework "rag" "RABackendRAG"
-        fi
     fi
 
     # Step 5: Package if requested

sdk/runanywhere-swift/Sources/RunAnywhere/CRACommons/shim.c

@@ -1,5 +1,4 @@
 // CRACommons shim — SPM requires at least one source file for C targets.
 // All real implementations live in the xcframework binary targets:
-//   - RACommons.xcframework      (LoRA, Voice Agent, core)
-//   - RABackendRAG.xcframework   (RAG pipeline)
+//   - RACommons.xcframework      (LoRA, Voice Agent, RAG pipeline, core)
 //   - RABackendONNX.xcframework  (STT/TTS/VAD)

sdk/runanywhere-swift/scripts/build-swift.sh

@@ -242,7 +242,7 @@ install_frameworks() {
     mkdir -p "$BINARIES_DIR"
 
     # All frameworks are now in dist/ (flat structure from build-ios.sh)
-    for framework in RACommons RABackendLLAMACPP RABackendONNX RABackendRAG; do
+    for framework in RACommons RABackendLLAMACPP RABackendONNX; do
         local src="$COMMONS_DIR/dist/${framework}.xcframework"
         if [[ -d "$src" ]]; then
             log_step "Copying ${framework}.xcframework"
@@ -405,8 +405,7 @@ main() {
         fi
         echo "  2. Build RACommons.xcframework"
         echo "  3. Build RABackendLLAMACPP.xcframework"
-        echo "  4. Build RABackendONNX.xcframework"
-        echo "  4b. Build RABackendRAG.xcframework"
+        echo "  4. Build RABackendONNX.xcframework (RAG pipeline merged into RACommons)"
         if [[ "$INCLUDE_MACOS" == true ]]; then
             echo "     (all xcframeworks will include macOS arm64 slices)"
             echo "  5. Create combined ONNX Runtime xcframework (iOS + macOS)"