Revert use of pre-built ort (#684)

Due to issues with signing build artifacts on macOS, we temporarily
revert #231 (96cffe4).

Author: calyptobai

.gitattributes

@@ -0,0 +1,125 @@
+name: Dependency matrix
+
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - "flake.nix"
+      - "flake.lock"
+      - ".github/workflows/dependencies.yml"
+
+jobs:
+  onnx-nix:
+    strategy:
+      fail-fast: false
+      matrix:
+        package: [ onnxruntime ]
+        target: [
+          x86_64-unknown-linux-gnu,
+          x86_64-darwin,
+          aarch64-darwin,
+        ]
+
+        include:
+          - target: x86_64-unknown-linux-gnu
+            os: ubuntu-latest
+            cross: false
+
+          - target: x86_64-darwin
+            os: macos-11
+            cross: false
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Setting variables
+        uses: actions/github-script@v6
+        id: var
+        with:
+          script: |
+            const target = ${{ matrix.cross }} && '-${{ matrix.target }}' || ''
+            const package_name = '${{ matrix.package }}-static' + target
+            core.setOutput('package-name', package_name)
+
+      - uses: actions/checkout@v3
+      - run: env
+
+      - name: Setup nix
+        uses: cachix/install-nix-action@v22
+        with:
+          github_access_token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Enable cachix
+        uses: cachix/cachix-action@v12
+        with:
+          name: bloopai
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Build package ${{matrix.package}}-${{matrix.target}}
+        env:
+          PACKAGE_NAME: ${{ steps.var.outputs.package-name }}
+        run: |
+          package=$(nix build -L --json .#${{ env.PACKAGE_NAME }})
+          package_path=$(echo $package | jq -r '.[0].outputs.out')
+          echo package_path=$package_path >> $GITHUB_ENV
+          mkdir ${{ env.PACKAGE_NAME }}_bundle
+          cp -r $package_path/* ${{ env.PACKAGE_NAME }}_bundle
+
+      - name: Upload binaries
+        env:
+          PACKAGE_NAME: ${{ steps.var.outputs.package-name }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: "${{ matrix.package }}_${{ matrix.target }}"
+          path: ${{ env.PACKAGE_NAME }}_bundle
+
+  qdrant-rustup:
+    strategy:
+      fail-fast: false
+      matrix:
+        package: [ qdrant ]
+        target: [
+          x86_64-unknown-linux-gnu,
+          x86_64-apple-darwin,
+          aarch64-apple-darwin,
+        ]
+
+        include:
+          - target: x86_64-unknown-linux-gnu
+            os: ubuntu-latest
+            cross: false
+
+          - target: x86_64-apple-darwin
+            os: macos-11
+            cross: false
+
+          - target: aarch64-apple-darwin
+            os: macos-11
+            cross: true
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          target: ${{ matrix.target }}
+
+      - uses: cachix/install-nix-action@v22
+        with:
+          github_access_token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Install dependencies
+        run: "nix profile install nixpkgs#protobuf"
+
+      - name: Build qdrant
+        env:
+          VERSION: 1.1.0
+        run: |
+          cargo install --target ${{ matrix.target }} --git https://github.com/qdrant/qdrant --tag v$VERSION --locked --root . qdrant
+
+      - name: Upload binaries
+        uses: actions/upload-artifact@v3
+        with:
+          name: "${{ matrix.package }}_${{ matrix.target }}"
+          path: bin

.github/workflows/dependencies.yml

@@ -37,7 +37,3 @@ playwright-report
 
 # local config
 /local_config.json
-
-apps/desktop/src-tauri/dylibs/*.so
-apps/desktop/src-tauri/dylibs/*.dylib
-apps/desktop/src-tauri/dylibs/*.dll

.gitignore

@@ -1,4 +1 @@
 server/bleep/bleep.db*
-apps/desktop/src-tauri/dylibs/*.so
-apps/desktop/src-tauri/dylibs/*.dylib
-apps/desktop/src-tauri/dylibs/*.dll

.taurignore

@@ -17,6 +17,3 @@ inherits = "release"
 debug = true
 split-debuginfo = "unpacked"
 strip = "none"
-
-[patch.crates-io]
-esaxx-rs = { git = "https://github.com/bloopai/esaxx-rs" }

Cargo.lock

@@ -26,18 +26,15 @@ ENV CXX /usr/bin/clang++
 COPY server server
 COPY apps/desktop/src-tauri apps/desktop/src-tauri
 COPY Cargo.lock Cargo.toml .
-RUN --mount=target=/root/.cache/sccache,type=cache --mount=target=/build/target,type=cache \
+RUN --mount=target=/root/.cache/sccache,type=cache --mount=target=/build/target,type=cache  \
     cargo --locked build -p bleep --release && \
     cp /build/target/release/bleep / && \
-    sccache --show-stats && \
-    mkdir /dylib && \
-    cp /build/target/release/libonnxruntime.so /dylib/
+    sccache --show-stats
 
 FROM debian:bookworm-slim
 VOLUME ["/repos", "/data"]
 RUN apt-get update && apt-get -y install openssl ca-certificates libprotobuf-lite32 && apt-get clean
 COPY model /model
 COPY --from=builder /bleep /
-COPY --from=builder /dylib /dylib
 COPY --from=frontend /build/client/dist /frontend
-ENTRYPOINT ["/bleep", "--host=0.0.0.0", "--source-dir=/repos", "--index-dir=/data", "--model-dir=/model", "--dylib-dir=/dylib"]
+ENTRYPOINT ["/bleep", "--host=0.0.0.0", "--source-dir=/repos", "--index-dir=/data", "--model-dir=/model"]

Cargo.toml

@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+git lfs install
+git lfs pull
+
+PROJECT_ROOT=$(realpath $(dirname $(realpath $0))/../../)
+LOCAL_CONFIG=$PROJECT_ROOT/local_config.json
+
+if [ -z "$ORT_LIB_LOCATION" ]; then
+    export ORT_LIB_LOCATION=$(realpath $PROJECT_ROOT/lib/$(rustc -vV |awk '/host:/ { print $2 }')/onnxruntime)
+fi
+
+echo $ORT_LIB_LOCATION
+
+if [ $1 == "dev" ]; then
+   npm run tauri dev -- -- -- --config-file=$LOCAL_CONFIG
+else
+   npm run tauri $@
+fi
+

Dockerfile

@@ -8,6 +8,8 @@
     "vite-build": "vite build",
     "build": "npm-run-all tsc vite-build",
     "preview": "vite preview",
-    "tauri": "tauri"
+    "tauri": "tauri",
+    "tauri-dev": "./build.sh dev",
+    "tauri-build": "./build.sh build"
   }
 }