baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Incorporate code review improvements

Browse source
This commit is contained in:
Mohit Gaur 2023-07-25 22:52:23 +05:30
parent ed89da92b4
commit f5f79049c2
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
parser/parser.go
View file

@ -2,14 +2,12 @@ package parser
import ( import (
"bufio" "bufio"
"bytes"
"errors" "errors"
"fmt" "fmt"
"io" "io"
"strings"
) )
const multilineString = `"""`
type Command struct { type Command struct {
Name string Name string
Args string Args string
@ -34,21 +32,23 @@ func Parse(reader io.Reader) ([]Command, error) {
continue continue
} }
switch strings.ToUpper(string(fields[0])) { switch string(bytes.ToUpper(fields[0])) {
case "FROM": case "FROM":
command.Name = "model" command.Name = "model"
command.Args = string(fields[1]) command.Args = string(fields[1])
// copy command for validation // copy command for validation
modelCommand = command modelCommand = command
case "LICENSE", "TEMPLATE", "SYSTEM", "PROMPT": case "LICENSE", "TEMPLATE", "SYSTEM", "PROMPT":
command.Name = strings.ToLower(string(fields[0])) command.Name = string(bytes.ToLower(fields[0]))
command.Args = string(fields[1]) command.Args = string(fields[1])
case "PARAMETER": case "PARAMETER":
fields = bytes.SplitN(fields[1], []byte(" "), 2) fields = bytes.SplitN(fields[1], []byte(" "), 2)
command.Name = string(fields[0]) command.Name = string(fields[0])
command.Args = string(fields[1]) command.Args = string(fields[1])
default: default:
return nil, fmt.Errorf("unknown command: %s", fields[0]) // log a warning for unknown commands
fmt.Printf("WARNING: Unknown command: %s\n", fields[0])
continue
} }
commands = append(commands, command) commands = append(commands, command)
@ -63,6 +63,8 @@ func Parse(reader io.Reader) ([]Command, error) {
} }
func scanModelfile(data []byte, atEOF bool) (advance int, token []byte, err error) { func scanModelfile(data []byte, atEOF bool) (advance int, token []byte, err error) {
const multilineString = `"""`
newline := bytes.IndexByte(data, '\n') newline := bytes.IndexByte(data, '\n')
if start := bytes.Index(data, []byte(multilineString)); start >= 0 && start < newline { if start := bytes.Index(data, []byte(multilineString)); start >= 0 && start < newline {