PyPI - solace-agent-mesh - Versions diffs - 1.3.2__py3-none-any.whl → 1.4.0__py3-none-any.whl - Mend

solace-agent-mesh 1.3.2py3-none-any.whl → 1.4.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of solace-agent-mesh might be problematic. Click here for more details.

Files changed (136) hide show

solace_agent_mesh/client/webui/frontend/static/auth-callback.html CHANGED Viewed

@@ -5,9 +5,9 @@
     <link rel="icon" type="image/svg+xml" href="/assets/favicon-BLgzUch9.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Solace Agent Mesh</title>
-    <script type="module" crossorigin src="/assets/authCallback-CAX9u8a7.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-B0BEKoAR.js">
-    <link rel="modulepreload" crossorigin href="/assets/client-DXU9SPI5.js">
+    <script type="module" crossorigin src="/assets/authCallback-j1LW-wlq.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-CS5YMf8a.js">
+    <link rel="modulepreload" crossorigin href="/assets/client-B9p_nFNA.js">
   </head>
   <body>
     <div id="root"></div>

solace_agent_mesh/client/webui/frontend/static/index.html CHANGED Viewed

@@ -5,10 +5,10 @@
     <link rel="icon" type="image/svg+xml" href="/assets/favicon-BLgzUch9.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Solace Agent Mesh</title>
-    <script type="module" crossorigin src="/assets/main-DjoMeldu.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-B0BEKoAR.js">
-    <link rel="modulepreload" crossorigin href="/assets/client-DXU9SPI5.js">
-    <link rel="stylesheet" crossorigin href="/assets/main-C03yrETa.css">
+    <script type="module" crossorigin src="/assets/main-Dq4AJNvn.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-CS5YMf8a.js">
+    <link rel="modulepreload" crossorigin href="/assets/client-B9p_nFNA.js">
+    <link rel="stylesheet" crossorigin href="/assets/main-B9s_V9tJ.css">
   </head>
   <body>
     <div id="root"></div>

solace_agent_mesh/common/utils/pydantic_utils.py ADDED Viewed

@@ -0,0 +1,56 @@
+"""Provides a Pydantic BaseModel for SAM configuration with dict-like access."""
+from pydantic import BaseModel
+from typing import Any, Dict, Type, TypeVar
+T = TypeVar("T", bound="SamConfigBase")
+class SamConfigBase(BaseModel):
+    """
+    A Pydantic BaseModel for SAM configuration that allows dictionary-style access
+    for backward compatibility with components expecting dicts.
+    Supports .get(), ['key'], and 'in' operator.
+    """
+    @classmethod
+    def model_validate_and_clean(cls: Type[T], obj: Any) -> T:
+        """
+        Validates a dictionary, first removing any keys with None values.
+        This allows Pydantic's default values to be applied correctly when
+        a config key is present but has no value in YAML.
+        """
+        if isinstance(obj, dict):
+            cleaned_obj = {k: v for k, v in obj.items() if v is not None}
+            return cls.model_validate(cleaned_obj)
+        return cls.model_validate(obj)
+    def get(self, key: str, default: Any = None) -> Any:
+        """Provides dict-like .get() method."""
+        return getattr(self, key, default)
+    def __getitem__(self, key: str) -> Any:
+        """Provides dict-like ['key'] access."""
+        return getattr(self, key)
+    def __contains__(self, key: str) -> bool:
+        """
+        Provides dict-like 'in' support that mimics the old behavior.
+        Returns True only if the key was explicitly provided during model creation.
+        """
+        return key in self.model_fields_set
+    def keys(self):
+        """Provides dict-like .keys() method."""
+        return self.model_dump().keys()
+    def values(self):
+        """Provides dict-like .values() method."""
+        return self.model_dump().values()
+    def items(self):
+        """Provides dict-like .items() method."""
+        return self.model_dump().items()
+    def __iter__(self):
+        """Provides dict-like iteration over keys."""
+        return iter(self.model_dump())

solace_agent_mesh/config_portal/backend/plugin_catalog/registry_manager.py CHANGED Viewed

@@ -46,7 +46,7 @@ class RegistryManager:
         if self.user_registries_file.exists():
             try:
-                with open(self.user_registries_file, "r") as f:
+                with open(self.user_registries_file, "r", encoding="utf-8") as f:
                     loaded_data = json.load(f)
                     if isinstance(loaded_data, list):
                         for reg_dict in loaded_data:
@@ -102,7 +102,7 @@ class RegistryManager:
                 return False
         registry_id = self._generate_registry_id(path_or_url)
         final_name = name
         if not final_name:
             if registry_type == "git":
