Fix crd agent creation (#169)

EItanya · web-flow · commit f564c67f674b · 2025-03-17T12:58:33.000-04:00
* fix-crd-agent-creation

* not necessary

* remove log

* tools are gettable via UI/CLI now

* oops
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -56,9 +56,11 @@ jobs:
         cluster_name: kagent
 
     - name: Install Kagent
-      run: make helm-install
       env:
         OPENAI_API_KEY: sk-fake-openai-api-key
+      run: |
+        make helm-install
+        kubectl wait --for=condition=Accepted  agents.kagent.dev -n kagent --all --timeout=60s
     
   python-test:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
@@ -88,6 +88,7 @@ helm-install: helm-version check-openai-key kind-load-docker-images
 	helm upgrade --install kagent helm/ \
 		--namespace kagent \
 		--create-namespace \
+		--wait \
 		--set controller.image.tag=$(CONTROLLER_IMAGE_TAG) \
 		--set ui.image.tag=$(UI_IMAGE_TAG) \
 		--set app.image.tag=$(APP_IMAGE_TAG) \
diff --git a/go/autogen/api/types.go b/go/autogen/api/types.go
@@ -14,6 +14,14 @@ type Component struct {
 	Config           map[string]interface{} `json:"config"`
 }
 
+func (c *Component) ToConfig() (map[string]interface{}, error) {
+	if c == nil {
+		return nil, nil
+	}
+
+	return toConfig(c)
+}
+
 func MustToConfig(c ComponentConfig) map[string]interface{} {
 	config, err := c.ToConfig()
 	if err != nil {
diff --git a/go/autogen/client/tools.go b/go/autogen/client/tools.go
@@ -0,0 +1,26 @@
+package client
+
+import (
+	"fmt"
+)
+
+func (c *Client) ListTools(userID string) ([]*Tool, error) {
+	var tools []*Tool
+	err := c.doRequest("GET", fmt.Sprintf("/tools/?user_id=%s", userID), nil, &tools)
+	return tools, err
+}
+
+func (c *Client) GetTool(provider string, userID string) (*Tool, error) {
+	allTools, err := c.ListTools(userID)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, tool := range allTools {
+		if tool.Component.Provider == provider {
+			return tool, nil
+		}
+	}
+
+	return nil, nil
+}
diff --git a/go/autogen/client/types.go b/go/autogen/client/types.go
@@ -16,6 +16,15 @@ type Team struct {
 	Id        int            `json:"id,omitempty"`
 }
 
+type Tool struct {
+	Id        *int          `json:"id,omitempty"`
+	Component api.Component `json:"component"`
+	CreatedAt *string       `json:"created_at,omitempty"`
+	UpdatedAt *string       `json:"updated_at,omitempty"`
+	UserID    *string       `json:"user_id,omitempty"`
+	Version   *string       `json:"version,omitempty"`
+}
+
 type ModelsUsage struct {
 	PromptTokens     int `json:"prompt_tokens"`
 	CompletionTokens int `json:"completion_tokens"`
diff --git a/go/cli/cmd/kagent/main.go b/go/cli/cmd/kagent/main.go
@@ -158,6 +158,20 @@ Examples:
 		Func: cli.GetAgentCmd,
 	})
 
+	getCmd.AddCmd(&ishell.Cmd{
+		Name:    "tool",
+		Aliases: []string{"t", "tools"},
+		Help:    "get a tool.",
+		LongHelp: `get a tool.
+
+If no resource name is provided, then a list of available resources will be returned.
+Examples:
+  get tool [tool_name]
+  get tool
+  `,
+		Func: cli.GetToolCmd,
+	})
+
 	shell.AddCmd(getCmd)
 
 	shell.NotFound(func(c *ishell.Context) {
diff --git a/go/cli/internal/cli/get.go b/go/cli/internal/cli/get.go
@@ -117,6 +117,41 @@ func GetSessionCmd(c *ishell.Context) {
 	}
 }
 
+func GetToolCmd(c *ishell.Context) {
+	var resourceName string
+	if len(c.Args) > 0 {
+		resourceName = c.Args[0]
+	}
+	client := config.GetClient(c)
+	cfg := config.GetCfg(c)
+	if resourceName == "" {
+		toolList, err := client.ListTools(cfg.UserID)
+		if err != nil {
+			c.Printf("Failed to get tools: %v\n", err)
+			return
+		}
+		if err := printTools(toolList); err != nil {
+			c.Printf("Failed to print tools: %v\n", err)
+			return
+		}
+	}
+}
+
+func printTools(tools []*autogen_client.Tool) error {
+	headers := []string{"#", "ID", "PROVIDER", "LABEL", "CREATED"}
+	rows := make([][]string, len(tools))
+	for i, tool := range tools {
+		rows[i] = []string{
+			strconv.Itoa(i),
+			strconv.Itoa(*tool.Id),
+			tool.Component.Provider,
+			*tool.Component.Label,
+			*tool.CreatedAt,
+		}
+	}
+
+	return printOutput(tools, headers, rows)
+}
 func printRuns(runs []*autogen_client.Run) error {
 	headers := []string{"#", "ID", "CONTENT", "MESSAGES", "STATUS", "CREATED"}
 	rows := make([][]string, len(runs))
diff --git a/go/cli/internal/config/config.go b/go/cli/internal/config/config.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 )
 
@@ -31,13 +32,17 @@ func Init() error {
 	viper.SetConfigFile(configFile)
 	viper.SetConfigType("yaml")
 
+	pflag.StringVar(&configFile, "config", configFile, "config file (default is $HOME/.kagent/config.yaml)")
+
 	// Set default values
 	viper.SetDefault("api_url", "http://localhost:8081/api")
 	viper.SetDefault("ws_url", "ws://localhost:8081/api/ws")
 	viper.SetDefault("user_id", "admin@kagent.dev")
 	viper.SetDefault("output_format", "table")
 	viper.SetDefault("namespace", "kagent")
 
+	viper.MustBindEnv("USER_ID")
+
 	if err := viper.ReadInConfig(); err != nil {
 		// If config file doesn't exist, create it with defaults
 		if _, ok := err.(viper.ConfigFileNotFoundError); ok || os.IsNotExist(err) {
diff --git a/go/controller/api/v1alpha1/autogenagent_types.go b/go/controller/api/v1alpha1/autogenagent_types.go
@@ -32,7 +32,7 @@ type AgentSpec struct {
 	// +kubebuilder:validation:MinLength=1
 	SystemMessage string `json:"systemMessage,omitempty"`
 	// +kubebuilder:validation:MaxItems=20
-	Tools []Tool `json:"tools,omitempty"`
+	Tools []*Tool `json:"tools,omitempty"`
 }
 
 type Tool struct {
diff --git a/go/controller/api/v1alpha1/zz_generated.deepcopy.go b/go/controller/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/go/controller/internal/autogen/autogen_api_translator.go b/go/controller/internal/autogen/autogen_api_translator.go
@@ -369,16 +369,15 @@ func translateAssistantAgent(
 		if tool.Description != "" {
 			description = makePtr(tool.Description)
 		}
-		tool := &api.Component{
+
+		tools = append(tools, &api.Component{
 			Provider:      tool.Provider,
 			Description:   description,
 			ComponentType: "tool",
 			Version:       makePtr(1),
 			Config:        api.GenericToolConfig(toolConfig),
 			Label:         makePtr(toolLabel),
-		}
-
-		tools = append(tools, tool)
+		})
 	}
 
 	sysMsgPtr := makePtr(agentSpec.SystemMessage + "\n" + defaultSystemMessageSuffix)
@@ -406,7 +405,7 @@ func translateAssistantAgent(
 	}, nil
 }
 
-func convertToolConfig(config interface{}) (map[string]interface{}, error) {
+func convertToolConfig(config map[string]v1alpha1.AnyType) (map[string]interface{}, error) {
 	// convert to map[string]interface{} to allow kubebuilder schemaless validation
 	// see https://github.com/kubernetes-sigs/controller-tools/issues/636 for more info
 	// must unmarshal to interface{} to avoid json.RawMessage
@@ -554,11 +553,12 @@ func addModelClientToConfig(
 	if *toolConfig == nil {
 		*toolConfig = make(map[string]interface{})
 	}
-	modelClientConfig, err := convertToolConfig(modelClient.Config)
+
+	cfg, err := modelClient.ToConfig()
 	if err != nil {
 		return err
 	}
 
-	(*toolConfig)["model_client"] = modelClientConfig
+	(*toolConfig)["model_client"] = cfg
 	return nil
 }
diff --git a/helm/templates/observability-agent.yaml b/helm/templates/observability-agent.yaml
@@ -80,14 +80,14 @@ spec:
     - provider: kagent.tools.k8s.GetAvailableAPIResources
     - provider: kagent.tools.prometheus.QueryTool
       config:
-        base_url: {{ .Values.contrib.agents.observability.prometheus.url }}
-        username: {{ .Values.contrib.agents.observability.prometheus.username }}
-        password: {{ .Values.contrib.agents.observability.prometheus.password }}
+        base_url: {{ .Values.contrib.agents.observability.prometheus.url | default "prometheus.kagent:9090" | quote }}
+        username: {{ .Values.contrib.agents.observability.prometheus.username | default "" | quote }}
+        password: {{ .Values.contrib.agents.observability.prometheus.password | default "" | quote }}
     - provider: kagent.tools.prometheus.GeneratePromQLTool
     - provider: kagent.tools.grafana.DashboardManagementTool
       config:
-        base_url: {{ .Values.contrib.agents.observability.grafana.url }}
-        username: {{ .Values.contrib.agents.observability.grafana.username }}
-        password: {{ .Values.contrib.agents.observability.grafana.password }}
-        api_key: {{ .Values.contrib.agents.observability.grafana.apiKey }}
+        base_url: {{ .Values.contrib.agents.observability.grafana.url | default "grafana.kagent:3000" | quote }}
+        username: {{ .Values.contrib.agents.observability.grafana.username | default "" | quote }}
+        password: {{ .Values.contrib.agents.observability.grafana.password | default "" | quote }}
+        api_key: {{ .Values.contrib.agents.observability.grafana.apiKey | default "" | quote }}
 {{- end }}
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -46,10 +46,10 @@ kagent-engine = "kagent.cli:run"
 tool_gen = "kagent.tools.utils.tool_gen:main"
 
 [tool.uv.sources]
-autogenstudio = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-studio", rev = "21acedd4a97579a2194514746039e2198fe95104" }
-autogen-agentchat = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-agentchat", rev = "21acedd4a97579a2194514746039e2198fe95104" }
-autogen-ext = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-ext", rev = "21acedd4a97579a2194514746039e2198fe95104" }
-autogen-core = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-core", rev = "21acedd4a97579a2194514746039e2198fe95104" }
+autogenstudio = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-studio", rev = "2f804d74ff68b2d020fe6b68526c33abecb72c07" }
+autogen-agentchat = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-agentchat", rev = "2f804d74ff68b2d020fe6b68526c33abecb72c07" }
+autogen-ext = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-ext", rev = "2f804d74ff68b2d020fe6b68526c33abecb72c07" }
+autogen-core = { git = "https://github.com/kagent-dev/autogen.git", subdirectory = "python/packages/autogen-core", rev = "2f804d74ff68b2d020fe6b68526c33abecb72c07" }
 kagent = { workspace = true }
 
 [tool.ruff]
diff --git a/python/uv.lock b/python/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ type AgentSpec struct {`
`32`	`32`	`// +kubebuilder:validation:MinLength=1`
`33`	`33`	SystemMessage string `json:"systemMessage,omitempty"`
`34`	`34`	`// +kubebuilder:validation:MaxItems=20`
`35`		- Tools []Tool `json:"tools,omitempty"`
	`35`	+ Tools []*Tool `json:"tools,omitempty"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`type Tool struct {`