Merge pull request #8 from Gyarbij/main

1.0.0
Gyarbij · Jun 22, 2024 · 2e95ea2 · 2e95ea2
2 parents 8bdcc7b + 776ace3
commit 2e95ea2
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 82 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,18 +1,17 @@
 # Build step
-FROM golang:1.18 AS builder
-ENV GOPROXY=https://goproxy.cn,direct
+FROM golang:1.22.4 AS builder
 RUN mkdir -p /build
 WORKDIR /build
 COPY . .
 RUN go build
 
 # Final step
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 RUN set -x && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     ca-certificates && \
     rm -rf /var/lib/apt/lists/* \
 
-EXPOSE 8080
+EXPOSE 11437
 WORKDIR /app
-COPY --from=builder /build/azure-openai-proxy /app/azure-openai-proxy
-ENTRYPOINT ["/app/azure-openai-proxy"]
+COPY --from=builder /build/azure-oai-proxy /app/azure-oai-proxy
+ENTRYPOINT ["/app/azure-oai-proxy"]
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ Environment Variables
 
 | Parameters                 | Description                                                                                                                                                                                                                                                                                                    | Default Value                                                           |
 | :------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------- |
-| AZURE_OPENAI_PROXY_ADDRESS | Service listening address                                                                                                                                                                                                                                                                                      | 0.0.0.0:8080                                                            |
+| AZURE_OPENAI_PROXY_ADDRESS | Service listening address                                                                                                                                                                                                                                                                                      | 0.0.0.0:11437                                                            |
 | AZURE_OPENAI_PROXY_MODE    | Proxy mode, can be either "azure" or "openai".                                                                                                                                                                                                                                                                 | azure                                                                   |
 | AZURE_OPENAI_ENDPOINT      | Azure OpenAI Endpoint, usually looks like https://{custom}.openai.azure.com. Required.                                                                                                                                                                                                                         |                                                                         |
 | AZURE_OPENAI_APIVERSION    | Azure OpenAI API version. Default is 2023-03-15-preview.                                                                                                                                                                                                                                                       | 2023-03-15-preview                                                      |
@@ -96,7 +96,7 @@ Deploying through Docker
 
 ```shell
 docker pull ishadows/azure-openai-proxy:latest
-docker run -d -p 8080:8080 --name=azure-openai-proxy \
+docker run -d -p 11437:11437 --name=azure-openai-proxy \
   --env AZURE_OPENAI_ENDPOINT={your azure endpoint} \
   --env AZURE_OPENAI_MODEL_MAPPER={your custom model mapper ,like: gpt-3.5-turbo=gpt-35-turbo,gpt-3.5-turbo-0301=gpt-35-turbo-0301} \
   ishadows/azure-openai-proxy:latest
@@ -105,7 +105,7 @@ docker run -d -p 8080:8080 --name=azure-openai-proxy \
 Calling
 
 ```shell
-curl https://localhost:8080/v1/chat/completions \
+curl https://localhost:11437/v1/chat/completions \
   -H "Content-Type: application/json" \
   -H "Authorization: Bearer {your azure api key}" \
   -d '{

diff --git a/go.mod b/go.mod
@@ -1,36 +1,39 @@
-module github.com/diemus/azure-openai-proxy
+module github.com/gyarbij/azure-oai-proxy
 
-go 1.18
+go 1.22.4
 
 require (
-	github.com/gin-gonic/gin v1.9.0
-	github.com/tidwall/gjson v1.14.4
+	github.com/gin-gonic/gin v1.10.0
+	github.com/tidwall/gjson v1.17.1
 )
 
 require (
-	github.com/bytedance/sonic v1.8.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/bytedance/sonic v1.11.6 // indirect
+	github.com/bytedance/sonic/loader v0.1.1 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.11.2 // indirect
-	github.com/goccy/go-json v0.10.0 // indirect
+	github.com/go-playground/validator/v10 v10.20.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.9 // indirect
-	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	golang.org/x/arch v0.8.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.mod.old b/go.mod.old
@@ -0,0 +1,36 @@
+module github.com/gyarbij/azure-oai-proxy
+
+go 1.18
+
+require (
+	github.com/gin-gonic/gin v1.9.0
+	github.com/tidwall/gjson v1.14.4
+)
+
+require (
+	github.com/bytedance/sonic v1.8.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.11.2 // indirect
+	github.com/goccy/go-json v0.10.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.9 // indirect
+	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)