Skip to content

Add Ollama Turbo support for interpreter #581

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.

Sign up for GitHub

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

Open
technovangelist wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Ollama Turbo support for interpreter #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions providers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@
{ "id": "Llama-3.3-70B-Instruct", "name": "Llama 3.3 70B" }
]
},
"ollamaturbo": {
"id": "ollamaturbo",
"name": "Ollama Turbo",
"apiKeyUrl": "https://ollama.com/settings/keys",
"apiKeyRequired": true,
"modelsList": "https://ollama.com/models",
"baseUrl": "https://ollama.com/api/chat",
"popularModels": [
{ "id": "gpt-oss:20b", "name": "GPT OSS 20B" },
{ "id": "gpt-oss:120b", "name": "GPT OSS 120B" }
]
},
"ollama": {
"id": "ollama",
"name": "Ollama",
Expand Down
40 changes: 30 additions & 10 deletions src/utils/interpreter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,36 @@ export async function sendToLLM(promptContext: string, content: string, promptVa
{ role: 'user', content: `
"${promptContext}"
"${JSON.stringify(promptContent)}"`
}
]
};
headers = {
...headers,
'HTTP-Referer': 'https://obsidian.md/',
'X-Title': 'Obsidian Web Clipper',
'Authorization': `Bearer ${provider.apiKey}`
};
} else if (provider.name.toLowerCase().includes('ollama')) {
}
]
};
headers = {
...headers,
'HTTP-Referer': 'https://obsidian.md/',
'X-Title': 'Obsidian Web Clipper',
'Authorization': `Bearer ${provider.apiKey}`
};
} else if (provider.name.toLowerCase().includes("turbo")) {
requestUrl = provider.baseUrl;
requestBody = {
model: model.providerModelId,
messages: [
{ role: 'system', content: systemContent },
{ role: 'user', content: `${promptContext}` },
{ role: 'user', content: `${JSON.stringify(promptContent)}` }
],
format: 'json',
num_ctx: 120000,
temperature: 0.5,
stream: false
};
headers = {
...headers,
'HTTP-Referer': 'https://obsidian.md/',
'X-Title': 'Obsidian Web Clipper',
'Authorization': `Bearer ${provider.apiKey}`
};
} else if (provider.name.toLowerCase().includes('ollama') && !provider.name.toLowerCase().includes("turbo")) {
requestUrl = provider.baseUrl;
requestBody = {
model: model.providerModelId,
Expand Down