fix: 画图报错undefined的解决方案

This commit is contained in:
ikechan8370 2023-03-11 20:25:32 +08:00
parent 7133ce29fc
commit 36cdd701f9
2 changed files with 25 additions and 6 deletions

View file

@ -1,7 +1,7 @@
import fs from 'fs'
import lodash from 'lodash'
export const defaultChatGPTAPI = 'https://pimon.d201.cn/backend-api/conversation'
export const officialChatGPTAPI = 'https://apps.openai.com/api/conversation'
export const officialChatGPTAPI = 'https://pimon.d201.cn/backend-api/conversation'
// Reverse proxy of https://api.openai.com
export const defaultOpenAIReverseProxy = 'https://mondstadt.d201.eu.org'
// blocked in China Mainland

View file

@ -1,5 +1,5 @@
import { Configuration, OpenAIApi } from 'openai'
import { Config } from './config.js'
import {Config, defaultOpenAIReverseProxy, officialChatGPTAPI} from './config.js'
import fs from 'fs'
import { mkdirs } from './common.js'
let proxy
@ -11,15 +11,21 @@ if (Config.proxy) {
}
}
function getProxy () {
if (proxy) {
if (!Config.proxy || proxy) {
return proxy
} else {
throw new Error('未安装https-proxy-agent请在插件目录下执行pnpm add https-proxy-agent')
}
}
export async function createImage (prompt, n = 1, size = '512x512') {
let basePath = Config.openAiBaseUrl
if (Config.openAiBaseUrl && Config.proxy && !Config.openAiForceUseReverse) {
// 如果配了proxy而且有反代但是没开启强制反代
basePath = defaultOpenAIReverseProxy
}
const configuration = new Configuration({
apiKey: Config.apiKey
apiKey: Config.apiKey,
basePath: basePath + '/v1'
})
const openai = new OpenAIApi(configuration)
if (Config.debug) {
@ -38,8 +44,15 @@ export async function createImage (prompt, n = 1, size = '512x512') {
}
export async function imageVariation (imageUrl, n = 1, size = '512x512') {
let basePath = Config.openAiBaseUrl
if (Config.openAiBaseUrl && Config.proxy && !Config.openAiForceUseReverse) {
// 如果配了proxy而且有反代但是没开启强制反代
basePath = defaultOpenAIReverseProxy
}
const configuration = new Configuration({
apiKey: Config.apiKey
apiKey: Config.apiKey,
basePath: basePath + '/v1'
})
const openai = new OpenAIApi(configuration)
if (Config.debug) {
@ -106,8 +119,14 @@ async function resizeAndCropImage (inputFilePath, outputFilePath, size = 512) {
}
export async function editImage (originalImage, mask = [], prompt, num = 1, size = '512x512') {
let basePath = Config.openAiBaseUrl
if (Config.openAiBaseUrl && Config.proxy && !Config.openAiForceUseReverse) {
// 如果配了proxy而且有反代但是没开启强制反代
basePath = defaultOpenAIReverseProxy
}
const configuration = new Configuration({
apiKey: Config.apiKey
apiKey: Config.apiKey,
basePath: basePath + '/v1'
})
const openai = new OpenAIApi(configuration)
if (Config.debug) {