solace-agent-mesh 1.6.1__py3-none-any.whl → 1.6.2__py3-none-any.whl

solace_agent_mesh/agent/protocol/event_handlers.py

@@ -2,52 +2,105 @@
 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.message import Message as SolaceMessage
-from ...agent.adk.callbacks import _publish_data_part_status_update
-from ...common.data_parts import ToolResultData
-from ...common.a2a.types import ToolsExtensionParams
-from solace_ai_connector.common.event import Event, EventType
+import json
+import logging
+from typing import TYPE_CHECKING, Any, Dict
+
 from a2a.types import (
     A2ARequest,
-    AgentCard,
     AgentCapabilities,
+    AgentCard,
     AgentExtension,
     DataPart,
     JSONRPCResponse,
     Task,
     TaskArtifactUpdateEvent,
+    TaskState,
     TaskStatusUpdateEvent,
     TextPart,
 )
+from google.adk.agents import RunConfig
+from google.adk.agents.run_config import StreamingMode
+from solace_ai_connector.common.event import Event, EventType
+from solace_ai_connector.common.message import Message as SolaceMessage
+
+from ...agent.adk.callbacks import _publish_data_part_status_update
+from ...agent.adk.runner import run_adk_async_task_thread_wrapper
+from ...agent.utils.artifact_helpers import generate_artifact_metadata_summary
 from ...common import a2a
 from ...common.a2a import (
     get_agent_request_topic,
-    get_discovery_topic,
-    translate_a2a_to_adk_content,
-    get_client_response_topic,
     get_agent_response_subscription_topic,
     get_agent_status_subscription_topic,
+    get_client_response_topic,
+    get_discovery_topic,
     get_sam_events_subscription_topic,
     get_text_from_message,
     topic_matches_subscription,
+    translate_a2a_to_adk_content,
 )
-from ...agent.utils.artifact_helpers import (
-    generate_artifact_metadata_summary,
-)
-from ...agent.adk.runner import run_adk_async_task_thread_wrapper
+from ...common.a2a.types import ToolsExtensionParams
+from ...common.data_parts import ToolResultData
 from ..sac.task_execution_context import TaskExecutionContext
-from google.adk.agents import RunConfig
 
 if TYPE_CHECKING:
     from ..sac.component import SamAgentComponent
-from google.adk.agents.run_config import StreamingMode
 
 log = logging.getLogger(__name__)
+trace_logger = logging.getLogger("sam_trace")
+
+
+def _forward_jsonrpc_response(
+    component: "SamAgentComponent",
+    original_jsonrpc_request_id: str,
+    result_data: Any,
+    target_topic: str,
+    main_logical_task_id: str,
+    peer_agent_name: str,
+    message: SolaceMessage,
+) -> None:
+    """
+    Utility method to forward a JSONRPCResponse with the given result data.
+
+    Args:
+        component: The SamAgentComponent instance
+        original_jsonrpc_request_id: The original JSONRPC request ID
+        result_data: The data to include in the response result
+        target_topic: The topic to publish to
+        main_logical_task_id: The main logical task ID for logging
+        peer_agent_name: The peer agent name for logging
+        message: The original message to acknowledge
+    """
+    forwarded_rpc_response = JSONRPCResponse(
+        id=original_jsonrpc_request_id,
+        result=result_data,
+    )
+    payload_to_publish = forwarded_rpc_response.model_dump(
+        by_alias=True, exclude_none=True
+    )
+
+    try:
+        component.publish_a2a_message(
+            payload_to_publish,
+            target_topic,
+        )
+        log.debug(
+            "%s Forwarded DataPart signal for main task %s (from peer %s) to %s.",
+            component.log_identifier,
+            main_logical_task_id,
+            peer_agent_name,
+            target_topic,
+        )
+    except Exception as pub_err:
+        log.exception(
+            "%s Failed to publish forwarded status signal for main task %s: %s",
+            component.log_identifier,
+            main_logical_task_id,
+            pub_err,
+        )
+    message.call_acknowledgements()
 
 
 def _register_peer_artifacts_in_parent_context(
@@ -196,7 +249,7 @@ async def process_event(component, event: Event):
 
 async def _publish_peer_tool_result_notification(
     component: "SamAgentComponent",
-    correlation_data: Dict[str, Any],
+    correlation_data: dict[str, Any],
     payload_to_queue: Any,
     log_identifier: str,
 ):
@@ -465,6 +518,35 @@ async def handle_a2a_request(component, message: SolaceMessage):
             # The gateway/client is the source of truth for the task ID.
             # The agent adopts the ID from the JSON-RPC request envelope.
             logical_task_id = str(a2a.get_request_id(a2a_request))
+
+            try:
+                from solace_agent_mesh_enterprise.auth.input_required import (
+                    a2a_auth_message_handler,
+                )
+
+                try:
+                    message_handled = await a2a_auth_message_handler(
+                        component, a2a_message, logical_task_id
+                    )
+                    if message_handled:
+                        message.call_acknowledgements()
+                        log.debug(
+                            "%s ACKed message handled by input-required auth handler.",
+                            component.log_identifier,
+                        )
+                        return None
+                except Exception as auth_import_err:
+                    log.error(
+                        "%s Error in input-required auth handler: %s",
+                        component.log_identifier,
+                        auth_import_err,
+                    )
+                    message.call_acknowledgements()
+                    return None
+
+            except ImportError:
+                pass
+
             # The session id is now contextId on the message
             original_session_id = a2a_message.context_id
             message_id = a2a_message.message_id
@@ -490,7 +572,7 @@ async def handle_a2a_request(component, message: SolaceMessage):
                     )
             else:
                 session_behavior = component.default_session_behavior