@@ -110,6 +110,8 @@ class RegistryManager:
             else:
                 final_name = Path(path_or_url).name
+        # Sanitize name to be filesystem-friendly
+        final_name = "".join(c if c.isalnum() else '_' for c in final_name)
         is_official_src = path_or_url == DEFAULT_OFFICIAL_REGISTRY_URL
         try:
@@ -128,7 +130,7 @@ class RegistryManager:
         current_registries_data: List[Dict[str, Any]] = []
         if self.user_registries_file.exists():
             try:
-                with open(self.user_registries_file, "r") as f:
+                with open(self.user_registries_file, "r", encoding="utf-8") as f:
                     loaded_data = json.load(f)
                     if isinstance(loaded_data, list):
                         current_registries_data = [
@@ -154,7 +156,7 @@ class RegistryManager:
         current_registries_data.append(new_registry.model_dump())
         try:
-            with open(self.user_registries_file, "w") as f:
+            with open(self.user_registries_file, "w", encoding="utf-8") as f:
                 json.dump(current_registries_data, f, indent=2)
             return True
         except Exception as e:

solace_agent_mesh/gateway/base/app.py CHANGED Viewed

@@ -4,13 +4,15 @@ Base App class for Gateway implementations in the Solace AI Connector.
 import uuid
 from abc import abstractmethod
-from typing import Any, Dict, List, Type
+from typing import Any, Dict, List, Type, Optional, Literal
+from pydantic import Field
 from solace_ai_connector.common.log import log
 from solace_ai_connector.common.utils import deep_merge
 from solace_ai_connector.flow.app import App
 from solace_ai_connector.components.component_base import ComponentBase
+from ...common.utils.pydantic_utils import SamConfigBase
 from ...common.a2a import (
     get_discovery_topic,
     get_gateway_response_subscription_topic,
@@ -22,91 +24,58 @@ class BaseGatewayComponent(ComponentBase):
     pass
-BASE_GATEWAY_APP_SCHEMA: Dict[str, List[Dict[str, Any]]] = {
-    "config_parameters": [
-        {
-            "name": "namespace",
-            "required": True,
-            "type": "string",
-            "description": "Absolute topic prefix for A2A communication (e.g., 'myorg/dev').",
-        },
-        {
-            "name": "gateway_id",
-            "required": False,
-            "type": "string",
-            "default": None,
-            "description": "Unique ID for this gateway instance. Auto-generated if omitted.",
-        },
-        {
-            "name": "artifact_service",
-            "required": True,
-            "type": "object",
-            "description": "Configuration for the SHARED ADK Artifact Service.",
-        },
-        {
-            "name": "enable_embed_resolution",
-            "required": False,
-            "type": "boolean",
-            "default": True,
-            "description": "Enable late-stage 'artifact_content' embed resolution in the gateway.",
-        },
-        {
-            "name": "gateway_max_artifact_resolve_size_bytes",
-            "required": False,
-            "type": "integer",
-            "default": 104857600,  # 100MB
-            "description": "Maximum size of an individual artifact's raw content for 'artifact_content' embeds and max total accumulated size for a parent artifact after internal recursive resolution.",
-        },
-        {
-            "name": "gateway_recursive_embed_depth",
-            "required": False,
-            "type": "integer",
-            "default": 12,
-            "description": "Maximum depth for recursively resolving 'artifact_content' embeds within files.",
-        },
-        {
-            "name": "artifact_handling_mode",
-            "required": False,
-            "type": "string",
-            "default": "reference",
-            "description": (
-                "How the gateway handles file parts from clients. "
-                "'reference': Save inline file bytes to the artifact store and replace with a URI. "
-                "'embed': Resolve file URIs and embed content as bytes. "
-                "'passthrough': Send file parts to the agent as-is."
-            ),
-            "enum": ["reference", "embed", "passthrough"],
-        },
-        {
-            "name": "gateway_max_message_size_bytes",
-            "required": False,
-            "type": "integer",
-            "default": 10_000_000,  # 10MB
-            "description": "Maximum allowed message size in bytes for messages published by the gateway.",
-        },
-        # --- Default User Identity Configuration ---
-        {
-            "name": "default_user_identity",
-            "required": False,
-            "type": "string",
-            "description": "Default user identity to use when no user authentication is provided. WARNING: Only use in development environments with trusted access!",
-        },
-        {
-            "name": "force_user_identity",
-            "required": False,
-            "type": "string",
-            "description": "Override any provided user identity with this value. WARNING: Development only! This completely replaces authentication.",
-        },
-        # --- Identity Service Configuration ---
-        {
-            "name": "identity_service",
-            "required": False,
-            "type": "object",
-            "default": None,
-            "description": "Configuration for the pluggable Identity Service provider.",
-        },
-    ]
-}
+class BaseGatewayAppConfig(SamConfigBase):
+    """Base Pydantic model for gateway application configuration."""
+    namespace: str = Field(
+        ...,
+        description="Absolute topic prefix for A2A communication (e.g., 'myorg/dev').",
+    )
+    gateway_id: Optional[str] = Field(
+        default=None,
+        description="Unique ID for this gateway instance. Auto-generated if omitted.",
+    )
+    artifact_service: Dict[str, Any] = Field(
+        ...,
+        description="Configuration for the SHARED ADK Artifact Service.",
+    )
+    enable_embed_resolution: bool = Field(
+        default=True,
+        description="Enable late-stage 'artifact_content' embed resolution in the gateway.",
+    )
+    gateway_max_artifact_resolve_size_bytes: int = Field(
+        default=104857600,  # 100MB
+        description="Maximum size of an individual artifact's raw content for 'artifact_content' embeds and max total accumulated size for a parent artifact after internal recursive resolution.",
+    )
+    gateway_recursive_embed_depth: int = Field(
+        default=12,
+        description="Maximum depth for recursively resolving 'artifact_content' embeds within files.",
+    )
+    artifact_handling_mode: Literal["reference", "embed", "passthrough"] = Field(
+        default="reference",
+        description=(
+            "How the gateway handles file parts from clients. "
+            "'reference': Save inline file bytes to the artifact store and replace with a URI. "
+            "'embed': Resolve file URIs and embed content as bytes. "
+            "'passthrough': Send file parts to the agent as-is."
+        ),
+    )
+    gateway_max_message_size_bytes: int = Field(
+        default=10_000_000,  # 10MB
+        description="Maximum allowed message size in bytes for messages published by the gateway.",
+    )
+    default_user_identity: Optional[str] = Field(
+        default=None,
+        description="Default user identity to use when no user authentication is provided. WARNING: Only use in development environments with trusted access!",
+    )
+    force_user_identity: Optional[str] = Field(
+        default=None,
+        description="Override any provided user identity with this value. WARNING: Development only! This completely replaces authentication.",
+    )
+    identity_service: Optional[Dict[str, Any]] = Field(
+        default=None,
+        description="Configuration for the pluggable Identity Service provider.",
+    )
 class BaseGatewayApp(App):
@@ -114,44 +83,13 @@ class BaseGatewayApp(App):
     Base class for Gateway applications.
     Handles common configuration, Solace broker setup, and instantiation
-    of the gateway-specific component. It also automatically merges its
-    base schema with specific schema parameters defined by subclasses.
+    of the gateway-specific component.
     """
-    app_schema: Dict[str, List[Dict[str, Any]]] = BASE_GATEWAY_APP_SCHEMA
+    # This is now a placeholder. Validation is handled by Pydantic models in subclasses.
+    app_schema: Dict[str, List[Dict[str, Any]]] = {"config_parameters": []}
     SPECIFIC_APP_SCHEMA_PARAMS_ATTRIBUTE_NAME = "SPECIFIC_APP_SCHEMA_PARAMS"
-    def __init_subclass__(cls, **kwargs):
-        """
-        Automatically merges the base gateway schema with specific schema
-        parameters defined in any subclass.
-        """
-        super().__init_subclass__(**kwargs)
-        specific_params = getattr(
-            cls, cls.SPECIFIC_APP_SCHEMA_PARAMS_ATTRIBUTE_NAME, []
-        )
-        if not isinstance(specific_params, list):
-            log.warning(
-                "Class attribute '%s' in %s is not a list. Schema merging might be incorrect.",
-                cls.SPECIFIC_APP_SCHEMA_PARAMS_ATTRIBUTE_NAME,
-                cls.__name__,
-            )
-            specific_params = []
-        base_params = BaseGatewayApp.app_schema.get("config_parameters", [])
-        merged_config_parameters = list(base_params)
-        merged_config_parameters.extend(specific_params)
-        cls.app_schema = {"config_parameters": merged_config_parameters}
-        log.debug(
-            "BaseGatewayApp.__init_subclass__ created merged app_schema for %s with %d params.",
-            cls.__name__,
-            len(merged_config_parameters),
-        )
     def __init__(self, app_info: Dict[str, Any], **kwargs):
         """
         Initializes the BaseGatewayApp.

solace_agent_mesh/gateway/http_sse/app.py CHANGED Viewed

@@ -3,15 +3,16 @@ Custom Solace AI Connector App class for the Web UI Backend.
 Defines configuration schema and programmatically creates the WebUIBackendComponent.
 """
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 import os
 from alembic import command
 from alembic.config import Config
+from pydantic import Field, ValidationError
 from solace_ai_connector.common.log import log
 from ...gateway.http_sse.component import WebUIBackendComponent
-from ...gateway.base.app import BaseGatewayApp
+from ...gateway.base.app import BaseGatewayApp, BaseGatewayAppConfig
 from ...gateway.base.component import BaseGatewayComponent
@@ -21,6 +22,88 @@ info = {
 }
+class WebUIBackendAppConfig(BaseGatewayAppConfig):
+    """Pydantic model for the Web UI Backend application configuration."""
+    session_secret_key: str = Field(
+        ..., description="Secret key for signing web user sessions."
+    )
+    fastapi_host: str = Field(
+        default="127.0.0.1", description="Host address for the embedded FastAPI server."
+    )
+    fastapi_port: int = Field(
+        default=8000, description="Port for the embedded FastAPI server."
+    )
+    fastapi_https_port: int = Field(
+        default=8443, description="Port for the embedded FastAPI server when SSL is enabled."
+    )
+    cors_allowed_origins: List[str] = Field(
+        default=["*"], description="List of allowed origins for CORS requests."
+    )
+    sse_max_queue_size: int = Field(
+        default=200,
+        description="Maximum size of the SSE connection queues. Adjust based on expected load.",
+    )
+    sse_buffer_max_age_seconds: int = Field(
+        default=600,  # 10 minutes
+        description="Maximum age in seconds for a pending event buffer before it is cleaned up.",
+    )
+    sse_buffer_cleanup_interval_seconds: int = Field(
+        default=300,  # 5 minutes
+        description="How often to run the cleanup task for stale pending event buffers.",
+    )
+    resolve_artifact_uris_in_gateway: bool = Field(
+        default=True,
+        description="If true, the gateway will resolve artifact:// URIs found in A2A messages and embed the content as bytes before sending to the UI. If false, URIs are passed through.",
+    )
+    system_purpose: str = Field(
+        default="",
+        description="Detailed description of the system's overall purpose, to be optionally used by agents.",
+    )
+    response_format: str = Field(
+        default="",
+        description="General guidelines on how agent responses should be structured, to be optionally used by agents.",
+    )
+    frontend_welcome_message: str = Field(
+        default="Hi! How can I help?",
+        description="Initial welcome message displayed in the chat.",
+    )
+    frontend_bot_name: str = Field(
+        default="A2A Agent", description="Name displayed for the bot/agent in the UI."
+    )
+    frontend_collect_feedback: bool = Field(
+        default=False, description="Enable/disable the feedback buttons in the UI."
+    )
+    frontend_auth_login_url: str = Field(
+        default="", description="URL for the external login page (if auth is enabled)."
+    )
+    frontend_use_authorization: bool = Field(
+        default=False, description="Tell frontend whether backend expects authorization."
+    )
+    frontend_redirect_url: str = Field(
+        default="", description="Redirect URL for OAuth flows (if auth is enabled)."
+    )
+    external_auth_callback_uri: str = Field(
+        default="", description="Redirect URI for the OIDC application."
+    )
+    external_auth_service_url: str = Field(
+        default="http://localhost:8080",
+        description="External authorization service URL for login initiation.",
+    )
+    external_auth_provider: str = Field(
+        default="", description="The external authentication provider."
+    )
+    ssl_keyfile: str = Field(
+        default="", description="The file path to the SSL private key."
+    )
+    ssl_certfile: str = Field(
+        default="", description="The file path to the SSL certificate."
+    )
+    ssl_keyfile_password: str = Field(
+        default="", description="The passphrase for the SSL private key."
+    )
 class WebUIBackendApp(BaseGatewayApp):
     """
     Custom App class for the A2A Web UI Backend.
@@ -28,154 +111,8 @@ class WebUIBackendApp(BaseGatewayApp):
     - Defines WebUI-specific configuration parameters.
     """
-    SPECIFIC_APP_SCHEMA_PARAMS: List[Dict[str, Any]] = [
-        {
-            "name": "session_secret_key",
-            "required": True,
-            "type": "string",
-            "description": "Secret key for signing web user sessions.",
-        },
-        {
-            "name": "fastapi_host",
-            "required": False,
-            "type": "string",
-            "default": "127.0.0.1",
-            "description": "Host address for the embedded FastAPI server.",
-        },
-        {
-            "name": "fastapi_port",
-            "required": False,
-            "type": "integer",
-            "default": 8000,
-            "description": "Port for the embedded FastAPI server.",
-        },
-        {
-            "name": "fastapi_https_port",
-            "required": False,
-            "type": "integer",
-            "default": 8443,
-            "description": "Port for the embedded FastAPI server when SSL is enabled.",
-        },
-        {
-            "name": "cors_allowed_origins",
-            "required": False,
-            "type": "list",
-            "default": ["*"],
-            "description": "List of allowed origins for CORS requests.",
-        },
-        {
-            "name": "sse_max_queue_size",
-            "required": False,
-            "type": "integer",
-            "default": 200,
-            "description": "Maximum size of the SSE connection queues. Adjust based on expected load.",
-        },
-        {
-            "name": "resolve_artifact_uris_in_gateway",
-            "required": False,
-            "type": "boolean",
-            "default": True,
-            "description": "If true, the gateway will resolve artifact:// URIs found in A2A messages and embed the content as bytes before sending to the UI. If false, URIs are passed through.",
-        },
-        {
-            "name": "system_purpose",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "Detailed description of the system's overall purpose, to be optionally used by agents.",
-        },
-        {
-            "name": "response_format",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "General guidelines on how agent responses should be structured, to be optionally used by agents.",
-        },
-        {
-            "name": "frontend_welcome_message",
-            "required": False,
-            "type": "string",
-            "default": "Hi! How can I help?",
-            "description": "Initial welcome message displayed in the chat.",
-        },
-        {
-            "name": "frontend_bot_name",
-            "required": False,
-            "type": "string",
-            "default": "A2A Agent",
-            "description": "Name displayed for the bot/agent in the UI.",
-        },
-        {
-            "name": "frontend_collect_feedback",
-            "required": False,
-            "type": "boolean",
-            "default": False,
-            "description": "Enable/disable the feedback buttons in the UI.",
-        },
-        {
-            "name": "frontend_auth_login_url",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "URL for the external login page (if auth is enabled).",
-        },
-        {
-            "name": "frontend_use_authorization",
-            "required": False,
-            "type": "boolean",
-            "default": False,
-            "description": "Tell frontend whether backend expects authorization.",
-        },
-        {
-            "name": "frontend_redirect_url",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "Redirect URL for OAuth flows (if auth is enabled).",
-        },
-        {
-            "name": "external_auth_callback_uri",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "Redirect URI for the OIDC application.",
-        },
-        {
-            "name": "external_auth_service_url",
-            "required": False,
-            "type": "string",
-            "default": "http://localhost:8080",
-            "description": "External authorization service URL for login initiation.",
-        },
-        {
-            "name": "external_auth_provider",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "The external authentication provider.",
-        },
-        {
-            "name": "ssl_keyfile",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "The file path to the SSL private key.",
-        },
-        {
-            "name": "ssl_certfile",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "The file path to the SSL certificate.",
-        },
-        {
-            "name": "ssl_keyfile_password",
-            "required": False,
-            "type": "string",
-            "default": "",
-            "description": "The passphrase for the SSL private key.",
-        },
-    ]
+    # This is now a placeholder. Validation is handled by the Pydantic model.
+    SPECIFIC_APP_SCHEMA_PARAMS: List[Dict[str, Any]] = []
     def __init__(self, app_info: Dict[str, Any], **kwargs):
         """
@@ -186,6 +123,18 @@ class WebUIBackendApp(BaseGatewayApp):
             "%s Initializing WebUIBackendApp...",
             app_info.get("name", "WebUIBackendApp"),
         )
+        app_config_dict = app_info.get("app_config", {})
+        try:
+            # Validate the raw dict, cleaning None values to allow defaults to apply
+            app_config = WebUIBackendAppConfig.model_validate_and_clean(
+                app_config_dict
+            )
+            app_info["app_config"] = app_config
+        except ValidationError as e:
+            log.error("Web UI Gateway configuration validation failed:\n%s", e)
+            raise ValueError(f"Invalid Web UI Gateway configuration: {e}") from e
         super().__init__(app_info, **kwargs)
         try:

solace-agent-mesh 1.3.2__py3-none-any.whl → 1.4.0__py3-none-any.whl

Potentially problematic release.

solace-agent-mesh 1.3.2py3-none-any.whl → 1.4.0py3-none-any.whl