feat(agents): support int and float cpu cfg values (#548)

Author: rektdeckard

cmd/lk/agent.go

@@ -110,7 +110,7 @@ var (
 					Before: createAgentClient,
 					Action: createAgentConfig,
 					Flags: []cli.Flag{
-						nameFlag(true),
+						nameFlag(false),
 						tomlFlag,
 					},
 					ArgsUsage: "[working-dir]",
@@ -388,7 +388,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
 		Secrets:     secrets,
 		Replicas:    int32(agentConfig.Replicas),
 		MaxReplicas: int32(agentConfig.MaxReplicas),
-		CpuReq:      agentConfig.CPU,
+		CpuReq:      string(agentConfig.CPU),
 	}
 
 	resp, err := agentsClient.CreateAgent(ctx, req)
@@ -455,8 +455,21 @@ func createAgentConfig(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
+	name := cmd.String("name")
+	if name == "" {
+		if err := huh.NewInput().
+			Title("Agent name").
+			Value(&name).
+			WithTheme(util.Theme).
+			Run(); err != nil {
+			return err
+		} else if name == "" {
+			return fmt.Errorf("name is required")
+		}
+	}
+
 	response, err := agentsClient.ListAgents(ctx, &lkproto.ListAgentsRequest{
-		AgentName: cmd.String("name"),
+		AgentName: name,
 	})
 	if err != nil {
 		if twerr, ok := err.(twirp.Error); ok {
@@ -481,7 +494,7 @@ func createAgentConfig(ctx context.Context, cmd *cli.Command) error {
 	agentConfig := &agentfs.AgentTOML{
 		ProjectSubdomain: matches[1],
 		Name:             agent.AgentName,
-		CPU:              regionAgent.CpuReq,
+		CPU:              agentfs.CPUString(regionAgent.CpuReq),
 		Replicas:         int(regionAgent.Replicas),
 		MaxReplicas:      int(regionAgent.MaxReplicas),
 	}
@@ -518,7 +531,7 @@ func deployAgent(ctx context.Context, cmd *cli.Command) error {
 		AgentName:   agentConfig.Name,
 		Secrets:     secrets,
 		Replicas:    int32(agentConfig.Replicas),
-		CpuReq:      agentConfig.CPU,
+		CpuReq:      string(agentConfig.CPU),
 		MaxReplicas: int32(agentConfig.MaxReplicas),
 	}
 
@@ -623,7 +636,7 @@ func updateAgent(ctx context.Context, cmd *cli.Command) error {
 	req := &lkproto.UpdateAgentRequest{
 		AgentName:   agentConfig.Name,
 		Replicas:    int32(agentConfig.Replicas),
-		CpuReq:      agentConfig.CPU,
+		CpuReq:      string(agentConfig.CPU),
 		MaxReplicas: int32(agentConfig.MaxReplicas),
 	}
 

cmd/lk/main.go

@@ -58,6 +58,7 @@ func main() {
 	}
 
 	app.Commands = append(app.Commands, AppCommands...)
+	app.Commands = append(app.Commands, AgentCommands...)
 	app.Commands = append(app.Commands, CloudCommands...)
 	app.Commands = append(app.Commands, ProjectCommands...)
 	app.Commands = append(app.Commands, RoomCommands...)
@@ -69,7 +70,6 @@ func main() {
 	app.Commands = append(app.Commands, SIPCommands...)
 	app.Commands = append(app.Commands, ReplayCommands...)
 	app.Commands = append(app.Commands, LoadTestCommands...)
-	app.Commands = append(app.Commands, AgentCommands...)
 
 	// Register cleanup hook for SIGINT, SIGTERM, SIGQUIT
 	ctx, stop := signal.NotifyContext(

pkg/agentfs/config-file.go

@@ -25,15 +25,31 @@ import (
 )
 
 type AgentTOML struct {
-	ProjectSubdomain string `toml:"project_subdomain"`
-	Name             string `toml:"name"`
-	CPU              string `toml:"cpu"`
-	Replicas         int    `toml:"replicas"`
-	MaxReplicas      int    `toml:"max_replicas"`
+	ProjectSubdomain string    `toml:"project_subdomain"`
+	Name             string    `toml:"name"`
+	CPU              CPUString `toml:"cpu"`
+	Replicas         int       `toml:"replicas"`
+	MaxReplicas      int       `toml:"max_replicas"`
 
 	Regions []string `toml:"regions"`
 }
 
+type CPUString string
+
+func (c *CPUString) UnmarshalTOML(v interface{}) error {
+	switch value := v.(type) {
+	case int64:
+		*c = CPUString(fmt.Sprintf("%d", value))
+	case float64:
+		*c = CPUString(fmt.Sprintf("%g", value))
+	case string:
+		*c = CPUString(value)
+	default:
+		return fmt.Errorf("invalid type for cpu: %T", v)
+	}
+	return nil
+}
+
 const (
 	AgentTOMLFile = "livekit.toml"
 )