diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.tsx | 13 | ||||
| -rw-r--r-- | src/ollama.tsx | 80 |
2 files changed, 42 insertions, 51 deletions
diff --git a/src/App.tsx b/src/App.tsx index 6ab84a8..3e50f38 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,9 +4,7 @@ import { convertToFlashCardFromEvent, DivideTaskIntoSubTasksFromEvent, ollamaUI, - summarizeBlockFromEvent, - promptFromBlockEvent, - expandBlockEvent + promptFromBlockEventClosure } from "./ollama"; import { useAppVisible } from "./utils"; @@ -48,10 +46,13 @@ function App() { } logseq.Editor.registerSlashCommand("ollama", ollamaUI) logseq.Editor.registerBlockContextMenuItem("Ollama: Create a flash card", convertToFlashCardFromEvent) - logseq.Editor.registerBlockContextMenuItem("Ollama: Summarize block", summarizeBlockFromEvent) logseq.Editor.registerBlockContextMenuItem("Ollama: Divide into subtasks", DivideTaskIntoSubTasksFromEvent) - logseq.Editor.registerBlockContextMenuItem("Ollama: Prompt from Block", promptFromBlockEvent) - logseq.Editor.registerBlockContextMenuItem("Ollama: Expand Block", expandBlockEvent) + logseq.Editor.registerBlockContextMenuItem("Ollama: Prompt from Block", promptFromBlockEventClosure()) + logseq.Editor.registerBlockContextMenuItem("Ollama: Summarize block", promptFromBlockEventClosure("Summarize: ")) + logseq.Editor.registerBlockContextMenuItem("Ollama: 总结 Block", promptFromBlockEventClosure("总结: ")) + logseq.Editor.registerBlockContextMenuItem("Ollama: Expand Block", promptFromBlockEventClosure("Expand: ")) + logseq.Editor.registerBlockContextMenuItem("Ollama: 扩展 Block", promptFromBlockEventClosure("扩展: ")) + logseq.App.registerCommandShortcut( { "binding": logseq.settings.shortcut }, ollamaUI diff --git a/src/ollama.tsx b/src/ollama.tsx index c6db897..5ba47ab 100644 --- a/src/ollama.tsx +++ b/src/ollama.tsx @@ -198,46 +198,48 @@ async function getOllamaParametersFromBlockProperties(b: BlockEntity) { return ollamaParameters } -export async function promptFromBlockEvent(event: IHookEvent) { - try { - const currentBlock = await logseq.Editor.getBlock(event.uuid) - const answerBlock = await logseq.Editor.insertBlock(currentBlock!.uuid, '🦙Generating ...', { before: false }) - let p_params: OllamaGenerateParameters = {} - - if (currentBlock?.parent) { - let parentBlock = await logseq.Editor.getBlock(currentBlock.parent.id) - if (parentBlock) - p_params = await getOllamaParametersFromBlockProperties(parentBlock) - } - const c_params = await getOllamaParametersFromBlockProperties(currentBlock!) - const params = { ...p_params, ...c_params } +async function getOllamaParametersFromBlockAndParentProperties(b: BlockEntity) { + let p_params: OllamaGenerateParameters = {} + if (b.parent) { + let parentBlock = await logseq.Editor.getBlock(b.parent.id) + if (parentBlock) + p_params = await getOllamaParametersFromBlockProperties(parentBlock) + } + const b_params = await getOllamaParametersFromBlockProperties(b) + return {...p_params, ...b_params} +} + +async function promptFromBlock(block: BlockEntity, prefix?: string) { + const answerBlock = await logseq.Editor.insertBlock(block!.uuid, '🦙Generating ...', { before: false }) + const params = await getOllamaParametersFromBlockAndParentProperties(block!) + console.log("ollama params", params) - console.log("params", params) + let prompt = block!.content.replace(/^.*::.*$/gm, '') // hack to remove properties from block content + if (prefix) { + prompt = prefix + " " + prompt + } + console.log("prompt", prompt) - const prompt = currentBlock!.content.replace(/^.*::.*$/gm, '') // nasty hack to remove properties from block content - const result = await ollamaGenerate(prompt, params); + const result = await ollamaGenerate(prompt, params); - console.log("result", result) + console.log("ollama response", 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) + if (params.usecontext) { //FIXME: work out the best way to story context + await logseq.Editor.upsertBlockProperty(block!.uuid, 'ollama-generate-context', result.context) } + + await logseq.Editor.updateBlock(answerBlock!.uuid, `${result.response}`) } -export async function expandBlockEvent(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(`Expand: ${currentBlock!.content}`); - await logseq.Editor.updateBlock(answerBlock!.uuid, `${response}`) - } catch (e: any) { - logseq.UI.showMsg(e.toString(), 'warning') - console.error(e) +export function promptFromBlockEventClosure(prefix?: string) { + return async (event: IHookEvent) => { + try { + const currentBlock = await logseq.Editor.getBlock(event.uuid) + await promptFromBlock(currentBlock!, prefix) + } catch (e: any) { + logseq.UI.showMsg(e.toString(), 'warning') + console.error(e) + } } } @@ -259,18 +261,6 @@ export async function askAI(prompt: string, context: string) { } } -export async function summarizeBlockFromEvent(b: IHookEvent) { - try { - const currentBlock = await logseq.Editor.getBlock(b.uuid) - let summaryBlock = await logseq.Editor.insertBlock(currentBlock!.uuid, `⌛Summarizing Block...`, { before: true }) - const summary = await promptLLM(`Summarize the following ${currentBlock!.content}`); - await logseq.Editor.updateBlock(summaryBlock!.uuid, `Summary: ${summary}`) - } catch (e: any) { - logseq.App.showMsg(e.toString(), 'warning') - console.error(e) - } -} - export async function convertToFlashCard(uuid: string, blockContent: string) { try { const questionBlock = await logseq.Editor.insertBlock(uuid, "⌛Genearting question....", { before: false }) |