Skip to content

Commit 90cacb9

Browse files
dave-gray101mudler
dave-gray101
and
mudler
authored
test: preliminary tests and merge fix for authv2 (#3584)
* add api key to existing app tests, add preliminary auth test Signed-off-by: Dave Lee <[email protected]> * small fix, run test Signed-off-by: Dave Lee <[email protected]> * status on non-opaque Signed-off-by: Dave Lee <[email protected]> * tweak auth error Signed-off-by: Dave Lee <[email protected]> * exp Signed-off-by: Dave Lee <[email protected]> * quick fix on real laptop Signed-off-by: Dave Lee <[email protected]> * add downloader version that allows providing an auth header Signed-off-by: Dave Lee <[email protected]> * stash some devcontainer fixes during testing Signed-off-by: Dave Lee <[email protected]> * s2 Signed-off-by: Dave Lee <[email protected]> * s Signed-off-by: Dave Lee <[email protected]> * done with experiment Signed-off-by: Dave Lee <[email protected]> * done with experiment Signed-off-by: Dave Lee <[email protected]> * after merge fix Signed-off-by: Dave Lee <[email protected]> * rename and fix Signed-off-by: Dave Lee <[email protected]> --------- Signed-off-by: Dave Lee <[email protected]> Co-authored-by: Ettore Di Giacinto <[email protected]>
1 parent 69d2902 commit 90cacb9

File tree

12 files changed

+95
-41
lines changed

12 files changed

+95
-41
lines changed

‎.devcontainer-scripts/utils.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# Param 2: email
1010
#
1111
config_user() {
12+
echo "Configuring git for $1 <$2>"
1213
local gcn=$(git config --global user.name)
1314
if [ -z "${gcn}" ]; then
1415
echo "Setting up git user / remote"
@@ -24,6 +25,7 @@ config_user() {
2425
# Param 2: remote url
2526
#
2627
config_remote() {
28+
echo "Adding git remote and fetching $2 as $1"
2729
local gr=$(git remote -v | grep $1)
2830
if [ -z "${gr}" ]; then
2931
git remote add $1 $2

‎Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,8 @@ RUN if [ "${FFMPEG}" = "true" ]; then \
338338

339339
RUN apt-get update && \
340340
apt-get install -y --no-install-recommends \
341-
ssh less && \
342-
apt-get clean && \
343-
rm -rf /var/lib/apt/lists/*
341+
ssh less wget
342+
# For the devcontainer, leave apt functional in case additional devtools are needed at runtime.
344343

345344
RUN go install github.com/go-delve/delve/cmd/dlv@latest
346345

‎Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,9 @@ clean-tests:
359359
rm -rf test-dir
360360
rm -rf core/http/backend-assets
361361

362+
clean-dc: clean
363+
cp -r /build/backend-assets /workspace/backend-assets
364+
362365
## Build:
363366
build: prepare backend-assets grpcs ## Build the project
364367
$(info ${GREEN}I local-ai build info:${RESET})

‎core/gallery/gallery.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func AvailableGalleryModels(galleries []config.Gallery, basePath string) ([]*Gal
132132
func findGalleryURLFromReferenceURL(url string, basePath string) (string, error) {
133133
var refFile string
134134
uri := downloader.URI(url)
135-
err := uri.DownloadAndUnmarshal(basePath, func(url string, d []byte) error {
135+
err := uri.DownloadWithCallback(basePath, func(url string, d []byte) error {
136136
refFile = string(d)
137137
if len(refFile) == 0 {
138138
return fmt.Errorf("invalid reference file at url %s: %s", url, d)
@@ -156,7 +156,7 @@ func getGalleryModels(gallery config.Gallery, basePath string) ([]*GalleryModel,
156156
}
157157
uri := downloader.URI(gallery.URL)
158158

159-
err := uri.DownloadAndUnmarshal(basePath, func(url string, d []byte) error {
159+
err := uri.DownloadWithCallback(basePath, func(url string, d []byte) error {
160160
return yaml.Unmarshal(d, &models)
161161
})
162162
if err != nil {

‎core/gallery/models.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type PromptTemplate struct {
6969
func GetGalleryConfigFromURL(url string, basePath string) (Config, error) {
7070
var config Config
7171
uri := downloader.URI(url)
72-
err := uri.DownloadAndUnmarshal(basePath, func(url string, d []byte) error {
72+
err := uri.DownloadWithCallback(basePath, func(url string, d []byte) error {
7373
return yaml.Unmarshal(d, &config)
7474
})
7575
if err != nil {

‎core/http/app.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,6 @@ import (
3131
"github.com/rs/zerolog/log"
3232
)
3333

34-
func readAuthHeader(c *fiber.Ctx) string {
35-
authHeader := c.Get("Authorization")
36-
37-
// elevenlabs
38-
xApiKey := c.Get("xi-api-key")
39-
if xApiKey != "" {
40-
authHeader = "Bearer " + xApiKey
41-
}
42-
43-
// anthropic
44-
xApiKey = c.Get("x-api-key")
45-
if xApiKey != "" {
46-
authHeader = "Bearer " + xApiKey
47-
}
48-
49-
return authHeader
50-
}
51-
5234
// Embed a directory
5335
//
5436
//go:embed static/*

‎core/http/app_test.go

Lines changed: 62 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ import (
3131
"github.com/sashabaranov/go-openai/jsonschema"
3232
)
3333

34+
const apiKey = "joshua"
35+
const bearerKey = "Bearer " + apiKey
36+
3437
const testPrompt = `### System:
3538
You are an AI assistant that follows instruction extremely well. Help as much as you can.
3639
@@ -50,11 +53,19 @@ type modelApplyRequest struct {
5053

5154
func getModelStatus(url string) (response map[string]interface{}) {
5255
// Create the HTTP request
53-
resp, err := http.Get(url)
56+
req, err := http.NewRequest("GET", url, nil)
57+
req.Header.Set("Content-Type", "application/json")
58+
req.Header.Set("Authorization", bearerKey)
5459
if err != nil {
5560
fmt.Println("Error creating request:", err)
5661
return
5762
}
63+
client := &http.Client{}
64+
resp, err := client.Do(req)
65+
if err != nil {
66+
fmt.Println("Error sending request:", err)
67+
return
68+
}
5869
defer resp.Body.Close()
5970

6071
body, err := io.ReadAll(resp.Body)
@@ -72,14 +83,15 @@ func getModelStatus(url string) (response map[string]interface{}) {
7283
return
7384
}
7485

75-
func getModels(url string) (response []gallery.GalleryModel) {
86+
func getModels(url string) ([]gallery.GalleryModel, error) {
87+
response := []gallery.GalleryModel{}
7688
uri := downloader.URI(url)
7789
// TODO: No tests currently seem to exercise file:// urls. Fix?
78-
uri.DownloadAndUnmarshal("", func(url string, i []byte) error {
90+
err := uri.DownloadWithAuthorizationAndCallback("", bearerKey, func(url string, i []byte) error {
7991
// Unmarshal YAML data into a struct
8092
return json.Unmarshal(i, &response)
8193
})
82-
return
94+
return response, err
8395
}
8496

8597
func postModelApplyRequest(url string, request modelApplyRequest) (response map[string]interface{}) {
@@ -101,6 +113,7 @@ func postModelApplyRequest(url string, request modelApplyRequest) (response map[
101113
return
102114
}
103115
req.Header.Set("Content-Type", "application/json")
116+
req.Header.Set("Authorization", bearerKey)
104117

105118
// Make the request
106119
client := &http.Client{}
@@ -140,6 +153,7 @@ func postRequestJSON[B any](url string, bodyJson *B) error {
140153
}
141154

142155
req.Header.Set("Content-Type", "application/json")
156+
req.Header.Set("Authorization", bearerKey)
143157

144158
client := &http.Client{}
145159
resp, err := client.Do(req)
@@ -175,6 +189,7 @@ func postRequestResponseJSON[B1 any, B2 any](url string, reqJson *B1, respJson *
175189
}
176190

177191
req.Header.Set("Content-Type", "application/json")
192+
req.Header.Set("Authorization", bearerKey)
178193

179194
client := &http.Client{}
180195
resp, err := client.Do(req)
@@ -195,6 +210,35 @@ func postRequestResponseJSON[B1 any, B2 any](url string, reqJson *B1, respJson *
195210
return json.Unmarshal(body, respJson)
196211
}
197212

213+
func postInvalidRequest(url string) (error, int) {
214+
215+
req, err := http.NewRequest("POST", url, bytes.NewBufferString("invalid request"))
216+
if err != nil {
217+
return err, -1
218+
}
219+
220+
req.Header.Set("Content-Type", "application/json")
221+
222+
client := &http.Client{}
223+
resp, err := client.Do(req)
224+
if err != nil {
225+
return err, -1
226+
}
227+
228+
defer resp.Body.Close()
229+
230+
body, err := io.ReadAll(resp.Body)
231+
if err != nil {
232+
return err, -1
233+
}
234+
235+
if resp.StatusCode < 200 || resp.StatusCode >= 400 {
236+
return fmt.Errorf("unexpected status code: %d, body: %s", resp.StatusCode, string(body)), resp.StatusCode
237+
}
238+
239+
return nil, resp.StatusCode
240+
}
241+
198242
//go:embed backend-assets/*
199243
var backendAssets embed.FS
200244

@@ -260,6 +304,7 @@ var _ = Describe("API test", func() {
260304
config.WithContext(c),
261305
config.WithGalleries(galleries),
262306
config.WithModelPath(modelDir),
307+
config.WithApiKeys([]string{apiKey}),
263308
config.WithBackendAssets(backendAssets),
264309
config.WithBackendAssetsOutput(backendAssetsDir))...)
265310
Expect(err).ToNot(HaveOccurred())
@@ -269,7 +314,7 @@ var _ = Describe("API test", func() {
269314

270315
go app.Listen("127.0.0.1:9090")
271316

272-
defaultConfig := openai.DefaultConfig("")
317+
defaultConfig := openai.DefaultConfig(apiKey)
273318
defaultConfig.BaseURL = "http://127.0.0.1:9090/v1"
274319

275320
client2 = openaigo.NewClient("")
@@ -295,10 +340,19 @@ var _ = Describe("API test", func() {
295340
Expect(err).To(HaveOccurred())
296341
})
297342

343+
Context("Auth Tests", func() {
344+
It("Should fail if the api key is missing", func() {
345+
err, sc := postInvalidRequest("http://127.0.0.1:9090/models/available")
346+
Expect(err).ToNot(BeNil())
347+
Expect(sc).To(Equal(403))
348+
})
349+
})
350+
298351
Context("Applying models", func() {
299352

300353
It("applies models from a gallery", func() {
301-
models := getModels("http://127.0.0.1:9090/models/available")
354+
models, err := getModels("http://127.0.0.1:9090/models/available")
355+
Expect(err).To(BeNil())
302356
Expect(len(models)).To(Equal(2), fmt.Sprint(models))
303357
Expect(models[0].Installed).To(BeFalse(), fmt.Sprint(models))
304358
Expect(models[1].Installed).To(BeFalse(), fmt.Sprint(models))
@@ -331,7 +385,8 @@ var _ = Describe("API test", func() {
331385
Expect(content["backend"]).To(Equal("bert-embeddings"))
332386
Expect(content["foo"]).To(Equal("bar"))
333387

334-
models = getModels("http://127.0.0.1:9090/models/available")
388+
models, err = getModels("http://127.0.0.1:9090/models/available")
389+
Expect(err).To(BeNil())
335390
Expect(len(models)).To(Equal(2), fmt.Sprint(models))
336391
Expect(models[0].Name).To(Or(Equal("bert"), Equal("bert2")))
337392
Expect(models[1].Name).To(Or(Equal("bert"), Equal("bert2")))

‎core/http/middleware/auth.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func getApiKeyErrorHandler(applicationConfig *config.ApplicationConfig) fiber.Er
3838
if applicationConfig.OpaqueErrors {
3939
return ctx.SendStatus(403)
4040
}
41+
return ctx.Status(403).SendString(err.Error())
4142
}
4243
if applicationConfig.OpaqueErrors {
4344
return ctx.SendStatus(500)
@@ -90,4 +91,4 @@ func getApiKeyRequiredFilterFunction(applicationConfig *config.ApplicationConfig
9091
}
9192
}
9293
return func(c *fiber.Ctx) bool { return false }
93-
}
94+
}

‎embedded/embedded.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func init() {
3939
func GetRemoteLibraryShorteners(url string, basePath string) (map[string]string, error) {
4040
remoteLibrary := map[string]string{}
4141
uri := downloader.URI(url)
42-
err := uri.DownloadAndUnmarshal(basePath, func(_ string, i []byte) error {
42+
err := uri.DownloadWithCallback(basePath, func(_ string, i []byte) error {
4343
return yaml.Unmarshal(i, &remoteLibrary)
4444
})
4545
if err != nil {

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/mudler/LocalAI
22

3-
go 1.22.0
3+
go 1.23
44

5-
toolchain go1.22.4
5+
toolchain go1.23.1
66

77
require (
88
dario.cat/mergo v1.0.0

‎pkg/downloader/uri.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ const (
3131

3232
type URI string
3333

34-
func (uri URI) DownloadAndUnmarshal(basePath string, f func(url string, i []byte) error) error {
34+
func (uri URI) DownloadWithCallback(basePath string, f func(url string, i []byte) error) error {
35+
return uri.DownloadWithAuthorizationAndCallback(basePath, "", f)
36+
}
37+
38+
func (uri URI) DownloadWithAuthorizationAndCallback(basePath string, authorization string, f func(url string, i []byte) error) error {
3539
url := uri.ResolveURL()
3640

3741
if strings.HasPrefix(url, LocalPrefix) {
@@ -41,7 +45,6 @@ func (uri URI) DownloadAndUnmarshal(basePath string, f func(url string, i []byte
4145
if err != nil {
4246
return err
4347
}
44-
// ???
4548
resolvedBasePath, err := filepath.EvalSymlinks(basePath)
4649
if err != nil {
4750
return err
@@ -63,7 +66,16 @@ func (uri URI) DownloadAndUnmarshal(basePath string, f func(url string, i []byte
6366
}
6467

6568
// Send a GET request to the URL
66-
response, err := http.Get(url)
69+
70+
req, err := http.NewRequest("GET", url, nil)
71+
if err != nil {
72+
return err
73+
}
74+
if authorization != "" {
75+
req.Header.Add("Authorization", authorization)
76+
}
77+
78+
response, err := http.DefaultClient.Do(req)
6779
if err != nil {
6880
return err
6981
}

‎pkg/downloader/uri_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var _ = Describe("Gallery API tests", func() {
1111
It("parses github with a branch", func() {
1212
uri := URI("github:go-skynet/model-gallery/gpt4all-j.yaml")
1313
Expect(
14-
uri.DownloadAndUnmarshal("", func(url string, i []byte) error {
14+
uri.DownloadWithCallback("", func(url string, i []byte) error {
1515
Expect(url).To(Equal("https://raw.githubusercontent.com/go-skynet/model-gallery/main/gpt4all-j.yaml"))
1616
return nil
1717
}),
@@ -21,7 +21,7 @@ var _ = Describe("Gallery API tests", func() {
2121
uri := URI("github:go-skynet/model-gallery/gpt4all-j.yaml@main")
2222

2323
Expect(
24-
uri.DownloadAndUnmarshal("", func(url string, i []byte) error {
24+
uri.DownloadWithCallback("", func(url string, i []byte) error {
2525
Expect(url).To(Equal("https://raw.githubusercontent.com/go-skynet/model-gallery/main/gpt4all-j.yaml"))
2626
return nil
2727
}),
@@ -30,7 +30,7 @@ var _ = Describe("Gallery API tests", func() {
3030
It("parses github with urls", func() {
3131
uri := URI("https://raw.githubusercontent.com/go-skynet/model-gallery/main/gpt4all-j.yaml")
3232
Expect(
33-
uri.DownloadAndUnmarshal("", func(url string, i []byte) error {
33+
uri.DownloadWithCallback("", func(url string, i []byte) error {
3434
Expect(url).To(Equal("https://raw.githubusercontent.com/go-skynet/model-gallery/main/gpt4all-j.yaml"))
3535
return nil
3636
}),

0 commit comments

Comments
 (0)