solace-agent-mesh 1.1.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

solace_agent_mesh/gateway/http_sse/session_manager.py

@@ -3,10 +3,13 @@ Manages web user sessions and mapping to A2A Client IDs.
 """
 
 import uuid
-from starlette.requests import Request
-from typing import Optional, Callable, Dict, Any
+from collections.abc import Callable
+from typing import Any
 
 from solace_ai_connector.common.log import log
+from starlette.requests import Request
+
+from .infrastructure.persistence_service import PersistenceService
 
 SESSION_KEY_CLIENT_ID = "a2a_client_id"
 SESSION_KEY_SESSION_ID = "a2a_session_id"
@@ -21,12 +24,18 @@ class SessionManager:
     Generates and stores unique A2A Client IDs and manages the current A2A Session ID per web session.
     """
 
-    def __init__(self, secret_key: str, app_config: Dict[str, Any]):
+    def __init__(
+        self,
+        secret_key: str,
+        app_config: dict[str, Any],
+        persistence_service: "PersistenceService",
+    ):
         if not secret_key:
             raise ValueError("Session secret key cannot be empty.")
         self.secret_key = secret_key
         self.force_user_identity = app_config.get("force_user_identity")
-        self.default_user_identity = app_config.get("default_user_identity")
+        self.use_authorization = app_config.get("frontend_use_authorization", False)
+        self.persistence_service = persistence_service
         self._temp_code_cache = {}
         log.info("[SessionManager] Initialized.")
         if self.force_user_identity:
@@ -34,10 +43,11 @@ class SessionManager:
                 f"[SessionManager] Forcing user identity to: {self.force_user_identity}"
             )
 
-    def _get_or_create_client_id(self, request: Request) -> str:
+    def _get_or_create_client_id(self, request: Request) -> str | None:
         """
         Retrieves the A2A Client ID. It prioritizes the authenticated user from
         `request.state.user` and falls back to session-based or generated IDs.
+        If authorization is enabled, it returns None if no user can be identified.
         """
         if self.force_user_identity:
             return self.force_user_identity
@@ -64,35 +74,35 @@ class SessionManager:
             return user_id
 
         client_id = request.session.get(SESSION_KEY_CLIENT_ID)
-        if not client_id:
-            if self.default_user_identity:
-                log.info(
-                    "[SessionManager] Using default_user_identity as A2A Client ID: %s",
-                    self.default_user_identity,
-                )
-                client_id = self.default_user_identity
-            else:
-                client_id = f"web-client-{uuid.uuid4().hex}"
-                log.info(
-                    "[SessionManager] Created new A2A Client ID: %s for web session.",
-                    client_id,
-                )
-            request.session[SESSION_KEY_CLIENT_ID] = client_id
-        else:
+        if client_id:
             log.debug(
                 "[SessionManager] Using existing A2A Client ID: %s for web session.",
                 client_id,
             )
-        return client_id
+            return client_id
+
+        if not self.use_authorization:
+            client_id = "sam_dev_user"
+            log.info(
+                "[SessionManager] No authenticated user and auth is disabled, using client ID: %s for web session.",
+                client_id,
+            )
+            request.session[SESSION_KEY_CLIENT_ID] = client_id
+            return client_id
+
+        log.warning(
+            "[SessionManager] Could not determine client ID and authorization is enabled."
+        )
+        return None
 
-    def get_a2a_client_id(self, request: Request) -> str:
+    def get_a2a_client_id(self, request: Request) -> str | None:
         """
         FastAPI dependency callable to get the A2A Client ID for the current request.
-        Ensures a client ID exists in the session.
+        Ensures a client ID exists in the session if auth is disabled.
         """
         return self._get_or_create_client_id(request)
 
-    def get_a2a_session_id(self, request: Request) -> Optional[str]:
+    def get_a2a_session_id(self, request: Request) -> str | None:
         """
         FastAPI dependency callable to get the current A2A Session ID for the current request.
         Returns None if no session has been started for the current agent in this web session.
@@ -107,6 +117,11 @@ class SessionManager:
         This should be called when the user explicitly starts a new chat or switches agents.
         """
         client_id = self._get_or_create_client_id(request)
