Skip to content

Refactor for shared cloud agents lib #698

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

Merged
yoonsio merged 1 commit into from
Oct 1, 2025
Merged

Refactor for shared cloud agents lib #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 9 additions & 48 deletions cmd/lk/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"context"
"errors"
"fmt"
"net/http"
"os"
"path/filepath"
"regexp"
Expand All @@ -30,14 +29,12 @@ import (
"github.com/twitchtv/twirp"
"github.com/urfave/cli/v3"

livekitcli "github.com/livekit/livekit-cli/v2"
"github.com/livekit/livekit-cli/v2/pkg/agentfs"
"github.com/livekit/livekit-cli/v2/pkg/bootstrap"
"github.com/livekit/livekit-cli/v2/pkg/config"
"github.com/livekit/livekit-cli/v2/pkg/util"
lkproto "github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
lksdk "github.com/livekit/server-sdk-go/v2"
)

var (
Expand Down Expand Up @@ -320,7 +317,7 @@ var (
},
}
subdomainPattern = regexp.MustCompile(`^(?:https?|wss?)://([^.]+)\.`)
agentsClient *lksdk.AgentClient
agentsClient *agentfs.Client
ignoredSecrets = []string{
"LIVEKIT_API_KEY",
"LIVEKIT_API_SECRET",
Expand Down Expand Up @@ -356,12 +353,7 @@ func createAgentClient(ctx context.Context, cmd *cli.Command) (context.Context,
}
}

agentsClient, err = lksdk.NewAgentClient(project.URL, project.APIKey, project.APISecret, twirp.WithClientHooks(&twirp.ClientHooks{
RequestPrepared: func(ctx context.Context, req *http.Request) (context.Context, error) {
req.Header.Set("X-LIVEKIT-CLI-VERSION", livekitcli.Version)
return ctx, nil
},
}))
agentsClient, err = agentfs.New(agentfs.WithProject(project.URL, project.APIKey, project.APISecret))
if err != nil {
return ctx, err
}
Expand Down Expand Up @@ -477,7 +469,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
}
var err error
// Recreate the client with the new project
agentsClient, err = lksdk.NewAgentClient(project.URL, project.APIKey, project.APISecret)
agentsClient, err = agentfs.New(agentfs.WithProject(project.URL, project.APIKey, project.APISecret))
if err != nil {
return err
}
Expand Down Expand Up @@ -538,13 +530,8 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
}

regions := cmd.StringSlice("regions")

req := &lkproto.CreateAgentRequest{
Secrets: secrets,
Regions: regions,
}

resp, err := agentsClient.CreateAgent(ctx, req)
excludeFiles := []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}
resp, err := agentsClient.CreateAgent(ctx, workingDir, secrets, regions, excludeFiles)
if err != nil {
if twerr, ok := err.(twirp.Error); ok {
return fmt.Errorf("unable to create agent: %s", twerr.Msg())
Expand All @@ -557,16 +544,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
return err
}

err = agentfs.UploadTarball(workingDir, resp.PresignedUrl, []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}, projectType)
if err != nil {
return err
}

fmt.Printf("Created agent with ID [%s]\n", util.Accented(resp.AgentId))
err = agentfs.Build(ctx, resp.AgentId, project)
if err != nil {
return err
}

fmt.Println("Build completed - You can view build logs later with `lk agent logs --log-type=build`")

Expand All @@ -584,7 +562,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
return err
} else if viewLogs {
fmt.Println("Tailing runtime logs...safe to exit at any time")
return agentfs.LogHelper(ctx, lkConfig.Agent.ID, "deploy", project)
return agentsClient.StreamLogs(ctx, "deploy", lkConfig.Agent.ID, os.Stdout)
}
}
return nil
Expand Down Expand Up @@ -697,30 +675,14 @@ func deployAgent(ctx context.Context, cmd *cli.Command) error {
}
}

resp, err := agentsClient.DeployAgent(ctx, req)
if err != nil {
excludeFiles := []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}
if err := agentsClient.DeployAgent(ctx, agentId, workingDir, secrets, excludeFiles); err != nil {
if twerr, ok := err.(twirp.Error); ok {
return fmt.Errorf("unable to deploy agent: %s", twerr.Msg())
}
return fmt.Errorf("unable to deploy agent: %w", err)
}

if !resp.Success {
return fmt.Errorf("failed to deploy agent: %s", resp.Message)
}

presignedUrl := resp.PresignedUrl
err = agentfs.UploadTarball(workingDir, presignedUrl, []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}, projectType)
if err != nil {
return err
}

fmt.Printf("Updated agent [%s]\n", util.Accented(resp.AgentId))
err = agentfs.Build(ctx, resp.AgentId, project)
if err != nil {
return err
}

fmt.Println("Deployed agent")
return nil
}
Expand Down Expand Up @@ -887,8 +849,7 @@ func getLogs(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
err = agentfs.LogHelper(ctx, agentID, cmd.String("log-type"), project)
return err
return agentsClient.StreamLogs(ctx, cmd.String("log-type"), agentID, os.Stdout)
}

func deleteAgent(ctx context.Context, cmd *cli.Command) error {
Expand Down
44 changes: 4 additions & 40 deletions pkg/agentfs/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,62 +23,26 @@ import (
"net/http"
"net/url"
"os"
"regexp"
"strings"

bkclient "github.com/moby/buildkit/client"
"github.com/moby/buildkit/util/progress/progressui"
"golang.org/x/sync/errgroup"

"github.com/livekit/livekit-cli/v2/pkg/config"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/logger"
)

func Build(ctx context.Context, id string, projectConfig *config.ProjectConfig) error {
baseUrl := projectConfig.URL
if strings.HasPrefix(projectConfig.URL, "ws") {
baseUrl = strings.Replace(projectConfig.URL, "ws", "http", 1)
}

var agentsUrl string
if os.Getenv("LK_AGENTS_URL") != "" {
agentsUrl = os.Getenv("LK_AGENTS_URL")
} else if !strings.Contains(baseUrl, "localhost") && !strings.Contains(baseUrl, "127.0.0.1") {
pattern := `^https://[a-zA-Z0-9\-]+\.`
re := regexp.MustCompile(pattern)
agentsUrl = re.ReplaceAllString(baseUrl, "https://agents.")
} else {
agentsUrl = baseUrl
}

logger.Debugw("Connecting to LK hosted agents on", "url", agentsUrl)

func (c *Client) Build(ctx context.Context, id string) error {
params := url.Values{}
params.Add("agent_id", id)
fullUrl := fmt.Sprintf("%s/build?%s", agentsUrl, params.Encode())

at := auth.NewAccessToken(projectConfig.APIKey, projectConfig.APISecret)
at.SetAgentGrant(&auth.AgentGrant{
Admin: true,
})
token, err := at.ToJWT()
if err != nil {
return err
}

req, err := http.NewRequest("POST", fullUrl, nil)
fullUrl := fmt.Sprintf("%s/build?%s", c.agentsURL, params.Encode())
req, err := c.newRequest("POST", fullUrl, nil)
if err != nil {
return err
}
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
client := &http.Client{}
resp, err := client.Do(req)
resp, err := c.httpClient.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()

if resp.StatusCode != http.StatusOK {
return fmt.Errorf("failed to build agent: %s", resp.Status)
}
Expand Down
Loading
Loading