solace-agent-mesh 1.5.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

solace_agent_mesh/agent/adk/setup.py

@@ -2,13 +2,14 @@
 Handles ADK Agent and Runner initialization, including tool loading and callback assignment.
 """
 
+import logging
 from typing import Dict, List, Optional, Union, Callable, Tuple, Set, Any, TYPE_CHECKING, Type
 import functools
 import inspect
-from solace_ai_connector.common.log import log
 from solace_ai_connector.common.utils import import_module
 from ...common.utils.type_utils import is_subclass_by_name
 
+
 from .app_llm_agent import AppLlmAgent
 from .tool_wrapper import ADKToolWrapper
 from .embed_resolving_mcp_toolset import EmbedResolvingMCPToolset
@@ -46,6 +47,7 @@ from ..tools.tool_config_types import (
 from ...agent.adk import callbacks as adk_callbacks
 from ...agent.adk.models.lite_llm import LiteLlm
 
+log = logging.getLogger(__name__)
 
 # Define a clear return type for all tool-loading helpers
 ToolLoadingResult = Tuple[List[Union[BaseTool, Callable]], List[BuiltinTool], List[Callable]]

solace_agent_mesh/agent/adk/tool_wrapper.py

@@ -2,13 +2,12 @@
 Defines the ADKToolWrapper, a consolidated wrapper for ADK tools.
 """
 
+import logging
 import asyncio
 import functools
 import inspect
 from typing import Callable, Dict, List, Optional, Literal
 
-from solace_ai_connector.common.log import log
-
 from ...common.utils.embeds import (
     resolve_embeds_in_string,
     evaluate_embed,
@@ -17,6 +16,7 @@ from ...common.utils.embeds import (
     EMBED_DELIMITER_OPEN,
 )
 
+log = logging.getLogger(__name__)
 
 class ADKToolWrapper:
     """

solace_agent_mesh/agent/protocol/event_handlers.py

@@ -2,11 +2,11 @@
 Contains event handling logic for the A2A_ADK_HostComponent.
 """
 
+import logging
 import json
 import asyncio
 from typing import TYPE_CHECKING, Dict, Any
 import fnmatch
-from solace_ai_connector.common.log import log
 from solace_ai_connector.common.message import Message as SolaceMessage
 from ...agent.adk.callbacks import _publish_data_part_status_update
 from ...common.data_parts import ToolResultData
@@ -47,6 +47,7 @@ if TYPE_CHECKING:
     from ..sac.component import SamAgentComponent
 from google.adk.agents.run_config import StreamingMode
 
+log = logging.getLogger(__name__)
 
 def _register_peer_artifacts_in_parent_context(
     parent_task_context: "TaskExecutionContext",
@@ -136,6 +137,9 @@ async def process_event(component, event: Event):
             )
             if timer_data.get("timer_id") == component._card_publish_timer_id:
                 publish_agent_card(component)
+            else:
+                # Handle other timer events including health check timer
+                component.handle_timer_event(timer_data)
         elif event.event_type == EventType.CACHE_EXPIRY:
             # Delegate cache expiry handling to the component itself.
             await component.handle_cache_expiry_event(event.data)
@@ -793,9 +797,26 @@ def handle_agent_card_message(component, message: SolaceMessage):
                     break
 
         if is_allowed:
-            # The received card is stored as-is. We don't need to modify it.
+            
+            # Also store in peer_agents for backward compatibility
             component.peer_agents[agent_name] = agent_card
 
+            # Store the agent card in the registry for health tracking
+            is_new = component.agent_registry.add_or_update_agent(agent_card)
+            
+            if is_new:
+                log.info(
+                    "%s Registered new agent '%s' in registry.",
+                    component.log_identifier,
+                    agent_name,
+                )
+            else:
+                log.debug(
+                    "%s Updated existing agent '%s' in registry.",
+                    component.log_identifier,
+                    agent_name,
+                )
+
         message.call_acknowledgements()
 
     except Exception as e:
@@ -1437,6 +1458,7 @@ def publish_agent_card(component):
         dynamic_url = f"solace:{agent_request_topic}"
 
         # Define unique URIs for our custom extensions.
+        DEPLOYMENT_EXTENSION_URI = "https://solace.com/a2a/extensions/sam/deployment"
         PEER_TOPOLOGY_EXTENSION_URI = (
             "https://solace.com/a2a/extensions/peer-agent-topology"
         )
@@ -1445,6 +1467,24 @@ def publish_agent_card(component):
 
         extensions_list = []
 
+        # Create the extension object for deployment tracking.
+        deployment_config = component.get_config("deployment", {})
+        deployment_id = deployment_config.get("id")
+
+        if deployment_id:
+            deployment_extension = AgentExtension(
+                uri=DEPLOYMENT_EXTENSION_URI,
+                description="SAM deployment tracking for rolling updates",
+                required=False,
+                params={"id": deployment_id}
+            )
+            extensions_list.append(deployment_extension)
+            log.debug(
+                "%s Added deployment extension with ID: %s",
+                component.log_identifier,
+                deployment_id
+            )
+
         # Create the extension object for peer agents.
         if peer_agents:
             peer_topology_extension = AgentExtension(

solace_agent_mesh/agent/proxies/a2a/__init__.py

@@ -0,0 +1,3 @@
+"""
+This package contains the concrete implementation for proxying standard A2A-over-HTTPS agents.
+"""

solace_agent_mesh/agent/proxies/a2a/app.py

@@ -0,0 +1,55 @@
+"""
+Concrete App class for the A2A-over-HTTPS proxy.
+"""
+
+from __future__ import annotations
+
+from typing import Any, Dict, Type
+
+from pydantic import ValidationError
+from solace_ai_connector.common.log import log
+
+from ..base.app import BaseProxyApp
+from ..base.component import BaseProxyComponent
+from .component import A2AProxyComponent
+from .config import A2AProxyAppConfig
+
+info = {
+    "class_name": "A2AProxyApp",
+}
+
+
+class A2AProxyApp(BaseProxyApp):
+    """
+    Concrete App class for the A2A-over-HTTPS proxy.
+
+    Extends the BaseProxyApp to add specific configuration validation for
+    A2A agents (e.g., URL, authentication).
+    """
+
+    # Keep app_schema for documentation purposes, but it's now redundant
+    # The Pydantic models handle all validation
+    app_schema = {}
+
+    def __init__(self, app_info: Dict[str, Any], **kwargs):
+        app_info["class_name"] = "A2AProxyApp"
+        
+        # Validate A2A-specific configuration before calling super().__init__
+        app_config_dict = app_info.get("app_config", {})
+        try:
+            # Validate with A2A-specific config model
+            app_config = A2AProxyAppConfig.model_validate_and_clean(app_config_dict)
+            # Overwrite the raw dict with the validated object
+            app_info["app_config"] = app_config
+            log.debug("A2A proxy configuration validated successfully.")
+        except ValidationError as e:
+            log.error("A2A proxy configuration validation failed:\n%s", e)
+            raise ValueError(f"Invalid A2A proxy configuration: {e}") from e
+        
+        super().__init__(app_info, **kwargs)
+
+    def _get_component_class(self) -> Type[BaseProxyComponent]:
+        """
+        Returns the concrete A2AProxyComponent class.
+        """
+        return A2AProxyComponent