-                log.info(
+                log.debug(
                     "%s No 'sessionBehavior' in task metadata. Using component default: '%s'.",
                     component.log_identifier,
                     session_behavior,
@@ -632,7 +714,6 @@ async def handle_a2a_request(component, message: SolaceMessage):
                 "is_streaming": is_streaming_request,
                 "statusTopic": status_topic_from_peer,
                 "replyToTopic": reply_topic_from_peer,
-                "original_solace_message": message,
                 "a2a_user_config": a2a_user_config,
                 "effective_session_id": effective_session_id,
                 "is_run_based_session": is_run_based_session,
@@ -654,17 +735,28 @@ async def handle_a2a_request(component, message: SolaceMessage):
                     component.log_identifier,
                     logical_task_id,
                 )
-            log.debug(
-                "%s A2A Context (shared service model): %s",
-                component.log_identifier,
-                a2a_context,
-            )
+            if trace_logger.isEnabledFor(logging.DEBUG):
+                trace_logger.debug(
+                    "%s A2A Context (shared service model): %s",
+                    component.log_identifier,
+                    a2a_context,
+                )
+            else:
+                log.debug(
+                    "%s A2A Context prepared for task %s",
+                    component.log_identifier,
+                    a2a_context.get("logical_task_id", "unknown"),
+                )
 
             # Create and store the execution context for this task
             task_context = TaskExecutionContext(
                 task_id=logical_task_id, a2a_context=a2a_context
             )
 
+            # Store the original Solace message in TaskExecutionContext instead of a2a_context
+            # This avoids serialization issues when a2a_context is stored in ADK session state
+            task_context.set_original_solace_message(message)
+
             # Store auth token for peer delegation using generic security storage
             if hasattr(component, "trust_manager") and component.trust_manager:
                 auth_token = message.get_user_properties().get("authToken")
@@ -760,7 +852,7 @@ async def handle_a2a_request(component, message: SolaceMessage):
             streaming_mode = StreamingMode.SSE
 
             max_llm_calls_per_task = component.get_config("max_llm_calls_per_task", 20)
-            log.info(
+            log.debug(
                 "%s Using max_llm_calls_per_task: %s",
                 component.log_identifier,
                 max_llm_calls_per_task,
@@ -926,13 +1018,13 @@ def handle_agent_card_message(component, message: SolaceMessage):
                     break
 
         if is_allowed:
-            
+
             # 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.",
@@ -1053,93 +1145,143 @@ async def handle_a2a_response(component, message: SolaceMessage):
                     if isinstance(payload_data, TaskStatusUpdateEvent):
                         try:
                             status_event = payload_data
+
                             data_parts = a2a.get_data_parts_from_status_update(
                                 status_event
                             )
                             if data_parts:
-                                for data_part in data_parts:
-                                    log.info(
-                                        "%s Received DataPart signal from peer for sub-task %s. Forwarding...",
-                                        component.log_identifier,
-                                        sub_task_id,
+
+                                peer_agent_name = (
+                                    status_event.metadata.get(
+                                        "agent_name", "UnknownPeer"
                                     )
-                                    correlation_data = await component._get_correlation_data_for_sub_task(
+                                    if status_event.metadata
+                                    else "UnknownPeer"
+                                )
+
+                                correlation_data = (
+                                    await component._get_correlation_data_for_sub_task(
                                         sub_task_id
                                     )
-                                    if not correlation_data:
-                                        log.warning(
-                                            "%s Correlation data not found for sub-task %s. Cannot forward status signal.",
-                                            component.log_identifier,
-                                            sub_task_id,
-                                        )
-                                        message.call_acknowledgements()
-                                        return
-
-                                    original_task_context = correlation_data.get(
-                                        "original_task_context"
+                                )
+                                if not correlation_data:
+                                    log.warning(
+                                        "%s Correlation data not found for sub-task %s. Cannot forward status signal.",
+                                        component.log_identifier,
+                                        sub_task_id,
                                     )
-                                    if not original_task_context:
-                                        log.warning(
-                                            "%s original_task_context not found in correlation data for sub-task %s. Cannot forward status signal.",
-                                            component.log_identifier,
-                                            sub_task_id,
-                                        )
-                                        message.call_acknowledgements()
-                                        return
+                                    message.call_acknowledgements()
+                                    return
 
-                                    main_logical_task_id = original_task_context.get(
-                                        "logical_task_id"
-                                    )
-                                    original_jsonrpc_request_id = (
-                                        original_task_context.get("jsonrpc_request_id")
+                                original_task_context = correlation_data.get(
+                                    "original_task_context"
+                                )
+                                if not original_task_context:
+                                    log.warning(
+                                        "%s original_task_context not found in correlation data for sub-task %s. Cannot forward status signal.",
+                                        component.log_identifier,
+                                        sub_task_id,
                                     )
-                                    main_context_id = original_task_context.get(
-                                        "contextId"
+                                    message.call_acknowledgements()
+                                    return
+
+                                main_logical_task_id = original_task_context.get(
+                                    "logical_task_id"
+                                )
+                                original_jsonrpc_request_id = original_task_context.get(
+                                    "jsonrpc_request_id"
+                                )
+                                main_context_id = original_task_context.get("contextId")
+
+                                target_topic_for_forward = original_task_context.get(
+                                    "statusTopic"
+                                )
+
+                                if (
+                                    not main_logical_task_id
+                                    or not original_jsonrpc_request_id
+                                    or not target_topic_for_forward
+                                ):
+                                    log.error(
+                                        "%s Missing critical info (main_task_id, original_rpc_id, or target_status_topic) in context for sub-task %s. Cannot forward. Context: %s",
+                                        component.log_identifier,
+                                        sub_task_id,
+                                        original_task_context,
                                     )
+                                    message.call_acknowledgements()
+                                    return
 
-                                    target_topic_for_forward = (
-                                        original_task_context.get("statusTopic")
+                                event_metadata = {
+                                    "agent_name": component.agent_name,
+                                    "forwarded_from_peer": peer_agent_name,
+                                    "original_peer_event_taskId": status_event.task_id,
+                                    "original_peer_event_timestamp": (
+                                        status_event.status.timestamp
+                                        if status_event.status
+                                        and status_event.status.timestamp
+                                        else None
+                                    ),
+                                    "function_call_id": correlation_data.get(
+                                        "adk_function_call_id", None
+                                    ),
+                                }
+
+                                if (
+                                    status_event.status.state
+                                    == TaskState.input_required
+                                ):
+                                    log.debug(
+                                        "%s Received input-required status for sub-task %s. Requesting user input. Forwarding to target.",
+                                        component.log_identifier,
+                                        sub_task_id,
                                     )
 
                                     if (
-                                        not main_logical_task_id
-                                        or not original_jsonrpc_request_id
-                                        or not target_topic_for_forward
+                                        status_event.metadata
+                                        and "task_call_stack" in status_event.metadata
+                                        and isinstance(
+                                            status_event.metadata["task_call_stack"],
+                                            list,
+                                        )
                                     ):
-                                        log.error(
-                                            "%s Missing critical info (main_task_id, original_rpc_id, or target_status_topic) in context for sub-task %s. Cannot forward. Context: %s",
-                                            component.log_identifier,
-                                            sub_task_id,
-                                            original_task_context,
+                                        task_call_stack = status_event.metadata[
+                                            "task_call_stack"
+                                        ].copy()
+                                        task_call_stack.insert(0, sub_task_id)
+                                        event_metadata["task_call_stack"] = (
+                                            task_call_stack
                                         )
-                                        message.call_acknowledgements()
-                                        return
+                                    else:
+                                        event_metadata["task_call_stack"] = [
+                                            sub_task_id
+                                        ]
+
+                                    status_event.metadata = event_metadata
+                                    status_event.task_id = main_logical_task_id
+
+                                    _forward_jsonrpc_response(
+                                        component=component,
+                                        original_jsonrpc_request_id=original_jsonrpc_request_id,
+                                        result_data=status_event,
+                                        target_topic=target_topic_for_forward,
+                                        main_logical_task_id=main_logical_task_id,
+                                        peer_agent_name=peer_agent_name,
+                                        message=message,
+                                    )
+                                    return
 
-                                    peer_agent_name = (
-                                        status_event.metadata.get(
-                                            "agent_name", "UnknownPeer"
-                                        )
-                                        if status_event.metadata
-                                        else "UnknownPeer"
+                                for data_part in data_parts:
+                                    log.info(
+                                        "%s Received DataPart signal from peer for sub-task %s. Forwarding...",
+                                        component.log_identifier,
+                                        sub_task_id,
                                     )
 
                                     forwarded_message = a2a.create_agent_parts_message(
                                         parts=[data_part],
-                                        metadata={
-                                            "agent_name": component.agent_name,
-                                            "forwarded_from_peer": peer_agent_name,
-                                            "original_peer_event_taskId": status_event.task_id,
-                                            "original_peer_event_timestamp": (
-                                                status_event.status.timestamp
-                                                if status_event.status
-                                                and status_event.status.timestamp
-                                                else None
-                                            ),
-                                            "function_call_id": correlation_data.get(
-                                                "adk_function_call_id", None
-                                            ),
-                                        },
+                                        metadata=event_metadata,
                                     )
+
                                     forwarded_event = a2a.create_status_update(
                                         task_id=main_logical_task_id,
                                         context_id=main_context_id,
@@ -1153,36 +1295,15 @@ async def handle_a2a_response(component, message: SolaceMessage):
                                         forwarded_event.status.timestamp = (
                                             status_event.status.timestamp
                                         )
-                                    forwarded_rpc_response = JSONRPCResponse(
-                                        id=original_jsonrpc_request_id,
-                                        result=forwarded_event,
+                                    _forward_jsonrpc_response(
+                                        component=component,
+                                        original_jsonrpc_request_id=original_jsonrpc_request_id,
+                                        result_data=forwarded_event,
+                                        target_topic=target_topic_for_forward,
+                                        main_logical_task_id=main_logical_task_id,
+                                        peer_agent_name=peer_agent_name,
+                                        message=message,
                                     )
-                                    payload_to_publish = (
-                                        forwarded_rpc_response.model_dump(
-                                            by_alias=True, exclude_none=True
-                                        )
-                                    )
-
-                                    try:
-                                        component.publish_a2a_message(
-                                            payload_to_publish,
-                                            target_topic_for_forward,
-                                        )
-                                        log.info(
-                                            "%s Forwarded DataPart signal for main task %s (from peer %s) to %s.",
-                                            component.log_identifier,
-                                            main_logical_task_id,
-                                            peer_agent_name,
-                                            target_topic_for_forward,
-                                        )
-                                    except Exception as pub_err:
-                                        log.exception(
-                                            "%s Failed to publish forwarded status signal for main task %s: %s",
-                                            component.log_identifier,
-                                            main_logical_task_id,
-                                            pub_err,
-                                        )
-                                    message.call_acknowledgements()
                                     return
 
                             payload_to_queue = status_event.model_dump(

solace_agent_mesh/agent/proxies/a2a/app.py

@@ -43,8 +43,9 @@ class A2AProxyApp(BaseProxyApp):
             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
+            message = A2AProxyAppConfig.format_validation_error_message(e, app_info['name'])
+            log.error("Invalid A2A Proxy configuration:\n%s", message)
+            raise
         
         super().__init__(app_info, **kwargs)
 

solace_agent_mesh/agent/proxies/base/app.py

@@ -43,8 +43,9 @@ class BaseProxyApp(App, ABC):
             # Overwrite the raw dict with the validated object for downstream use
             app_info["app_config"] = app_config
         except ValidationError as e:
-            log.error("Proxy configuration validation failed:\n%s", e)
-            raise ValueError(f"Invalid proxy configuration: {e}") from e
+            message = BaseProxyAppConfig.format_validation_error_message(e, app_info['name'])
+            log.error("Invalid Proxy configuration:\n%s", message)
+            raise
 
         namespace = app_config.get("namespace")
         proxied_agents = app_config.get("proxied_agents", [])

solace_agent_mesh/agent/sac/app.py

@@ -230,6 +230,32 @@ class ArtifactServiceConfig(SamConfigBase):
             )
         return self
 
+class AgentIdentityConfig(SamConfigBase):
+    """Configuration for agent identity and key management."""
+    key_mode: Literal["auto", "manual"] = Field(
+        default="auto",
+        description="Key mode for agent identity: 'auto' for automatic generation, 'manual' for user-provided."
+    )
+    key_identity: Optional[str] = Field(
+        default=None,
+        description="Actual key value when key_mode is 'manual'."
+    )
+    key_persistence: Optional[str] = Field(
+        default=None,
+        description="Path to the key file, e.g. '/path/to/keys/agent_{name}.key'."
+    )
+
+    @model_validator(mode="after")
+    def check_key_mode_and_identity(self) -> "AgentIdentityConfig":
+        if self.key_mode == "manual" and not self.key_identity:
+            raise ValueError(
+                "'key_identity' is required when 'key_mode' is 'manual'."
+            )
+        if self.key_mode == "auto" and self.key_identity:
+            log.warning(
+                "Configuration Warning: 'key_identity' is ignored when 'key_mode' is 'auto'."
+            )
+        return self
 
 class SessionServiceConfig(SamConfigBase):
     """Configuration for the ADK Session Service."""
@@ -245,6 +271,12 @@ class SessionServiceConfig(SamConfigBase):
     )
 
 
+class CredentialServiceConfig(SamConfigBase):
+    """Configuration for the ADK Credential Service."""
+
+    type: str = Field(..., description="Service type (e.g., 'memory').")
+
+
 class SamAgentAppConfig(SamConfigBase):
     """Pydantic model for the complete agent application configuration."""
 
@@ -264,6 +296,10 @@ class SamAgentAppConfig(SamConfigBase):
     model: Union[str, Dict[str, Any]] = Field(
         ..., description="ADK model name (string) or BaseLlm config dict."
     )
+    agent_identity: Optional[AgentIdentityConfig] = Field(
+        default_factory=lambda: AgentIdentityConfig(key_mode="auto"),
+        description="Configuration for agent identity and key management."
+    )
     trust_manager: Optional[Union[TrustManagerConfig, Dict[str, Any]]] = Field(
         default=None,
         description="Configuration for the Trust Manager (enterprise feature)",
@@ -306,6 +342,10 @@ class SamAgentAppConfig(SamConfigBase):
         default={"type": "memory"},
         description="Configuration for ADK Memory Service (defaults to memory).",
     )
+    credential_service: Optional[CredentialServiceConfig] = Field(
+        default=None,
+        description="Configuration for ADK Credential Service (optional).",
+    )
     multi_session_request_response: Dict[str, Any] = Field(
         default_factory=lambda: {"enabled": True},
         description="Enables multi-session request/response capabilities for the agent, required for peer delegation.",
@@ -436,8 +476,9 @@ class SamAgentApp(App):
             # Overwrite the raw dict with the validated object for downstream use
             app_info["app_config"] = app_config
         except ValidationError as e:
-            log.error("Agent configuration validation failed:\n%s", e)
-            raise ValueError(f"Invalid agent configuration: {e}") from e
+            message = SamAgentAppConfig.format_validation_error_message(e, app_info['name'], app_config_dict.get('agent_name'))
+            log.error("Invalid Agent configuration:\n%s", message)
+            raise
 
         # The rest of the method can now safely use .get() on the app_config object,
         # ensuring full backward compatibility.