Skip to content

[DO NOT MERGE] Fix frame system serialize main #5212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

[DO NOT MERGE] Fix frame system serialize main #5212

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bebe4f6
fix bug in frame system serialization
gvaradarajan Jul 30, 2025
56d13bf
fixes, more tests incoming
gvaradarajan Jul 31, 2025
28d7529
missed a spot
gvaradarajan Jul 31, 2025
81104f6
add other frame types to test + fixes
gvaradarajan Aug 1, 2025
1aa713b
oops
gvaradarajan Aug 1, 2025
2c1bbf7
fix not allowing lack of model config
gvaradarajan Aug 4, 2025
ead5423
add roundtrip tests for all frame implementers
gvaradarajan Aug 4, 2025
cfb1727
oops
gvaradarajan Aug 4, 2025
bf376b0
use explicit comparisons over ShouldResemble
gvaradarajan Aug 4, 2025
f5af70d
implement better equality checks
gvaradarajan Aug 4, 2025
6b49d8d
lint
gvaradarajan Aug 5, 2025
e4c8551
some missed cleanup
gvaradarajan Aug 5, 2025
8cbcb14
changes
gvaradarajan Aug 5, 2025
0c4145d
add configurable epsilon
gvaradarajan Aug 5, 2025
6c24169
pass Limits by value
gvaradarajan Aug 5, 2025
49b4f25
implement nil checks
gvaradarajan Aug 5, 2025
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
missed a spot
  • Loading branch information
@gvaradarajan @nicksanford
gvaradarajan authored and nicksanford committed Aug 6, 2025
commit 28d75294e684536ec5bc9703d624e806f8545002
17 changes: 10 additions & 7 deletions referenceframe/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,21 +246,24 @@ func (m *SimpleModel) DoF() []Limit {
// MarshalJSON serializes a Model.
func (m *SimpleModel) MarshalJSON() ([]byte, error) {
type serialized struct {
Name string `json:"name"`
Model *ModelConfigJSON `json:"model"`
Name string `json:"name"`
Model *ModelConfigJSON `json:"model"`
Limits []Limit `json:"limits"`
}
ser := serialized{
Name: m.name,
Model: m.modelConfig,
Name: m.name,
Model: m.modelConfig,
Limits: m.limits,
}
return json.Marshal(ser)
}

// UnmarshalJSON deserializes a Model.
func (m *SimpleModel) UnmarshalJSON(data []byte) error {
type serialized struct {
Name string `json:"name"`
Model *ModelConfigJSON `json:"model"`
Name string `json:"name"`
Model *ModelConfigJSON `json:"model"`
Limits []Limit `json:"limits"`
}
var ser serialized
if err := json.Unmarshal(data, &ser); err != nil {
Expand All @@ -271,7 +274,7 @@ func (m *SimpleModel) UnmarshalJSON(data []byte) error {
if frameName == "" {
frameName = ser.Model.Name
}
m.baseFrame = &baseFrame{name: frameName}
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")
Expand Down