Skip to content

feat: set API Key from env #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: set API Key from env #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions azure/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -25,6 +26,7 @@ func Init() error {
apiVersion string
endpoint string
openaiModelMapper string
apikey string
err error
)

Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -84,7 +87,7 @@ func InitFromEnvironmentVariables(apiVersion, endpoint, openaiModelMapper string
ModelName: modelName,
Endpoint: endpoint,
EndpointUrl: u,
ApiKey: "",
ApiKey: apikey,
ApiVersion: apiVersion,
}
}
Expand Down
1 change: 1 addition & 0 deletions constant/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down