Skip to content

Commit aaf4e98

Browse files
committed
Clean fields when show final configuration
Signed-off-by: Qifan Deng <[email protected]>
1 parent 50cf9e8 commit aaf4e98

File tree

1 file changed

+38
-1
lines changed

1 file changed

+38
-1
lines changed

pkg/llm-d-inference-sim/simulator.go

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,44 @@ func (s *VllmSimulator) showConfig(tgtLgr logr.Logger) error {
720720
err := fmt.Errorf("target logger is nil, cannot show configuration")
721721
return err
722722
}
723-
cfgJSON, err := json.MarshalIndent(s.config, "", " ")
723+
cfgJSON, err := json.Marshal(s.config)
724+
if err != nil {
725+
return fmt.Errorf("failed to marshal configuration to JSON: %w", err)
726+
}
727+
728+
// clean LoraModulesString field
729+
var m map[string]interface{}
730+
err = json.Unmarshal(cfgJSON, &m)
731+
if err != nil {
732+
return fmt.Errorf("failed to unmarshal JSON to map: %w", err)
733+
}
734+
m["lora-modules"] = m["LoraModules"]
735+
delete(m, "LoraModules")
736+
if m["lora-modules"] == nil {
737+
m["lora-modules"] = ""
738+
}
739+
delete(m, "LoraModulesString")
740+
741+
// clean fake-metrics field
742+
if m["fake-metrics"] != nil {
743+
var fakeMetricsM map[string]interface{}
744+
fakeMetricsJSON, err := json.Marshal(m["fake-metrics"])
745+
if err != nil {
746+
return fmt.Errorf("failed to marshal fake-metrics to JSON: %w", err)
747+
}
748+
err = json.Unmarshal(fakeMetricsJSON, &fakeMetricsM)
749+
if err != nil {
750+
return fmt.Errorf("failed to unmarshal fake-metrics to map: %w", err)
751+
}
752+
delete(fakeMetricsM, "LorasString")
753+
// set fake-metrics
754+
m["fake-metrics"] = fakeMetricsM
755+
} else {
756+
m["fake-metrics"] = ""
757+
}
758+
759+
// show in JSON
760+
cfgJSON, err = json.MarshalIndent(m, "", " ")
724761
if err != nil {
725762
return fmt.Errorf("failed to marshal configuration to JSON: %w", err)
726763
}

0 commit comments

Comments
 (0)