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.

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

Jump to bottom

When prompt from block, use the properties to pass #9

Merged
merged 1 commit into from
Dec 2, 2023
Merged

When prompt from block, use the properties to pass #9

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
64 changes: 62 additions & 2 deletions src/ollama.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,50 @@ export async function getPageContentFromBlock(b: BlockEntity): Promise<string> {
return blockContents.join(" ");
}

type OllamaGenerateParameters = {
model?: string;
[key: string]: any;
}

async function ollamaGenerate(prompt: string, parameters?: OllamaGenerateParameters) {

if (!logseq.settings) {
throw new Error("Couldn't find ollama-logseq settings")
}

let params = parameters || {};
if (params.model === undefined) {
params.model = logseq.settings.model;
}
params.prompt = prompt
params.stream = false

console.log(params)

try {
const response = await fetch(`http://${logseq.settings.host}/api/generate`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(params)
})
if (!response.ok) {
console.log("Error in Ollama request: " + response.statusText)
logseq.UI.showMsg("Error in Ollama request")
throw new Error("Error in Ollama request: " + response.statusText)
}
const data = await response.json()

console.log(data)

return data.response
} catch (e: any) {
console.log(e)
logseq.UI.showMsg("Error in Ollama request")
}
}

async function promptLLM(prompt: string) {
if (!logseq.settings) {
throw new Error("Couldn't find logseq settings");
Expand Down Expand Up @@ -149,11 +193,27 @@ export async function summarizeBlock() {
}
}

async function getOllamaParametersFromBlockProperties(b: BlockEntity) {
const properties = await logseq.Editor.getBlockProperties(b.uuid);
omagdy7 marked this conversation as resolved.
Show resolved Hide resolved
const ollamaParameters: OllamaGenerateParameters = {}
const prefix = 'ollamaGenerate'
for (const property in properties) {
if (property.startsWith(prefix)) {
const key = property.replace(prefix, '').toLowerCase()
ollamaParameters[key] = properties[property]
}
}
return ollamaParameters
}

export async function promptFromBlockEvent(b: IHookEvent) {
try {
const currentBlock = await logseq.Editor.getBlock(b.uuid)
const answerBlock = await logseq.Editor.insertBlock(currentBlock!.uuid, '⌛Generating ...', { before: false })
const response = await promptLLM(`${currentBlock!.content}`);
const answerBlock = await logseq.Editor.insertBlock(currentBlock!.uuid, '🦙Generating ...', { before: false })
const params = await getOllamaParametersFromBlockProperties(currentBlock!)
const prompt = currentBlock!.content.replace(/^.*::.*$/gm, '') // nasty hack to remove properties from block content
const response = await ollamaGenerate(prompt, params);

await logseq.Editor.updateBlock(answerBlock!.uuid, `${response}`)
} catch (e: any) {
logseq.UI.showMsg(e.toString(), 'warning')
Expand Down