diff --git a/azure/init.go b/azure/init.go index b128ee4..09b429c 100644 --- a/azure/init.go +++ b/azure/init.go @@ -2,13 +2,14 @@ package azure import ( "fmt" - "github.com/spf13/viper" - "github.com/stulzq/azure-openai-proxy/constant" - "github.com/stulzq/azure-openai-proxy/util" "log" "net/url" "path/filepath" "strings" + + "github.com/spf13/viper" + "github.com/stulzq/azure-openai-proxy/constant" + "github.com/stulzq/azure-openai-proxy/util" ) const ( @@ -25,6 +26,7 @@ func Init() error { apiVersion string endpoint string openaiModelMapper string + apikey string err error ) @@ -35,7 +37,8 @@ func Init() error { if apiVersion == "" { apiVersion = "2023-07-01-preview" } - InitFromEnvironmentVariables(apiVersion, endpoint, openaiModelMapper) + apikey = strings.TrimSpace(viper.GetString(constant.ENV_AZURE_OPENAI_API_KEY)) + InitFromEnvironmentVariables(apiVersion, apikey, endpoint, openaiModelMapper) } else { if err = InitFromConfigFile(); err != nil { return err @@ -64,7 +67,7 @@ func Init() error { return err } -func InitFromEnvironmentVariables(apiVersion, endpoint, openaiModelMapper string) { +func InitFromEnvironmentVariables(apiVersion, apikey, endpoint, openaiModelMapper string) { log.Println("Init from environment variables") if openaiModelMapper != "" { // openaiModelMapper example: @@ -84,7 +87,7 @@ func InitFromEnvironmentVariables(apiVersion, endpoint, openaiModelMapper string ModelName: modelName, Endpoint: endpoint, EndpointUrl: u, - ApiKey: "", + ApiKey: apikey, ApiVersion: apiVersion, } } diff --git a/constant/env.go b/constant/env.go index 434dc2e..21f168c 100644 --- a/constant/env.go +++ b/constant/env.go @@ -4,6 +4,7 @@ const ( ENV_AZURE_OPENAI_ENDPOINT = "AZURE_OPENAI_ENDPOINT" ENV_AZURE_OPENAI_API_VER = "AZURE_OPENAI_API_VER" ENV_AZURE_OPENAI_MODEL_MAPPER = "AZURE_OPENAI_MODEL_MAPPER" + ENV_AZURE_OPENAI_API_KEY = "AZURE_OPENAI_API_KEY" ENV_AZURE_OPENAI_HTTP_PROXY = "AZURE_OPENAI_HTTP_PROXY" ENV_AZURE_OPENAI_SOCKS_PROXY = "AZURE_OPENAI_SOCKS_PROXY"