Skip to content
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.

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

feat(copilot): support custom copilot api #1660

Merged
merged 1 commit into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/background.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ async function createWindow() {
multiTopics: setting.multiTopics,
jsonHighlight: setting.jsonHighlight,
enableCopilot: setting.enableCopilot,
openAIAPIHost: setting.openAIAPIHost,
openAIAPIKey: setting.openAIAPIKey,
model: setting.model,
logLevel: setting.logLevel,
Expand Down
3 changes: 2 additions & 1 deletion src/components/Copilot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export default class Copilot extends Vue {
@Prop({ required: true }) public mode!: 'connections' | 'scripts' | 'help'
@Action('SET_INSERT_BUTTON_ADDED') private setisPrismButtonAdded!: (payload: { isPrismButtonAdded: boolean }) => void

@Getter('openAIAPIHost') private openAIAPIHost!: string
@Getter('openAIAPIKey') private openAIAPIKey!: string
@Getter('model') private model!: AIModel
@Getter('isPrismButtonAdded') private isPrismButtonAdded!: boolean
Expand Down Expand Up @@ -232,7 +233,7 @@ export default class Copilot extends Vue {
}

this.isResponseStream = true
const response = await fetch('https://api.openai.com/v1/chat/completions', fetchOptions)
const response = await fetch(`${this.openAIAPIHost}/chat/completions`, fetchOptions)
if (response && response.status === 200 && response.ok) {
this.isSending = false
const throttledScroll = throttle(() => {
Expand Down
2 changes: 2 additions & 0 deletions src/database/database.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import { aiTables1701936842016 } from './migration/1701936842016-aiTables'
import { enableCopilot1703659148195 } from './migration/1703659148195-enableCopilot'
import { logLevel1704941582350 } from './migration/1704941582350-logLevel'
import { updatePayloadTypeToVarchar1630403733965 } from './migration/1705478422620-updatePayloadTypeToVarchar'
import { supportOpenAIAPIHost1716044120271 } from './migration/1716044120271-supportOpenAIAPIHost'

const STORE_PATH = getAppDataPath('MQTTX')
try {
Expand Down Expand Up @@ -94,6 +95,7 @@ const ORMConfig = {
enableCopilot1703659148195,
logLevel1704941582350,
updatePayloadTypeToVarchar1630403733965,
supportOpenAIAPIHost1716044120271,
],
migrationsTableName: 'temp_migration_table',
entities: [
Expand Down
226 changes: 226 additions & 0 deletions src/database/migration/1716044120271-supportOpenAIAPIHost.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
import { MigrationInterface, QueryRunner } from 'typeorm'

export class supportOpenAIAPIHost1716044120271 implements MigrationInterface {
name = 'supportOpenAIAPIHost1716044120271'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE "temporary_historyMessagePayloadEntity" (
"id" uuid PRIMARY KEY NOT NULL,
"payload" varchar NOT NULL,
"payloadType" varchar NOT NULL DEFAULT ('JSON'),
"createAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
)
`)
await queryRunner.query(`
INSERT INTO "temporary_historyMessagePayloadEntity"("id", "payload", "payloadType", "createAt")
SELECT "id",
"payload",
"payloadType",
"createAt"
FROM "historyMessagePayloadEntity"
`)
await queryRunner.query(`
DROP TABLE "historyMessagePayloadEntity"
`)
await queryRunner.query(`
ALTER TABLE "temporary_historyMessagePayloadEntity"
RENAME TO "historyMessagePayloadEntity"
`)
await queryRunner.query(`
CREATE TABLE "temporary_SettingEntity" (
"id" varchar PRIMARY KEY NOT NULL,
"width" integer NOT NULL DEFAULT (1025),
"height" integer NOT NULL DEFAULT (749),
"autoCheck" boolean NOT NULL DEFAULT (1),
"currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
"currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
"maxReconnectTimes" integer NOT NULL DEFAULT (10),
"autoResub" boolean NOT NULL DEFAULT (1),
"syncOsTheme" boolean NOT NULL DEFAULT (0),
"multiTopics" boolean NOT NULL DEFAULT (1),
"jsonHighlight" boolean NOT NULL DEFAULT (1),
"openAIAPIKey" varchar NOT NULL DEFAULT (''),
"model" varchar NOT NULL DEFAULT ('gpt-3.5-turbo'),
"enableCopilot" boolean NOT NULL DEFAULT (1),
"logLevel" varchar CHECK(logLevel IN ('debug', 'info', 'warn', 'error')) NOT NULL DEFAULT ('info'),
"openAIAPIHost" varchar NOT NULL DEFAULT ('https://api.openai.com/v1')
)
`)
await queryRunner.query(`
INSERT INTO "temporary_SettingEntity"(
"id",
"width",
"height",
"autoCheck",
"currentLang",
"currentTheme",
"maxReconnectTimes",
"autoResub",
"syncOsTheme",
"multiTopics",
"jsonHighlight",
"openAIAPIKey",
"model",
"enableCopilot",
"logLevel"
)
SELECT "id",
"width",
"height",
"autoCheck",
"currentLang",
"currentTheme",
"maxReconnectTimes",
"autoResub",
"syncOsTheme",
"multiTopics",
"jsonHighlight",
"openAIAPIKey",
"model",
"enableCopilot",
"logLevel"
FROM "SettingEntity"
`)
await queryRunner.query(`
DROP TABLE "SettingEntity"
`)
await queryRunner.query(`
ALTER TABLE "temporary_SettingEntity"
RENAME TO "SettingEntity"
`)
await queryRunner.query(`
CREATE TABLE "temporary_historyMessagePayloadEntity" (
"id" varchar PRIMARY KEY NOT NULL,
"payload" varchar NOT NULL,
"payloadType" varchar NOT NULL DEFAULT ('JSON'),
"createAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
)
`)
await queryRunner.query(`
INSERT INTO "temporary_historyMessagePayloadEntity"("id", "payload", "payloadType", "createAt")
SELECT "id",
"payload",
"payloadType",
"createAt"
FROM "historyMessagePayloadEntity"
`)
await queryRunner.query(`
DROP TABLE "historyMessagePayloadEntity"
`)
await queryRunner.query(`
ALTER TABLE "temporary_historyMessagePayloadEntity"
RENAME TO "historyMessagePayloadEntity"
`)
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE "historyMessagePayloadEntity"
RENAME TO "temporary_historyMessagePayloadEntity"
`)
await queryRunner.query(`
CREATE TABLE "historyMessagePayloadEntity" (
"id" uuid PRIMARY KEY NOT NULL,
"payload" varchar NOT NULL,
"payloadType" varchar NOT NULL DEFAULT ('JSON'),
"createAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
)
`)
await queryRunner.query(`
INSERT INTO "historyMessagePayloadEntity"("id", "payload", "payloadType", "createAt")
SELECT "id",
"payload",
"payloadType",
"createAt"
FROM "temporary_historyMessagePayloadEntity"
`)
await queryRunner.query(`
DROP TABLE "temporary_historyMessagePayloadEntity"
`)
await queryRunner.query(`
ALTER TABLE "SettingEntity"
RENAME TO "temporary_SettingEntity"
`)
await queryRunner.query(`
CREATE TABLE "SettingEntity" (
"id" varchar PRIMARY KEY NOT NULL,
"width" integer NOT NULL DEFAULT (1025),
"height" integer NOT NULL DEFAULT (749),
"autoCheck" boolean NOT NULL DEFAULT (1),
"currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
"currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
"maxReconnectTimes" integer NOT NULL DEFAULT (10),
"autoResub" boolean NOT NULL DEFAULT (1),
"syncOsTheme" boolean NOT NULL DEFAULT (0),
"multiTopics" boolean NOT NULL DEFAULT (1),
"jsonHighlight" boolean NOT NULL DEFAULT (1),
"openAIAPIKey" varchar NOT NULL DEFAULT (''),
"model" varchar NOT NULL DEFAULT ('gpt-3.5-turbo'),
"enableCopilot" boolean NOT NULL DEFAULT (1),
"logLevel" varchar CHECK(logLevel IN ('debug', 'info', 'warn', 'error')) NOT NULL DEFAULT ('info')
)
`)
await queryRunner.query(`
INSERT INTO "SettingEntity"(
"id",
"width",
"height",
"autoCheck",
"currentLang",
"currentTheme",
"maxReconnectTimes",
"autoResub",
"syncOsTheme",
"multiTopics",
"jsonHighlight",
"openAIAPIKey",
"model",
"enableCopilot",
"logLevel"
)
SELECT "id",
"width",
"height",
"autoCheck",
"currentLang",
"currentTheme",
"maxReconnectTimes",
"autoResub",
"syncOsTheme",
"multiTopics",
"jsonHighlight",
"openAIAPIKey",
"model",
"enableCopilot",
"logLevel"
FROM "temporary_SettingEntity"
`)
await queryRunner.query(`
DROP TABLE "temporary_SettingEntity"
`)
await queryRunner.query(`
ALTER TABLE "historyMessagePayloadEntity"
RENAME TO "temporary_historyMessagePayloadEntity"
`)
await queryRunner.query(`
CREATE TABLE "historyMessagePayloadEntity" (
"id" uuid PRIMARY KEY NOT NULL,
"payload" varchar NOT NULL,
"payloadType" varchar NOT NULL DEFAULT ('JSON'),
"createAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
)
`)
await queryRunner.query(`
INSERT INTO "historyMessagePayloadEntity"("id", "payload", "payloadType", "createAt")
SELECT "id",
"payload",
"payloadType",
"createAt"
FROM "temporary_historyMessagePayloadEntity"
`)
await queryRunner.query(`
DROP TABLE "temporary_historyMessagePayloadEntity"
`)
}
}
3 changes: 3 additions & 0 deletions src/database/models/SettingEntity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export default class SettingEntity {
@Column({ type: 'boolean', default: true })
enableCopilot!: boolean

@Column({ type: 'varchar', default: 'https://api.openai.com/v1' })
openAIAPIHost!: string

@Column({ type: 'varchar', default: '' })
openAIAPIKey!: string

Expand Down
1 change: 1 addition & 0 deletions src/store/getter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const getters = {
multiTopics: (state: State) => state.app.multiTopics,
jsonHighlight: (state: State) => state.app.jsonHighlight,
enableCopilot: (state: State) => state.app.enableCopilot,
openAIAPIHost: (state: State) => state.app.openAIAPIHost,
openAIAPIKey: (state: State) => state.app.openAIAPIKey,
model: (state: State) => state.app.model,
isPrismButtonAdded: (state: State) => state.app.isPrismButtonAdded,
Expand Down
11 changes: 11 additions & 0 deletions src/store/modules/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const SET_CURRENT_CONNECTION_ID = 'SET_CURRENT_CONNECTION_ID'
const TOGGLE_SYNC_OS_THEME = 'TOGGLE_SYNC_OS_THEME'
const TOGGLE_MULTI_TOPICS = 'TOGGLE_MULTI_TOPICS'
const TOGGLE_JSON_HIGHLIGHT = 'TOGGLE_JSON_HIGHLIGHT'
const SET_OPEN_AI_HOST = 'SET_OPEN_AI_HOST'
const SET_OPEN_AI_API_KEY = 'SET_OPEN_AI_API_KEY'
const SET_MODEL = 'SET_MODEL'
const SET_INSERT_BUTTON_ADDED = 'SET_INSERT_BUTTON_ADDED'
Expand Down Expand Up @@ -56,6 +57,7 @@ const app = {
currentScript: null,
currentConnectionId: null,
enableCopilot: settingData.enableCopilot,
openAIAPIHost: settingData.openAIAPIHost || 'https://api.openai.com/v1',
openAIAPIKey: settingData.openAIAPIKey || '',
model: settingData.model || 'gpt-3.5-turbo',
isPrismButtonAdded: false,
Expand Down Expand Up @@ -141,6 +143,9 @@ const app = {
[SET_CURRENT_CONNECTION_ID](state: App, currentConnectionId: string) {
state.currentConnectionId = currentConnectionId
},
[SET_OPEN_AI_HOST](state: App, openAIHost: string) {
state.openAIAPIHost = openAIHost
},
[SET_OPEN_AI_API_KEY](state: App, openAIAPIKey: string) {
state.openAIAPIKey = openAIAPIKey
},
Expand Down Expand Up @@ -246,6 +251,12 @@ const app = {
settingData.enableCopilot = payload.enableCopilot
await settingService.update(payload)
},
async SET_OPEN_AI_HOST({ commit }: any, payload: App) {
const { settingService } = useServices()
commit(SET_OPEN_AI_HOST, payload.openAIAPIHost)
settingData.openAIAPIHost = payload.openAIAPIHost
await settingService.update(payload)
},
async SET_OPEN_AI_API_KEY({ commit }: any, payload: App) {
const { settingService } = useServices()
commit(SET_OPEN_AI_API_KEY, payload.openAIAPIKey)
Expand Down
2 changes: 2 additions & 0 deletions src/types/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ declare global {
connectionTreeState: ConnectionTreeStateMap
jsonHighlight: boolean
enableCopilot: boolean
openAIAPIHost: string
openAIAPIKey: string
model: AIModel
isPrismButtonAdded: boolean
Expand Down Expand Up @@ -388,6 +389,7 @@ declare global {
| 'gpt-4-32k-0613'
| 'gpt-4-turbo'
| 'gpt-4o'
| string

interface AreaLineSeriesData {
xData: string[]
Expand Down
Loading
Loading