Skip to content
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix not allowing lack of model config
  • Loading branch information
gvaradarajan authored and nicksanford committed Aug 6, 2025
commit 2c1bbf7217864e183e2815f7d0cb42e450d19c14
25 changes: 13 additions & 12 deletions referenceframe/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,20 +274,21 @@ func (m *SimpleModel) UnmarshalJSON(data []byte) error {
if frameName == "" {
frameName = ser.Model.Name
}

if ser.Model != nil {
parsed, err := ser.Model.ParseConfig(ser.Model.Name)
if err != nil {
return err
}
newModel, ok := parsed.(*SimpleModel)
if !ok {
return fmt.Errorf("could not parse config for simple model, name: %v", ser.Name)
}
m.OrdTransforms = newModel.OrdTransforms
}
m.baseFrame = &baseFrame{name: frameName, limits: ser.Limits}
m.modelConfig = ser.Model
if ser.Model == nil {
return fmt.Errorf("could not unmarshal simple model frame json, 'model' key missing")
}
parsed, err := ser.Model.ParseConfig(m.modelConfig.Name)
if err != nil {
return err
}
newModel, ok := parsed.(*SimpleModel)
if !ok {
return fmt.Errorf("could not parse config for simple model, name: %v", ser.Name)
}
m.OrdTransforms = newModel.OrdTransforms

return nil
}

Expand Down