API URL setting, system prompt override

rpggio · Sep 19, 2023 · b373618 · b373618
1 parent 5b831a7
commit b373618
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/src/ChatStreamPlugin.ts b/src/ChatStreamPlugin.ts
@@ -181,6 +181,7 @@ export class ChatStreamPlugin extends Plugin {
          try {
             const generated = await getChatGPTCompletion(
                settings.apiKey,
+					settings.apiUrl,
                settings.apiModel,
                messages,
                {

diff --git a/src/openai/chatGPT.ts b/src/openai/chatGPT.ts
@@ -1,6 +1,8 @@
 import { request, RequestUrlParam } from "obsidian"
 import { openai } from './chatGPT-types'
 
+export const OPENAI_COMPLETIONS_URL = `https://api.openai.com/v1/chat/completions`
+
 export const CHAT_MODELS = {
 	GPT35: {
 		name: 'gpt-3.5-turbo',
@@ -40,11 +42,11 @@ export const defaultChatGPTSettings: Partial<openai.CreateChatCompletionRequest>
 
 export async function getChatGPTCompletion(
 	apiKey: string,
+	apiUrl: string,
 	model: openai.CreateChatCompletionRequest['model'],
 	messages: openai.CreateChatCompletionRequest['messages'],
 	settings?: Partial<Omit<openai.CreateChatCompletionRequest, 'messages' | 'model'>>
 ): Promise<string | undefined> {
-	const apiUrl = `https://api.openai.com/v1/chat/completions`
 	const headers = {
 		Authorization: `Bearer ${apiKey}`,
 		"Content-Type": "application/json",

diff --git a/src/settings/ChatStreamSettings.ts b/src/settings/ChatStreamSettings.ts
@@ -1,11 +1,16 @@
-import { CHAT_MODELS } from 'src/openai/chatGPT'
+import { CHAT_MODELS, OPENAI_COMPLETIONS_URL } from 'src/openai/chatGPT'
 
 export interface ChatStreamSettings {
 	/**
 	 * The API key to use when making requests
 	 */
 	apiKey: string
 
+	/**
+	 * The URL endpoint for chat
+	 */
+	apiUrl: string
+
 	/**
 	 * The GPT model to use
 	 */
@@ -53,6 +58,7 @@ Use step-by-step reasoning. Be brief.
 
 export const DEFAULT_SETTINGS: ChatStreamSettings = {
 	apiKey: '',
+	apiUrl: OPENAI_COMPLETIONS_URL,
 	apiModel: CHAT_MODELS.GPT35.name,
 	temperature: 1,
 	systemPrompt: DEFAULT_SYSTEM_PROMPT,

diff --git a/src/settings/SettingsTab.ts b/src/settings/SettingsTab.ts
@@ -48,7 +48,7 @@ export class SettingsTab extends PluginSettingTab {
 
 		new Setting(containerEl)
 			.setName('System prompt')
-			.setDesc('The system prompt sent with each request to the API.')
+			.setDesc(`The system prompt sent with each request to the API. \n(Note: you can override this by beginning a note stream with a note starting 'SYSTEM PROMPT'. The remaining content of that note will be used as system prompt.)`)
 			.addTextArea((component) => {
 				component.inputEl.rows = 6
 				component.inputEl.style.width = '300px'
@@ -120,6 +120,23 @@ export class SettingsTab extends PluginSettingTab {
 					})
 			)
 
+		new Setting(containerEl)
+			.setName("API URL")
+			.setDesc(
+				"The chat completions URL to use. You probably won't need to change this."
+			)
+			.addText((text) => {
+				text.inputEl.style.width = '300px'
+				text
+					.setPlaceholder("API URL")
+					.setValue(this.plugin.settings.apiUrl)
+					.onChange(async (value) => {
+						this.plugin.settings.apiUrl = value
+						await this.plugin.saveSettings()
+					})
+			}
+			)
+
 		new Setting(containerEl)
 			.setName("Debug output")
 			.setDesc(