Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
11 changes: 8 additions & 3 deletions apps/a2a_app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package a2a_app
import (
"context"
"fmt"
"log"
"net/http"
"net/url"

Expand All @@ -25,6 +26,7 @@ import (
"github.com/gorilla/mux"
"github.com/volcengine/veadk-go/apps"
"google.golang.org/adk/cmd/launcher/web"
"google.golang.org/adk/cmd/launcher/web/a2a"
"google.golang.org/adk/runner"
"google.golang.org/adk/server/adka2a"
"google.golang.org/adk/session"
Expand All @@ -44,13 +46,12 @@ func (a *agentkitA2AServerApp) Run(ctx context.Context, config *apps.RunConfig)
config.SessionService = session.InMemoryService()
}

log.Printf("Web servers starts on %s", a.GetWebUrl())
err := a.SetupRouters(router, config)
if err != nil {
return fmt.Errorf("setup a2a routers failed: %w", err)
}

apps.RoutesLog(router)

srv := http.Server{
Addr: fmt.Sprintf(":%v", fmt.Sprint(a.Port)),
WriteTimeout: a.WriteTimeout,
Expand Down Expand Up @@ -99,12 +100,16 @@ func (a *agentkitA2AServerApp) SetupRouters(router *mux.Router, config *apps.Run
})
reqHandler := a2asrv.NewHandler(executor, config.A2AOptions...)
router.Handle(apiPath, a2asrv.NewJSONRPCHandler(reqHandler))

a2aLauncher := a2a.NewLauncher()
a2aLauncher.UserMessage(a.GetWebUrl()+apiPath, log.Println)

return nil
}

func NewAgentkitA2AServerApp(config apps.ApiConfig) apps.BasicApp {
return &agentkitA2AServerApp{
ApiConfig: config,
a2aAgentUrl: fmt.Sprintf("http://localhost:%v", config.Port),
a2aAgentUrl: config.GetWebUrl(),
}
}
7 changes: 5 additions & 2 deletions apps/agentkit_server_app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package agentkit_server_app
import (
"context"
"fmt"
"log"
"net/http"

"github.com/gorilla/mux"
Expand Down Expand Up @@ -47,13 +48,12 @@ func (a *agentkitServerApp) Run(ctx context.Context, config *apps.RunConfig) err
config.SessionService = session.InMemoryService()
}

log.Printf("Web servers starts on %s", a.GetWebUrl())
err := a.SetupRouters(router, config)
if err != nil {
return fmt.Errorf("setup agentkit server routers failed: %w", err)
}

apps.RoutesLog(router)

srv := http.Server{
Addr: fmt.Sprintf(":%v", fmt.Sprint(a.Port)),
WriteTimeout: a.WriteTimeout,
Expand Down Expand Up @@ -129,5 +129,8 @@ func (a *agentkitServerApp) SetupRouters(router *mux.Router, config *apps.RunCon
return fmt.Errorf("setup webui routers failed: %w", err)
}

apiLauncher.UserMessage(a.GetWebUrl(), log.Println)
webuiLauncher.UserMessage(a.GetWebUrl(), log.Println)

return nil
}
5 changes: 5 additions & 0 deletions apps/basic_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package apps

import (
"context"
"fmt"
"time"

"github.com/a2aproject/a2a-go/a2asrv"
Expand Down Expand Up @@ -70,3 +71,7 @@ func (a *ApiConfig) SetReadTimeout(t int64) {
func (a *ApiConfig) SetIdleTimeout(t int64) {
a.IdleTimeout = time.Second * time.Duration(t)
}

func (a *ApiConfig) GetWebUrl() string {
return fmt.Sprintf("http://localhost:%d", a.Port)
}
44 changes: 0 additions & 44 deletions apps/looger.go

This file was deleted.

6 changes: 4 additions & 2 deletions apps/simple_app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,21 @@ func (app *agentkitSimpleApp) SetupRouters(router *mux.Router, config *apps.RunC
router.NewRoute().Path("/invoke").Methods(http.MethodPost).HandlerFunc(app.newInvokeHandler())
router.NewRoute().Path("/health").Methods(http.MethodGet).HandlerFunc(app.newHealthHandler())

log.Printf(" invoke: you can invoke agent using %s/invoke", app.GetWebUrl())
log.Printf(" health: you can get health status using: %s/health", app.GetWebUrl())

return nil
}

func (app *agentkitSimpleApp) Run(ctx context.Context, config *apps.RunConfig) error {
router := web.BuildBaseRouter()

log.Printf("Web servers starts on %s", app.GetWebUrl())
err := app.SetupRouters(router, config)
if err != nil {
return fmt.Errorf("setup simple app router error: %w", err)
}

apps.RoutesLog(router)

srv := http.Server{
Addr: fmt.Sprintf(":%s", fmt.Sprint(app.Port)),
WriteTimeout: app.WriteTimeout,
Expand Down