+        if not client_id:
+            # This case should ideally be prevented by middleware raising 401
+            raise RuntimeError(
+                "Cannot start a new A2A session without a client ID when authorization is enabled."
+            )
         new_session_id = f"web-session-{uuid.uuid4().hex}"
         request.session[SESSION_KEY_SESSION_ID] = new_session_id
         log.info(
@@ -116,6 +131,25 @@ class SessionManager:
         )
         return new_session_id
 
+    def create_new_session_id(self, request: Request) -> str:
+        """
+        Generates a new A2A Session ID without storing it in cookies.
+        This should be used when the frontend manages session state.
+        """
+        client_id = self._get_or_create_client_id(request)
+        if not client_id:
+            # This case should ideally be prevented by middleware raising 401
+            raise RuntimeError(
+                "Cannot start a new A2A session without a client ID when authorization is enabled."
+            )
+        new_session_id = f"web-session-{uuid.uuid4().hex}"
+        log.info(
+            "[SessionManager] Generated new A2A Session ID: %s for Client ID: %s (not stored in cookies)",
+            new_session_id,
+            client_id,
+        )
+        return new_session_id
+
     def ensure_a2a_session(self, request: Request) -> str:
         """
         Ensures an A2A session ID exists, creating one if necessary.
@@ -131,7 +165,7 @@ class SessionManager:
         return session_id
 
     def store_auth_tokens(
-        self, request: Request, access_token: str, refresh_token: Optional[str] = None
+        self, request: Request, access_token: str, refresh_token: str | None = None
     ):
         """
         Stores authentication tokens directly in the user's session.
@@ -141,13 +175,13 @@ class SessionManager:
             request.session[SESSION_KEY_REFRESH_TOKEN] = refresh_token
         log.info("[SessionManager] Stored auth tokens directly in session.")
 
-    def get_access_token(self, request: Request) -> Optional[str]:
+    def get_access_token(self, request: Request) -> str | None:
         """
         Retrieves the access token from the web session.
         """
         return request.session.get(SESSION_KEY_ACCESS_TOKEN)
 
-    def get_refresh_token(self, request: Request) -> Optional[str]:
+    def get_refresh_token(self, request: Request) -> str | None:
         """
         Retrieves the refresh token from the web session.
         """
@@ -168,17 +202,17 @@ class SessionManager:
         request.session[SESSION_KEY_USER_ID] = user_id
         log.info("[SessionManager] Stored user ID in session: %s", user_id)
 
-    def get_user_id(self, request: Request) -> Optional[str]:
+    def get_user_id(self, request: Request) -> str | None:
         """
         Retrieves the user ID from the web session.
         """
         return request.session.get(SESSION_KEY_USER_ID)
 
-    def dep_get_client_id(self) -> Callable[[Request], str]:
+    def dep_get_client_id(self) -> Callable[[Request], str | None]:
         """Returns a callable suitable for FastAPI Depends to get the client ID."""
         return self.get_a2a_client_id
 
-    def dep_get_session_id(self) -> Callable[[Request], Optional[str]]:
+    def dep_get_session_id(self) -> Callable[[Request], str | None]:
         """Returns a callable suitable for FastAPI Depends to get the current session ID."""
         return self.get_a2a_session_id
 

solace_agent_mesh/gateway/http_sse/shared/__init__.py

@@ -0,0 +1,9 @@
+"""
+Shared Utilities and Constants
+
+Contains common utilities, constants, enums, and types used across layers.
+"""
+
+from .auth_utils import get_current_user
+
+__all__ = ["get_current_user"]

solace_agent_mesh/gateway/http_sse/shared/auth_utils.py

@@ -0,0 +1,29 @@
+"""
+Authentication utilities for the FastAPI application.
+
+This module provides common authentication functions used across controllers.
+"""
+
+from fastapi import Depends, Request as FastAPIRequest
+
+
+async def get_current_user(request: FastAPIRequest) -> dict:
+    """
+    Extracts the current user from the request state.
+    
+    This function is used as a FastAPI dependency to get the authenticated user
+    information that was set by the AuthMiddleware.
+    
+    Args:
+        request: The FastAPI request object with user state
+        
+    Returns:
+        dict: User information dictionary containing id, name, email, etc.
+    """
+    return getattr(request.state, "user", {
+        "id": "anonymous",
+        "name": "Anonymous User",
+        "email": "anonymous@localhost",
+        "authenticated": False,
+        "auth_method": "none"
+    })

