Fix in go package

synw · Jan 16, 2025 · 05d6a88 · 05d6a88
1 parent d05add0
commit 05d6a88
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/codegen/golang/gen.go b/codegen/golang/gen.go
@@ -1,7 +1,9 @@
 package golang
 
 func Gen(content string) string {
-	codeStart := `package templates
+	codeStart := `// Autogenerated code: do not edit
+
+package templates
 
 var templates = `
 	return codeStart + "`" + content + "`"

diff --git a/codegen/ts/gen.go b/codegen/ts/gen.go
@@ -1,7 +1,9 @@
 package ts
 
 func Gen(content string) string {
-	codeStart := `import { LmTemplate } from "./interfaces.js";
+	codeStart := `// Autogenerated code: do not edit
+
+import { LmTemplate } from "./interfaces.js";
 
 const templates: Record<string, LmTemplate> = `
 	codeEnd := `;

diff --git a/go/templates/lmtemplate.go b/go/templates/lmtemplate.go
@@ -138,17 +138,15 @@ func (tpl *PromptTemplate) _buildUserBlock(msg *string) string {
 func (tpl *PromptTemplate) _buildAssistantBlock(msg *string, isShot bool) string {
 	var buf []string
 	assistantBlock := tpl.Assistant
-	if (tpl._extraAssistant != "") && !isShot {
-		assistantBlock += tpl._extraAssistant
+	buf = append(buf, assistantBlock)
+	if tpl.Linebreaks != nil && tpl.Linebreaks.Assistant != nil {
+		buf = append(buf, strings.Repeat("\n", *tpl.Linebreaks.Assistant))
 	}
 	if msg != nil {
-		buf = append(buf, assistantBlock)
 		buf = append(buf, *msg)
-	} else {
-		buf = append(buf, assistantBlock)
 	}
-	if tpl.Linebreaks != nil && tpl.Linebreaks.Assistant != nil {
-		buf = append(buf, strings.Repeat("\n", *tpl.Linebreaks.Assistant))
+	if (tpl._extraAssistant != "") && !isShot {
+		buf = append(buf, tpl._extraAssistant)
 	}
 	return strings.Join(buf, "")
 }