prep-for-release

Author: EItanya

helm/Chart-template.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 name: kagent
-description: A Helm chart for KAgent, built with AutogenStudio
+description: A Helm chart for KAgent, built with Autogen
 type: application
 version: ${VERSION}

helm/templates/deployment.yaml

@@ -50,6 +50,14 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.openai.secretName }}
                   key: {{ .Values.openai.secretKey }}
+            - name: OTEL_TRACING_ENABLED
+              value: {{ .Values.otel.tracing.enabled | quote }}
+            - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+              value: {{ .Values.otel.tracing.exporter.otlp.endpoint | quote }}
+            - name: OTEL_EXPORTER_OTLP_TRACES_TIMEOUT
+              value: {{ .Values.otel.tracing.exporter.otlp.timeout | quote }}
+            - name: OTEL_EXPORTER_OTLP_TRACES_INSECURE
+              value: {{ .Values.otel.tracing.exporter.otlp.insecure | quote }}
           ports:
             - name: http
               containerPort: {{ .Values.service.ports.app.targetPort }}

helm/templates/helm-agent.yaml

@@ -11,35 +11,50 @@ spec:
   systemMessage: |-
     You are a Kubernetes expert agent specialized in cluster management and operations. Your primary responsibilities include:
 
-        1. Helm Operations:
-           - Managing Helm releases (list, get details, upgrade, and uninstall)
-           - Understanding Helm chart structures and dependencies
-           - Validating release states and configurations
+    1. Helm Operations:
+        - Managing Helm releases (list, get details, upgrade, and uninstall)
+        - Understanding Helm chart structures and dependencies
+        - Validating release states and configurations
 
-        2. Kubernetes Resource Management:
-           - Monitoring and managing various Kubernetes resources (Pods, Deployments, Services, etc.)
-           - Analyzing resource configurations and relationships
-           - Applying and validating Kubernetes manifests
-           - Understanding API resource availability and versioning
+    2. Kubernetes Resource Management:
+        - Monitoring and managing various Kubernetes resources (Pods, Deployments, Services, etc.)
+        - Analyzing resource configurations and relationships
+        - Applying and validating Kubernetes manifests
+        - Understanding API resource availability and versioning
 
-        3. Documentation and Troubleshooting:
-           - Accessing and interpreting Kubernetes and related project documentation
-           - Providing context-aware recommendations
-           - Identifying potential issues in configurations
+    3. Documentation and Troubleshooting:
+        - Accessing and interpreting Kubernetes and related project documentation
+        - Providing context-aware recommendations
+        - Identifying potential issues in configurations
 
-        Always follow these principles:
-        - Validate operations before execution
-        - Provide clear explanations for your actions
-        - Consider security implications
-        - Follow Kubernetes best practices
-        - Use appropriate tools based on the context
+    Always follow these principles:
+    - Validate operations before execution. For example: 
+      - If a user asks to upgrade a release, you will first check if the release exists and if it is upgradable.
+      - If a user asks to uninstall a release, you will first check if the release exists and if it can be uninstalled.
+      - If a user asks to change a resource, you will first check if the resource exists and see if it can be changed.
+    - Provide clear explanations for your actions
+    - Consider security implications
+    - Follow Kubernetes best practices
+    - Use appropriate tools based on the context
+      - If you or a user needs more information about a resource, you will use the `GetResources` tool to get the resource details.
+      - If you need to apply (create or update) a Kubernetes manifest, you will use the `ApplyManifest` tool to apply the manifest.
+      - If you need more information about any project documentation, you will use the `QueryTool` tool to get the information.
+      - If you need to add a new repository, you will use the `RepoAdd` tool to add the repository.
+      - If you need to update a repository, you will use the `RepoUpdate` tool to update the repository.
+      - If you need to list the releases, you will use the `ListReleases` tool.
+      - If you need to get the details of a release, you will use the `GetRelease` tool.
+      - If you need to upgrade a release, you will use the `Upgrade` tool.
+      - If you need to uninstall a release, you will use the `Uninstall` tool.
 
