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

solace_agent_mesh/agent/adk/callbacks.py

@@ -4,6 +4,7 @@ Includes dynamic instruction injection, artifact metadata injection,
 embed resolution, and logging.
 """
 
+import logging
 import json
 import asyncio
 import uuid
@@ -18,7 +19,7 @@ from google.adk.models.llm_request import LlmRequest
 from google.adk.models.llm_response import LlmResponse
 from google.genai import types as adk_types
 from google.adk.tools.mcp_tool import MCPTool
-from solace_ai_connector.common.log import log
+
 from .intelligent_mcp_callbacks import (
     save_mcp_response_as_artifact_intelligent,
     McpSaveStatus,
@@ -76,6 +77,8 @@ from ...agent.adk.stream_parser import (
     ARTIFACT_BLOCK_DELIMITER_CLOSE,
 )
 
+log = logging.getLogger(__name__)
+
 A2A_LLM_STREAM_CHUNKS_PROCESSED_KEY = "temp:llm_stream_chunks_processed"
 
 if TYPE_CHECKING:
@@ -775,17 +778,16 @@ def _generate_fenced_artifact_instruction() -> str:
 To create an artifact from content you generate (like code, a report, or a document), you MUST use a special `save_artifact` block. This is the only reliable way to ensure your content is saved correctly.
 
 **Syntax:**
-```
 {open_delim}save_artifact: filename="your_filename.ext" mime_type="text/plain" description="A brief description."
 The full content you want to save goes here.
 It can span multiple lines.
 {close_delim}
-```
 
 - **Rules:**
   - The parameters `filename` and `mime_type` are required. `description` is optional but recommended.
   - All parameter values **MUST** be enclosed in double quotes.
   - You **MUST NOT** use double quotes `"` inside the parameter values (e.g., within the description string). Use single quotes or rephrase instead.
+  - Do not surround a save_artifact block with '```' (triple backticks). This will create rendering issues.
 
 The system will automatically save the content and give you a confirmation in the next turn."""
 
@@ -1484,32 +1486,32 @@ def solace_llm_response_callback(
             "type": "llm_response",
             "data": llm_response.model_dump(exclude_none=True),
         }
-        
+
         # Extract and record token usage
         if llm_response.usage_metadata:
             usage = llm_response.usage_metadata
             model_name = callback_context.state.get("model_name", "unknown")
-            
+
             usage_dict = {
                 "input_tokens": usage.prompt_token_count,
                 "output_tokens": usage.candidates_token_count,
                 "model": model_name,
             }
-            
+
             # Check for cached tokens (provider-specific)
             cached_tokens = 0
-            if hasattr(usage, 'prompt_tokens_details') and usage.prompt_tokens_details:
-                cached_tokens = getattr(usage.prompt_tokens_details, 'cached_tokens', 0)
+            if hasattr(usage, "prompt_tokens_details") and usage.prompt_tokens_details:
+                cached_tokens = getattr(usage.prompt_tokens_details, "cached_tokens", 0)
                 if cached_tokens > 0:
                     usage_dict["cached_input_tokens"] = cached_tokens
-            
+
             # Add to response data
             llm_response_data["usage"] = usage_dict
-            
+
             # Record in task context for aggregation
             with host_component.active_tasks_lock:
                 task_context = host_component.active_tasks.get(logical_task_id)
