aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ollama.tsx13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/ollama.tsx b/src/ollama.tsx
index f792613..a59b03b 100644
--- a/src/ollama.tsx
+++ b/src/ollama.tsx
@@ -101,10 +101,8 @@ async function ollamaGenerate(prompt: string, parameters?: OllamaGenerateParamet
throw new Error("Error in Ollama request: " + response.statusText)
}
const data = await response.json()
-
- console.log(data)
- return data.response
+ return data
} catch (e: any) {
console.log(e)
logseq.UI.showMsg("Error in Ollama request")
@@ -212,9 +210,14 @@ export async function promptFromBlockEvent(b: IHookEvent) {
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);
+ const result = await ollamaGenerate(prompt, params);
- await logseq.Editor.updateBlock(answerBlock!.uuid, `${response}`)
+ console.log(result)
+
+ if (params.usecontext) {
+ await logseq.Editor.upsertBlockProperty(currentBlock!.uuid, 'ollama-generate-context', result.context)
+ }
+ await logseq.Editor.updateBlock(answerBlock!.uuid, `${result.response}`)
} catch (e: any) {
logseq.UI.showMsg(e.toString(), 'warning')
console.error(e)