-        When handling tasks:
-        1. First analyze the current state
-        2. Plan your actions
-        3. Execute with appropriate tools
-        4. Verify results
-        5. Report outcomes clearly
+    # Instructions
+    - If user question is unclear, ask for clarification before running any tools
+    - Always be helpful and friendly
+    - If you don't know how to answer the question DO NOT make things up, tell the user "Sorry, I don't know how to answer that" and ask them to clarify the question further
+
+    # Response format
+    - ALWAYS format your response as Markdown
+    - Your response will include a summary of actions you took and an explanation of the result
+    - If you created any artifacts such as files or resources, you will include those in your response as well
   tools:
     - provider: kagent.tools.helm.ListReleases
     - provider: kagent.tools.helm.GetRelease

helm/values.yaml

@@ -1,11 +1,11 @@
-# Default values for autogenstudio
+# Default values for kagent
 replicaCount: 1
 
 global:
   tag: ""
 
 openai:
-  secretName: "autogenstudio-openai"
+  secretName: "kagent-openai"
   apiKey: ""
   secretKey: "OPENAI_API_KEY"
 
@@ -89,3 +89,12 @@ contrib:
       enabled: true
     argoRolloutsConversion:
       enabled: true
+
+otel:
+  tracing:
+    enabled: false
+    exporter:
+      otlp:
+        endpoint: http://localhost:4317
+        timeout: 10
+        insecure: true

python/Dockerfile

@@ -73,10 +73,10 @@ WORKDIR /app/python
 COPY pyproject.toml .
 COPY .python-version .
 COPY uv.lock .
-COPY src src
 COPY README.md .
-RUN uv sync --frozen && \
-    chown -R python:pythongroup /app/python
+RUN uv sync --frozen
+COPY src src
+RUN chown -R python:pythongroup /app/python
 
 # Generate tools and agents
 RUN mkdir -p /root/.autogenstudio/configs
@@ -94,4 +94,4 @@ EXPOSE 8081
 LABEL org.opencontainers.image.source=https://github.com/kagent-dev/kagent
 LABEL org.opencontainers.image.description="Kagent app is the apiserver for running agents."
 
-CMD ["uv", "run", "autogenstudio", "ui", "--host", "0.0.0.0", "--port", "8081"]
+CMD ["uv", "run", "kagent", "serve", "--host", "0.0.0.0", "--port", "8081"]

python/pyproject.toml

@@ -19,8 +19,13 @@ dependencies = [
   "pyyaml>=6.0.2",
   "mcp>=1.2.0",
   "sqlite-vec>=0.1.0",
-  "typer",
+  "typer>=0.15.2",
   "numpy>=2.2.3",
+  "opentelemetry-api>=1.30.0",
+  "opentelemetry-sdk>=1.30.0",
+  "opentelemetry-exporter-otlp-proto-grpc>=1.30.0",
+  "opentelemetry-instrumentation-openai>= 0.38.0",
+  "opentelemetry-instrumentation-httpx >= 0.51.0",
 ]
 
 [project.optional-dependencies]

python/src/kagent/cli.py

@@ -3,11 +3,6 @@
 from mcp.server.fastmcp import FastMCP
 from pydantic import BaseModel
 
-from kagent.tools.argo._argo_crds import (
-    ArgoCRDTool,
-    ArgoCRDToolConfig,
-    ArgoCRDToolInput,
-)
 from kagent.tools.argo._argo_rollouts_k8sgw_installation import (
     check_plugin_logs,
     verify_gateway_plugin,
@@ -19,11 +14,13 @@
     verify_argo_rollouts_controller_install,
     verify_kubectl_plugin_install,
 )
