move option for initial prompt/attachment and system prompt; add option for adding initial messages

rainu · rainu · commit 384350d114f8 · 2025-06-19T15:34:50.000+02:00
diff --git a/frontend/src/store/history.ts b/frontend/src/store/history.ts
@@ -25,7 +25,7 @@ const buildSystemMessage = (): HistoryEntry => ({
 		Role: Role.System,
 		ContentParts: [{
 			Type: ContentType.Text,
-			Content: useConfigStore().profile.LLM.CallOptions.SystemPrompt,
+			Content: useConfigStore().profile.LLM.CallOptions.Prompt.System,
 		}],
 		Created: Math.floor(new Date().getTime() / 1000),
 	}),
diff --git a/frontend/src/views/Chat.vue b/frontend/src/views/Chat.vue
@@ -150,8 +150,8 @@ export default {
 			appbarHeight: 0,
 			progress: false,
 			input: {
-				prompt: this.$appProfile.UI.Prompt.InitValue,
-				attachments: this.$appProfile.UI.Prompt.InitAttachments,
+				prompt: this.$appProfile.LLM.CallOptions.Prompt.InitValue,
+				attachments: this.$appProfile.LLM.CallOptions.Prompt.InitAttachments,
 			} as ChatInputType,
 			outputStream: [
 				{
@@ -362,8 +362,8 @@ export default {
 			await this.processLLM(input, () => LLMAsk(args))
 		},
 		async waitForLLM() {
-			this.input.prompt = this.profile.UI.Prompt.InitValue
-			this.input.attachments = this.profile.UI.Prompt.InitAttachments
+			this.input.prompt = this.profile.LLM.CallOptions.Prompt.InitValue
+			this.input.attachments = this.profile.LLM.CallOptions.Prompt.InitAttachments
 			await this.processLLM(this.input, () => LLMWait())
 		},
 		async onInterrupt() {
@@ -423,7 +423,7 @@ export default {
 
 			AppMounted()
 				.then(() => {
-					if (this.$appProfile.UI.Prompt.InitValue && !stateAsString) {
+					if (this.$appProfile.LLM.CallOptions.Prompt.InitValue && !stateAsString) {
 						this.waitForLLM()
 					}
 				})
diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts
@@ -1837,8 +1837,58 @@ export namespace llm {
 		}
 	}
 	
+	export class Message {
+	    Role: string;
+	    Content: string;
+	
+	    static createFrom(source: any = {}) {
+	        return new Message(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.Role = source["Role"];
+	        this.Content = source["Content"];
+	    }
+	}
+	export class PromptConfig {
+	    System: string;
+	    InitMessages: Message[];
+	    InitValue: string;
+	    InitAttachments: string[];
+	
+	    static createFrom(source: any = {}) {
+	        return new PromptConfig(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.System = source["System"];
+	        this.InitMessages = this.convertValues(source["InitMessages"], Message);
+	        this.InitValue = source["InitValue"];
+	        this.InitAttachments = source["InitAttachments"];
+	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
+	}
 	export class CallOptionsConfig {
-	    SystemPrompt: string;
+	    Prompt: PromptConfig;
 	    MaxToken: number;
 	    Temperature: number;
 	    TopK: number;
@@ -1852,14 +1902,32 @@ export namespace llm {
 	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
-	        this.SystemPrompt = source["SystemPrompt"];
+	        this.Prompt = this.convertValues(source["Prompt"], PromptConfig);
 	        this.MaxToken = source["MaxToken"];
 	        this.Temperature = source["Temperature"];
 	        this.TopK = source["TopK"];
 	        this.TopP = source["TopP"];
 	        this.MinLength = source["MinLength"];
 	        this.MaxLength = source["MaxLength"];
 	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
 	}
 	export class DeepSeekConfig {
 	    APIKey: common.Secret;
@@ -2121,6 +2189,8 @@ export namespace llm {
 	
 	
 	
+	
+	
 
 }
 
@@ -2642,8 +2712,6 @@ export namespace model {
 	    }
 	}
 	export class PromptConfig {
-	    InitValue: string;
-	    InitAttachments: string[];
 	    MinRows?: number;
 	    MaxRows?: number;
 	    PinTop?: boolean;
@@ -2655,8 +2723,6 @@ export namespace model {
 	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
-	        this.InitValue = source["InitValue"];
-	        this.InitAttachments = source["InitAttachments"];
 	        this.MinRows = source["MinRows"];
 	        this.MaxRows = source["MaxRows"];
 	        this.PinTop = source["PinTop"];
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -81,37 +81,37 @@ func TestConfig_Parse(t *testing.T) {
 		},
 		{
 			name: "Set UI prompt value",
-			args: []string{"--ui.prompt.value=test"},
+			args: []string{"--llm.call.prompt.init-value=test"},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.UI.Prompt.InitValue = "test"
+				c.MainProfile.LLM.CallOptions.Prompt.InitValue = "test"
 			}),
 		},
 		{
 			name: "Set UI prompt value - shorthand",
 			args: []string{"-p=test"},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.UI.Prompt.InitValue = "test"
+				c.MainProfile.LLM.CallOptions.Prompt.InitValue = "test"
 			}),
 		},
 		{
 			name: "Set system prompt value",
-			args: []string{"--llm.call.system-prompt=test"},
+			args: []string{"--llm.call.prompt.system=test"},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.LLM.CallOptions.SystemPrompt = "test"
+				c.MainProfile.LLM.CallOptions.Prompt.System = "test"
 			}),
 		},
 		{
 			name: "Set UI prompt initial attachments",
-			args: []string{"--ui.prompt.attachments.[0]=file1.txt", "--ui.prompt.attachments.[1]=file2.txt"},
+			args: []string{"--llm.call.prompt.init-attachment.[0]=file1.txt", "--llm.call.prompt.init-attachment.[1]=file2.txt"},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.UI.Prompt.InitAttachments = []string{"file1.txt", "file2.txt"}
+				c.MainProfile.LLM.CallOptions.Prompt.InitAttachments = []string{"file1.txt", "file2.txt"}
 			}),
 		},
 		{
 			name: "Set UI prompt initial attachments - shorthand",
 			args: []string{"-a=file1.txt", "-a=file2.txt"},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.UI.Prompt.InitAttachments = []string{"file1.txt", "file2.txt"}
+				c.MainProfile.LLM.CallOptions.Prompt.InitAttachments = []string{"file1.txt", "file2.txt"}
 			}),
 		},
 		{
@@ -385,9 +385,9 @@ func TestConfig_Parse(t *testing.T) {
 		},
 		{
 			name: "Set environment variable for init prompt",
-			env:  []string{EnvironmentPrefix + "=--ui.prompt.value=test"},
+			env:  []string{EnvironmentPrefix + "=--llm.call.prompt.init-value=test"},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.UI.Prompt.InitValue = "test"
+				c.MainProfile.LLM.CallOptions.Prompt.InitValue = "test"
 			}),
 		},
 		{
@@ -470,11 +470,11 @@ func TestConfig_Parse(t *testing.T) {
 		{
 			name: "Set environment variable for UI prompt initial attachments",
 			env: []string{
-				EnvironmentPrefix + "=--ui.prompt.attachments.[1]=file2.txt",
-				EnvironmentPrefix + "=--ui.prompt.attachments.[0]=file1.txt",
+				EnvironmentPrefix + "=--llm.call.prompt.init-attachment.[1]=file2.txt",
+				EnvironmentPrefix + "=--llm.call.prompt.init-attachment.[0]=file1.txt",
 			},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.UI.Prompt.InitAttachments = []string{"file1.txt", "file2.txt"}
+				c.MainProfile.LLM.CallOptions.Prompt.InitAttachments = []string{"file1.txt", "file2.txt"}
 			}),
 		},
 		{
@@ -672,10 +672,10 @@ func TestConfig_Parse(t *testing.T) {
 		},
 		{
 			name: "Argument will override environment",
-			args: []string{"--ui.prompt.value=arg-prompt"},
-			env:  []string{EnvironmentPrefix + "=--ui.prompt.value=env-prompt"},
+			args: []string{"--llm.call.prompt.init-value=arg-prompt"},
+			env:  []string{EnvironmentPrefix + "=--llm.call.prompt.init-value=env-prompt"},
 			expected: modifiedConfig(func(c *model.Config) {
-				c.MainProfile.UI.Prompt.InitValue = "arg-prompt"
+				c.MainProfile.LLM.CallOptions.Prompt.InitValue = "arg-prompt"
 			}),
 		},
 		{
@@ -714,12 +714,12 @@ func TestConfig_Parse(t *testing.T) {
 			args: []string{"--profiles.test.description=test", "-P", "test", "-p", "What is the answer?"},
 			expected: modifiedConfig(func(c *model.Config) {
 				c.ActiveProfile = "test"
-				c.MainProfile.UI.Prompt.InitValue = "What is the answer?"
+				c.MainProfile.LLM.CallOptions.Prompt.InitValue = "What is the answer?"
 
 				testProfile := &model.Profile{}
 				yacl.NewConfig(testProfile).ApplyDefaults()
 				testProfile.Meta.Description = "test"
-				testProfile.UI.Prompt.InitValue = "What is the answer?"
+				testProfile.LLM.CallOptions.Prompt.InitValue = "What is the answer?"
 
 				c.Profiles = map[string]*model.Profile{
 					"test": testProfile,
diff --git a/internal/config/help.go b/internal/config/help.go
@@ -173,15 +173,19 @@ func printHelpConfig(output io.Writer) {
 					},
 				},
 				CallOptions: llm.CallOptionsConfig{
-					SystemPrompt: "You are a helpful assistant.",
+					Prompt: llm.PromptConfig{
+						System: "You are a helpful assistant.",
+					},
 				},
 			},
 		},
 		Profiles: map[string]*model.Profile{
 			"evil": {
 				LLM: llm.LLMConfig{
 					CallOptions: llm.CallOptionsConfig{
-						SystemPrompt: "You are a evil assistant.",
+						Prompt: llm.PromptConfig{
+							System: "You are a evil assistant.",
+						},
 					},
 				},
 			},
diff --git a/internal/config/model/llm/calloptions.go b/internal/config/model/llm/calloptions.go
@@ -6,13 +6,13 @@ import (
 )
 
 type CallOptionsConfig struct {
-	SystemPrompt string  `yaml:"system-prompt,omitempty" short:"S" usage:"System Prompt"`
-	MaxToken     int     `yaml:"max-token,omitempty" usage:"Max Token"`
-	Temperature  float64 `yaml:"temperature,omitempty" usage:"Temperature"`
-	TopK         int     `yaml:"top-k,omitempty" usage:"Top-K"`
-	TopP         float64 `yaml:"top-p,omitempty" usage:"Top-P"`
-	MinLength    int     `yaml:"min-length,omitempty" usage:"Min Length"`
-	MaxLength    int     `yaml:"max-length,omitempty" usage:"Max Length"`
+	Prompt      PromptConfig `yaml:"prompt,omitempty"`
+	MaxToken    int          `yaml:"max-token,omitempty" usage:"Max Token"`
+	Temperature float64      `yaml:"temperature,omitempty" usage:"Temperature"`
+	TopK        int          `yaml:"top-k,omitempty" usage:"Top-K"`
+	TopP        float64      `yaml:"top-p,omitempty" usage:"Top-P"`
+	MinLength   int          `yaml:"min-length,omitempty" usage:"Min Length"`
+	MaxLength   int          `yaml:"max-length,omitempty" usage:"Max Length"`
 }
 
 func (c *CallOptionsConfig) AsOptions() (opts []llms.CallOption) {
@@ -58,5 +58,9 @@ func (c *CallOptionsConfig) Validate() error {
 		return fmt.Errorf("LLM-Call Max Length")
 	}
 
+	if ve := c.Prompt.Validate(); ve != nil {
+		return ve
+	}
+
 	return nil
 }
diff --git a/internal/config/model/llm/general.go b/internal/config/model/llm/general.go
@@ -30,7 +30,7 @@ type LLMConfig struct {
 	DeepSeek    DeepSeekConfig    `yaml:"deepseek,omitempty" usage:"DeepSeek " llm:""`
 	Google      GoogleAIConfig    `yaml:"google,omitempty" usage:"Google " llm:""`
 
-	CallOptions CallOptionsConfig `yaml:"call,omitempty" usage:"Call option "`
+	CallOptions CallOptionsConfig `yaml:"call,omitempty"`
 	Tool        tools.Config      `yaml:"tool,omitempty"`
 }
 
diff --git a/internal/config/model/llm/prompt.go b/internal/config/model/llm/prompt.go
@@ -0,0 +1,50 @@
+package llm
+
+import (
+	"fmt"
+	"github.com/tmc/langchaingo/llms"
+)
+
+type PromptConfig struct {
+	System string `yaml:"system,omitempty" short:"S" usage:"System Prompt"`
+
+	InitMessages    []Message `yaml:"init-message,omitempty" usage:"initial message(s) to use: "`
+	InitValue       string    `yaml:"init-value,omitempty" short:"p" usage:"the initial prompt to use"`
+	InitAttachments []string  `yaml:"init-attachment,omitempty" short:"a" usage:"the initial attachment(s) to use"`
+}
+
+func (p *PromptConfig) Validate() error {
+	for _, message := range p.InitMessages {
+		if ve := message.Validate(); ve != nil {
+			return ve
+		}
+	}
+	return nil
+}
+
+func (p *PromptConfig) HasInitialValues() bool {
+	return p.InitValue != "" || len(p.InitMessages) > 0 || len(p.InitAttachments) > 0
+}
+
+type Message struct {
+	Role    llms.ChatMessageType `yaml:"role,omitempty"`
+	Content string               `yaml:"content,omitempty" usage:"content"`
+}
+
+func (m *Message) GetUsage(field string) string {
+	switch field {
+	case "Role":
+		return fmt.Sprintf("role (%s, %s)", llms.ChatMessageTypeHuman, llms.ChatMessageTypeAI)
+	}
+	return ""
+}
+
+func (m *Message) Validate() error {
+	if m.Role != llms.ChatMessageTypeHuman && m.Role != llms.ChatMessageTypeAI {
+		return fmt.Errorf("Invalid message role '%s', must be one of %s, %s!", m.Role, llms.ChatMessageTypeHuman, llms.ChatMessageTypeAI)
+	}
+	if m.Content == "" {
+		return fmt.Errorf("Message content is required!")
+	}
+	return nil
+}
diff --git a/internal/config/model/ui_prompt.go b/internal/config/model/ui_prompt.go
@@ -3,12 +3,10 @@ package model
 import "github.com/rainu/go-yacl"
 
 type PromptConfig struct {
-	InitValue       string   `yaml:"value,omitempty" short:"p" usage:"The (initial) prompt to use"`
-	InitAttachments []string `yaml:"attachments,omitempty" short:"a" usage:"The (initial) attachments to use"`
-	MinRows         *uint    `yaml:"min-rows,omitempty" usage:"The minimal number of rows the prompt should have"`
-	MaxRows         *uint    `yaml:"max-rows,omitempty" usage:"The maximal number of rows the prompt should have"`
-	PinTop          *bool    `yaml:"pin-top,omitempty" usage:"Pin the prompt input at the top of the window (otherwise pin at the bottom)"`
-	SubmitShortcut  Shortcut `yaml:"submit,omitempty" usage:"The shortcut for submit the prompt: "`
+	MinRows        *uint    `yaml:"min-rows,omitempty" usage:"The minimal number of rows the prompt should have"`
+	MaxRows        *uint    `yaml:"max-rows,omitempty" usage:"The maximal number of rows the prompt should have"`
+	PinTop         *bool    `yaml:"pin-top,omitempty" usage:"Pin the prompt input at the top of the window (otherwise pin at the bottom)"`
+	SubmitShortcut Shortcut `yaml:"submit,omitempty" usage:"The shortcut for submit the prompt: "`
 }
 
 func (p *PromptConfig) SetDefaults() {
diff --git a/internal/config/parser_yml_test.go b/internal/config/parser_yml_test.go
diff --git a/internal/controller/build.go b/internal/controller/build.go
diff --git a/internal/controller/vue.go b/internal/controller/vue.go

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ type LLMConfig struct {`
`30`	`30`	DeepSeek DeepSeekConfig `yaml:"deepseek,omitempty" usage:"DeepSeek " llm:""`
`31`	`31`	Google GoogleAIConfig `yaml:"google,omitempty" usage:"Google " llm:""`
`32`	`32`
`33`		- CallOptions CallOptionsConfig `yaml:"call,omitempty" usage:"Call option "`
	`33`	+ CallOptions CallOptionsConfig `yaml:"call,omitempty"`
`34`	`34`	Tool tools.Config `yaml:"tool,omitempty"`
`35`	`35`	`}`
`36`	`36`