kagent-adk 0.6.7__py3-none-any.whl → 0.6.9__py3-none-any.whl

kagent_adk/models.py → kagent/adk/types.py

@@ -4,8 +4,7 @@ from typing import Literal, Self, Union
 from google.adk.agents import Agent
 from google.adk.agents.base_agent import BaseAgent
 from google.adk.agents.llm_agent import ToolUnion
-from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
-from google.adk.agents.run_config import RunConfig, StreamingMode
+from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH, RemoteA2aAgent
 from google.adk.models.anthropic_llm import Claude as ClaudeLLM
 from google.adk.models.google_llm import Gemini as GeminiLLM
 from google.adk.models.lite_llm import LiteLlm
@@ -13,6 +12,9 @@ from google.adk.tools.agent_tool import AgentTool
 from google.adk.tools.mcp_tool import MCPToolset, SseConnectionParams, StreamableHTTPConnectionParams
 from pydantic import BaseModel, Field
 
+from .models import AzureOpenAI as OpenAIAzure
+from .models import OpenAI as OpenAINative
+
 logger = logging.getLogger(__name__)
 
 
@@ -88,18 +90,17 @@ class AgentConfig(BaseModel):
         if self.sse_tools:
             for sse_tool in self.sse_tools:  # add stdio tools
                 mcp_toolsets.append(MCPToolset(connection_params=sse_tool.params, tool_filter=sse_tool.tools))
-        remote_agents: list[BaseAgent] = []
         if self.remote_agents:
             for remote_agent in self.remote_agents:  # Add remote agents as tools
-                remote_agents.append(
-                    RemoteA2aAgent(
-                        name=remote_agent.name,
-                        agent_card=remote_agent.url,
-                        description=remote_agent.description,
-                    )
+                remote_agent = RemoteA2aAgent(
+                    name=remote_agent.name,
+                    agent_card=f"{remote_agent.url}/{AGENT_CARD_WELL_KNOWN_PATH}",
+                    description=remote_agent.description,
                 )
+                mcp_toolsets.append(AgentTool(agent=remote_agent, skip_summarization=True))
+
         if self.model.type == "openai":
-            model = LiteLlm(model=f"openai/{self.model.model}", base_url=self.model.base_url)
+            model = OpenAINative(model=self.model.model, base_url=self.model.base_url, type="openai")
         elif self.model.type == "anthropic":
             model = LiteLlm(model=f"anthropic/{self.model.model}", base_url=self.model.base_url)
         elif self.model.type == "gemini_vertex_ai":
@@ -109,7 +110,7 @@ class AgentConfig(BaseModel):
         elif self.model.type == "ollama":
             model = LiteLlm(model=f"ollama_chat/{self.model.model}")
         elif self.model.type == "azure_openai":
-            model = LiteLlm(model=f"azure/{self.model.model}")
+            model = OpenAIAzure(model=self.model.model, type="azure_openai")
         elif self.model.type == "gemini":
             model = self.model.model
         else:
@@ -120,5 +121,4 @@ class AgentConfig(BaseModel):
             description=self.description,
             instruction=self.instruction,
             tools=mcp_toolsets,
-            sub_agents=remote_agents,
         )

