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

solace_agent_mesh/common/a2a/__init__.py

@@ -14,6 +14,8 @@ from .artifact import (
     get_artifact_id,
     get_artifact_name,
     get_parts_from_artifact,
+    get_text_content_from_artifact,
+    is_text_only_artifact,
     update_artifact_parts,
     prepare_file_part_for_publishing,
     resolve_file_part_uri,
@@ -25,6 +27,8 @@ from .events import (
     get_artifact_from_artifact_update,
     get_data_parts_from_status_update,
     get_message_from_status_update,
+    is_task_artifact_update,
+    is_task_status_update,
 )
 from .message import (
     create_agent_data_message,
@@ -51,6 +55,11 @@ from .message import (
     get_text_from_message,
     get_text_from_text_part,
     get_uri_from_file_part,
+    is_data_part,
+    is_file_part,
+    is_file_part_bytes,
+    is_file_part_uri,
+    is_text_part,
 )
 from .protocol import (
     create_cancel_task_request,
@@ -92,8 +101,11 @@ from .protocol import (
     get_response_result,
     get_task_id_from_cancel_request,
     extract_task_id_from_topic,
+    is_client_event,
+    is_message_object,
     subscription_to_regex,
     topic_matches_subscription,
+    unpack_client_event,
 )
 from .task import (
     create_final_task,
@@ -122,6 +134,8 @@ __all__ = [
     "get_artifact_id",
     "get_artifact_name",
     "get_parts_from_artifact",
+    "get_text_content_from_artifact",
+    "is_text_only_artifact",
     "update_artifact_parts",
     "prepare_file_part_for_publishing",
     "resolve_file_part_uri",
@@ -132,6 +146,8 @@ __all__ = [
     "get_artifact_from_artifact_update",
     "get_data_parts_from_status_update",
     "get_message_from_status_update",
+    "is_task_artifact_update",
+    "is_task_status_update",
     # message.py
     "create_agent_data_message",
     "create_agent_parts_message",
@@ -157,6 +173,11 @@ __all__ = [
     "get_text_from_message",
     "get_uri_from_file_part",
     "get_text_from_text_part",
+    "is_data_part",
+    "is_file_part",
+    "is_file_part_bytes",
+    "is_file_part_uri",
+    "is_text_part",
     # protocol.py
     "create_cancel_task_request",
     "create_error_response",
@@ -197,8 +218,11 @@ __all__ = [
     "get_response_result",
     "get_task_id_from_cancel_request",
     "extract_task_id_from_topic",
+    "is_client_event",
+    "is_message_object",
     "subscription_to_regex",
     "topic_matches_subscription",
+    "unpack_client_event",
     # task.py
     "create_final_task",
     "create_initial_task",

solace_agent_mesh/common/a2a/artifact.py

@@ -327,3 +327,42 @@ def get_parts_from_artifact(artifact: Artifact) -> List[ContentPart]:
         A list of the unwrapped content parts.
     """
     return [part.root for part in artifact.parts]
+
+
+def is_text_only_artifact(artifact: Artifact) -> bool:
+    """
+    Checks if an artifact contains only TextParts.
+
+    Args:
+        artifact: The Artifact object to check.
+
+    Returns:
+        True if all parts are TextParts, False otherwise.
+    """
+    if not artifact.parts:
+        return False
+    
+    for part in artifact.parts:
+        if not isinstance(part.root, TextPart):
+            return False
+    
+    return True
+
+
+def get_text_content_from_artifact(artifact: Artifact) -> List[str]:
+    """
+    Extracts all text content from TextParts in an artifact.
+
+    Args:
+        artifact: The Artifact object to extract text from.
+
+    Returns:
+        A list of text strings from all TextParts. Returns empty list if no TextParts found.
+    """
+    text_content = []
+    
+    for part in artifact.parts:
+        if isinstance(part.root, TextPart):
+            text_content.append(part.root.text)
+    
+    return text_content

solace_agent_mesh/common/a2a/events.py

@@ -181,3 +181,32 @@ def get_artifact_from_artifact_update(
     if event:
         return event.artifact
     return None
+
+
+# --- Type Checking Helpers ---
+
+
+def is_task_status_update(obj: Any) -> bool:
+    """
+    Checks if an object is a TaskStatusUpdateEvent.
+
+    Args:
+        obj: The object to check.
+
+    Returns:
+        True if the object is a TaskStatusUpdateEvent, False otherwise.
+    """
+    return isinstance(obj, TaskStatusUpdateEvent)
+
+
+def is_task_artifact_update(obj: Any) -> bool:
+    """
+    Checks if an object is a TaskArtifactUpdateEvent.
+
+    Args:
+        obj: The object to check.
+
+    Returns:
+        True if the object is a TaskArtifactUpdateEvent, False otherwise.
+    """
+    return isinstance(obj, TaskArtifactUpdateEvent)

solace_agent_mesh/common/a2a/message.py

@@ -305,3 +305,71 @@ def get_filename_from_file_part(part: FilePart) -> Optional[str]:
 def get_mimetype_from_file_part(part: FilePart) -> Optional[str]:
     """Safely retrieves the MIME type from a FilePart."""
     return part.file.mime_type
+
+
+# --- Type Checking Helpers ---
+
+
+def is_text_part(part: Part) -> bool:
+    """
+    Checks if a Part contains a TextPart.
+
+    Args:
+        part: The Part object to check.
+
+    Returns:
+        True if the part contains a TextPart, False otherwise.
+    """
+    return isinstance(part.root, TextPart)
+
+
+def is_file_part(part: Part) -> bool:
+    """
+    Checks if a Part contains a FilePart.
+
+    Args:
+        part: The Part object to check.
+
+    Returns:
+        True if the part contains a FilePart, False otherwise.
+    """
+    return isinstance(part.root, FilePart)
+
+
+def is_data_part(part: Part) -> bool:
+    """
+    Checks if a Part contains a DataPart.
+
+    Args:
+        part: The Part object to check.
+
+    Returns:
+        True if the part contains a DataPart, False otherwise.
+    """
+    return isinstance(part.root, DataPart)
+
+
+def is_file_part_bytes(part: FilePart) -> bool:
+    """
+    Checks if a FilePart uses FileWithBytes (embedded content).
+
+    Args:
+        part: The FilePart object to check.
+
+    Returns:
+        True if the file content is embedded as bytes, False otherwise.
+    """
+    return isinstance(part.file, FileWithBytes)
+
+
+def is_file_part_uri(part: FilePart) -> bool:
+    """
+    Checks if a FilePart uses FileWithUri (reference to external content).
+
+    Args:
+        part: The FilePart object to check.
+
+    Returns:
+        True if the file content is a URI reference, False otherwise.
+    """
+    return isinstance(part.file, FileWithUri)

solace_agent_mesh/common/a2a/protocol.py

@@ -5,7 +5,7 @@ parsing of JSON-RPC requests and responses.
 import logging
 import re
 import uuid
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional, Tuple, Union
 
 from a2a.types import (
     A2ARequest,
@@ -532,3 +532,75 @@ def extract_task_id_from_topic(
         subscription_pattern,
     )
     return None
+
+
+# --- Client Event Helpers ---
+
+
+def is_client_event(obj: Any) -> bool:
+    """
+    Checks if an object is a ClientEvent tuple (Task, UpdateEvent).
+
+    A ClientEvent is a tuple with 2 elements where the first element is a Task
+    and the second is either a TaskStatusUpdateEvent, TaskArtifactUpdateEvent, or None.
+
+    Args:
+        obj: The object to check.
+
+    Returns:
+        True if the object is a ClientEvent tuple, False otherwise.
+    """
+    if not isinstance(obj, tuple) or len(obj) != 2:
+        return False
+    
+    task, update_event = obj
+    
+    # First element must be a Task
+    if not isinstance(task, Task):
+        return False
+    
+    # Second element must be an update event or None
+    if update_event is not None and not isinstance(
+        update_event, (TaskStatusUpdateEvent, TaskArtifactUpdateEvent)
+    ):
+        return False
+    
+    return True
+
+
+def is_message_object(obj: Any) -> bool:
+    """
+    Checks if an object is a Message.
+
+    Args:
+        obj: The object to check.
+
+    Returns:
+        True if the object is a Message, False otherwise.
+    """
+    return isinstance(obj, Message)
+
+
+def unpack_client_event(
+    event: tuple,
+) -> Tuple[Task, Optional[Union[TaskStatusUpdateEvent, TaskArtifactUpdateEvent]]]:
+    """
+    Safely unpacks a ClientEvent tuple into its components.
+
+    Args:
+        event: A ClientEvent tuple (Task, UpdateEvent).
+
+    Returns:
+        A tuple of (Task, Optional[UpdateEvent]) where UpdateEvent can be
+        TaskStatusUpdateEvent, TaskArtifactUpdateEvent, or None.
+
+    Raises:
+        ValueError: If the event is not a valid ClientEvent tuple.
+    """
+    if not is_client_event(event):
+        raise ValueError(
+            f"Expected a ClientEvent tuple, got {type(event).__name__}"
+        )
+    
+    task, update_event = event
+    return task, update_event

solace_agent_mesh/common/agent_registry.py

@@ -4,26 +4,37 @@ Consolidated from src/tools/common/agent_registry.py and src/tools/a2a_cli_clien
 """
 
 import threading
-from typing import Dict, List, Optional
+import time
+from typing import Dict, List, Optional, Tuple
+import logging
 
 from a2a.types import AgentCard
 
+log = logging.getLogger(__name__)
 
 class AgentRegistry:
-    """Stores and manages discovered AgentCards."""
+    """Stores and manages discovered AgentCards with health tracking."""
 
     def __init__(self):
         self._agents: Dict[str, AgentCard] = {}
+        self._last_seen: Dict[str, float] = {}  # Timestamp of last agent card received
         self._lock = threading.Lock()
 
     def add_or_update_agent(self, agent_card: AgentCard):
         """Adds a new agent or updates an existing one."""
+        
         if not agent_card or not agent_card.name:
-            return
+            log.warning("Attempted to register agent with invalid agent card or missing name")
+            return False
 
         with self._lock:
             is_new = agent_card.name not in self._agents
+            current_time = time.time()
+            
+            # Store the agent information
             self._agents[agent_card.name] = agent_card
+            self._last_seen[agent_card.name] = current_time
+                    
             return is_new
 
     def get_agent(self, agent_name: str) -> Optional[AgentCard]:
@@ -35,8 +46,77 @@ class AgentRegistry:
         """Returns a sorted list of discovered agent names."""
         with self._lock:
             return sorted(list(self._agents.keys()))
+            
+    def get_last_seen(self, agent_name: str) -> Optional[float]:
+        """Returns the timestamp when the agent was last seen."""
+        with self._lock:
+            return self._last_seen.get(agent_name)
+            
+    def check_ttl_expired(self, agent_name: str, ttl_seconds: int) -> Tuple[bool, int]:
+        """
+        Checks if an agent's TTL has expired.
+        
+        Args:
+            agent_name: The name of the agent to check
+            ttl_seconds: The TTL in seconds
+            
+        Returns:
+            A tuple of (is_expired, seconds_since_last_seen)
+        """
+        
+        with self._lock:
+            if agent_name not in self._last_seen:
+                log.debug("Attempted to check TTL for non-existent agent '%s'", agent_name)
+                return False, 0
+                
+            last_seen_time = self._last_seen.get(agent_name)
+            current_time = time.time()
+            time_since_last_seen = int(current_time - last_seen_time) if last_seen_time else 0
+            
+            is_expired = time_since_last_seen > ttl_seconds
+            
+            if is_expired:
+                log.warning(
+                    "AGENT HEALTH CRITICAL: Agent '%s' TTL expired. "
+                    "Last seen: %s seconds ago, TTL: %d seconds",
+                    agent_name,
+                    time_since_last_seen,
+                    ttl_seconds
+                )
+            
+            return is_expired, time_since_last_seen
+            
+    def remove_agent(self, agent_name: str) -> bool:
+        """Removes an agent from the registry."""
+        
+        with self._lock:
+            if agent_name in self._agents:
+                # Get agent details before removal for logging
+                last_seen_time = self._last_seen.get(agent_name)
+                current_time = time.time()
+                time_since_last_seen = int(current_time - last_seen_time) if last_seen_time else "unknown"
+                
+                # Log detailed information about the agent being removed
+                log.warning(
+                    "AGENT DE-REGISTRATION: Removing agent '%s' from registry. "
+                    "Last seen: %s seconds ago",
+                    agent_name,
+                    time_since_last_seen
+                )
+                
+                # Remove the agent from all tracking dictionaries
+                del self._agents[agent_name]
+                if agent_name in self._last_seen:
+                    del self._last_seen[agent_name]
+                
+                log.info("Agent '%s' successfully removed from registry", agent_name)
+                return True
+            else:
+                log.debug("Attempted to remove non-existent agent '%s' from registry", agent_name)
+                return False
 
     def clear(self):
         """Clears all registered agents."""
         with self._lock:
             self._agents.clear()
+            self._last_seen.clear()

solace_agent_mesh/common/constants.py

@@ -1,4 +1,6 @@
 
 DEFAULT_COMMUNICATION_TIMEOUT = 600  # 10 minutes
+HEALTH_CHECK_TTL_SECONDS = 60  # 60 seconds - time after which a health check is considered stale
+HEALTH_CHECK_INTERVAL_SECONDS = 10  # 10 seconds - interval between health checks
 TEXT_ARTIFACT_CONTEXT_MAX_LENGTH_CAPACITY = 200000  # maximum number of characters that can be loaded from a text artifact
-TEXT_ARTIFACT_CONTEXT_DEFAULT_LENGTH = 100000  # default number of characters to load from a text artifact 
+TEXT_ARTIFACT_CONTEXT_DEFAULT_LENGTH = 100000  # default number of characters to load from a text artifact 

solace_agent_mesh/common/utils/pydantic_utils.py

@@ -58,3 +58,15 @@ class SamConfigBase(BaseModel):
     def __iter__(self):
         """Provides dict-like iteration over keys."""
         return iter(self.model_dump())
+    
+    def pop(self, key: str, default: Any = None) -> Any:
+        """
+        Provides dict-like .pop() method.
+        Removes the attribute and returns its value, or default if not present.
+        """
+        if hasattr(self, key):
+            value = getattr(self, key)
+            # Set to None rather than deleting, as Pydantic models don't support delattr
+            setattr(self, key, None)
+            return value
+        return default

solace_agent_mesh/config_portal/backend/common.py

@@ -34,7 +34,7 @@ AGENT_DEFAULTS = {
     "enable_embed_resolution": True,
     "enable_artifact_content_instruction": True,
     "tools": "[]",
-    "session_service_type": USE_DEFAULT_SHARED_SESSION,
+    "session_service_type": "sql",
     "session_service_behavior": "PERSISTENT",
     "artifact_service_type": USE_DEFAULT_SHARED_ARTIFACT,
     "artifact_service_base_path": "/tmp/samv2",