solace_agent_mesh/gateway/http_sse/shared/enums.py

@@ -0,0 +1,45 @@
+"""
+Enumerations used throughout the application.
+"""
+
+from enum import Enum
+
+
+class SenderType(str, Enum):
+    """Types of message senders."""
+    USER = "user"
+    AGENT = "agent"
+    SYSTEM = "system"
+
+
+class TaskStatus(str, Enum):
+    """Task execution status."""
+    PENDING = "pending"
+    RUNNING = "running"
+    COMPLETED = "completed"
+    FAILED = "failed"
+    CANCELLED = "cancelled"
+
+
+class SessionStatus(str, Enum):
+    """Session status."""
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+    ARCHIVED = "archived"
+
+
+class MessageType(str, Enum):
+    """Types of messages."""
+    TEXT = "text"
+    FILE = "file"
+    IMAGE = "image"
+    DOCUMENT = "document"
+
+
+class ValidationErrorType(str, Enum):
+    """Types of validation errors."""
+    REQUIRED_FIELD = "required_field"
+    INVALID_FORMAT = "invalid_format"
+    OUT_OF_RANGE = "out_of_range"
+    DUPLICATE_VALUE = "duplicate_value"
+    BUSINESS_RULE = "business_rule"

solace_agent_mesh/gateway/http_sse/shared/types.py

@@ -0,0 +1,45 @@
+"""
+Custom types and type aliases used throughout the application.
+"""
+
+from typing import Dict, Any, List, Optional, Union
+from datetime import datetime
+from pydantic import BaseModel
+
+# Basic type aliases
+UserId = str
+SessionId = str
+MessageId = str
+TaskId = str
+AgentId = str
+
+# Dictionary types
+JsonDict = Dict[str, Any]
+Headers = Dict[str, str]
+QueryParams = Dict[str, Union[str, List[str]]]
+
+# Common data structures
+class Timestamp(BaseModel):
+    """Standardized timestamp representation."""
+    created_at: datetime
+    updated_at: Optional[datetime] = None
+
+class PaginationInfo(BaseModel):
+    """Pagination information for list responses."""
+    page: int
+    page_size: int
+    total_items: int
+    total_pages: int
+    has_next: bool
+    has_previous: bool
+
+class SortInfo(BaseModel):
+    """Sorting information for list requests."""
+    field: str
+    direction: str = "asc"  # asc or desc
+
+class FilterInfo(BaseModel):
+    """Filtering information for list requests."""
+    field: str
+    operator: str  # eq, ne, gt, lt, gte, lte, contains, in
+    value: Any

solace_agent_mesh/templates/shared_config.yaml

@@ -6,8 +6,7 @@ shared_config:
       broker_password: ${SOLACE_BROKER_PASSWORD, default}
       broker_vpn: ${SOLACE_BROKER_VPN, default}
       temporary_queue: ${USE_TEMPORARY_QUEUES, true}
-      # Ensure high enough limits if many agents are running
-      # max_connection_retries: -1 # Retry forever
+      
 
   - models:
     planning: &planning_model
@@ -57,13 +56,13 @@ shared_config:
   - services:
     # Default session service configuration
     session_service: &default_session_service
-      type: "__DEFAULT_SESSION_SERVICE_TYPE__"
-      default_behavior: "__DEFAULT_SESSION_SERVICE_BEHAVIOR__"
+      type: "memory"
+      default_behavior: "PERSISTENT"
     
     # Default artifact service configuration
     artifact_service: &default_artifact_service
       type: "__DEFAULT_ARTIFACT_SERVICE_TYPE__"
-      __DEFAULT_ARTIFACT_SERVICE_BASE_PATH_LINE__
+      # __DEFAULT_ARTIFACT_SERVICE_BASE_PATH_LINE__
       artifact_scope: __DEFAULT_ARTIFACT_SERVICE_SCOPE__
     
     # Default data tools configuration