{kagent_adk-0.6.7.dist-info → kagent_adk-0.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kagent-adk
-Version: 0.6.7
+Version: 0.6.9
 Summary: kagent-adk is an sdk for integrating adk agents with kagent
 Requires-Python: >=3.12.11
 Requires-Dist: a2a-sdk>=0.3.1
@@ -13,15 +13,10 @@ Requires-Dist: google-auth>=2.40.2
 Requires-Dist: google-genai>=1.21.1
 Requires-Dist: httpx>=0.25.0
 Requires-Dist: jsonref>=1.1.0
+Requires-Dist: kagent-core
 Requires-Dist: litellm>=1.74.3
 Requires-Dist: mcp>=1.12.0
 Requires-Dist: openai>=1.72.0
-Requires-Dist: opentelemetry-api>=1.36.0
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc>=1.36.0
-Requires-Dist: opentelemetry-instrumentation-anthropic>=0.44.0
-Requires-Dist: opentelemetry-instrumentation-httpx>=0.52.0
-Requires-Dist: opentelemetry-instrumentation-openai>=0.44.3
-Requires-Dist: opentelemetry-sdk>=1.36.0
 Requires-Dist: protobuf>=6
 Requires-Dist: pydantic>=2.5.0
 Requires-Dist: typer>=0.15.0

kagent_adk-0.6.9.dist-info/RECORD

@@ -0,0 +1,17 @@
+kagent/adk/__init__.py,sha256=Cam9hwhl6Z1tZ3WJIB1KATX24MwRMpiyBLYF64DTqQI,182
+kagent/adk/_a2a.py,sha256=HvduKJlfuUIKzYuPs_U_9A-xuhcMdQutZTzdLNaGORc,4406
+kagent/adk/_agent_executor.py,sha256=rxNVdrcS4L5Kwe8oF7mLUnD1KOYhe6vXK-si0O-KQ9o,10730
+kagent/adk/_session_service.py,sha256=A47gsfDVp8jITzeW987AHTJLEhcU_mU3ik_SFptFGIc,5815
+kagent/adk/_token.py,sha256=OL46m7U5vUTby1WWjVB7Jqzig4TWddzoAmLVLlfSdAg,2515
+kagent/adk/cli.py,sha256=Sdw9FXnUmeHfgJhdRDq1zpoNMf6GM7x35ZDz_OkQgJg,2963
+kagent/adk/types.py,sha256=v7VbO0tAPvpjdEgWJroEq64jSCz6D3Q0yPdRM0a7MjM,4260
+kagent/adk/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kagent/adk/converters/event_converter.py,sha256=gPDxJhPtoIp2CAm0VjSPTH-siuz3IR23CV25AiN_1B8,10392
+kagent/adk/converters/part_converter.py,sha256=Q9Kbteit8XdL_9Tb8bAtxRxOZQei8Wabszwsl4YMe2c,7507
+kagent/adk/converters/request_converter.py,sha256=iTmTmhlnyRfuYyFi4WmpTSXPz22xjjotbe750j-CvYA,1072
+kagent/adk/models/__init__.py,sha256=mqD0JhS9kT1rMpFNLq5-qnjstpp6lzT9xADaOfjrUKY,78
+kagent/adk/models/_openai.py,sha256=Xdu0AteM4nFbZaCMAcSC_nj1iJRgpWBVXFzD0aPELGA,15685
+kagent_adk-0.6.9.dist-info/METADATA,sha256=JtlHtn8MXVr9XeCg8QX3C0zob7ibyNhf1N6ygfQTLlE,943
+kagent_adk-0.6.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kagent_adk-0.6.9.dist-info/entry_points.txt,sha256=a1Q2Inc9L0dvXWEkwnCdf9cfXdpX5Dl2Q6DhNWNjhxw,50
+kagent_adk-0.6.9.dist-info/RECORD,,

kagent_adk-0.6.9.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+kagent-adk = kagent.adk.cli:app

kagent_adk/_task_store.py

@@ -1,30 +0,0 @@
-from typing import override
-
-import httpx
-from a2a.server.tasks import TaskStore
-from a2a.types import Task
-
-
-class KAgentTaskStore(TaskStore):
-    client: httpx.AsyncClient
-
-    def __init__(self, client: httpx.AsyncClient):
-        self.client = client
-
-    @override
-    async def save(self, task: Task) -> None:
-        response = await self.client.post("/api/tasks", json=task.model_dump())
-        response.raise_for_status()
-
-    @override
-    async def get(self, task_id: str) -> Task | None:
-        response = await self.client.get(f"/api/tasks/{task_id}")
-        if response.status_code == 404:
-            return None
-        response.raise_for_status()
-        return Task.model_validate(response.json())
-
-    @override
-    async def delete(self, task_id: str) -> None:
-        response = await self.client.delete(f"/api/tasks/{task_id}")
-        response.raise_for_status()

kagent_adk/cli.py

@@ -1,202 +0,0 @@
-import asyncio
-import json
-import logging
-import os
-from typing import Annotated
-
-import typer
-import uvicorn
-from a2a.types import AgentCard
-from google.adk.cli.utils.agent_loader import AgentLoader
-from opentelemetry import _logs, trace
-from opentelemetry.exporter.otlp.proto.grpc._log_exporter import OTLPLogExporter
-from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
-from opentelemetry.instrumentation.anthropic import AnthropicInstrumentor
-from opentelemetry.instrumentation.openai import OpenAIInstrumentor
-from opentelemetry.sdk._events import EventLoggerProvider
-from opentelemetry.sdk._logs import LoggerProvider
-from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
-from opentelemetry.sdk.resources import Resource
-from opentelemetry.sdk.trace import TracerProvider
-from opentelemetry.sdk.trace.export import BatchSpanProcessor
-
-from . import AgentConfig, KAgentApp
-
-logger = logging.getLogger(__name__)
-
-app = typer.Typer()
-
-kagent_url = os.getenv("KAGENT_URL")
-kagent_name = os.getenv("KAGENT_NAME")
-kagent_namespace = os.getenv("KAGENT_NAMESPACE")
-
-
-class Config:
-    _url: str
-    _name: str
-    _namespace: str
-
-    def __init__(self):
-        if not kagent_url:
-            raise ValueError("KAGENT_URL is not set")
-        if not kagent_name:
-            raise ValueError("KAGENT_NAME is not set")
-        if not kagent_namespace:
-            raise ValueError("KAGENT_NAMESPACE is not set")
-        self._url = kagent_url
-        self._name = kagent_name
-        self._namespace = kagent_namespace
-
-    @property
-    def name(self):
-        return self._name.replace("-", "_")
-
-    @property
-    def namespace(self):
-        return self._namespace.replace("-", "_")
-
-    @property
-    def app_name(self):
-        return self.namespace + "__NS__" + self.name
-
-    @property
-    def url(self):
-        return self._url
-
-
-def configure_tracing():
-    tracing_enabled = os.getenv("OTEL_TRACING_ENABLED", "false").lower() == "true"
-    logging_enabled = os.getenv("OTEL_LOGGING_ENABLED", "false").lower() == "true"
-
-    resource = Resource({"service.name": "kagent"})
-
-    # Configure tracing if enabled
-    if tracing_enabled:
-        logging.info("Enabling tracing")
-        tracer_provider = TracerProvider(resource=resource)
-        # Check new env var first, fall back to old one for backward compatibility
-        trace_endpoint = os.getenv("OTEL_TRACING_EXPORTER_OTLP_ENDPOINT") or os.getenv("OTEL_EXPORTER_OTLP_ENDPOINT")
-        if trace_endpoint:
-            processor = BatchSpanProcessor(OTLPSpanExporter(endpoint=trace_endpoint))
-        else:
-            processor = BatchSpanProcessor(OTLPSpanExporter())
-        tracer_provider.add_span_processor(processor)
-        trace.set_tracer_provider(tracer_provider)
-
-    # Configure logging if enabled
-    if logging_enabled:
-        logging.info("Enabling logging for GenAI events")
-        logger_provider = LoggerProvider(resource=resource)
-        log_endpoint = os.getenv("OTEL_LOGGING_EXPORTER_OTLP_ENDPOINT")
-        logging.info(f"Log endpoint configured: {log_endpoint}")
-
-        # Add OTLP exporter
-        if log_endpoint:
-            log_processor = BatchLogRecordProcessor(OTLPLogExporter(endpoint=log_endpoint))
-        else:
-            log_processor = BatchLogRecordProcessor(OTLPLogExporter())
-        logger_provider.add_log_record_processor(log_processor)
-
-        _logs.set_logger_provider(logger_provider)
-        logging.info("Log provider configured with OTLP")
-        # When logging is enabled, use new event-based approach (input/output as log events in Body)
-        logging.info("OpenAI instrumentation configured with event logging capability")
-        # Create event logger provider using the configured logger provider
-        event_logger_provider = EventLoggerProvider(logger_provider)
-        OpenAIInstrumentor(use_legacy_attributes=False).instrument(event_logger_provider=event_logger_provider)
-        AnthropicInstrumentor(use_legacy_attributes=False).instrument(event_logger_provider=event_logger_provider)
-    else:
-        # Use legacy attributes (input/output as GenAI span attributes)
-        logging.info("OpenAI instrumentation configured with legacy GenAI span attributes")
-        OpenAIInstrumentor().instrument()
-        AnthropicInstrumentor().instrument()
-
-
-@app.command()
-def static(
-    host: str = "127.0.0.1",
-    port: int = 8080,
-    workers: int = 1,
-    filepath: str = "/config",
-    reload: Annotated[bool, typer.Option("--reload")] = False,
-):
-    configure_tracing()
-
-    app_cfg = Config()
-
-    with open(os.path.join(filepath, "config.json"), "r") as f:
-        config = json.load(f)
-    agent_config = AgentConfig.model_validate(config)
-    with open(os.path.join(filepath, "agent-card.json"), "r") as f:
-        agent_card = json.load(f)
-    agent_card = AgentCard.model_validate(agent_card)
-    root_agent = agent_config.to_agent(app_cfg.name)
-
-    kagent_app = KAgentApp(root_agent, agent_card, app_cfg.url, app_cfg.app_name)
-
-    uvicorn.run(
-        kagent_app.build,
-        host=host,
-        port=port,
-        workers=workers,
-        reload=reload,
-    )
-
-
-@app.command()
-def run(
-    name: Annotated[str, typer.Argument(help="The name of the agent to run")],
-    working_dir: str = ".",
-    host: str = "127.0.0.1",
-    port: int = 8080,
-    workers: int = 1,
-):
-    configure_tracing()
-    app_cfg = Config()
-
-    agent_loader = AgentLoader(agents_dir=working_dir)
-    root_agent = agent_loader.load_agent(name)
-
-    with open(os.path.join(working_dir, name, "agent-card.json"), "r") as f:
-        agent_card = json.load(f)
-    agent_card = AgentCard.model_validate(agent_card)
-    kagent_app = KAgentApp(root_agent, agent_card, app_cfg.url, app_cfg.app_name)
-    uvicorn.run(
-        kagent_app.build,
-        host=host,
-        port=port,
-        workers=workers,
-    )
-
-
-async def test_agent(agent_config: AgentConfig, agent_card: AgentCard, task: str):
-    app_cfg = Config()
-    agent = agent_config.to_agent(app_cfg.name)
-    app = KAgentApp(agent, agent_card, app_cfg.url, app_cfg.app_name)
-    await app.test(task)
-
-
-@app.command()
-def test(
-    task: Annotated[str, typer.Option("--task", help="The task to test the agent with")],
-    filepath: Annotated[str, typer.Option("--filepath", help="The path to the agent config file")],
-):
-    with open(filepath, "r") as f:
-        content = f.read()
-        config = json.loads(content)
-
-    with open(os.path.join(filepath, "agent-card.json"), "r") as f:
-        agent_card = json.load(f)
-    agent_card = AgentCard.model_validate(agent_card)
-    agent_config = AgentConfig.model_validate(config)
-    asyncio.run(test_agent(agent_config, agent_card, task))
-
-
-def run_cli():
-    logging.basicConfig(level=logging.INFO)
-    logging.info("Starting KAgent")
-    app()
-
-
-if __name__ == "__main__":
-    run_cli()

kagent_adk-0.6.7.dist-info/RECORD

@@ -1,12 +0,0 @@
-kagent_adk/__init__.py,sha256=3oB8gbSzsvVmqV8w-BGKkRlH3JPfK6o27AfOD6wAd8o,182
-kagent_adk/_agent_executor.py,sha256=8NDMNUveFtewamYtBQ4MkCwFIRn5xDWeuDaMsW-QGF8,10806
-kagent_adk/_session_service.py,sha256=A47gsfDVp8jITzeW987AHTJLEhcU_mU3ik_SFptFGIc,5815
-kagent_adk/_task_store.py,sha256=3ApKbFfcDZmcEnwef6bCDhBhoGY9ZYwwyP671B1DHFo,889
-kagent_adk/_token.py,sha256=M9TOxxC4RAWPup_MIYuLIYoklnfllJS0yV3dQOfr5ng,2486
-kagent_adk/a2a.py,sha256=r8GgDkeKoZJx_qZmLfoaA0zSrP7t0Hn_VqEc-m0xIc8,5845
-kagent_adk/cli.py,sha256=fqGRM6egX0Kb2AvZWWDCv4Ad7oJ8rh0UDOsV9BZKujQ,6858
-kagent_adk/models.py,sha256=BCG7FdXnizGc28HyHne-GRkUUKoc-QII4b8xcIl_4Yc,4201
-kagent_adk-0.6.7.dist-info/METADATA,sha256=LWyROW1gHg-SbR7va1aFGOBhSRUg1QD8wAWNWaUFCY8,1242
-kagent_adk-0.6.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kagent_adk-0.6.7.dist-info/entry_points.txt,sha256=bmqHEc9zPYkbRoK57wF3wi5ohHTMB6yHTslKfvuVpc4,50
-kagent_adk-0.6.7.dist-info/RECORD,,

kagent_adk-0.6.7.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-kagent-adk = kagent_adk.cli:app