chore: update localai to v2.20.1 (#369)

Signed-off-by: Sertac Ozercan <[email protected]>
sozercan · Sep 1, 2024 · 004ea5f · 004ea5f
1 parent 5c1643e
commit 004ea5f
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 10 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -58,7 +58,7 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           check-latest: true
 
       # Initializes the CodeQL tools for scanning.

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -16,6 +16,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -36,10 +40,10 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           check-latest: true
 
       - name: lint
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
-          version: v1.59.0
+          version: v1.60.3
diff --git a/.github/workflows/test-docker-args.yaml b/.github/workflows/test-docker-args.yaml
@@ -16,6 +16,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test-docker.yaml b/.github/workflows/test-docker.yaml
@@ -16,6 +16,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -67,6 +71,7 @@ jobs:
             dl-cdn.alpinelinux.org:443
             *.ubuntu.com:80
             ghcr.io:443
+            sum.golang.org:443
 
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
@@ -198,6 +203,7 @@ jobs:
             registry.ollama.ai:443
             *.cloudflarestorage.com:443
             ghcr.io:443
+            sum.golang.org:443
 
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 

diff --git a/.github/workflows/test-helm.yaml b/.github/workflows/test-helm.yaml
@@ -16,6 +16,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test-kubernetes.yaml b/.github/workflows/test-kubernetes.yaml
@@ -16,6 +16,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
@@ -16,6 +16,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -36,7 +40,7 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           check-latest: true
 
       - name: go mod tidy

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,6 +1,6 @@
 run:
   timeout: 5m
-  go: "1.22"
+  go: "1.23"
 
 linters-settings:
   lll:
@@ -13,7 +13,7 @@ linters:
   enable:
     - errcheck
     - errorlint
-    - exportloopref
+    - copyloopvar
     - forcetypeassert
     - gci
     - gocritic

diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/sozercan/aikit
 
 go 1.21.0
 
-toolchain go1.22.5
+toolchain go1.23.0
 
 require (
 	github.com/containerd/platforms v0.2.1

diff --git a/pkg/aikit2llb/inference/convert.go b/pkg/aikit2llb/inference/convert.go
@@ -14,7 +14,7 @@ import (
 const (
 	distrolessBase = "ghcr.io/sozercan/base:latest"
 	localAIRepo    = "https://github.com/mudler/LocalAI"
-	localAIVersion = "v2.19.4"
+	localAIVersion = "v2.20.1"
 	cudaVersion    = "12-5"
 )
 

diff --git a/pkg/aikit2llb/inference/exllama.go b/pkg/aikit2llb/inference/exllama.go
@@ -19,7 +19,9 @@ func installExllama(c *config.InferenceConfig, s llb.State, merge llb.State) llb
 
 	s = cloneLocalAI(s)
 
-	s = s.Run(utils.Bashf("export BUILD_TYPE=cublas && cd /tmp/localai/backend/python/%[1]s && make %[1]s", backend)).Root()
+	// TODO: remove sed for grpcio with localai v2.20.2+
+	// https://github.com/mudler/LocalAI/pull/3428/files
+	s = s.Run(utils.Bashf("export BUILD_TYPE=cublas && export CUDA_MAJOR_VERSION=12 && cd /tmp/localai/backend/python/%[1]s && sed -i 's/grpcio==1.66.0/grpcio==1.66.1/g' requirements.txt && make %[1]s", backend)).Root()
 
 	diff := llb.Diff(savedState, s)
 	return llb.Merge([]llb.State{merge, diff})

diff --git a/pkg/aikit2llb/inference/mamba.go b/pkg/aikit2llb/inference/mamba.go
@@ -12,7 +12,7 @@ func installMamba(s llb.State, merge llb.State) llb.State {
 
 	s = cloneLocalAI(s)
 
-	s = s.Run(utils.Bashf("export BUILD_TYPE=cublas && cd /tmp/localai/backend/python/%[1]s && make %[1]s", utils.BackendMamba)).Root()
+	s = s.Run(utils.Bashf("export BUILD_TYPE=cublas && export CUDA_MAJOR_VERSION=12 && cd /tmp/localai/backend/python/%[1]s && make %[1]s", utils.BackendMamba)).Root()
 
 	diff := llb.Diff(savedState, s)
 	return llb.Merge([]llb.State{merge, diff})