solace_agent_mesh/templates/webui.yaml

@@ -1,11 +1,11 @@
-# Solace Agent Mesh WebUI Gateway Configuration
+
 
 log:
   stdout_log_level: INFO
   log_file_level: DEBUG
   log_file: webui_app.log
 
-# Shared SAM config
+
 !include ../shared_config.yaml
 
 apps:
@@ -21,14 +21,13 @@ apps:
       session_secret_key: ${SESSION_SECRET_KEY}
 
       artifact_service: *default_artifact_service
-
+      session_service: __SESSION_SERVICE__
       gateway_id: ${WEBUI_GATEWAY_ID}
       fastapi_host: ${FASTAPI_HOST}
       fastapi_port: ${FASTAPI_PORT}
-      cors_allowed_origins: # List of allowed origins for CORS
-        - "http://localhost:3000" # Example: Allow local React dev server
+      cors_allowed_origins: 
+        - "http://localhost:3000" 
         - "http://127.0.0.1:3000"
-        # Add other origins as needed, or use ["*"] for wide open (less secure)
 
       enable_embed_resolution: ${ENABLE_EMBED_RESOLUTION} # Enable late-stage resolution
       gateway_artifact_content_limit_bytes: ${GATEWAY_ARTIFACT_LIMIT_BYTES, 10000000} # Max size for late-stage embeds
@@ -47,7 +46,6 @@ apps:
             Format responses to the user in Markdown using appropriate formatting.
 
       # --- Frontend Config Passthrough ---
-      frontend_welcome_message: >
-            __FRONTEND_WELCOME_MESSAGE__
-      frontend_bot_name: __FRONTEND_BOT_NAME__
-      frontend_collect_feedback: __FRONTEND_COLLECT_FEEDBACK__
+      frontend_welcome_message: ${FRONTEND_WELCOME_MESSAGE}
+      frontend_bot_name: ${FRONTEND_BOT_NAME}
+      frontend_collect_feedback: ${FRONTEND_COLLECT_FEEDBACK}

{solace_agent_mesh-1.1.0.dist-info → solace_agent_mesh-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solace-agent-mesh
-Version: 1.1.0
+Version: 1.3.1
 Summary: Solace Agent Mesh is an open-source framework for building event-driven, multi-agent AI systems where specialized agents collaborate on complex tasks.
 Project-URL: Homepage, https://github.com/SolaceLabs/solace-agent-mesh
 Project-URL: Repository, https://github.com/SolaceLabs/solace-agent-mesh
@@ -215,6 +215,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Requires-Python: >=3.10.16
 Requires-Dist: a2a-sdk[http-server]>=0.3.1
+Requires-Dist: alembic>=1.13.1
 Requires-Dist: asteval>=1.0.6
 Requires-Dist: asteval~=1.0.0
 Requires-Dist: beautifulsoup4>=4.12.0
@@ -250,6 +251,7 @@ Requires-Dist: python-multipart>=0.0.7
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rouge~=1.0.1
 Requires-Dist: solace-ai-connector~=1.1.8
+Requires-Dist: sqlalchemy>=2.0
 Requires-Dist: sse-starlette>=1.6
 Requires-Dist: toml~=0.10.2
 Requires-Dist: uvicorn[standard]>=0.20
@@ -257,12 +259,12 @@ Provides-Extra: cli
 Requires-Dist: click>=8.0; extra == 'cli'
 Requires-Dist: prompt-toolkit>=3.0; extra == 'cli'
 Requires-Dist: rich>=13.0; extra == 'cli'
-Provides-Extra: database
-Requires-Dist: sqlalchemy>=2.0; extra == 'database'
 Provides-Extra: employee-tools
 Requires-Dist: holidays>=0.24; extra == 'employee-tools'
 Provides-Extra: gcs
 Requires-Dist: google-cloud-storage>=2.0; extra == 'gcs'
+Provides-Extra: postgresql
+Requires-Dist: psycopg2-binary>=2.9.0; extra == 'postgresql'
 Provides-Extra: s3
 Requires-Dist: boto3<2.0,>=1.35.0; extra == 's3'
 Provides-Extra: vertex