-from kagent.tools.helm._helm import helm_list, helm_uninstall, helm_upgrade
-from kagent.tools.istio._istio_crds import (
-    IstioCRDTool,
-    IstioCRDToolConfig,
-    IstioCRDToolInput,
+from kagent.tools.helm._helm import (
+    helm_get_release,
+    helm_list_releases,
+    helm_repo_add,
+    helm_repo_update,
+    helm_uninstall,
+    upgrade_release,
 )
 from kagent.tools.istio._istioctl import (
     analyze_cluster_configuration,
@@ -218,13 +215,6 @@ def argo():
     mcp.add_tool(promote_rollout._func, promote_rollout.name, promote_rollout.description)
     mcp.add_tool(set_rollout_image._func, set_rollout_image.name, set_rollout_image.description)
 
-    cfg = ArgoCRDToolConfig(model="gpt-4o-mini", openai_api_key=None)
-
-    def argo_crd_tool(input: ArgoCRDToolInput):
-        return ArgoCRDTool(cfg).run_json(input.model_dump(), CancellationToken())
-
-    mcp.add_tool(argo_crd_tool, ArgoCRDTool(cfg).name, ArgoCRDTool(cfg).description)
-
     mcp.run()
 
 
@@ -248,13 +238,6 @@ def istio():
     mcp.add_tool(proxy_status._func, proxy_status.name, proxy_status.description)
     mcp.add_tool(remote_clusters._func, remote_clusters.name, remote_clusters.description)
 
-    cfg = IstioCRDToolConfig(model="gpt-4o-mini", openai_api_key=None)
-
-    def istio_crd_tool(input: IstioCRDToolInput):
-        return IstioCRDTool(cfg).run_json(input.model_dump(), CancellationToken())
-
-    mcp.add_tool(istio_crd_tool, IstioCRDTool(cfg).name, IstioCRDTool(cfg).description)
-
     mcp.run()
 
 
@@ -287,15 +270,45 @@ def k8s():
 
 @app.command()
 def helm():
-    mcp.add_tool(helm_list._func, helm_list.name, helm_list.description)
-    mcp.add_tool(helm_upgrade._func, helm_upgrade.name, helm_upgrade.description)
+    mcp.add_tool(helm_list_releases._func, helm_list_releases.name, helm_list_releases.description)
+    mcp.add_tool(helm_get_release._func, helm_get_release.name, helm_get_release.description)
     mcp.add_tool(helm_uninstall._func, helm_uninstall.name, helm_uninstall.description)
+    mcp.add_tool(upgrade_release._func, upgrade_release.name, upgrade_release.description)
+    mcp.add_tool(helm_repo_add._func, helm_repo_add.name, helm_repo_add.description)
+    mcp.add_tool(helm_repo_update._func, helm_repo_update.name, helm_repo_update.description)
     mcp.run()
 
 
-def run():
-    app()
+@app.command()
+def serve(
+    host: str = "127.0.0.1",
+    port: int = 8081,
+):
+    import logging
+    import os
+
+    from autogenstudio.cli import ui
+    from opentelemetry import trace
+    from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+    from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
+    from opentelemetry.instrumentation.openai import OpenAIInstrumentor
+    from opentelemetry.sdk.resources import Resource
+    from opentelemetry.sdk.trace import TracerProvider
+    from opentelemetry.sdk.trace.export import BatchSpanProcessor
+
+    logging.basicConfig(level=logging.INFO)
+    tracing_enabled = os.getenv("OTEL_TRACING_ENABLED", "false").lower() == "true"
+    if tracing_enabled:
+        logging.info("Enabling tracing")
+        tracer_provider = TracerProvider(resource=Resource({"service.name": "kagent"}))
+        processor = BatchSpanProcessor(OTLPSpanExporter())
+        tracer_provider.add_span_processor(processor)
+        trace.set_tracer_provider(tracer_provider)
+        HTTPXClientInstrumentor().instrument()
+        OpenAIInstrumentor().instrument()
+
+    ui(host=host, port=port)
 
 
-if __name__ == "__main__":
+def run():
     app()

python/src/kagent/tools/common/_llm_tool.py

@@ -1,8 +1,10 @@
 import logging
+import os
 
 from autogen_core import CancellationToken, Component, ComponentModel
 from autogen_core.models import ChatCompletionClient, SystemMessage, UserMessage
 from autogen_core.tools import BaseTool
+from autogen_ext.models.openai import OpenAIChatCompletionClient
 from pydantic import BaseModel, Field
 
 logger = logging.getLogger(__name__)
@@ -11,7 +13,12 @@
 class LLMToolConfig(BaseModel):
     """Configuration for the LLMTool."""
 
-    model_client: ComponentModel
+    model_client: ComponentModel = Field(
+        default_factory=lambda: OpenAIChatCompletionClient(
+            model="gpt-4o-mini",
+        ).dump_component(),
+        description="The model client to use for the LLM. If not provided, the default model client will be used.",
+    )
 
 
 class LLMToolInput(BaseModel):

python/tests/test_generate_resource.py

@@ -6,7 +6,6 @@
 import pytest
 import yaml
 from autogen_core import CancellationToken
-
 from autogen_ext.models.openai import OpenAIChatCompletionClient
 
 from kagent.tools.k8s import GenerateResourceTool, GenerateResourceToolConfig, GenerateResourceToolInput, ResourceTypes