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

output type parsed from modelfile (#678)

Browse source
This commit is contained in:
Bruce MacDonald 2023-10-05 14:58:04 -04:00 committed by GitHub
parent 61ff1946e6
commit 2130c0708b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/types.go
View file

@ -227,12 +227,12 @@ func (opts *Options) FromMap(m map[string]interface{}) error {
// when JSON unmarshals numbers, it uses float64, not int // when JSON unmarshals numbers, it uses float64, not int
field.SetInt(int64(t)) field.SetInt(int64(t))
default: default:
log.Printf("could not convert model parameter %v to int, skipped", key) log.Printf("could not convert model parameter %v of type %T to int, skipped", key, val)
} }
case reflect.Bool: case reflect.Bool:
val, ok := val.(bool) val, ok := val.(bool)
if !ok { if !ok {
log.Printf("could not convert model parameter %v to bool, skipped", key) log.Printf("could not convert model parameter %v of type %T to bool, skipped", key, val)
continue continue
} }
field.SetBool(val) field.SetBool(val)
@ -240,14 +240,14 @@ func (opts *Options) FromMap(m map[string]interface{}) error {
// JSON unmarshals to float64 // JSON unmarshals to float64
val, ok := val.(float64) val, ok := val.(float64)
if !ok { if !ok {
log.Printf("could not convert model parameter %v to float32, skipped", key) log.Printf("could not convert model parameter %v of type %T to float32, skipped", key, val)
continue continue
} }
field.SetFloat(val) field.SetFloat(val)
case reflect.String: case reflect.String:
val, ok := val.(string) val, ok := val.(string)
if !ok { if !ok {
log.Printf("could not convert model parameter %v to string, skipped", key) log.Printf("could not convert model parameter %v of type %T to string, skipped", key, val)
continue continue
} }
field.SetString(val) field.SetString(val)
@ -255,7 +255,7 @@ func (opts *Options) FromMap(m map[string]interface{}) error {
// JSON unmarshals to []interface{}, not []string // JSON unmarshals to []interface{}, not []string
val, ok := val.([]interface{}) val, ok := val.([]interface{})
if !ok { if !ok {
log.Printf("could not convert model parameter %v to slice, skipped", key) log.Printf("could not convert model parameter %v of type %T to slice, skipped", key, val)
continue continue
} }
// convert []interface{} to []string // convert []interface{} to []string
@ -263,7 +263,7 @@ func (opts *Options) FromMap(m map[string]interface{}) error {
for i, item := range val { for i, item := range val {
str, ok := item.(string) str, ok := item.(string)
if !ok { if !ok {
log.Printf("could not convert model parameter %v to slice of strings, skipped", key) log.Printf("could not convert model parameter %v of type %T to slice of strings, skipped", key, item)
continue continue
} }
slice[i] = str slice[i] = str

2
server/images.go
View file

@ -831,7 +831,7 @@ func formatParams(params map[string][]string) (map[string]interface{}, error) {
return nil, fmt.Errorf("invalid int value %s", vals) return nil, fmt.Errorf("invalid int value %s", vals)
} }
out[key] = int(intVal) out[key] = intVal
case reflect.Bool: case reflect.Bool:
boolVal, err := strconv.ParseBool(vals[0]) boolVal, err := strconv.ParseBool(vals[0])
if err != nil { if err != nil {