From af8c4af45e25e0633acbc874f5bc044aed302967 Mon Sep 17 00:00:00 2001 From: Pedro Cuenca Date: Tue, 7 Jan 2025 09:47:28 +0100 Subject: [PATCH 1/3] Fix prompt from file --- Tools/llm-tool/LLMTool.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/llm-tool/LLMTool.swift b/Tools/llm-tool/LLMTool.swift index 48176a3..1c442c4 100644 --- a/Tools/llm-tool/LLMTool.swift +++ b/Tools/llm-tool/LLMTool.swift @@ -212,7 +212,7 @@ struct EvaluateCommand: AsyncParsableCommand { private func userInput(modelConfiguration: ModelConfiguration) -> UserInput { // prompt and images - let prompt = generate.prompt ?? modelConfiguration.defaultPrompt + let prompt = try? generate.resolvePrompt(configuration: modelConfiguration) ?? modelConfiguration.defaultPrompt let images = image.map { UserInput.Image.url($0) } var input = UserInput(prompt: prompt, images: images) From 57492e719ce079236e10992cd4bef3e1fee99eed Mon Sep 17 00:00:00 2001 From: Pedro Cuenca Date: Tue, 7 Jan 2025 10:08:14 +0100 Subject: [PATCH 2/3] Fix expression --- Tools/llm-tool/LLMTool.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/llm-tool/LLMTool.swift b/Tools/llm-tool/LLMTool.swift index 1c442c4..20afe78 100644 --- a/Tools/llm-tool/LLMTool.swift +++ b/Tools/llm-tool/LLMTool.swift @@ -212,7 +212,7 @@ struct EvaluateCommand: AsyncParsableCommand { private func userInput(modelConfiguration: ModelConfiguration) -> UserInput { // prompt and images - let prompt = try? generate.resolvePrompt(configuration: modelConfiguration) ?? modelConfiguration.defaultPrompt + let prompt = (try? generate.resolvePrompt(configuration: modelConfiguration)) ?? modelConfiguration.defaultPrompt let images = image.map { UserInput.Image.url($0) } var input = UserInput(prompt: prompt, images: images) From 0d57ada52939509d398a9531199613cc907b968a Mon Sep 17 00:00:00 2001 From: Pedro Cuenca Date: Wed, 8 Jan 2025 13:01:03 +0100 Subject: [PATCH 3/3] swift-format --- Tools/llm-tool/LLMTool.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tools/llm-tool/LLMTool.swift b/Tools/llm-tool/LLMTool.swift index 20afe78..13dc0eb 100644 --- a/Tools/llm-tool/LLMTool.swift +++ b/Tools/llm-tool/LLMTool.swift @@ -212,7 +212,9 @@ struct EvaluateCommand: AsyncParsableCommand { private func userInput(modelConfiguration: ModelConfiguration) -> UserInput { // prompt and images - let prompt = (try? generate.resolvePrompt(configuration: modelConfiguration)) ?? modelConfiguration.defaultPrompt + let prompt = + (try? generate.resolvePrompt(configuration: modelConfiguration)) + ?? modelConfiguration.defaultPrompt let images = image.map { UserInput.Image.url($0) } var input = UserInput(prompt: prompt, images: images)