-            
+
             if task_context:
                 task_context.record_token_usage(
                     input_tokens=usage.prompt_token_count,
@@ -1526,7 +1528,7 @@ def solace_llm_response_callback(
                     cached_tokens,
                     model_name,
                 )
-        
+
         # This signal doesn't have a dedicated Pydantic model, so we create the
         # DataPart directly and use the lower-level helpers.
         data_part = a2a.create_data_part(data=llm_response_data)

solace_agent_mesh/agent/adk/embed_resolving_mcp_toolset.py

@@ -2,6 +2,7 @@
 Custom MCPToolset that resolves embeds in tool parameters before calling MCP tools.
 """
 
+import logging
 import asyncio
 from typing import Dict, List, Optional, Any
 
@@ -12,7 +13,7 @@ from google.adk.tools.mcp_tool.mcp_session_manager import (
     StreamableHTTPConnectionParams,
 )
 from google.adk.tools.tool_context import ToolContext
-from solace_ai_connector.common.log import log
+
 
 from ..utils.context_helpers import get_original_session_id
 from ...common.utils.embeds import (
@@ -23,6 +24,7 @@ from ...common.utils.embeds import (
     EMBED_DELIMITER_OPEN,
 )
 
+log = logging.getLogger(__name__)
 
 class EmbedResolvingMCPTool(MCPTool):
     """

solace_agent_mesh/agent/adk/intelligent_mcp_callbacks.py

@@ -5,6 +5,7 @@ This module contains the refactored MCP callback functions that use intelligent
 content processing to save MCP tool responses as appropriately typed artifacts.
 """
 
+import logging
 import json
 import uuid
 from datetime import datetime, timezone
@@ -13,7 +14,6 @@ from enum import Enum
 from pydantic import BaseModel
 
 from google.adk.tools import ToolContext, BaseTool
-from solace_ai_connector.common.log import log
 
 from .mcp_content_processor import MCPContentProcessor, MCPContentProcessorConfig
 from ...agent.utils.artifact_helpers import (
@@ -22,6 +22,7 @@ from ...agent.utils.artifact_helpers import (
 )
 from ...agent.utils.context_helpers import get_original_session_id
 
+log = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
     from ...agent.sac.component import SamAgentComponent

solace_agent_mesh/agent/adk/mcp_content_processor.py

@@ -12,6 +12,7 @@ Supports:
 - Resource content with URI-based filename extraction
 """
 
+import logging
 import base64
 import csv
 import json
@@ -23,7 +24,7 @@ from io import StringIO
 from typing import Any, Dict, List, Optional, Tuple, Union
 from urllib.parse import urlparse
 
-from solace_ai_connector.common.log import log
+log = logging.getLogger(__name__)
 
 from ...common.utils.mime_helpers import (
     is_text_based_mime_type,

solace_agent_mesh/agent/adk/runner.py

@@ -2,6 +2,7 @@
 Manages the asynchronous execution of the ADK Runner.
 """
 
+import logging
 import asyncio
 
 from google.adk.agents.invocation_context import LlmCallsLimitExceededError
@@ -21,10 +22,11 @@ from google.adk.events import Event as ADKEvent
 from google.adk.events.event_actions import EventActions
 from google.adk.sessions import Session as ADKSession
 from google.genai import types as adk_types
-from solace_ai_connector.common.log import log
 
 from ...common import a2a
 
+log = logging.getLogger(__name__)
+
 if TYPE_CHECKING:
     from ..sac.component import SamAgentComponent
     from ..sac.task_execution_context import TaskExecutionContext

solace_agent_mesh/agent/adk/services.py

@@ -2,13 +2,14 @@
 Initializes ADK Services based on configuration.
 """
 
+import logging
 import os
 import re
 from typing import Dict, Optional, List, Any
 from typing_extensions import override
 
 from google.genai import types as adk_types
-from solace_ai_connector.common.log import log
+
 
 from google.adk.sessions import (
     BaseSessionService,
@@ -29,6 +30,8 @@ from google.adk.memory import (
 
 from .artifacts.filesystem_artifact_service import FilesystemArtifactService
 
+log = logging.getLogger(__name__)
+
 try:
     from sam_test_infrastructure.artifact_service.service import (
         TestInMemoryArtifactService,

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",

solace_agent_mesh/agent/sac/app.py

@@ -1,3 +1,4 @@
+import logging
 import sys
 import os
 
@@ -7,7 +8,6 @@ sys.path.insert(
 
 from common.utils.asyncio_macos_fix import ensure_asyncio_compatibility
 from .patch_adk import patch_adk
-from solace_ai_connector.common.log import log
 
 ensure_asyncio_compatibility()
 patch_adk()
@@ -29,6 +29,8 @@ from ...agent.utils.artifact_helpers import DEFAULT_SCHEMA_MAX_KEYS
 from ...common.utils.pydantic_utils import SamConfigBase
 from ..tools.tool_config_types import AnyToolConfig
 
+log = logging.getLogger(__name__)
+
 info = {
     "class_name": "SamAgentApp",
     "description": "Custom App class for SAM Agent Host with namespace prefixing and automatic subscription generation.",

solace_agent_mesh/agent/sac/component.py

@@ -2,6 +2,7 @@
 Custom Solace AI Connector Component to Host Google ADK Agents via A2A Protocol.
 """
 
+import logging
 from typing import Any, Dict, Optional, Union, Callable, List, Tuple, TYPE_CHECKING
 import asyncio
 import functools
@@ -15,8 +16,8 @@ import json
 from solace_ai_connector.common.message import (
     Message as SolaceMessage,
 )
-from solace_ai_connector.common.log import log
 from solace_ai_connector.common.event import Event, EventType
+
 from solace_ai_connector.common.utils import import_module
 import inspect
 from pydantic import BaseModel, ValidationError
@@ -76,6 +77,8 @@ from ...common.constants import DEFAULT_COMMUNICATION_TIMEOUT
 from ...agent.tools.registry import tool_registry
 from ...common.sac.sam_component_base import SamComponentBase
 
+log = logging.getLogger(__name__)
+
 if TYPE_CHECKING:
     from .app import AgentInitCleanupConfig
     from .task_execution_context import TaskExecutionContext

solace_agent_mesh/agent/tools/audio_tools.py

@@ -2,6 +2,7 @@
 Collection of Python tools for audio processing and text-to-speech generation.
 """
 
+import logging
 import asyncio
 import inspect
 import io
@@ -20,7 +21,6 @@ from google import genai
 from google.genai import types as adk_types
 from google.adk.tools import ToolContext
 from pydub import AudioSegment
-from solace_ai_connector.common.log import log
 
 from ...agent.utils.artifact_helpers import (
     load_artifact_content_or_metadata,
@@ -32,6 +32,7 @@ from ...agent.utils.context_helpers import get_original_session_id
 from .tool_definition import BuiltinTool
 from .registry import tool_registry
 
+log = logging.getLogger(__name__)
 
 VOICE_TONE_MAPPING = {
     "bright": ["Zephyr", "Autonoe"],

solace_agent_mesh/agent/tools/builtin_artifact_tools.py

@@ -5,6 +5,7 @@ use state_delta for signaling artifact return requests to the host component.
 Metadata handling is integrated via artifact_helpers.
 """
 
+import logging
 import uuid
 import json
 import re
@@ -16,7 +17,6 @@ from google.adk.tools import ToolContext
 if TYPE_CHECKING:
     from google.adk.agents.invocation_context import InvocationContext
 from google.genai import types as adk_types
-from solace_ai_connector.common.log import log
 from .tool_definition import BuiltinTool
 from .registry import tool_registry
 from ...agent.utils.artifact_helpers import (
@@ -38,6 +38,8 @@ from google.adk.models import LlmRequest
 from google.adk.models.registry import LLMRegistry
 from ...common.utils.mime_helpers import is_text_based_file
 
+log = logging.getLogger(__name__)
+
 CATEGORY_NAME = "Artifact Management"
 CATEGORY_DESCRIPTION = "List, read, create, update, and delete artifacts."
 

solace_agent_mesh/agent/tools/builtin_data_analysis_tools.py

@@ -2,6 +2,7 @@
 Built-in ADK Tools for Data Analysis (SQL, JQ, Plotly).
 """
 
+import logging
 import json
 from typing import Any, Dict, Tuple, Optional, Literal
 from datetime import datetime, timezone
@@ -31,7 +32,6 @@ except ImportError:
 
 from google.adk.tools import ToolContext
 from google.genai import types as adk_types
-from solace_ai_connector.common.log import log
 
 from ...agent.utils.artifact_helpers import (
     ensure_correct_extension,
@@ -44,6 +44,8 @@ from ...agent.utils.context_helpers import get_original_session_id
 from .tool_definition import BuiltinTool
 from .registry import tool_registry
 
+log = logging.getLogger(__name__)
+
 CATEGORY_NAME = "Data Analysis"
 CATEGORY_DESCRIPTION = "Create static chart images from data in JSON or YAML format."
 

solace_agent_mesh/agent/tools/dynamic_tool.py

@@ -4,6 +4,7 @@ Dynamic tools allow for programmatic definition of tool names, descriptions,
 and parameter schemas, offering more flexibility than standard Python tools.
 """
 
+import logging
 from abc import ABC, abstractmethod
 from typing import (
     Optional,
@@ -23,7 +24,6 @@ import inspect
 from pydantic import BaseModel
 from google.adk.tools import BaseTool, ToolContext
 from google.genai import types as adk_types
-from solace_ai_connector.common.log import log
 
 from solace_agent_mesh.agent.utils.context_helpers import get_original_session_id
 
@@ -35,6 +35,7 @@ from ...common.utils.embeds import (
     EMBED_DELIMITER_OPEN,
 )
 
+log = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
     from ..sac.component import SamAgentComponent

solace_agent_mesh/agent/tools/general_agent_tools.py

@@ -2,6 +2,7 @@
 Collection of Python tools that can be configured for general purpose agents.
 """
 
+import logging
 import asyncio
 import inspect
 import json
@@ -13,7 +14,6 @@ from typing import Any, Dict, Optional, Tuple
 from playwright.async_api import async_playwright
 
 from google.adk.tools import ToolContext
-from solace_ai_connector.common.log import log
 
 from markitdown import MarkItDown, UnsupportedFormatException
 from mermaid_cli import render_mermaid
@@ -30,6 +30,7 @@ from google.genai import types as adk_types
 from .tool_definition import BuiltinTool
 from .registry import tool_registry
 
+log = logging.getLogger(__name__)
 
 def _simple_truncate_text(text: str, max_bytes: int = 2048) -> Tuple[str, bool]:
     """Truncates text to a maximum number of bytes for preview."""

solace_agent_mesh/agent/tools/image_tools.py

@@ -3,6 +3,7 @@ Collection of Python tools for image generation, manipulation, and multimodal co
 Includes tools for image description and audio description using vision and audio APIs.
 """
 
+import logging
 import asyncio
 import base64
 import inspect
@@ -14,7 +15,6 @@ from typing import Any, Dict, Optional
 
 import httpx
 from google.adk.tools import ToolContext
-from solace_ai_connector.common.log import log
 
 from ..utils.artifact_helpers import (
     save_artifact_with_metadata,
@@ -26,6 +26,7 @@ from google.genai import types as adk_types
 from .tool_definition import BuiltinTool
 from .registry import tool_registry
 
+log = logging.getLogger(__name__)
 
 async def create_image_from_description(
     image_description: str,

solace_agent_mesh/agent/tools/peer_agent_tool.py

@@ -2,13 +2,13 @@
 ADK Tool implementation for delegating tasks to peer A2A agents over Solace.
 """
 
+import logging
 from typing import Any, Dict, Optional, List, Union
 import uuid
 
 from google.adk.tools import BaseTool, ToolContext
 from google.genai import types as adk_types
 from pydantic import BaseModel, Field
-from solace_ai_connector.common.log import log
 
 from ...common.a2a.types import ContentPart
 from a2a.types import (
@@ -18,6 +18,7 @@ from ...common import a2a
 from ...common.constants import DEFAULT_COMMUNICATION_TIMEOUT
 from ...common.exceptions import MessageSizeExceededError
 
+log = logging.getLogger(__name__)
 
 class ArtifactIdentifier(BaseModel):
     """Identifies a specific version of an artifact."""

solace_agent_mesh/agent/tools/registry.py

@@ -2,9 +2,11 @@
 A singleton registry for discovering and holding all BuiltinTool definitions.
 """
 
+import logging
 from typing import Dict, List, Optional
 from .tool_definition import BuiltinTool
-from solace_ai_connector.common.log import log
+
+log = logging.getLogger(__name__)
 
 
 class _ToolRegistry:

solace_agent_mesh/agent/tools/test_tools.py

@@ -2,16 +2,17 @@
 Test-specific ADK Tools.
 """
 
+import logging
 import asyncio
 from typing import Dict, Optional, Any
 
 from google.adk.tools import ToolContext
-from solace_ai_connector.common.log import log
 
 from google.genai import types as adk_types
 from .tool_definition import BuiltinTool
 from .registry import tool_registry
 
+log = logging.getLogger(__name__)
 
 async def time_delay(
     seconds: float,

solace_agent_mesh/agent/tools/web_tools.py

@@ -2,6 +2,7 @@
 Collection of Python tools for web-related tasks, such as making HTTP requests.
 """
 
+import logging
 import json
 import uuid
 from datetime import datetime, timezone
@@ -15,7 +16,6 @@ from markdownify import markdownify as md
 from bs4 import BeautifulSoup
 
 from google.adk.tools import ToolContext
-from solace_ai_connector.common.log import log
 
 from ...agent.utils.artifact_helpers import (
     save_artifact_with_metadata,
@@ -27,6 +27,7 @@ from google.genai import types as adk_types
 from .tool_definition import BuiltinTool
 from .registry import tool_registry
 
+log = logging.getLogger(__name__)
 
 CATEGORY_NAME = "Web Access"
 CATEGORY_DESCRIPTION = "Access the web to find information to complete user requests."

solace_agent_mesh/agent/utils/artifact_helpers.py

@@ -2,6 +2,7 @@
 Helper functions for artifact management, including metadata handling and schema inference.
 """
 
+import logging
 import base64
 import binascii
 import json
@@ -16,7 +17,6 @@ from typing import Any, Dict, Optional, Tuple, List, Union, TYPE_CHECKING
 from urllib.parse import urlparse, parse_qs, urlunparse, urlencode
 from google.adk.artifacts import BaseArtifactService
 from google.genai import types as adk_types
-from solace_ai_connector.common.log import log
 from ...common.a2a.types import ArtifactInfo
 from ...common.utils.mime_helpers import is_text_based_mime_type, is_text_based_file
 from ...common.constants import TEXT_ARTIFACT_CONTEXT_MAX_LENGTH_CAPACITY, TEXT_ARTIFACT_CONTEXT_DEFAULT_LENGTH
@@ -26,6 +26,8 @@ if TYPE_CHECKING:
     from google.adk.tools import ToolContext
     from ...agent.sac.component import SamAgentComponent
 
+log = logging.getLogger(__name__)
+
 METADATA_SUFFIX = ".metadata.json"
 DEFAULT_SCHEMA_MAX_KEYS = 20
 

solace_agent_mesh/agent/utils/config_parser.py

@@ -2,10 +2,12 @@
 Parses and validates configuration for the SamAgentComponent and its App.
 """
 
+import logging
 from typing import Any, Union, Callable
-from solace_ai_connector.common.log import log
 from google.adk.agents.readonly_context import ReadonlyContext
 
+log = logging.getLogger(__name__)
+
 InstructionProvider = Callable[[ReadonlyContext], str]