Skip to content

Commit 20aa35f

Browse files
authored
chore: optimize code (Chanzhaoyu#1328)
1 parent ddc7066 commit 20aa35f

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

service/src/chatgpt/index.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const timeoutMs: number = !isNaN(+process.env.TIMEOUT_MS) ? +process.env.TIMEOUT
2727
const disableDebug: boolean = process.env.OPENAI_API_DISABLE_DEBUG === 'true'
2828

2929
let apiModel: ApiModel
30-
let model = 'gpt-3.5-turbo'
30+
const model = isNotEmptyString(process.env.OPENAI_API_MODEL) ? process.env.OPENAI_API_MODEL : 'gpt-3.5-turbo'
3131

3232
if (!isNotEmptyString(process.env.OPENAI_API_KEY) && !isNotEmptyString(process.env.OPENAI_ACCESS_TOKEN))
3333
throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable')
@@ -39,8 +39,6 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
3939

4040
if (isNotEmptyString(process.env.OPENAI_API_KEY)) {
4141
const OPENAI_API_BASE_URL = process.env.OPENAI_API_BASE_URL
42-
const OPENAI_API_MODEL = process.env.OPENAI_API_MODEL
43-
model = isNotEmptyString(OPENAI_API_MODEL) ? OPENAI_API_MODEL : 'gpt-3.5-turbo'
4442

4543
const options: ChatGPTAPIOptions = {
4644
apiKey: process.env.OPENAI_API_KEY,
@@ -70,19 +68,13 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
7068
apiModel = 'ChatGPTAPI'
7169
}
7270
else {
73-
const OPENAI_API_MODEL = process.env.OPENAI_API_MODEL
7471
const options: ChatGPTUnofficialProxyAPIOptions = {
7572
accessToken: process.env.OPENAI_ACCESS_TOKEN,
73+
apiReverseProxyUrl: isNotEmptyString(process.env.API_REVERSE_PROXY) ? process.env.API_REVERSE_PROXY : 'https://bypass.churchless.tech/api/conversation',
74+
model,
7675
debug: !disableDebug,
7776
}
7877

79-
if (isNotEmptyString(OPENAI_API_MODEL))
80-
options.model = OPENAI_API_MODEL
81-
82-
options.apiReverseProxyUrl = isNotEmptyString(process.env.API_REVERSE_PROXY)
83-
? process.env.API_REVERSE_PROXY
84-
: 'https://bypass.churchless.tech/api/conversation'
85-
8678
setupProxy(options)
8779

8880
api = new ChatGPTUnofficialProxyAPI({ ...options })

0 commit comments

Comments
 (0)