Merge branch 'main' into feat-post-process-remove-suffic-from-completion

TabbyML · Nov 22, 2024 · 5f7d99b · 5f7d99b
2 parents f175287 + 90b4b4c
commit 5f7d99b
Show file tree

Hide file tree

Showing 417 changed files with 6,564 additions and 3,450 deletions.
diff --git a/.changes/unreleased/Fixed and Improvements-20241031-155759.yaml b/.changes/unreleased/Fixed and Improvements-20241031-155759.yaml
diff --git a/.changes/v0.20.0.md b/.changes/v0.20.0.md
@@ -0,0 +1,12 @@
+## v0.20.0 (2024-11-08)
+
+### Features
+
+* Search results can now be edited directly.
+* Allow switching backend chat models in Answer Engine.
+* Added a connection test button in the `System` tab to test the connection to the backend LLM server.
+
+### Fixes and Improvements
+
+* Optimized CR-LF inference in code completion. ([#3279](https://github.com/TabbyML/tabby/issues/3279))
+* Bumped `llama.cpp` version to `b3995`.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,8 @@ on:
       - '.github/workflows/release.yml'
 
 concurrency:
-  group: ${{ github.workflow_ref }}-${{ github.head_ref || github.ref_name }} 
-  
+  group: ${{ github.workflow_ref }}-${{ github.head_ref || github.ref_name }}
+
   # If this is enabled it will cancel current running and start latest
   cancel-in-progress: true
 
@@ -246,24 +246,24 @@ jobs:
           retention-days: 3
           name: tabby_${{ matrix.binary }}${{ matrix.ext }}
           path: tabby_${{ matrix.binary }}${{ matrix.ext }}
-  
+
   package-win-cuda:
     runs-on: ubuntu-latest
-    env:
-      LLAMA_CPP_VERSION: b3571
     needs: [release-binary]
     permissions:
       contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Download all artifacts
         uses: actions/download-artifact@v3
-      
+
       - name: Display structure of downloaded files
         run: ls -R
-      
+
       - name: Package CUDA 11.7
         run: >
           LLAMA_CPP_PLATFORM=cuda-cu11.7.1-x64 OUTPUT_NAME=tabby_x86_64-windows-msvc-cuda117 ./ci/package-win.sh
@@ -293,17 +293,20 @@ jobs:
         run: ls -R
 
       - name: Creating distribution bundles
-        run: >
+        run: |
           get_file_extension() {
-              local filename="$1"
-              # Check if the file has an extension
-              if [[ "$filename" == *.* && ! "$filename" == .* ]]; then
-                echo ".${filename##*.}"
-              else
-                echo ""
-              fi
+            local filename="$1"
+            # Check if the file has an extension
+            if [[ "$filename" == *.* && ! "$filename" == .* ]]; then
+              echo ".${filename##*.}"
+            else
+              echo ""
+            fi
           }
 
+          dist_dir=$(pwd)/dist
+          mkdir -p $dist_dir
+
           for llama_server in llama-server_*/llama-server_*; do
             for tabby in tabby_*/tabby_*; do
               llamab=$(basename $llama_server)
@@ -315,18 +318,36 @@ jobs:
 
               llamav=${llaman#llama-server_}
               tabbyv=${tabbyn#tabby_}
+
               if [[ $llamav == *"$tabbyv"* ]]; then
                 echo "Creating bundle for $llamav"
-                distdir=dist/tabby_$llamav
-                mkdir -p $distdir
-                cp $llama_server $distdir/llama-server${extname}
-                cp $tabby $distdir/tabby${extname}
-                zip -r $distdir.zip $distdir
-                rm -rf $distdir
+
+                # the downloaded files may have the same folder name with release_dir
+                # put the release files in a new folder
+                build_dir=build
+                release_name=tabby_${llamav}
+                release_dir=$build_dir/$release_name
+                mkdir -p $release_dir
+                cp $llama_server $release_dir/llama-server${extname}
+                cp $tabby $release_dir/tabby${extname}
+
+                pushd $build_dir
+                # Release zip for Windows, tar.gz for macOS and Linux
+                # use `extname` to determine the platform
+                if [[ "$extname" == ".exe" ]]; then
+                  zip -r $release_name.zip $release_name
+                  mv $release_name.zip $dist_dir/
+                else
+                  chmod +x $release_name/llama-server${extname} $release_name/tabby${extname}
+                  tar zcvf $release_name.tar.gz $release_name
+                  mv $release_name.tar.gz $dist_dir/
+                fi
+                rm -rf "$release_name"
+                popd
               fi
             done
           done
-      
+
       - name: Display structure of created files
         run: ls -R dist
 
@@ -340,13 +361,13 @@ jobs:
 
       - name: Check if stable release
         run: echo "Stable Release is ${{ env.STABLE_RELEASE }}"
-  
+
       - uses: ncipollo/release-action@v1
         if: github.event_name == 'push'
         with:
           allowUpdates: true
           prerelease: ${{ env.STABLE_RELEASE == 'false' }}
           makeLatest: ${{ env.STABLE_RELEASE == 'true' }}
-          artifacts: "dist/tabby_*.zip"
+          artifacts: "dist/tabby_*.zip,dist/tabby_*.tar.gz"
           tag: ${{ github.ref_name }}
           removeArtifacts: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
+## v0.20.0 (2024-11-08)
+
+### Features
+
+* Search results can now be edited directly.
+* Allow switching backend chat models in Answer Engine.
+* Added a connection test button in the `System` tab to test the connection to the backend LLM server.
+
+### Fixes and Improvements
+
+* Optimized CR-LF inference in code completion. ([#3279](https://github.com/TabbyML/tabby/issues/3279))
+* Bumped `llama.cpp` version to `b3995`.
+
 ## v0.19.0 (2024-10-30)
 
 ### Features

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.20.0-dev.0"
+version = "0.21.0-dev.0"
 edition = "2021"
 authors = ["TabbyML Team"]
 homepage = "https://github.com/TabbyML/tabby"
@@ -55,7 +55,7 @@ hyper = "1.1"
 juniper = "0.16"
 chrono = "0.4"
 reqwest-eventsource = "0.6"
-serial_test = "3.0.0"
+serial_test = { version = "3.0.0", features = ["file_locks"] }
 hash-ids = { path = "./crates/hash-ids" }
 ignore = "0.4.20"
 nucleo = "0.5.0"
@@ -65,7 +65,7 @@ git2 = "0.18.3"
 tower-http = "0.5"
 mime_guess = "2.0.4"
 assert_matches = "1.5"
-insta = "1.34.0" 
+insta = "1.34.0"
 logkit = "0.3"
 async-openai = "0.20"
 tracing-test = "0.2"

diff --git a/ci/package-win.sh b/ci/package-win.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+# get current bash file directory
+PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+LLAMA_CPP_PATH="${PROJECT_ROOT}/crates/llama-cpp-server/llama.cpp"
+
 # Input variables
-LLAMA_CPP_VERSION=${LLAMA_CPP_VERSION:-b3571}
+LLAMA_CPP_VERSION=${LLAMA_CPP_VERSION:-$(cd ${LLAMA_CPP_PATH} && git fetch --tags origin >/dev/null && git describe --tags --abbrev=0)}
+echo "LLAMA_CPP_VERSION=${LLAMA_CPP_VERSION}"
 LLAMA_CPP_PLATFORM=${LLAMA_CPP_PLATFORM:-cuda-cu11.7.1-x64}
 OUTPUT_NAME=${OUTPUT_NAME:-tabby_x86_64-windows-msvc-cuda117}
 
@@ -17,7 +22,7 @@ cp ../tabby_x86_64-windows-msvc.exe/tabby_x86_64-windows-msvc.exe tabby.exe
 popd
 
 zip -r ${OUTPUT_NAME}.zip ${OUTPUT_NAME}
-rm -rf ${OUTPUT_NAME}
+rm -rf "${OUTPUT_NAME}"
 
 mkdir -p dist
-mv ${OUTPUT_NAME}.zip dist/
+mv ${OUTPUT_NAME}.zip dist/