obsidian-plugin/fbarrca_obsidian-inlineAI
1
0
Fork 0
mirror of https://github.com/fbarrca/obsidian-inlineAI.git synced 2026-07-22 11:50:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/FBarrca/obsidian-inlineAI

Browse source
This commit is contained in:
FBarrca 2025-01-12 01:37:06 +01:00
commit f8ba30fed9
2 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/api.ts
View file

@ -50,6 +50,24 @@ export class ChatApiManager {
// Add other necessary configurations for Ollama if needed
});
case "custom":
if (!settings.apiKey) {
throw new Error("An API key is required for custom providers.");
}
if (!settings.customURL) {
throw new Error("A custom base URL is required for custom providers.");
}
// Use ChatOpenAI with configuration pointing to user’s custom URL
return new ChatOpenAI({
modelName: settings.model,
temperature: 0,
openAIApiKey: settings.apiKey,
// 'configuration.basePath' is the recognized property
configuration: {
baseURL: settings.customURL.trim(),
},
});
default:
throw new Error(`Unsupported provider: ${settings.provider}`);
}

43
src/settings.ts
View file

@ -4,9 +4,10 @@ import { cursorPrompt, selectionPrompt } from "./default_prompts";
// Interface for the settings
export interface InlineAISettings {
provider: "openai" | "ollama";
provider: "openai" | "ollama" | "custom";
model: string;
apiKey?: string;
customURL?: string; // Add a custom URL field
selectionPrompt: string;
cursorPrompt: string;
}
@ -16,6 +17,7 @@ export const DEFAULT_SETTINGS: InlineAISettings = {
provider: "ollama",
model: "llama3.2",
apiKey: "",
customURL: "",
selectionPrompt: selectionPrompt,
cursorPrompt: cursorPrompt,
};
@ -36,14 +38,15 @@ export class InlineAISettingsTab extends PluginSettingTab {
// Provider setting
new Setting(containerEl)
.setName("Provider")
.setDesc("Choose between OpenAI or Ollama as your provider.")
.addDropdown(dropdown =>
.setDesc("Choose between OpenAI, Ollama, or a custom OpenAI-compatible endpoint.")
.addDropdown((dropdown) =>
dropdown
.addOption("openai", "OpenAI")
.addOption("ollama", "Ollama")
.addOption("custom", "Custom/OpenAI-compatible")
.setValue(this.plugin.settings.provider)
.onChange(async (value) => {
this.plugin.settings.provider = value as "openai" | "ollama";
this.plugin.settings.provider = value as "openai" | "ollama" | "custom";
await this.plugin.saveSettings();
this.display(); // Refresh to update the API key field visibility
})
@ -55,7 +58,7 @@ export class InlineAISettingsTab extends PluginSettingTab {
.setDesc("Specify the model to use.")
.addText(text =>
text
.setPlaceholder("e.g., text-davinci-003")
.setPlaceholder("e.g., gpt-4o-mini")
.setValue(this.plugin.settings.model)
.onChange(async (value) => {
this.plugin.settings.model = value;
@ -63,12 +66,14 @@ export class InlineAISettingsTab extends PluginSettingTab {
})
);
// API Key setting (only for OpenAI)
if (this.plugin.settings.provider === "openai") {
// API Key setting (conditionally displayed for OpenAI suported endpoints
if (this.plugin.settings.provider === "openai" ||
this.plugin.settings.provider === "custom"
) {
new Setting(containerEl)
.setName("OpenAI API Key")
.setDesc("Enter your OpenAI API key.")
.addText(text =>
.setName("API Key")
.setDesc("Enter your API key.")
.addText((text) =>
text
.setPlaceholder("sk-...")
.setValue(this.plugin.settings.apiKey || "")
@ -79,6 +84,24 @@ export class InlineAISettingsTab extends PluginSettingTab {
);
}
/**
* If the user chooses 'custom', show a field for the base endpoint URL.
*/
if (this.plugin.settings.provider === "custom") {
new Setting(containerEl)
.setName("Custom Endpoint")
.setDesc("Enter your OpenAI-compatible base URL (e.g. https://api.groq.com/openai/v1).")
.addText((text) =>
text
.setPlaceholder("https://api.mycustomhost.com/v1")
.setValue(this.plugin.settings.customURL || "")
.onChange(async (value) => {
this.plugin.settings.customURL = value;
await this.plugin.saveSettings();
})
);
}
// Advanced Section
new Setting(containerEl)
.setName("Advanced")