From 9bd00041fa1c82881299f34a5950f9edc2a7e66c Mon Sep 17 00:00:00 2001 From: Josh Yan Date: Thu, 27 Jun 2024 11:18:38 -0700 Subject: [PATCH] trim all params --- parser/parser.go | 11 ++--------- parser/parser_test.go | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/parser/parser.go b/parser/parser.go index fa60ebc0..7f566da4 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -124,8 +124,7 @@ func ParseFile(r io.Reader) (*File, error) { case stateComment, stateNil: // pass case stateValue: - s, ok := unquote(b.String()) - + s, ok := unquote(strings.TrimSpace(b.String())) if !ok || isSpace(r) { if _, err := b.WriteRune(r); err != nil { return nil, err @@ -159,13 +158,7 @@ func ParseFile(r io.Reader) (*File, error) { case stateComment, stateNil: // pass; nothing to flush case stateValue: - var s string - var ok bool - if cmd.Name == "model" { - s, ok = unquote(strings.TrimSpace(b.String())) - } else { - s, ok = unquote(b.String()) - } + s, ok := unquote(strings.TrimSpace(b.String())) if !ok { return nil, io.ErrUnexpectedEOF } diff --git a/parser/parser_test.go b/parser/parser_test.go index 35556515..3dc59223 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -108,7 +108,7 @@ func TestParseFileFrom(t *testing.T) { }, { "PARAMETER what the \nFROM lemons make lemonade ", - []Command{{Name: "what", Args: "the "}, {Name: "model", Args: "lemons make lemonade"}}, + []Command{{Name: "what", Args: "the"}, {Name: "model", Args: "lemons make lemonade"}}, nil, }, } @@ -424,7 +424,7 @@ func TestParseFileParameters(t *testing.T) { "mirostat_eta 1.0": {"mirostat_eta", "1.0"}, "penalize_newline true": {"penalize_newline", "true"}, "stop ### User:": {"stop", "### User:"}, - "stop ### User: ": {"stop", "### User: "}, + "stop ### User: ": {"stop", "### User:"}, "stop \"### User:\"": {"stop", "### User:"}, "stop \"### User: \"": {"stop", "### User: "}, "stop \"\"\"### User:\"\"\"": {"stop", "### User:"},