diff --git a/Dockerfile b/Dockerfile index 346d9c5ba7..438da7e2ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,15 +16,21 @@ RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ./VERSION) npm run buil FROM golang:alpine AS builder2 -RUN apk add --no-cache \ - gcc \ - musl-dev \ - sqlite-dev \ - build-base - -ENV GO111MODULE=on \ - CGO_ENABLED=1 \ - GOOS=linux +# 替换为国内源(解决卡住问题) +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add --no-cache gcc musl-dev sqlite-dev build-base + +# RUN apk add --no-cache \ +# gcc \ +# musl-dev \ +# sqlite-dev \ +# build-base + +# 设置 Go 环境 + 国内代理 +ENV CGO_ENABLED=1 \ + GOOS=linux \ + GO111MODULE=on \ + GOPROXY=https://goproxy.cn,direct WORKDIR /build diff --git a/relay/adaptor/zhipu/adaptor.go b/relay/adaptor/zhipu/adaptor.go index 660bd37960..cec24e22d1 100644 --- a/relay/adaptor/zhipu/adaptor.go +++ b/relay/adaptor/zhipu/adaptor.go @@ -134,9 +134,15 @@ func ConvertEmbeddingRequest(request model.GeneralOpenAIRequest) (*EmbeddingRequ if len(inputs) != 1 { return nil, errors.New("invalid input length, zhipu only support one input") } + + if request.Dimensions == 0 { + return nil, errors.New("dimensions is required for zhipu embedding request") + } + return &EmbeddingRequest{ Model: request.Model, Input: inputs[0], + Dimensions: request.Dimensions, }, nil } diff --git a/relay/adaptor/zhipu/model.go b/relay/adaptor/zhipu/model.go index 06e22dc153..7ff27c5b3b 100644 --- a/relay/adaptor/zhipu/model.go +++ b/relay/adaptor/zhipu/model.go @@ -48,6 +48,7 @@ type tokenData struct { type EmbeddingRequest struct { Model string `json:"model"` Input string `json:"input"` + Dimensions int `json:"dimensions"` } type EmbeddingResponse struct {